aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/vnf/ims
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-03-07 01:38:44 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-03-07 05:28:41 +0100
commit39ab5b6cab5d6c664dc96bbb92781a9eed0aa41d (patch)
tree05aefefc4be5c9bb935532c12bac6838e0c05bd8 /functest/opnfv_tests/vnf/ims
parent147f5a373b4c8659826f1f626bd9b6042afc3934 (diff)
Modify the upstream Clearwater Heat files
It forces a single network for both management and signaling traffic. It meets the OPNFV deployment requirements and the Functest SUT ones. The security group will be improved in a second step to first quickly fix the testcase in gambia. Private IPs may be registered in DNS to avoid network address translations. Change-Id: Ic19cf336ac5c2d07c52c6dd37b06271790145cf9 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/vnf/ims')
-rw-r--r--functest/opnfv_tests/vnf/ims/heat_ims.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/functest/opnfv_tests/vnf/ims/heat_ims.py b/functest/opnfv_tests/vnf/ims/heat_ims.py
index 0caa2b00d..1be82eef8 100644
--- a/functest/opnfv_tests/vnf/ims/heat_ims.py
+++ b/functest/opnfv_tests/vnf/ims/heat_ims.py
@@ -49,11 +49,7 @@ class HeatIms(singlevm.VmReady2):
'private_mgmt_net_cidr': '192.168.100.0/24',
'private_mgmt_net_gateway': '192.168.100.254',
'private_mgmt_net_pool_start': '192.168.100.1',
- 'private_mgmt_net_pool_end': '192.168.100.253',
- 'private_sig_net_cidr': '192.168.101.0/24',
- 'private_sig_net_gateway': '192.168.101.254',
- 'private_sig_net_pool_start': '192.168.101.1',
- 'private_sig_net_pool_end': '192.168.101.253'}
+ 'private_mgmt_net_pool_end': '192.168.100.253'}
def __init__(self, **kwargs):
"""Initialize HeatIms testcase object."""
@@ -91,6 +87,9 @@ class HeatIms(singlevm.VmReady2):
self.clearwater = None
self.role = None
+ def create_network_resources(self):
+ pass
+
def execute(self):
# pylint: disable=too-many-locals,too-many-statements
"""
@@ -152,12 +151,10 @@ class HeatIms(singlevm.VmReady2):
parameters = self.vnf['parameters']
parameters['public_mgmt_net_id'] = self.ext_net.id
- parameters['public_sig_net_id'] = self.ext_net.id
parameters['flavor'] = self.flavor.name
parameters['image'] = self.image.name
parameters['key_name'] = self.keypair.name
parameters['external_mgmt_dns_ip'] = env.get('NAMESERVER')
- parameters['external_sig_dns_ip'] = env.get('NAMESERVER')
parameters.update(self.parameters)
self.__logger.info("Create Heat Stack")