From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 28 Nov 2018 18:18:05 +0000 (-0500)
Subject: qa/rgw: add credentials to zone 'remove' in test_zonegroup_remove()
X-Git-Tag: v12.2.13~247^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=91e42bd657ba70ee53701e6455776c9b2487493c;p=ceph.git

qa/rgw: add credentials to zone 'remove' in test_zonegroup_remove()

zone credentials are required to 'period update --commit' from
--rgw-zone remove

Signed-off-by: Casey Bodley <cbodley@redhat.com>

Conflicts:
	src/test/rgw/rgw_multi/tests.py
(cherry picked from commit 56021eab9584f10fa43053621cce93b623c36265)
---

diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py
index 7d97c67cd1cdf..97f2409267cfa 100644
--- a/src/test/rgw/rgw_multi/tests.py
+++ b/src/test/rgw/rgw_multi/tests.py
@@ -22,7 +22,7 @@ from nose.tools import eq_ as eq
 from nose.plugins.attrib import attr
 from nose.plugins.skip import SkipTest
 
-from .multisite import Zone, ZoneGroup
+from .multisite import Zone, ZoneGroup, Credentials
 
 from .conn import get_gateway_connection
 
@@ -951,9 +951,13 @@ def test_zonegroup_remove():
     z1, z2 = zonegroup.zones[0:2]
     c1, c2 = (z1.cluster, z2.cluster)
 
+    # get admin credentials out of existing zone
+    system_key = z1.data['system_key']
+    admin_creds = Credentials(system_key['access_key'], system_key['secret_key'])
+
     # create a new zone in zonegroup on c2 and commit
     zone = Zone('remove', zonegroup, c2)
-    zone.create(c2)
+    zone.create(c2, admin_creds.credential_args())
     zonegroup.zones.append(zone)
     zonegroup.period.update(zone, commit=True)