diff options
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 13 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 3 | ||||
| -rw-r--r-- | functest/utils/env.py | 3 |
3 files changed, 16 insertions, 3 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index c428c78ce..8a4bb9386 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -12,6 +12,7 @@ from __future__ import print_function +import json import logging import fileinput import os @@ -174,7 +175,8 @@ def update_tempest_conf_file(conf_file, rconfig): def configure_tempest_update_params( tempest_conf_file, network_name=None, image_id=None, flavor_id=None, - compute_cnt=1, image_alt_id=None, flavor_alt_id=None): + compute_cnt=1, image_alt_id=None, flavor_alt_id=None, + domain_name="Default"): # pylint: disable=too-many-branches, too-many-arguments """ Add/update needed parameters into tempest.conf file @@ -200,6 +202,8 @@ def configure_tempest_update_params( if os.environ.get('OS_REGION_NAME'): rconfig.set('identity', 'region', os.environ.get('OS_REGION_NAME')) identity_api_version = os.environ.get("OS_IDENTITY_API_VERSION", '3') + rconfig.set('auth', 'admin_domain_scope', True) + rconfig.set('auth', 'default_credentials_domain_name', domain_name) if identity_api_version == '3': auth_version = 'v3' rconfig.set('identity-feature-enabled', 'api_v2', False) @@ -207,6 +211,13 @@ def configure_tempest_update_params( auth_version = 'v2' if env.get("NEW_USER_ROLE").lower() != "member": rconfig.set('auth', 'tempest_roles', env.get("NEW_USER_ROLE")) + if not json.loads(env.get("USE_DYNAMIC_CREDENTIALS").lower()): + rconfig.set('auth', 'use_dynamic_credentials', False) + account_file = os.path.join( + getattr(config.CONF, 'dir_functest_data'), 'accounts.yaml') + assert os.path.exists( + account_file), "{} doesn't exist".format(account_file) + rconfig.set('auth', 'test_accounts_file', account_file) rconfig.set('identity', 'auth_version', auth_version) rconfig.set( 'validation', 'ssh_timeout', diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index d38ee1e84..bd337ce2f 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -373,7 +373,8 @@ class TempestCommon(singlevm.VmReady2): flavor_id=self.flavor.id, compute_cnt=compute_cnt, image_alt_id=self.image_alt.id, - flavor_alt_id=self.flavor_alt.id) + flavor_alt_id=self.flavor_alt.id, + domain_name=self.cloud.auth.get("project_domain_name", "Default")) self.backup_tempest_config(self.conf_file, self.res_dir) def run(self, **kwargs): diff --git a/functest/utils/env.py b/functest/utils/env.py index 5f414f1f4..1f649834d 100644 --- a/functest/utils/env.py +++ b/functest/utils/env.py @@ -33,7 +33,8 @@ INPUTS = { 'ENERGY_RECORDER_API_PASSWORD': env.INPUTS['ENERGY_RECORDER_API_PASSWORD'], 'VOLUME_DEVICE_NAME': 'vdb', 'NAMESERVER': '8.8.8.8', - 'NEW_USER_ROLE': 'Member' + 'NEW_USER_ROLE': 'Member', + 'USE_DYNAMIC_CREDENTIALS': 'True' } |