Remove last CONST.__getattribute__()

[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 a4144ad..a6b87ea 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
@@ -58,8 +58,8 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
 
         # Retrieve the configuration
         try:
-            self.config = CONST.__getattribute__(
-                'vnf_{}_config'.format(self.case_name))
+            self.config = getattr(
+                CONST, 'vnf_{}_config'.format(self.case_name))
         except Exception:
             raise Exception("VNF config file not found")
 
@@ -124,7 +124,7 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
                         name=image_name, image_user='cloud',
                         img_format='qcow2', image_file=image_file))
                 image_creator.create()
-                # self.created_object.append(image_creator)
+                self.created_object.append(image_creator)
 
     def deploy_orchestrator(self):
         """
@@ -137,17 +137,20 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
         start_time = time.time()
         self.__logger.info("Creating keypair ...")
         kp_file = os.path.join(self.data_dir, "cloudify_ims.pem")
-        keypair_settings = KeypairConfig(name='cloudify_ims_kp',
-                                         private_filepath=kp_file)
+        keypair_settings = KeypairConfig(
+            name='cloudify_ims_kp-{}'.format(self.uuid),
+            private_filepath=kp_file)
         keypair_creator = OpenStackKeypair(self.snaps_creds, keypair_settings)
         keypair_creator.create()
         self.created_object.append(keypair_creator)
 
         self.__logger.info("Creating full network ...")
-        subnet_settings = SubnetConfig(name='cloudify_ims_subnet',
-                                       cidr='10.67.79.0/24')
-        network_settings = NetworkConfig(name='cloudify_ims_network',
-                                         subnet_settings=[subnet_settings])
+        subnet_settings = SubnetConfig(
+            name='cloudify_ims_subnet-{}'.format(self.uuid),
+            cidr='10.67.79.0/24')
+        network_settings = NetworkConfig(
+            name='cloudify_ims_network-{}'.format(self.uuid),
+            subnet_settings=[subnet_settings])
         network_creator = OpenStackNetwork(self.snaps_creds, network_settings)
         network_creator.create()
         self.created_object.append(network_creator)
@@ -155,7 +158,7 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
         router_creator = OpenStackRouter(
             self.snaps_creds,
             RouterConfig(
-                name='cloudify_ims_router',
+                name='cloudify_ims_router-{}'.format(self.uuid),
                 external_gateway=ext_net_name,
                 internal_subnets=[subnet_settings.name]))
         router_creator.create()
@@ -166,19 +169,19 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
         sg_rules = list()
         sg_rules.append(
             SecurityGroupRuleConfig(
-                sec_grp_name="sg-cloudify-manager",
+                sec_grp_name="sg-cloudify-manager-{}".format(self.uuid),
                 direction=Direction.ingress, protocol=Protocol.tcp,
                 port_range_min=1, port_range_max=65535))
         sg_rules.append(
             SecurityGroupRuleConfig(
-                sec_grp_name="sg-cloudify-manager",
+                sec_grp_name="sg-cloudify-manager-{}".format(self.uuid),
                 direction=Direction.ingress, protocol=Protocol.udp,
                 port_range_min=1, port_range_max=65535))
 
         security_group_creator = OpenStackSecurityGroup(
             self.snaps_creds,
             SecurityGroupConfig(
-                name="sg-cloudify-manager",
+                name="sg-cloudify-manager-{}".format(self.uuid),
                 rule_settings=sg_rules))
 
         security_group_creator.create()
@@ -200,24 +203,24 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
             image_user='centos',
             exists=True)
 
-        port_settings = PortConfig(name='cloudify_manager_port',
-                                   network_name=network_settings.name)
+        port_settings = PortConfig(
+            name='cloudify_manager_port-{}'.format(self.uuid),
+            network_name=network_settings.name)
 
         manager_settings = VmInstanceConfig(
-            name='cloudify_manager',
+            name='cloudify_manager-{}'.format(self.uuid),
             flavor=flavor_settings.name,
             port_settings=[port_settings],
             security_group_names=[
                 security_group_creator.sec_grp_settings.name],
             floating_ip_settings=[FloatingIpConfig(
-                name='cloudify_manager_fip',
+                name='cloudify_manager_fip-{}'.format(self.uuid),
                 port_name=port_settings.name,
                 router_name=router_creator.router_settings.name)])
 
-        manager_creator = OpenStackVmInstance(self.snaps_creds,
-                                              manager_settings,
-                                              image_settings,
-                                              keypair_settings)
+        manager_creator = OpenStackVmInstance(
+            self.snaps_creds, manager_settings, image_settings,
+            keypair_settings)
 
         self.__logger.info("Creating cloudify manager VM")
         manager_creator.create()
@@ -226,16 +229,17 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
         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.snaps_creds.username,
-                         keystone_password=self.snaps_creds.password,
-                         keystone_tenant_name=self.snaps_creds.project_name,
-                         keystone_url=public_auth_url)
+        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,
+            region=self.snaps_creds.region_name)
+        self.__logger.info("Set creds for cloudify manager %s", cfy_creds)
 
-        cfy_client = CloudifyClient(host=manager_creator.get_floating_ip().ip,
-                                    username='admin',
-                                    password='admin',
-                                    tenant='default_tenant')
+        cfy_client = CloudifyClient(
+            host=manager_creator.get_floating_ip().ip,
+            username='admin', password='admin', tenant='default_tenant')
 
         self.orchestrator['object'] = cfy_client
 
@@ -248,8 +252,8 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
                 self.__logger.debug("The current manager status is %s",
                                     cfy_status)
             except Exception:  # pylint: disable=broad-except
-                self.__logger.warning("Cloudify Manager isn't " +
-                                      "up and running. Retrying ...")
+                self.__logger.exception(
+                    "Cloudify Manager isn't up and running. Retrying ...")
             retry = retry - 1
             time.sleep(30)
 
@@ -285,7 +289,8 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
 
         self.vnf['inputs'].update(dict(
             external_network_name=ext_net_name,
-            network_name=network_settings.name
+            network_name=network_settings.name,
+            key_pair_name=keypair_settings.name
         ))
         self.result = 1/3 * 100
         return True