Merge "Removal of re-switching of rbac-role from tearDown"
diff --git a/patrole_tempest_plugin/tests/api/image/v1/test_images_member_rbac.py b/patrole_tempest_plugin/tests/api/image/v1/test_images_member_rbac.py
index b188304..d431eee 100644
--- a/patrole_tempest_plugin/tests/api/image/v1/test_images_member_rbac.py
+++ b/patrole_tempest_plugin/tests/api/image/v1/test_images_member_rbac.py
@@ -30,12 +30,11 @@
def setup_clients(cls):
super(ImagesMemberRbacTest, cls).setup_clients()
cls.image_member_client = cls.os.image_member_client
- cls.alt_image_member_client = cls.os_alt.image_member_client
@classmethod
def resource_setup(cls):
super(ImagesMemberRbacTest, cls).resource_setup()
- cls.alt_tenant_id = cls.alt_image_member_client.tenant_id
+ cls.alt_tenant_id = cls.os_alt.image_member_client.tenant_id
@rbac_rule_validation.action(service="glance", rule="add_member")
@decorators.idempotent_id('bda2bb78-e6ec-4b87-ba6d-1eaf1b28fa8b')
diff --git a/patrole_tempest_plugin/tests/api/image/v2/test_images_member_rbac.py b/patrole_tempest_plugin/tests/api/image/v2/test_images_member_rbac.py
index 5e26db2..bbd5a79 100644
--- a/patrole_tempest_plugin/tests/api/image/v2/test_images_member_rbac.py
+++ b/patrole_tempest_plugin/tests/api/image/v2/test_images_member_rbac.py
@@ -28,21 +28,19 @@
class ImagesMemberRbacTest(base.BaseV2ImageRbacTest):
- credentials = ['admin', 'alt']
+ credentials = ['admin', 'primary', 'alt']
@classmethod
def resource_setup(cls):
super(ImagesMemberRbacTest, cls).resource_setup()
cls.tenant_id = cls.image_member_client.tenant_id
- cls.alt_tenant_id = cls.alt_image_member_client.tenant_id
+ cls.alt_tenant_id = cls.os_alt.image_member_client_v2.tenant_id
@classmethod
def setup_clients(cls):
super(ImagesMemberRbacTest, cls).setup_clients()
cls.image_client = cls.os.image_client_v2
- cls.alt_image_client = cls.os_alt.image_client_v2
cls.image_member_client = cls.os.image_member_client_v2
- cls.alt_image_member_client = cls.os_alt.image_member_client_v2
def setUp(self):
self.rbac_utils.switch_role(self, switchToRbacRole=False)