From: Orit Wasserman <owasserm@redhat.com>
Date: Tue, 29 Mar 2016 15:19:07 +0000 (+0200)
Subject: rgw: policy acl format should be xml
X-Git-Tag: v10.2.6~165^2^2~110^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4534e8ed610253a203b127152e5a13d89d243063;p=ceph.git

rgw: policy acl format should be xml

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---

diff --git a/tasks/radosgw_admin.py b/tasks/radosgw_admin.py
index 7cea724ae23f..142b8f22385d 100644
--- a/tasks/radosgw_admin.py
+++ b/tasks/radosgw_admin.py
@@ -931,7 +931,7 @@ def task(ctx, config):
 
     (err, out) = rgwadmin(ctx, client,
         ['policy', '--bucket', bucket.name, '--object', key.key],
-        check_status=True)
+        check_status=True, format='xml')
 
     acl = get_acl(key)
 
@@ -942,7 +942,7 @@ def task(ctx, config):
 
     (err, out) = rgwadmin(ctx, client,
         ['policy', '--bucket', bucket.name, '--object', key.key],
-        check_status=True)
+        check_status=True, format='xml')
 
     acl = get_acl(key)
 
diff --git a/tasks/util/rgw.py b/tasks/util/rgw.py
index e5fba9f82f9a..cf06443ef342 100644
--- a/tasks/util/rgw.py
+++ b/tasks/util/rgw.py
@@ -15,7 +15,8 @@ def multi_region_enabled(ctx):
     # use that as an indicator that we're testing multi-region sync
     return 'radosgw_agent' in ctx
 
-def rgwadmin(ctx, client, cmd, stdin=StringIO(), check_status=False):
+def rgwadmin(ctx, client, cmd, stdin=StringIO(), check_status=False,
+             format='json'):
     log.info('rgwadmin: {client} : {cmd}'.format(client=client,cmd=cmd))
     testdir = teuthology.get_testdir(ctx)
     pre = [
@@ -24,7 +25,7 @@ def rgwadmin(ctx, client, cmd, stdin=StringIO(), check_status=False):
         '{tdir}/archive/coverage'.format(tdir=testdir),
         'radosgw-admin'.format(tdir=testdir),
         '--log-to-stderr',
-        '--format', 'json',
+        '--format', format,
         '-n',  client,
         ]
     pre.extend(cmd)