]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
workunits/rgw: adjust radosgw-admin output parsing
authorYehuda Sadeh <yehuda@redhat.com>
Mon, 26 Jan 2015 21:10:37 +0000 (13:10 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Thu, 29 Jan 2015 17:31:33 +0000 (09:31 -0800)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
qa/workunits/rgw/s3_utilities.pm

index 5ad3714143b9507e91dfa61a517379f65fe1743f..8492dd328dcf595d62386acb879325e253083436 100644 (file)
@@ -96,7 +96,7 @@ sub get_user_info
     if ($cmd_op !~ /keys/){
         return (0,0);
     }
-    my @get_user = (split/,/,$cmd_op);
+    my @get_user = (split/\n/,$cmd_op);
     foreach (@get_user) {
         if ($_ =~ /access_key/ ){
             $get_acc_key = $_;
@@ -109,13 +109,13 @@ sub get_user_info
     $acc_key =~ s/\\//g;
     $acc_key =~ s/ //g;
     $acc_key =~ s/"//g;
+    $acc_key =~ s/,//g;
     my $secret_key = $get_sec_key;
     my $sec_key = (split /:/, $secret_key)[1];
-    chop($sec_key);
-    chop($sec_key);
     $sec_key =~ s/\\//g;
     $sec_key =~ s/ //g;
     $sec_key =~ s/"//g;
+    $sec_key =~ s/,//g;
     return ($acc_key, $sec_key);
 }