diff --git a/tempest/api/identity/admin/v2/test_tokens.py b/tempest/api/identity/admin/v2/test_tokens.py index 3428c07c17..98abd02a84 100644 --- a/tempest/api/identity/admin/v2/test_tokens.py +++ b/tempest/api/identity/admin/v2/test_tokens.py @@ -87,10 +87,7 @@ class TokensTestJSON(base.BaseIdentityV2AdminTest): self.addCleanup(self.tenants_client.delete_tenant, tenant2['id']) # Create a role - role_name = data_utils.rand_name(name='role') - role = self.roles_client.create_role(name=role_name)['role'] - # Delete the role at the end of the test - self.addCleanup(self.roles_client.delete_role, role['id']) + role = self.setup_test_role() # Grant the user the role on the tenants. self.roles_client.create_user_role_on_project(tenant1['id'], diff --git a/tempest/api/identity/admin/v3/test_inherits.py b/tempest/api/identity/admin/v3/test_inherits.py index 3fe591bd2e..4de0f5bfad 100644 --- a/tempest/api/identity/admin/v3/test_inherits.py +++ b/tempest/api/identity/admin/v3/test_inherits.py @@ -65,9 +65,7 @@ class InheritsV3TestJSON(BaseInheritsV3Test): @decorators.idempotent_id('4e6f0366-97c8-423c-b2be-41eae6ac91c8') def test_inherit_assign_list_check_revoke_roles_on_domains_user(self): # Create role - src_role = self.roles_client.create_role( - name=data_utils.rand_name('Role'))['role'] - self.addCleanup(self.roles_client.delete_role, src_role['id']) + src_role = self.setup_test_role() # Assign role on domains user self.inherited_roles_client.create_inherited_role_on_domains_user( self.domain['id'], self.user['id'], src_role['id']) @@ -91,9 +89,7 @@ class InheritsV3TestJSON(BaseInheritsV3Test): @decorators.idempotent_id('c7a8dda2-be50-4fb4-9a9c-e830771078b1') def test_inherit_assign_list_check_revoke_roles_on_domains_group(self): # Create role - src_role = self.roles_client.create_role( - name=data_utils.rand_name('Role'))['role'] - self.addCleanup(self.roles_client.delete_role, src_role['id']) + src_role = self.setup_test_role() # Assign role on domains group self.inherited_roles_client.create_inherited_role_on_domains_group( self.domain['id'], self.group['id'], src_role['id']) @@ -117,9 +113,7 @@ class InheritsV3TestJSON(BaseInheritsV3Test): @decorators.idempotent_id('18b70e45-7687-4b72-8277-b8f1a47d7591') def test_inherit_assign_check_revoke_roles_on_projects_user(self): # Create role - src_role = self.roles_client.create_role( - name=data_utils.rand_name('Role'))['role'] - self.addCleanup(self.roles_client.delete_role, src_role['id']) + src_role = self.setup_test_role() # Assign role on projects user self.inherited_roles_client.create_inherited_role_on_projects_user( self.project['id'], self.user['id'], src_role['id']) @@ -134,9 +128,7 @@ class InheritsV3TestJSON(BaseInheritsV3Test): @decorators.idempotent_id('26021436-d5a4-4256-943c-ded01e0d4b45') def test_inherit_assign_check_revoke_roles_on_projects_group(self): # Create role - src_role = self.roles_client.create_role( - name=data_utils.rand_name('Role'))['role'] - self.addCleanup(self.roles_client.delete_role, src_role['id']) + src_role = self.setup_test_role() # Assign role on projects group self.inherited_roles_client.create_inherited_role_on_projects_group( self.project['id'], self.group['id'], src_role['id']) @@ -152,9 +144,7 @@ class InheritsV3TestJSON(BaseInheritsV3Test): @decorators.idempotent_id('3acf666e-5354-42ac-8e17-8b68893bcd36') def test_inherit_assign_list_revoke_user_roles_on_domain(self): # Create role - src_role = self.roles_client.create_role( - name=data_utils.rand_name('Role'))['role'] - self.addCleanup(self.roles_client.delete_role, src_role['id']) + src_role = self.setup_test_role() # Create a project hierarchy leaf_project_name = data_utils.rand_name('project') @@ -202,9 +192,7 @@ class InheritsV3TestJSON(BaseInheritsV3Test): @decorators.idempotent_id('9f02ccd9-9b57-46b4-8f77-dd5a736f3a06') def test_inherit_assign_list_revoke_user_roles_on_project_tree(self): # Create role - src_role = self.roles_client.create_role( - name=data_utils.rand_name('Role'))['role'] - self.addCleanup(self.roles_client.delete_role, src_role['id']) + src_role = self.setup_test_role() # Create a project hierarchy leaf_project_name = data_utils.rand_name('project') diff --git a/tempest/api/identity/admin/v3/test_tokens.py b/tempest/api/identity/admin/v3/test_tokens.py index fabb91c349..ae687f6ea6 100644 --- a/tempest/api/identity/admin/v3/test_tokens.py +++ b/tempest/api/identity/admin/v3/test_tokens.py @@ -81,9 +81,7 @@ class TokensV3TestJSON(base.BaseIdentityV3AdminTest): self.addCleanup(self.projects_client.delete_project, project2['id']) # Create a role - role_name = data_utils.rand_name(name='role') - role = self.roles_client.create_role(name=role_name)['role'] - self.addCleanup(self.roles_client.delete_role, role['id']) + role = self.setup_test_role() # Grant the user the role on both projects. self.roles_client.create_user_role_on_project(project1['id'], diff --git a/tempest/api/identity/admin/v3/test_users.py b/tempest/api/identity/admin/v3/test_users.py index 0d12ba9762..28137ad921 100644 --- a/tempest/api/identity/admin/v3/test_users.py +++ b/tempest/api/identity/admin/v3/test_users.py @@ -118,10 +118,7 @@ class UsersV3TestJSON(base.BaseIdentityV3AdminTest): # Delete the User at the end of this method self.addCleanup(self.users_client.delete_user, user_body['id']) # Creating Role - role_body = self.roles_client.create_role( - name=data_utils.rand_name('role'))['role'] - # Delete the Role at the end of this method - self.addCleanup(self.roles_client.delete_role, role_body['id']) + role_body = self.setup_test_role() user = self.users_client.show_user(user_body['id'])['user'] role = self.roles_client.show_role(role_body['id'])['role'] diff --git a/tempest/api/identity/base.py b/tempest/api/identity/base.py index 8317535c61..5cb4c776cd 100644 --- a/tempest/api/identity/base.py +++ b/tempest/api/identity/base.py @@ -78,9 +78,9 @@ class BaseIdentityTest(tempest.test.BaseTestCase): self.users_client.delete_user, user['id']) return user - def setup_test_role(self, domain_id=None): + def setup_test_role(self, name=None, domain_id=None): """Set up a test role.""" - params = {'name': data_utils.rand_name('test_role')} + params = {'name': name or data_utils.rand_name('test_role')} if domain_id: params['domain_id'] = domain_id