commit f0b44d8fd474c8d6381160b06dab83c153110e5a
author Jenkins <jenkins@review.openstack.org> Tue Mar 14 19:24:36 2017 +0000
committer Gerrit Code Review <review@openstack.org> Tue Mar 14 19:24:36 2017 +0000
tree b4588d38d65d938bafb0e689adab74e22f492ba8
parent 3642309e96c6deba99200d9bcb56f5d1bf27f3ba
parent dbea7df218bb351b62bdd4bf0dbf587cd76032dd

Merge "Fixes test_images_member_rbac missing os credentials for image v2."

patrole_tempest_plugin/tests/api/image/v1/test_images_member_rbac.py

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 8ded2ec..c062769 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
 
     def tearDown(self):
         self.rbac_utils.switch_role(self, switchToRbacRole=False)

patrole_tempest_plugin/tests/api/image/v2/test_images_member_rbac.py

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 81bad5f..f11dbd2 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 tearDown(self):
         self.rbac_utils.switch_role(self, switchToRbacRole=False)