From 3edd080dfe21c5a272ccf6d959c53d6e40fdadc7 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 7 Feb 2018 08:16:31 +0100 Subject: Remove dns server from juju_epc config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The dns server shoud be set by the Cloud provider via Neutron configs. Snaps is currently enforcing 8.8.8.8 as default too. Change-Id: I3e9a25d8bbfbab4cd1d44e394235b329df86e82e Signed-off-by: Cédric Ollivier --- functest/ci/config_functest.yaml | 2 -- functest/opnfv_tests/vnf/epc/juju_epc.py | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index 54e8d08c3..928da8f93 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -153,8 +153,6 @@ vnf: private_subnet_cidr: 172.16.0.0/24 private_subnet_name: abot-subnet external_router: abot-router - dns_nameserver: ['8.8.8.8'] - cloudify_ims: tenant_name: cloudify_ims tenant_description: vIMS diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py index 4ca540f17..c373eee46 100644 --- a/functest/opnfv_tests/vnf/epc/juju_epc.py +++ b/functest/opnfv_tests/vnf/epc/juju_epc.py @@ -226,13 +226,10 @@ class JujuEpc(vnf.VnfOnBoarding): CONST, 'vnf_{}_private_subnet_cidr'.format(self.case_name)) abot_router = getattr( CONST, 'vnf_{}_external_router'.format(self.case_name)) - dns_nameserver = getattr( - CONST, 'vnf_{}_dns_nameserver'.format(self.case_name)) self.__logger.info("Creating full network ...") subnet_settings = SubnetConfig( - name=private_subnet_name, cidr=private_subnet_cidr, - dns_nameservers=dns_nameserver) + name=private_subnet_name, cidr=private_subnet_cidr) network_settings = NetworkConfig( name=private_net_name, subnet_settings=[subnet_settings]) network_creator = OpenStackNetwork(self.snaps_creds, network_settings) -- cgit 1.2.3-korg