Switch to project domain name

At least Fuel, Apex and Joid don't export OS_PROJECT_DOMAIN_ID.
https://build.opnfv.org/ci/view/functest/job/functest-joid-baremetal-daily-master/353/console

Change-Id: I8441d2de1841d5a9ce78c6929fd78da01c45548c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 084dd47cdeb68f150165e009877ed995cb9db6dc)

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 285dc44..ff2b297 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -368,7 +368,9 @@ class TempestResourcesManager(object):
         self.guid = '-' + str(uuid.uuid4())
         self.cloud = shade.OperatorCloud(
             cloud_config=os_client_config.get_config())
-        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
@@ -384,7 +386,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):
@@ -395,7 +397,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):