Configure password for the user in vnf

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

diff --git a/functest/core/vnf.py b/functest/core/vnf.py
index 868b8b4..856e62b 100644 (file)
--- 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
                 ))
@@ -116,13 +119,15 @@ class VnfOnBoarding(base.TestCase):
             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)
+            user_creator = OpenStackUser(
+                snaps_creds,
+                UserConfig(
+                    name=self.tenant_name,
+                    password=str(uuid.uuid4()),
+                    roles={'admin': self.tenant_name}))
 
-            project_creator.assoc_user(user_creator.create())
+            user_creator.create()
+            self.created_object.append(user_creator)
 
             self.snaps_creds = user_creator.get_os_creds(self.tenant_name)
 
@@ -135,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
@@ -150,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