From a691a8c2868d3f8af531e0bff513023c3a704aaf Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 3 Oct 2017 00:27:36 +0200 Subject: Create a router in both vping scenarii MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It fixes vping_userdata as it allows getting metadata due to the gateway defined for the subnet. It could be noted that DHCP can add the route needed if no gateway is defined and if force_metadata is set in dhcp_agent.ini. Change-Id: Ia62e0f00e3d2caee6262dd9cd9966d1f21fe40d5 Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/vping/vping_base.py | 16 ++++++++++++++++ functest/opnfv_tests/openstack/vping/vping_ssh.py | 20 +------------------- 2 files changed, 17 insertions(+), 19 deletions(-) (limited to 'functest') diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py index 8b622e1c7..a8525a382 100644 --- a/functest/opnfv_tests/openstack/vping/vping_base.py +++ b/functest/opnfv_tests/openstack/vping/vping_base.py @@ -13,11 +13,13 @@ import time import uuid from functest.core import testcase +from functest.opnfv_tests.openstack.snaps import snaps_utils from functest.utils.constants import CONST from snaps.openstack import create_flavor from snaps.openstack.create_flavor import FlavorSettings, OpenStackFlavor from snaps.openstack.create_network import NetworkSettings, SubnetSettings +from snaps.openstack.create_router import RouterSettings from snaps.openstack.tests import openstack_tests from snaps.openstack.utils import deploy_utils @@ -62,6 +64,8 @@ class VPingBase(testcase.TestCase): if CONST.__getattribute__('vping_unique_names'): self.guid = '-' + str(uuid.uuid4()) + self.router_name = CONST.__getattribute__( + 'vping_router_name') + self.guid self.vm1_name = CONST.__getattribute__('vping_vm_name_1') + self.guid self.vm2_name = CONST.__getattribute__('vping_vm_name_2') + self.guid @@ -136,6 +140,18 @@ class VPingBase(testcase.TestCase): cidr=private_subnet_cidr)])) self.creators.append(self.network_creator) + # Creating router to external network + log = "Creating router with name: '%s'" % self.router_name + self.logger.info(log) + ext_net_name = snaps_utils.get_ext_net_name(self.os_creds) + self.router_creator = deploy_utils.create_router( + self.os_creds, + RouterSettings( + name=self.router_name, + external_gateway=ext_net_name, + internal_subnets=[private_subnet_name])) + self.creators.append(self.router_creator) + self.logger.info( "Creating flavor with name: '%s'" % self.flavor_name) scenario = CONST.__getattribute__('DEPLOY_SCENARIO') diff --git a/functest/opnfv_tests/openstack/vping/vping_ssh.py b/functest/opnfv_tests/openstack/vping/vping_ssh.py index f94d20b20..1a04ad023 100644 --- a/functest/opnfv_tests/openstack/vping/vping_ssh.py +++ b/functest/opnfv_tests/openstack/vping/vping_ssh.py @@ -20,7 +20,6 @@ import pkg_resources from functest.core.testcase import TestCase from functest.energy import energy -from functest.opnfv_tests.openstack.snaps import snaps_utils from functest.opnfv_tests.openstack.vping import vping_base from functest.utils.constants import CONST from snaps.openstack.create_instance import FloatingIpSettings, \ @@ -28,7 +27,6 @@ from snaps.openstack.create_instance import FloatingIpSettings, \ from snaps.openstack.create_keypairs import KeypairSettings from snaps.openstack.create_network import PortSettings -from snaps.openstack.create_router import RouterSettings from snaps.openstack.create_security_group import Direction, Protocol, \ SecurityGroupSettings, SecurityGroupRuleSettings from snaps.openstack.utils import deploy_utils @@ -51,8 +49,6 @@ class VPingSSH(vping_base.VPingBase): self.kp_name = CONST.__getattribute__('vping_keypair_name') + self.guid self.kp_priv_file = CONST.__getattribute__('vping_keypair_priv_file') self.kp_pub_file = CONST.__getattribute__('vping_keypair_pub_file') - self.router_name = CONST.__getattribute__( - 'vping_router_name') + self.guid self.sg_name = CONST.__getattribute__('vping_sg_name') + self.guid self.sg_desc = CONST.__getattribute__('vping_sg_desc') @@ -77,20 +73,6 @@ class VPingSSH(vping_base.VPingBase): public_filepath=self.kp_pub_file)) self.creators.append(kp_creator) - # Creating router to external network - log = "Creating router with name: '%s'" % self.router_name - self.logger.info(log) - net_set = self.network_creator.network_settings - sub_set = [net_set.subnet_settings[0].name] - ext_net_name = snaps_utils.get_ext_net_name(self.os_creds) - router_creator = deploy_utils.create_router( - self.os_creds, - RouterSettings( - name=self.router_name, - external_gateway=ext_net_name, - internal_subnets=sub_set)) - self.creators.append(router_creator) - # Creating Instance 1 port1_settings = PortSettings( name=self.vm1_name + '-vPingPort', @@ -129,7 +111,7 @@ class VPingSSH(vping_base.VPingBase): floating_ip_settings=[FloatingIpSettings( name=self.vm2_name + '-FIPName', port_name=port2_settings.name, - router_name=router_creator.router_settings.name)]) + router_name=self.router_creator.router_settings.name)]) log = ("Creating VM 2 instance with name: '%s'" % instance2_settings.name) -- cgit 1.2.3-korg From 5ffb995c110be39364535f56c86c46d092b8cea0 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 3 Oct 2017 06:16:20 +0200 Subject: Report duration and result when vping fails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It completes "Bug fix: vping_userdata test status was not properly reported" [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/43911/ Change-Id: I7e8be6cd564a24ca174e63cfc295861c51cae8ed Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/vping/vping_base.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'functest') diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py index a8525a382..e719145bf 100644 --- a/functest/opnfv_tests/openstack/vping/vping_base.py +++ b/functest/opnfv_tests/openstack/vping/vping_base.py @@ -181,10 +181,12 @@ class VPingBase(testcase.TestCase): else: raise Exception('VMs never became active') + self.stop_time = time.time() + if result != testcase.TestCase.EX_OK: + self.result = 0 return testcase.TestCase.EX_RUN_ERROR - self.stop_time = time.time() self.result = 100 return testcase.TestCase.EX_OK -- cgit 1.2.3-korg From ef034e78a6a3cfe90da77a60ae88d0d6bfddfb2e Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 3 Oct 2017 06:29:23 +0200 Subject: Disable vyos_vrouter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's postponed to 5.1. Change-Id: Ic06d47b4b5df167044363b40aea0c7932b550be7 Signed-off-by: Cédric Ollivier --- docker/vnf/testcases.yaml | 1 + functest/ci/testcases.yaml | 1 + 2 files changed, 2 insertions(+) (limited to 'functest') diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml index f9e63da35..5db81b89f 100644 --- a/docker/vnf/testcases.yaml +++ b/docker/vnf/testcases.yaml @@ -51,6 +51,7 @@ tiers: - case_name: vyos_vrouter project_name: functest + enabled: false criteria: 100 blocking: false description: >- diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 97b2414e0..c2787fa7c 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -421,6 +421,7 @@ tiers: - case_name: vyos_vrouter project_name: functest + enabled: false criteria: 100 blocking: false description: >- -- cgit 1.2.3-korg