diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-07-28 08:37:35 -0600 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-07-31 08:59:59 -0600 |
| commit | c4eba6eaaa2f8e0a0ca40c40907fc9e04a65e6d9 (patch) | |
| tree | 300fc72621cc56c589e57587f9333e90ec2c6bf2 /snaps/openstack/tests/openstack_tests.py | |
| parent | b003647b70545008405294c4268e62fa87c18574 (diff) | |
Attempt to fix domain support.
The prior code treated *_domain_name & *_domain_id the same
where the ID was taken first and the name was used as the
fallback which was incorrect. This patch treats the name and
ID fields as separate members.
JIRA: SNAPS-154
Change-Id: I5219863de597c4db24579f4af74ece2d648b2b07
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/tests/openstack_tests.py')
| -rw-r--r-- | snaps/openstack/tests/openstack_tests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/snaps/openstack/tests/openstack_tests.py b/snaps/openstack/tests/openstack_tests.py index 927b5b3..2dab75c 100644 --- a/snaps/openstack/tests/openstack_tests.py +++ b/snaps/openstack/tests/openstack_tests.py @@ -95,10 +95,10 @@ def get_credentials(os_env_file=None, proxy_settings_str=None, 'network_api_version': config.get('OS_NETWORK_API_VERSION'), 'compute_api_version': config.get('OS_COMPUTE_API_VERSION'), 'heat_api_version': config.get('OS_HEAT_API_VERSION'), - 'user_domain_id': config.get( - 'OS_USER_DOMAIN_ID', config.get('OS_USER_DOMAIN_NAME')), - 'project_domain_id': config.get( - 'OS_PROJECT_DOMAIN_ID', config.get('OS_PROJECT_DOMAIN_NAME')), + 'user_domain_id': config.get('OS_USER_DOMAIN_ID'), + 'user_domain_name': config.get('OS_USER_DOMAIN_NAME'), + 'project_domain_id': config.get('OS_PROJECT_DOMAIN_ID'), + 'project_domain_name': config.get('OS_PROJECT_DOMAIN_NAME'), 'interface': interface, 'proxy_settings': proxy_settings, 'cacert': https_cacert, |