Support different user/project domain values

[functest.git] / functest / core / vnf.py

diff --git a/functest/core/vnf.py b/functest/core/vnf.py
index 5339e42..15065f7 100644 (file)
--- a/functest/core/vnf.py
+++ b/functest/core/vnf.py
@@ -13,14 +13,15 @@ import logging
 import time
 import uuid
 
-import functest.core.testcase as base
-from functest.utils.constants import CONST
 from snaps.config.user import UserConfig
 from snaps.config.project import ProjectConfig
 from snaps.openstack.create_user import OpenStackUser
 from snaps.openstack.create_project import OpenStackProject
+from snaps.openstack.utils import keystone_utils
 from snaps.openstack.tests import openstack_tests
 
+from functest.core import testcase
+
 __author__ = ("Morgan Richomme <morgan.richomme@orange.com>, "
               "Valentin Boucher <valentin.boucher@orange.com>")
 
@@ -41,18 +42,23 @@ class VnfTestException(Exception):
     """Raise when VNF cannot be tested."""
 
 
-class VnfOnBoarding(base.TestCase):
+class VnfOnBoarding(testcase.TestCase):
+    # pylint: disable=too-many-instance-attributes
     """Base model for VNF test cases."""
 
     __logger = logging.getLogger(__name__)
+    env_file = "/home/opnfv/functest/conf/env_file"
 
     def __init__(self, **kwargs):
         super(VnfOnBoarding, self).__init__(**kwargs)
-        self.tenant_name = CONST.__getattribute__(
-            'vnf_{}_tenant_name'.format(self.case_name))
+        self.uuid = uuid.uuid4()
+        self.user_name = "{}-{}".format(self.case_name, self.uuid)
+        self.tenant_name = "{}-{}".format(self.case_name, self.uuid)
         self.snaps_creds = {}
         self.created_object = []
         self.os_project = None
+        self.tenant_description = "Created by OPNFV Functest: {}".format(
+            self.case_name)
 
     def run(self, **kwargs):
         """
@@ -79,15 +85,14 @@ class VnfOnBoarding(base.TestCase):
                 self.stop_time = time.time()
                 # Calculation with different weight depending on the steps TODO
                 self.result = 100
-                return base.TestCase.EX_OK
-            else:
-                self.result = 0
-                self.stop_time = time.time()
-                return base.TestCase.EX_TESTCASE_FAILED
+                return testcase.TestCase.EX_OK
+            self.result = 0
+            self.stop_time = time.time()
+            return testcase.TestCase.EX_TESTCASE_FAILED
         except Exception:  # pylint: disable=broad-except
             self.stop_time = time.time()
             self.__logger.exception("Exception on VNF testing")
-            return base.TestCase.EX_TESTCASE_FAILED
+            return testcase.TestCase.EX_TESTCASE_FAILED
 
     def prepare(self):
         """
@@ -102,36 +107,46 @@ class VnfOnBoarding(base.TestCase):
         Raise VnfPreparationException in case of problem
         """
         try:
-            tenant_description = CONST.__getattribute__(
-                'vnf_{}_tenant_description'.format(self.case_name))
-            self.__logger.info("Prepare VNF: %s, description: %s",
-                               self.tenant_name, tenant_description)
+            self.__logger.info(
+                "Prepare VNF: %s, description: %s", self.case_name,
+                self.tenant_description)
             snaps_creds = openstack_tests.get_credentials(
-                os_env_file=CONST.__getattribute__('openstack_creds'))
+                os_env_file=self.env_file)
 
-            project_creator = OpenStackProject(
+            self.os_project = OpenStackProject(
                 snaps_creds,
                 ProjectConfig(
                     name=self.tenant_name,
-                    description=tenant_description
+                    description=self.tenant_description,
+                    domain=snaps_creds.project_domain_name
                 ))
-            project_creator.create()
-            self.created_object.append(project_creator)
-            self.os_project = project_creator
+            self.os_project.create()
+            self.created_object.append(self.os_project)
+
+            snaps_creds.project_domain_id = \
+                self.os_project.get_project().domain_id
+            snaps_creds.user_domain_id = \
+                self.os_project.get_project().domain_id
+
+            for role in ['admin', 'Admin']:
+                if keystone_utils.get_role_by_name(
+                        keystone_utils.keystone_client(snaps_creds), role):
+                    admin_role = role
+                    break
 
             user_creator = OpenStackUser(
                 snaps_creds,
                 UserConfig(
-                    name=self.tenant_name,
+                    name=self.user_name,
                     password=str(uuid.uuid4()),
-                    roles={'admin': self.tenant_name}))
-
+                    project_name=self.tenant_name,
+                    domain_name=snaps_creds.user_domain_name,
+                    roles={admin_role: self.tenant_name}))
             user_creator.create()
             self.created_object.append(user_creator)
-
             self.snaps_creds = user_creator.get_os_creds(self.tenant_name)
 
-            return base.TestCase.EX_OK
+            return testcase.TestCase.EX_OK
         except Exception:  # pylint: disable=broad-except
             self.__logger.exception("Exception raised during VNF preparation")
             raise VnfPreparationException