summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-09-22 23:48:15 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-09-23 03:40:57 +0200
commit9498a703aa0fe8b4834993a0381d2b68511bcf36 (patch)
treedd1e09b5c76c0a882d277b2b5a701cba999bfddf
parent93443346d63d74ed8a3a7af31778f12114d37347 (diff)
Set default_domain_id in tempest.conf
It allows verifying via non-default domain. Change-Id: I95ae26fd3bfd1c10421c02d2b4f6e8a9b6aa49e6 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 11d28aaf2e726859b59b7511d64dc4dd4b422e1e)
-rw-r--r--functest/opnfv_tests/openstack/tempest/conf_utils.py6
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py3
2 files changed, 6 insertions, 3 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 382b04863..381ab90f4 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -173,8 +173,9 @@ def update_tempest_conf_file(conf_file, rconfig):
def configure_tempest_update_params(
tempest_conf_file, image_id=None, flavor_id=None,
compute_cnt=1, image_alt_id=None, flavor_alt_id=None,
- admin_role_name='admin', cidr='192.168.120.0/24'):
- # pylint: disable=too-many-branches, too-many-arguments
+ admin_role_name='admin', cidr='192.168.120.0/24',
+ domain_id='default'):
+ # pylint: disable=too-many-branches,too-many-arguments,too-many-statements
"""
Add/update needed parameters into tempest.conf file
"""
@@ -217,6 +218,7 @@ def configure_tempest_update_params(
rconfig.set('identity', 'auth_version', 'v3')
rconfig.set('identity', 'admin_role', admin_role_name)
rconfig.set('identity', 'admin_domain_scope', True)
+ rconfig.set('identity', 'default_domain_id', domain_id)
rconfig.set('identity-feature-enabled', 'api_v2', False)
rconfig.set('identity-feature-enabled', 'api_v2_admin', False)
if not rconfig.has_section('neutron'):
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index e9ab53c90..d903411ab 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -409,7 +409,8 @@ class TempestCommon(singlevm.VmReady2):
compute_cnt=compute_cnt,
image_alt_id=self.image_alt.id,
flavor_alt_id=self.flavor_alt.id,
- admin_role_name=self.role_name, cidr=self.cidr)
+ admin_role_name=self.role_name, cidr=self.cidr,
+ domain_id=self.project.domain.id)
self.update_scenario_section()
self.backup_tempest_config(self.conf_file, self.res_dir)