workunits/rgw: set radosgw-admin location through env variable

add new RGW_ADMIN to be able to set call.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/qa/workunits/rgw/s3_bucket_quota.pl b/qa/workunits/rgw/s3_bucket_quota.pl
index 1b607ac70ae16fb6f2fc30217ae06974db80ca12..6a4a1a4513c6d2c0841f1c0e76ee09c7934fb327 100755 (executable)
--- a/qa/workunits/rgw/s3_bucket_quota.pl
+++ b/qa/workunits/rgw/s3_bucket_quota.pl
@@ -61,7 +61,7 @@ my $rgw_user = "qa_user";
 # Function that deletes the user $rgw_user and write to logfile. 
 sub delete_user
 {
-    my $cmd = "sudo radosgw-admin user rm --uid=$rgw_user";
+    my $cmd = "$radosgw_admin user rm --uid=$rgw_user";
     my $cmd_op = get_command_output($cmd);
     if ($cmd_op !~ /aborting/){
         print "user $rgw_user deleted\n";
@@ -73,7 +73,7 @@ sub delete_user
 }
 
 sub quota_set_max_size {
-    my $set_quota = `sudo radosgw-admin quota set --bucket=$bucketname --max-size=1048576000`; 
+    my $set_quota = `$radosgw_admin quota set --bucket=$bucketname --max-size=1048576000`; 
     if ($set_quota !~ /./){
       print "quota set for the bucket: $bucketname \n";
     } else {
@@ -85,7 +85,7 @@ sub quota_set_max_size {
 
 sub quota_set_max_size_zero {
     run_s3($rgw_user);
-    my $set_quota = `sudo radosgw-admin quota set --bucket=$bucketname --max-size=0`; 
+    my $set_quota = `$radosgw_admin quota set --bucket=$bucketname --max-size=0`; 
     if ($set_quota !~ /./){
       pass ("quota set for the bucket: $bucketname with max size as zero\n");
     } else {
@@ -96,7 +96,7 @@ sub quota_set_max_size_zero {
 
 sub quota_set_max_objs_zero {
     run_s3($rgw_user);
-    my $set_quota = `sudo radosgw-admin quota set --bucket=$bucketname --max-objects=0`; 
+    my $set_quota = `$radosgw_admin quota set --bucket=$bucketname --max-objects=0`; 
     if ($set_quota !~ /./){
       pass ("quota set for the bucket: $bucketname with max objects as zero\n");
     } else {
@@ -107,7 +107,7 @@ sub quota_set_max_objs_zero {
 
 sub quota_set_neg_size {
     run_s3($rgw_user);
-    my $set_quota = `sudo radosgw-admin quota set --bucket=$bucketname --max-size=-1`; 
+    my $set_quota = `$radosgw_admin quota set --bucket=$bucketname --max-size=-1`; 
     if ($set_quota !~ /./){
       pass ("quota set for the bucket: $bucketname with max size -1\n");
     } else {
@@ -118,7 +118,7 @@ sub quota_set_neg_size {
 
 sub quota_set_neg_objs {
     run_s3($rgw_user);
-    my $set_quota = `sudo radosgw-admin quota set --bucket=$bucketname --max-objects=-1`; 
+    my $set_quota = `$radosgw_admin quota set --bucket=$bucketname --max-objects=-1`; 
     if ($set_quota !~ /./){
       pass ("quota set for the bucket: $bucketname max objects -1 \n");
     } else {
@@ -128,8 +128,8 @@ sub quota_set_neg_objs {
 }
 
 sub quota_set_user_objs {
-    my $set_quota = `sudo radosgw-admin quota set --uid=$rgw_user --quota-scope=bucket`; 
-    my $set_quota1 = `sudo radosgw-admin quota set --bucket=$bucketname --max-objects=1`; 
+    my $set_quota = `$radosgw_admin quota set --uid=$rgw_user --quota-scope=bucket`; 
+    my $set_quota1 = `$radosgw_admin quota set --bucket=$bucketname --max-objects=1`; 
     if ($set_quota1 !~ /./){
       print "bucket quota max_objs set for the given user: $bucketname \n";
     } else {
@@ -140,8 +140,8 @@ sub quota_set_user_objs {
 }
 
 sub quota_set_user_size {
-    my $set_quota = `sudo radosgw-admin quota set --uid=$rgw_user --quota-scope=bucket`; 
-    my $set_quota1 = `sudo radosgw-admin quota set --bucket=$bucketname --max-size=1048576000`; 
+    my $set_quota = `$radosgw_admin quota set --uid=$rgw_user --quota-scope=bucket`; 
+    my $set_quota1 = `$radosgw_admin quota set --bucket=$bucketname --max-size=1048576000`; 
     if ($set_quota1 !~ /./){
       print "bucket quota max size set for the given user: $bucketname \n";
     } else {
@@ -153,7 +153,7 @@ sub quota_set_user_size {
 
 sub quota_set_max_obj {
     # set max objects 
-    my $set_quota = `sudo radosgw-admin quota set --bucket=$bucketname --max-objects=1`; 
+    my $set_quota = `$radosgw_admin quota set --bucket=$bucketname --max-objects=1`; 
     if ($set_quota !~ /./){ 
       print "quota set for the bucket: $bucketname \n"; 
     } else {
@@ -164,7 +164,7 @@ sub quota_set_max_obj {
 }
 
 sub quota_enable {
-    my $en_quota = `sudo radosgw-admin quota enable --bucket=$bucketname`; 
+    my $en_quota = `$radosgw_admin quota enable --bucket=$bucketname`; 
     if ($en_quota !~ /./){ 
       print "quota enabled for the bucket: $bucketname \n"; 
     } else {
@@ -175,7 +175,7 @@ sub quota_enable {
 }
 
 sub quota_disable {
-    my $dis_quota = `sudo radosgw-admin quota disable --bucket=$bucketname`; 
+    my $dis_quota = `$radosgw_admin quota disable --bucket=$bucketname`; 
     if ($dis_quota !~ /./){ 
       print "quota disabled for the bucket: $bucketname \n"; 
     } else {

diff --git a/qa/workunits/rgw/s3_user_quota.pl b/qa/workunits/rgw/s3_user_quota.pl
index 04d352ddff224b42030564a56982f8227a5cd190..fbda89a66d9e3f854890fae4c2443fbacabe5a74 100755 (executable)
--- a/qa/workunits/rgw/s3_user_quota.pl
+++ b/qa/workunits/rgw/s3_user_quota.pl
@@ -60,7 +60,7 @@ our $cnt;
 sub quota_set_max_size_per_user {
     my ($maxsize, $size1,$rgw_user) = @_;
     run_s3($rgw_user);
-    my $set_quota = `sudo radosgw-admin quota set --uid=$rgw_user --quota-scope=user --max-size=$maxsize`;
+    my $set_quota = `$radosgw_admin quota set --uid=$rgw_user --quota-scope=user --max-size=$maxsize`;
     if (($set_quota !~ /./)&&($maxsize == 0)){
       my $ret = test_max_objs($size1, $rgw_user);
       if ($ret == 1){
@@ -84,7 +84,7 @@ sub quota_set_max_size_per_user {
 sub max_size_per_user {
     my ($maxsize, $size1,$rgw_user) = @_;
     run_s3($rgw_user);
-    my $set_quota = `sudo radosgw-admin quota set --uid=$rgw_user --quota-scope=user --max-size=$maxsize`;
+    my $set_quota = `$radosgw_admin quota set --uid=$rgw_user --quota-scope=user --max-size=$maxsize`;
     if (($set_quota !~ /./) && ($maxsize != 0)) {
       my $ret = test_max_objs($size1, $rgw_user);
       if ($ret == 0){
@@ -98,7 +98,7 @@ sub quota_set_max_obj_per_user {
     # set max objects
     my ($maxobjs, $size1, $rgw_user) = @_;
     run_s3($rgw_user);
-    my $set_quota = `sudo radosgw-admin quota set --uid=$rgw_user --quota-scope=user --max-objects=$maxobjs`;
+    my $set_quota = `$radosgw_admin quota set --uid=$rgw_user --quota-scope=user --max-objects=$maxobjs`;
     if (($set_quota !~ /./) && ($maxobjs == 0)){
       my $ret = test_max_objs($size1, $rgw_user);
       if ($ret == 1){
@@ -120,7 +120,7 @@ sub quota_set_max_obj_per_user {
  
 sub quota_enable_user {
     my ($rgw_user) = @_;
-    my $en_quota = `sudo radosgw-admin quota enable --uid=$rgw_user --quota-scope=user`;
+    my $en_quota = `$radosgw_admin quota enable --uid=$rgw_user --quota-scope=user`;
     if ($en_quota !~ /./){
       print "quota enabled for the user $rgw_user \n";
     } else {
@@ -131,7 +131,7 @@ sub quota_enable_user {
 }
 
 sub quota_disable_user {
-    my $dis_quota = `sudo radosgw-admin quota disable --uid=$rgw_user --quota-scope=user`;
+    my $dis_quota = `$radosgw_admin quota disable --uid=$rgw_user --quota-scope=user`;
     if ($dis_quota !~ /./){
       print "quota disabled for the user $rgw_user \n";
     } else {

diff --git a/qa/workunits/rgw/s3_utilities.pm b/qa/workunits/rgw/s3_utilities.pm
index e0c8b7664ba4c3cd5a89f17de29ff726ed61d7d6..5ad3714143b9507e91dfa61a517379f65fe1743f 100644 (file)
--- a/qa/workunits/rgw/s3_utilities.pm
+++ b/qa/workunits/rgw/s3_utilities.pm
@@ -11,6 +11,8 @@ my $isdst;
 my $PASS_CNT = 0;
 my $FAIL_CNT = 0;
 
+our $radosgw_admin = $ENV{RGW_ADMIN}||"sudo radosgw-admin";
+
 # function to get the current time stamp from the test set up
 sub get_timestamp {
    ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
@@ -89,7 +91,7 @@ sub print_border2 {
 sub get_user_info
 {
     my ($rgw_user) = @_;
-    my $cmd = "sudo radosgw-admin user create --uid=$rgw_user --display-name=$rgw_user";
+    my $cmd = "$radosgw_admin user create --uid=$rgw_user --display-name=$rgw_user";
     my $cmd_op = get_command_output($cmd);
     if ($cmd_op !~ /keys/){
         return (0,0);
@@ -121,7 +123,7 @@ sub get_user_info
 sub purge_data
 {
     my ($rgw_user) = @_;
-    my $cmd = "sudo radosgw-admin user rm --uid=$rgw_user --purge-data";
+    my $cmd = "$radosgw_admin user rm --uid=$rgw_user --purge-data";
     my $cmd_op = get_command_output($cmd);
     if ($cmd_op !~ /./){
         print "user $rgw_user deleted\n";