Shorten Identity project name due to 64 char limit.
Removed -testproject from identity project created using
setup_test_project since rand_name it already has tempest-
in front of the name. Adding -testproject to a project
provides no additional value on a name with restricted size limit.
Also removing -test_domain and -test_update_domain sufix from
domain name since they have a 64 char limit also.
remove -IdentityCosumer from test test_oauth_consumers_rbac.py.
Our downstream tooling we replace tempest- with shorter word
and unique id to find project, global and orphaned project resources
in test and production site. This will allow us to find resource
leaks and submit upstream corrections.
Change-Id: Ic4014938c4a2dae64892954d8638f9d8d519a234
diff --git a/patrole_tempest_plugin/tests/api/compute/test_quota_class_sets_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_quota_class_sets_rbac.py
index d9022d4..b26ddc3 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_quota_class_sets_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_quota_class_sets_rbac.py
@@ -51,7 +51,7 @@
def resource_setup(cls):
super(QuotaClassesRbacTest, cls).resource_setup()
# Create a project with its own quota.
- project_name = data_utils.rand_name(cls.__name__ + '-project')
+ project_name = data_utils.rand_name(cls.__name__)
project_desc = project_name + '-desc'
project = identity.identity_utils(cls.os_admin).create_project(
name=project_name, description=project_desc)
diff --git a/patrole_tempest_plugin/tests/api/compute/test_quota_sets_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_quota_sets_rbac.py
index 5835905..a41d0e0 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_quota_sets_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_quota_sets_rbac.py
@@ -90,7 +90,7 @@
rules=["os_compute_api:os-quota-sets:delete"])
def test_delete_quota_set(self):
project_name = data_utils.rand_name(
- self.__class__.__name__ + '-project')
+ self.__class__.__name__)
project_desc = project_name + '-desc'
project = identity.identity_utils(self.os_admin).create_project(
name=project_name, description=project_desc)
diff --git a/patrole_tempest_plugin/tests/api/identity/rbac_base.py b/patrole_tempest_plugin/tests/api/identity/rbac_base.py
index 6e76a72..4321c60 100644
--- a/patrole_tempest_plugin/tests/api/identity/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/identity/rbac_base.py
@@ -204,7 +204,7 @@
def setup_test_domain(cls):
"""Set up a test domain."""
domain = cls.domains_client.create_domain(
- name=data_utils.rand_name(cls.__name__ + '-test_domain'),
+ name=data_utils.rand_name(cls.__name__),
description=data_utils.rand_name(
cls.__name__ + '-desc'))['domain']
cls.domains.append(domain)
@@ -240,7 +240,7 @@
"""Set up a test project."""
project = cls.projects_client.create_project(
name=data_utils.rand_name(
- cls.__name__ + '-testproject'),
+ cls.__name__),
description=data_utils.rand_name(
cls.__name__ + '-desc'))['project']
cls.projects.append(project)
diff --git a/patrole_tempest_plugin/tests/api/identity/v3/test_domains_rbac.py b/patrole_tempest_plugin/tests/api/identity/v3/test_domains_rbac.py
index f97570f..2ad50cf 100644
--- a/patrole_tempest_plugin/tests/api/identity/v3/test_domains_rbac.py
+++ b/patrole_tempest_plugin/tests/api/identity/v3/test_domains_rbac.py
@@ -35,7 +35,7 @@
def test_update_domain(self):
domain = self.setup_test_domain()
new_domain_name = data_utils.rand_name(
- self.__class__.__name__ + '-test_update_domain')
+ self.__class__.__name__)
with self.override_role():
self.domains_client.update_domain(domain['id'],
domain=domain,
diff --git a/patrole_tempest_plugin/tests/api/identity/v3/test_oauth_consumers_rbac.py b/patrole_tempest_plugin/tests/api/identity/v3/test_oauth_consumers_rbac.py
index aaaddf7..4198a46 100644
--- a/patrole_tempest_plugin/tests/api/identity/v3/test_oauth_consumers_rbac.py
+++ b/patrole_tempest_plugin/tests/api/identity/v3/test_oauth_consumers_rbac.py
@@ -25,7 +25,7 @@
def _create_consumer(self):
description = data_utils.rand_name(
- self.__class__.__name__ + '-IdentityConsumer')
+ self.__class__.__name__)
consumer = self.consumers_client.create_consumer(
description)['consumer']
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
@@ -55,7 +55,7 @@
def test_update_consumer(self):
consumer = self._create_consumer()
updated_description = data_utils.rand_name(
- self.__class__.__name__ + '-IdentityConsumer')
+ self.__class__.__name__)
with self.override_role():
self.consumers_client.update_consumer(consumer['id'],