From 2abaf3d53d978ce045d6ffa3887a892eb73129ad Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 2 Feb 2018 08:22:00 +0100 Subject: Stop setting ext net in config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It simply relies on the related env var as expected. Change-Id: Ibbb1a2ab2cccdff8cafe6f409af383a24778b1f5 Signed-off-by: Cédric Ollivier --- functest/ci/config_functest.yaml | 1 - functest/opnfv_tests/vnf/epc/juju_epc.py | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index 192a1ee0..1f8753bf 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -153,7 +153,6 @@ vnf: private_subnet_cidr: 172.16.0.0/24 private_subnet_name: abot-subnet external_router: abot-router - external_network_name: ext-net dns_nameserver: ['8.8.8.8'] cloudify_ims: diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py index e7743b3a..052efd3f 100644 --- a/functest/opnfv_tests/vnf/epc/juju_epc.py +++ b/functest/opnfv_tests/vnf/epc/juju_epc.py @@ -16,7 +16,7 @@ import sys from copy import deepcopy from urlparse import urljoin -import functest.core.vnf as vnf +from functest.core import vnf from functest.opnfv_tests.openstack.snaps import snaps_utils from functest.utils.constants import CONST import functest.utils.openstack_utils as os_utils @@ -169,8 +169,6 @@ class JujuEpc(vnf.VnfOnBoarding): 'vnf_{}_external_router'.format(self.case_name)) dns_nameserver = CONST.__getattribute__( 'vnf_{}_dns_nameserver'.format(self.case_name)) - ext_net_name = CONST.__getattribute__( - 'vnf_{}_external_network_name'.format(self.case_name)) self.__logger.info("Creating full network ...") subnet_settings = SubnetConfig(name=private_subnet_name, -- cgit 1.2.3-korg