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
This commit is contained in:
parent
00681d0deb
commit
6587fd6efe
@ -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:
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user