X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fcore%2Fvnf.py;h=868b8b48f7f7949d1d0d5e301d053f12802012ef;hb=82b5b5c13ed5b08ff7191d0d1dcddfc4bd99f0c7;hp=0589b5d2a1ae50deb23d26a008ef8d20263b71ca;hpb=e7ab53553d719b0fb35b4a74cd0bbc9572c7a48d;p=functest.git

diff --git a/functest/core/vnf.py b/functest/core/vnf.py
index 0589b5d2a..868b8b48f 100644
--- a/functest/core/vnf.py
+++ b/functest/core/vnf.py
@@ -14,7 +14,9 @@ import time
 
 import functest.core.testcase as base
 from functest.utils.constants import CONST
-import functest.utils.openstack_utils as os_utils
+from snaps.openstack.create_user import UserSettings, OpenStackUser
+from snaps.openstack.create_project import ProjectSettings, OpenStackProject
+from snaps.openstack.tests import openstack_tests
 
 __author__ = ("Morgan Richomme <morgan.richomme@orange.com>, "
               "Valentin Boucher <valentin.boucher@orange.com>")
@@ -43,12 +45,11 @@ class VnfOnBoarding(base.TestCase):
 
     def __init__(self, **kwargs):
         super(VnfOnBoarding, self).__init__(**kwargs)
-        self.tenant_created = False
-        self.user_created = False
         self.tenant_name = CONST.__getattribute__(
             'vnf_{}_tenant_name'.format(self.case_name))
-        self.tenant_description = CONST.__getattribute__(
-            'vnf_{}_tenant_description'.format(self.case_name))
+        self.snaps_creds = {}
+        self.created_object = []
+        self.os_project = None
 
     def run(self, **kwargs):
         """
@@ -78,8 +79,10 @@ class VnfOnBoarding(base.TestCase):
                 return base.TestCase.EX_OK
             else:
                 self.result = 0
+                self.stop_time = time.time()
                 return base.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
 
@@ -96,20 +99,33 @@ 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, self.tenant_description)
-            admin_creds = os_utils.get_credentials()
-            keystone_client = os_utils.get_keystone_client()
-            self.tenant_created = os_utils.get_or_create_tenant_for_vnf(
-                keystone_client, self.tenant_name, self.tenant_description)
-            self.user_created = os_utils.get_or_create_user_for_vnf(
-                keystone_client, self.tenant_name)
-            creds = admin_creds.copy()
-            creds.update({
-                "tenant": self.tenant_name,
-                "username": self.tenant_name,
-                "password": self.tenant_name
-                })
+                               self.tenant_name, tenant_description)
+            snaps_creds = openstack_tests.get_credentials(
+                os_env_file=CONST.__getattribute__('openstack_creds'))
+
+            project_creator = OpenStackProject(
+                snaps_creds,
+                ProjectSettings(
+                    name=self.tenant_name,
+                    description=tenant_description
+                ))
+            project_creator.create()
+            self.created_object.append(project_creator)
+            self.os_project = project_creator
+
+            user_creator = OpenStackUser(snaps_creds,
+                                         UserSettings(
+                                             name=self.tenant_name,
+                                             password=self.tenant_name))
+            self.created_object.append(user_creator)
+
+            project_creator.assoc_user(user_creator.create())
+
+            self.snaps_creds = user_creator.get_os_creds(self.tenant_name)
+
             return base.TestCase.EX_OK
         except Exception:  # pylint: disable=broad-except
             self.__logger.exception("Exception raised during VNF preparation")
@@ -181,8 +197,9 @@ class VnfOnBoarding(base.TestCase):
             * the tenant
         """
         self.__logger.info("test cleaning")
-        keystone_client = os_utils.get_keystone_client()
-        if self.tenant_created:
-            os_utils.delete_tenant(keystone_client, self.tenant_name)
-        if self.user_created:
-            os_utils.delete_user(keystone_client, self.tenant_name)
+        self.__logger.info('Remove the cloudify manager OS object ..')
+        for creator in reversed(self.created_object):
+            try:
+                creator.clean()
+            except Exception as exc:  # pylint: disable=broad-except
+                self.__logger.error('Unexpected error cleaning - %s', exc)