Fix typos in cloudify_ims

[functest.git] / functest / opnfv_tests / vnf / ims / cloudify_ims.py

diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
index d97a0bc..a4144ad 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
@@ -22,7 +22,6 @@ from functest.energy import energy
 from functest.opnfv_tests.openstack.snaps import snaps_utils
 import functest.opnfv_tests.vnf.ims.clearwater_ims_base as clearwater_ims_base
 from functest.utils.constants import CONST
-import functest.utils.openstack_utils as os_utils
 
 from snaps.config.flavor import FlavorConfig
 from snaps.config.image import ImageConfig
@@ -40,6 +39,7 @@ from snaps.openstack.create_keypairs import OpenStackKeypair
 from snaps.openstack.create_network import OpenStackNetwork
 from snaps.openstack.create_router import OpenStackRouter
 from snaps.openstack.create_security_group import OpenStackSecurityGroup
+from snaps.openstack.utils import keystone_utils
 
 
 __author__ = "Valentin Boucher <valentin.boucher@orange.com>"
@@ -63,8 +63,6 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
         except Exception:
             raise Exception("VNF config file not found")
 
-        self.snaps_creds = ''
-
         config_file = os.path.join(self.case_dir, self.config)
         self.orchestrator = dict(
             requirements=get_config("orchestrator.requirements", config_file),
@@ -177,14 +175,14 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
                 direction=Direction.ingress, protocol=Protocol.udp,
                 port_range_min=1, port_range_max=65535))
 
-        securit_group_creator = OpenStackSecurityGroup(
+        security_group_creator = OpenStackSecurityGroup(
             self.snaps_creds,
             SecurityGroupConfig(
                 name="sg-cloudify-manager",
                 rule_settings=sg_rules))
 
-        securit_group_creator.create()
-        self.created_object.append(securit_group_creator)
+        security_group_creator.create()
+        self.created_object.append(security_group_creator)
 
         # orchestrator VM flavor
         self.__logger.info("Get or create flavor for cloudify manager vm ...")
@@ -209,7 +207,8 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
             name='cloudify_manager',
             flavor=flavor_settings.name,
             port_settings=[port_settings],
-            security_group_names=[securit_group_creator.sec_grp_settings.name],
+            security_group_names=[
+                security_group_creator.sec_grp_settings.name],
             floating_ip_settings=[FloatingIpConfig(
                 name='cloudify_manager_fip',
                 port_name=port_settings.name,
@@ -224,12 +223,13 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
         manager_creator.create()
         self.created_object.append(manager_creator)
 
-        public_auth_url = os_utils.get_endpoint('identity')
+        public_auth_url = keystone_utils.get_endpoint(
+            self.snaps_creds, 'identity')
 
         self.__logger.info("Set creds for cloudify manager")
-        cfy_creds = dict(keystone_username=self.tenant_name,
-                         keystone_password=self.tenant_name,
-                         keystone_tenant_name=self.tenant_name,
+        cfy_creds = dict(keystone_username=self.snaps_creds.username,
+                         keystone_password=self.snaps_creds.password,
+                         keystone_tenant_name=self.snaps_creds.project_name,
                          keystone_url=public_auth_url)
 
         cfy_client = CloudifyClient(host=manager_creator.get_floating_ip().ip,
@@ -324,7 +324,7 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
                            _get_deployment_environment_creation_execution(
                                cfy_client, descriptor.get('name')),
                            self.__logger,
-                           timeout=600)
+                           timeout=300)
 
         self.__logger.info("Start the VNF Instance deployment")
         execution = cfy_client.executions.start(descriptor.get('name'),
@@ -441,7 +441,7 @@ def get_config(parameter, file_path):
     return value
 
 
-def wait_for_execution(client, execution, logger, timeout=2400, ):
+def wait_for_execution(client, execution, logger, timeout=1500, ):
     """Wait for a workflow execution on Cloudify Manager."""
     # if execution already ended - return without waiting
     if execution.status in Execution.END_STATES: