X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fcore%2Fvnf.py;h=856e62b5a4d6b63ae0f8abc9a91a7a024bee93f8;hb=45fdfedc5b5573926c53264ff5eb3e48a43345d9;hp=517838a76c71be62ffdae3f8ce9b2d6b999a3b32;hpb=6dac04c5556db7fa2dc4088116b91509f4e73084;p=functest.git

diff --git a/functest/core/vnf.py b/functest/core/vnf.py
index 517838a76..856e62b5a 100644
--- a/functest/core/vnf.py
+++ b/functest/core/vnf.py
@@ -11,11 +11,14 @@
 
 import logging
 import time
+import uuid
 
 import functest.core.testcase as base
 from functest.utils.constants import CONST
-from snaps.openstack.create_user import UserSettings, OpenStackUser
-from snaps.openstack.create_project import ProjectSettings, OpenStackProject
+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.tests import openstack_tests
 
 __author__ = ("Morgan Richomme <morgan.richomme@orange.com>, "
@@ -55,16 +58,16 @@ class VnfOnBoarding(base.TestCase):
         """
         Run of the VNF test case:
 
-            * Deploy an orchestrator if needed (e.g. heat, cloudify, ONAP),
+            * Deploy an orchestrator if needed (e.g. heat, cloudify, ONAP,...),
             * Deploy the VNF,
             * Perform tests on the VNF
 
           A VNF test case is successfull when the 3 steps are PASS
           If one of the step is FAIL, the test case is FAIL
 
-          Returns:
-            TestCase.EX_OK if result is 'PASS'.
-            TestCase.EX_TESTCASE_FAILED otherwise.
+        Returns:
+          TestCase.EX_OK if result is 'PASS'.
+          TestCase.EX_TESTCASE_FAILED otherwise.
         """
         self.start_time = time.time()
 
@@ -108,7 +111,7 @@ class VnfOnBoarding(base.TestCase):
 
             project_creator = OpenStackProject(
                 snaps_creds,
-                ProjectSettings(
+                ProjectConfig(
                     name=self.tenant_name,
                     description=tenant_description
                 ))
@@ -118,9 +121,9 @@ class VnfOnBoarding(base.TestCase):
 
             user_creator = OpenStackUser(
                 snaps_creds,
-                UserSettings(
+                UserConfig(
                     name=self.tenant_name,
-                    password=self.tenant_name,
+                    password=str(uuid.uuid4()),
                     roles={'admin': self.tenant_name}))
 
             user_creator.create()
@@ -137,9 +140,8 @@ class VnfOnBoarding(base.TestCase):
         """
         Deploy an orchestrator (optional).
 
-        If function overwritten
-        raise orchestratorDeploymentException if error during orchestrator
-        deployment
+        If this method is overriden then raise orchestratorDeploymentException
+        if error during orchestrator deployment
         """
         self.__logger.info("Deploy orchestrator (if necessary)")
         return True
@@ -152,10 +154,8 @@ class VnfOnBoarding(base.TestCase):
         The details section MAY be updated in the vnf test cases.
 
         The deployment can be executed via a specific orchestrator
-        or using nuild-in orchestrators such as:
-
-            * heat, openbaton, cloudify (available on all scenario),
-            * open-o (on open-o scenarios)
+        or using build-in orchestrators such as heat, OpenBaton, cloudify,
+        juju, onap, ...
 
         Returns:
             True if the VNF is properly deployed