diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2018-03-05 03:14:23 +0000 |
|---|---|---|
| committer |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-03-07 03:36:40 +0100 |
| commit | 530c678677cc314c159936fdf5e121e83fc1d0cc (patch) | |
| tree | dc206cc94f933c696721b064ba00c48ce20e7872 /functest/opnfv_tests/vnf/ims | |
| parent | 8ea8434a1d02d57f61c34113b676d9f8f2530dde (diff) | |
Add a new env var for nameserver
We should still consider that the nameserver must be handled by all
installers instead [1]:
- by configuring one or more DNS resolvers in dhcp_agent.ini
- by asking a local resolv
It eases setting the nameserver in testcases and then allows gating
them. 8.8.8.8 is still defined by default.
[1] https://docs.openstack.org/neutron/pike/admin/config-dns-res.html
Co-Authored-By: Cédric Ollivier <cedric.ollivier@orange.com>
Change-Id: Id58dd5ebee612a0fce2ebc40f089769e60899416
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/vnf/ims')
4 files changed, 12 insertions, 4 deletions
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py index b7a750e6d..73a9bfe9e 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py @@ -39,6 +39,7 @@ from xtesting.energy import energy from functest.opnfv_tests.openstack.snaps import snaps_utils import functest.opnfv_tests.vnf.ims.clearwater_ims_base as clearwater_ims_base from functest.utils import config +from functest.utils import env __author__ = "Valentin Boucher <valentin.boucher@orange.com>" @@ -145,7 +146,8 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase): self.__logger.info("Creating full network ...") subnet_settings = SubnetConfig( name='cloudify_ims_subnet-{}'.format(self.uuid), - cidr='10.67.79.0/24') + cidr='10.67.79.0/24', + dns_nameservers=[env.get('NAMESERVER')]) network_settings = NetworkConfig( name='cloudify_ims_network-{}'.format(self.uuid), subnet_settings=[subnet_settings]) diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.py b/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.py index 7af609a71..37148c918 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.py +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.py @@ -38,6 +38,7 @@ from functest.opnfv_tests.vnf.ims.ixia.utils import IxChassisUtils from functest.opnfv_tests.vnf.ims.ixia.utils import IxLoadUtils from functest.opnfv_tests.vnf.ims.ixia.utils import IxRestUtils from functest.utils import config +from functest.utils import env __author__ = "Valentin Boucher <valentin.boucher@orange.com>" @@ -113,7 +114,8 @@ class CloudifyImsPerf(cloudify_ims.CloudifyIms): self.__logger.info("Creating full IXIA network ...") subnet_settings = SubnetConfig(name='ixia_management_subnet', - cidr='10.10.10.0/24') + cidr='10.10.10.0/24', + dns_nameservers=[env.get('NAMESERVER')]) network_settings = NetworkConfig(name='ixia_management_network', subnet_settings=[subnet_settings]) network_creator = OpenStackNetwork(self.snaps_creds, network_settings) diff --git a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py index 2d248b2e6..2b458e8c1 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py @@ -21,6 +21,7 @@ import yaml from functest.core import vnf from functest.opnfv_tests.openstack.snaps import snaps_utils from functest.utils import config +from functest.utils import env from org.openbaton.cli.errors.errors import NfvoException from org.openbaton.cli.agents.agents import MainAgent @@ -315,7 +316,8 @@ class ClearwaterImsVnf(vnf.VnfOnBoarding): "Creating network/subnet/router if they doen't exist yet...") subnet_settings = SubnetConfig( name='{}_subnet-{}'.format(self.case_name, self.uuid), - cidr="192.168.100.0/24") + cidr="192.168.100.0/24", + dns_nameservers=[env.get('NAMESERVER')]) network_settings = NetworkConfig( name='{}_net-{}'.format(self.case_name, self.uuid), subnet_settings=[subnet_settings]) diff --git a/functest/opnfv_tests/vnf/ims/orchestra_openims.py b/functest/opnfv_tests/vnf/ims/orchestra_openims.py index 8f209d5cf..5615b6ac7 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_openims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_openims.py @@ -19,6 +19,7 @@ import yaml from functest.core import vnf from functest.utils import config +from functest.utils import env from org.openbaton.cli.errors.errors import NfvoException from org.openbaton.cli.agents.agents import MainAgent @@ -300,7 +301,8 @@ class OpenImsVnf(vnf.VnfOnBoarding): "Creating network/subnet/router if they doen't exist yet...") subnet_settings = SubnetConfig( name='{}_subnet-{}'.format(self.case_name, self.uuid), - cidr="192.168.100.0/24") + cidr="192.168.100.0/24", + dns_nameservers=[env.get('NAMESERVER')]) network_settings = NetworkConfig( name='{}_net-{}'.format(self.case_name, self.uuid), subnet_settings=[subnet_settings]) |