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>

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index d02c114..5ba1ed3 100644 (file)
--- 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):