diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-02-02 23:12:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-02 23:12:14 +0000 |
| commit | 768601416d408f8596f6d86f9abadbe13cf19c72 (patch) | |
| tree | 34a34c853fd8ef3119180f175f669d3217e54200 /functest | |
| parent | 359ca83f394748b258980d9fd827e42cdb0d6e2b (diff) | |
| parent | 2abaf3d53d978ce045d6ffa3887a892eb73129ad (diff) | |
Merge "Stop setting ext net in config"
Diffstat (limited to 'functest')
| -rw-r--r-- | functest/ci/config_functest.yaml | 1 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/epc/juju_epc.py | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index ebaccc0c..54e8d08c 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, |