From 6587fd6efe5217390443544da3856e79803dbf4f Mon Sep 17 00:00:00 2001 From: Chi Lo Date: Mon, 31 Aug 2020 16:21:38 -0700 Subject: [PATCH] Remove dependency on RMS's domainName for CMS test cases CMS will use its own customer domain name instead of retrieving from RMS's region. As a result, no RMS's domainName update is required to alter the domain name prior to the test case execution. Change-Id: Ib28f705fe2ba9362da138d88aeacd18f26222daf --- ranger_tempest_plugin/tests/api/base.py | 10 ---------- ranger_tempest_plugin/tests/api/cms_base.py | 2 ++ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ranger_tempest_plugin/tests/api/base.py b/ranger_tempest_plugin/tests/api/base.py index dcc1709..354979e 100755 --- a/ranger_tempest_plugin/tests/api/base.py +++ b/ranger_tempest_plugin/tests/api/base.py @@ -110,16 +110,6 @@ class BaseOrmTest(test.BaseTestCase): " to False to run against one site.") raise cls.skipException(skip_msg) from e - # Get regions in ranger deployment - _, regions_list = cls.region_client.list_regions() - for region in regions_list['regions']: - if region['id'] == CONF.identity.region or \ - (region['id'] == CONF.ranger.alt_region - and CONF.ranger.alt_region_available is True): - region['domainName'] = CONF.auth.admin_domain_name - cls.region_client.update_region(region['id'], - **region) - def assert_expected(self, expected, actual, excluded_keys): for key, value in list(expected.items()): if key not in excluded_keys: diff --git a/ranger_tempest_plugin/tests/api/cms_base.py b/ranger_tempest_plugin/tests/api/cms_base.py index ec39f17..491ad6d 100755 --- a/ranger_tempest_plugin/tests/api/cms_base.py +++ b/ranger_tempest_plugin/tests/api/cms_base.py @@ -121,6 +121,7 @@ class CmsBaseOrmTest(base.BaseOrmTest): customer["regions"] = regions customer["defaultQuotas"] = [quota] customer['users'] = [user] if default_users else [] + customer["customerDomain"] = CONF.auth.admin_domain_name return customer @classmethod @@ -132,6 +133,7 @@ class CmsBaseOrmTest(base.BaseOrmTest): customer['regions'] = [] customer['defaultQuotas'] = [] customer['users'] = [] + customer["customerDomain"] = CONF.auth.admin_domain_name return customer @classmethod