X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fcore%2Fvnf.py;h=856e62b5a4d6b63ae0f8abc9a91a7a024bee93f8;hb=45fdfedc5b5573926c53264ff5eb3e48a43345d9;hp=507e27651e0f98da3ebc2d781bd24cf0d235f5e0;hpb=a60f59504444da2018da2e599a1ae67e2ff11945;p=functest.git diff --git a/functest/core/vnf.py b/functest/core/vnf.py index 507e27651..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 , " @@ -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()