summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-05-07 16:43:20 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-05-07 16:43:20 +0000
commitac8e3d4d9f7fe99021f41ee9c86370e7d9866d65 (patch)
treef57802dd7559e083c676cac2abaedeee9d239ebc
parent062513f302369a8d48394edb0b1a75df660fee20 (diff)
parent084dd47cdeb68f150165e009877ed995cb9db6dc (diff)
Merge "Switch to project domain name"
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index d02c114a6..5ba1ed38a 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -364,7 +364,9 @@ class TempestResourcesManager(object):
def __init__(self):
self.guid = '-' + str(uuid.uuid4())
self.cloud = os_client_config.make_shade()
- self.domain_id = self.cloud.auth["project_domain_id"]
+ LOGGER.debug("cloud: %s", self.cloud)
+ self.domain = self.cloud.auth.get("project_domain_name", "Default")
+ LOGGER.debug("domain: %s", self.domain)
self.project = None
self.user = None
self.network = None
@@ -380,7 +382,7 @@ class TempestResourcesManager(object):
getattr(config.CONF, 'tempest_identity_tenant_name') + self.guid,
description=getattr(
config.CONF, 'tempest_identity_tenant_description'),
- domain_id=self.domain_id)
+ domain_id=self.domain)
LOGGER.debug("project: %s", self.project)
def _create_user(self):
@@ -391,7 +393,7 @@ class TempestResourcesManager(object):
password=getattr(config.CONF, 'tempest_identity_user_password'),
default_project=getattr(
config.CONF, 'tempest_identity_tenant_name') + self.guid,
- domain_id=self.domain_id)
+ domain_id=self.domain)
LOGGER.debug("user: %s", self.user)
def _create_network(self):