X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=functest%2Fopnfv_tests%2Fvnf%2Fims%2Fcloudify_ims_perf.py;h=376138bb95985f8b1b08de506379402567c94122;hb=7f2d7515e068c2ba072d4f3b4cf0997e06ae8460;hp=a1612a52d491cf8b2084dfa87d30d468ab1672d8;hpb=01a5192428eb99afcb94047e6faa54e1d57114d1;p=functest.git diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.py b/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.py index a1612a52d..376138bb9 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.py +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.py @@ -18,13 +18,6 @@ import yaml import paramiko import dns.resolver from jinja2 import Environment, FileSystemLoader - - -from functest.energy import energy -from functest.opnfv_tests.openstack.snaps import snaps_utils -import functest.opnfv_tests.vnf.ims.cloudify_ims as cloudify_ims -from functest.utils.constants import CONST - from snaps.config.flavor import FlavorConfig from snaps.config.image import ImageConfig from snaps.config.network import NetworkConfig, PortConfig, SubnetConfig @@ -32,16 +25,20 @@ from snaps.config.router import RouterConfig from snaps.config.security_group import ( Direction, Protocol, SecurityGroupConfig, SecurityGroupRuleConfig) from snaps.config.vm_inst import FloatingIpConfig, VmInstanceConfig - from snaps.openstack.create_flavor import OpenStackFlavor from snaps.openstack.create_instance import OpenStackVmInstance from snaps.openstack.create_network import OpenStackNetwork from snaps.openstack.create_router import OpenStackRouter from snaps.openstack.create_security_group import OpenStackSecurityGroup +from xtesting.energy import energy -from ixia.utils.IxChassisUtils import ChassisRestAPI -import ixia.utils.IxLoadUtils as IxLoadUtils -import ixia.utils.IxRestUtils as IxRestUtils +from functest.opnfv_tests.openstack.snaps import snaps_utils +from functest.opnfv_tests.vnf.ims import cloudify_ims +from functest.opnfv_tests.vnf.ims.ixia.utils import IxChassisUtils +from functest.opnfv_tests.vnf.ims.ixia.utils import IxLoadUtils +from functest.opnfv_tests.vnf.ims.ixia.utils import IxRestUtils +from functest.utils import config +from functest.utils import env __author__ = "Valentin Boucher " @@ -59,8 +56,8 @@ class CloudifyImsPerf(cloudify_ims.CloudifyIms): # Retrieve the configuration try: - self.config = CONST.__getattribute__( - 'vnf_{}_config'.format(self.case_name)) + self.config = getattr( + config.CONF, 'vnf_{}_config'.format(self.case_name)) except Exception: raise Exception("VNF config file not found") @@ -117,7 +114,8 @@ class CloudifyImsPerf(cloudify_ims.CloudifyIms): self.__logger.info("Creating full IXIA network ...") subnet_settings = SubnetConfig(name='ixia_management_subnet', - cidr='10.10.10.0/24') + cidr='10.10.10.0/24', + dns_nameservers=[env.get('NAMESERVER')]) network_settings = NetworkConfig(name='ixia_management_network', subnet_settings=[subnet_settings]) network_creator = OpenStackNetwork(self.snaps_creds, network_settings) @@ -152,8 +150,7 @@ class CloudifyImsPerf(cloudify_ims.CloudifyIms): protocol=Protocol.icmp)) ixia_managment_sg_settings = SecurityGroupConfig( - name="ixia_management", - rule_settings=sg_rules) + name="ixia_management", rule_settings=sg_rules) securit_group_creator = OpenStackSecurityGroup( self.snaps_creds, ixia_managment_sg_settings) @@ -169,8 +166,7 @@ class CloudifyImsPerf(cloudify_ims.CloudifyIms): port_range_max=65535)) ixia_ssh_http_sg_settings = SecurityGroupConfig( - name="ixia_ssh_http", - rule_settings=sg_rules) + name="ixia_ssh_http", rule_settings=sg_rules) securit_group_creator = OpenStackSecurityGroup( self.snaps_creds, ixia_ssh_http_sg_settings) @@ -224,28 +220,22 @@ class CloudifyImsPerf(cloudify_ims.CloudifyIms): exists=True) chassis_port_settings = PortConfig( - name='ixia_chassis_port', - network_name=network_settings.name) + name='ixia_chassis_port', network_name=network_settings.name) card1_port1_settings = PortConfig( - name='ixia_card1_port1', - network_name=network_settings.name) + name='ixia_card1_port1', network_name=network_settings.name) card2_port1_settings = PortConfig( - name='ixia_card2_port1', - network_name=network_settings.name) + name='ixia_card2_port1', network_name=network_settings.name) card1_port2_settings = PortConfig( - name='ixia_card1_port2', - network_name="cloudify_ims_network") + name='ixia_card1_port2', network_name="cloudify_ims_network") card2_port2_settings = PortConfig( - name='ixia_card2_port2', - network_name="cloudify_ims_network") + name='ixia_card2_port2', network_name="cloudify_ims_network") load_port_settings = PortConfig( - name='ixia_load_port', - network_name=network_settings.name) + name='ixia_load_port', network_name=network_settings.name) chassis_settings = VmInstanceConfig( name='ixia_vChassis', @@ -329,19 +319,19 @@ class CloudifyImsPerf(cloudify_ims.CloudifyIms): "password": "admin", "rememberMe": "false"}) api_key = json.loads(( - ChassisRestAPI.postWithPayload(login_url, payload)))["apiKey"] + IxChassisUtils.ChassisRestAPI.postWithPayload( + login_url, payload)))["apiKey"] self.__logger.info("Adding 2 card back inside the ixia chassis...") for ip in vcard_ips: payload = {"ipAddress": str(ip)} - response = json.loads(ChassisRestAPI.postOperation(cards_url, - api_key, - payload)) + response = json.loads(IxChassisUtils.ChassisRestAPI.postOperation( + cards_url, api_key, payload)) count = 0 while (int( - ChassisRestAPI.getWithHeaders(response['url'], - api_key)['progress']) != 100): + IxChassisUtils.ChassisRestAPI.getWithHeaders( + response['url'], api_key)['progress']) != 100): self.__logger.debug("Operation did not finish yet. \ Waiting for 1 more second..") time.sleep(1) @@ -368,7 +358,7 @@ class CloudifyImsPerf(cloudify_ims.CloudifyIms): i = 0 for rdata in result: i = i + 1 - print rdata.address + print(rdata.address) iplistims += str(rdata.address) if i != len(result): iplistims += ';' @@ -406,10 +396,8 @@ class CloudifyImsPerf(cloudify_ims.CloudifyIms): j2_env = Environment(loader=FileSystemLoader(files_dir), trim_blocks=True) self.test['inputs'].update(dict( - ipchassis=fip_chassis, - ipcard1=vcard_ips_p2[0], - ipcard2=vcard_ips_p2[1], - iplistims=iplistims + ipchassis=fip_chassis, ipcard1=vcard_ips_p2[0], + ipcard2=vcard_ips_p2[1], iplistims=iplistims )) target_file.write( @@ -444,8 +432,8 @@ class CloudifyImsPerf(cloudify_ims.CloudifyIms): self.__logger.info("Starting the test...") IxLoadUtils.runTest(connection, sessionUrl) - self.__logger.info("Polling values for stats %s..." % ( - kStatsToDisplayDict)) + self.__logger.info( + "Polling values for stats %s..." % (kStatsToDisplayDict)) result = IxLoadUtils.pollStats(connection, sessionUrl, kStatsToDisplayDict) self.__logger.info("Test finished.") @@ -458,8 +446,8 @@ class CloudifyImsPerf(cloudify_ims.CloudifyIms): result=result, duration=duration) if testRunError: - self.__logger.info("The test exited with following error: %s" % ( - testRunError)) + self.__logger.info( + "The test exited with following error: %s" % (testRunError)) self.details['test_vnf'].update(status='FAIL', duration=duration) return False else: