From a82827bd4f93c318f0bc2554928ab2213d1ee766 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 20 May 2019 17:49:38 +0200 Subject: Avoid running local dnsmasq when testing IMS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It may be unsafe and it's useless for testing IMS if BONO_IP is set. Change-Id: I8b0f010956defbfa1fd22b5aa5cbea70bd2968a4 Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/vnf/ims/heat_ims.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'functest/opnfv_tests/vnf/ims/heat_ims.py') diff --git a/functest/opnfv_tests/vnf/ims/heat_ims.py b/functest/opnfv_tests/vnf/ims/heat_ims.py index cce1a330b..9ea9c5627 100644 --- a/functest/opnfv_tests/vnf/ims/heat_ims.py +++ b/functest/opnfv_tests/vnf/ims/heat_ims.py @@ -194,12 +194,16 @@ class HeatIms(singlevm.VmReady2): server.name, regex='Cloud-init .* finished at ', loop=1): return False if 'ellis' in server.name: - self.__logger.debug("server: %s", server) + self.__logger.debug("ellis: %s", server) ellis_ip = server.public_v4 + elif 'bono' in server.name: + self.__logger.debug("bono: %s", server) + bono_ip = server.public_v4 assert ellis_ip - self.clearwater = clearwater.ClearwaterTesting(self.case_name, - ellis_ip) + assert bono_ip + self.clearwater = clearwater.ClearwaterTesting( + self.case_name, bono_ip, ellis_ip) # This call can take time and many retry because Heat is # an infrastructure orchestrator so when Heat say "stack created" # it means that all OpenStack ressources are created but not that @@ -222,7 +226,7 @@ class HeatIms(singlevm.VmReady2): if not dns_ip: return False short_result, vnf_test_rate = self.clearwater.run_clearwater_live_test( - dns_ip=dns_ip, public_domain=self.vnf['parameters']["zone"]) + public_domain=self.vnf['parameters']["zone"]) duration = time.time() - start_time self.__logger.info(short_result) self.details['test_vnf'] = dict(result=short_result, duration=duration) -- cgit 1.2.3-korg