summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-02-07 08:16:31 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2018-02-07 08:19:58 +0100
commit3edd080dfe21c5a272ccf6d959c53d6e40fdadc7 (patch)
tree61b5ef524759f7b180e5e8c64f6752a2343304c2
parentf48ff105d10b4e25da8d24f2d20b7e59f06afaa4 (diff)
Remove dns server from juju_epc config
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 <cedric.ollivier@orange.com>
-rw-r--r--functest/ci/config_functest.yaml2
-rw-r--r--functest/opnfv_tests/vnf/epc/juju_epc.py5
2 files changed, 1 insertions, 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)