Support domains when creating project/user

JIRA: FUNCTEST-945

Change-Id: Ibfce5a7d2ebb59a83ad5b2b6344c2fc87d7f3e84
Signed-off-by: Linda Wang <wangwulin@huawei.com>

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 04f3e60..b1384dd 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -334,7 +334,8 @@ class TempestResourcesManager(object):
                 name=getattr(
                     config.CONF, 'tempest_identity_tenant_name') + self.guid,
                 description=getattr(
-                    config.CONF, 'tempest_identity_tenant_description')))
+                    config.CONF, 'tempest_identity_tenant_description'),
+                domain=self.os_creds.project_domain_name))
         if project_creator is None or project_creator.get_project() is None:
             raise Exception("Failed to create tenant")
         self.creators.append(project_creator)
@@ -349,7 +350,8 @@ class TempestResourcesManager(object):
                 password=getattr(
                     config.CONF, 'tempest_identity_user_password'),
                 project_name=getattr(
-                    config.CONF, 'tempest_identity_tenant_name') + self.guid))
+                    config.CONF, 'tempest_identity_tenant_name') + self.guid,
+                domain_name=self.os_creds.user_domain_name))
         if user_creator is None or user_creator.get_user() is None:
             raise Exception("Failed to create user")
         self.creators.append(user_creator)