From 45708eda7ba8e4ddac85930dbb5defb14b9af88b Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 18 Mar 2019 18:04:40 +0100 Subject: Avoid killing create_number.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit create_numbers.py has been killed by other services as described in [1]. It's now called when ellis is up and running. It adds few sleeps to ensure the right boot orders (signals must be send before switching DNS). [1] http://www.projectclearwater.org/using-start-stop-daemon-with-the-python-interpreter/ Change-Id: I87ad3828c10d3ccbc707ed8f4ab99987c6968f09 Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/vnf/ims/heat_ims.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'functest/opnfv_tests/vnf/ims') diff --git a/functest/opnfv_tests/vnf/ims/heat_ims.py b/functest/opnfv_tests/vnf/ims/heat_ims.py index ff93e9850..56082683c 100644 --- a/functest/opnfv_tests/vnf/ims/heat_ims.py +++ b/functest/opnfv_tests/vnf/ims/heat_ims.py @@ -185,11 +185,14 @@ class HeatIms(singlevm.VmReady2): wait=True, **parameters) self.__logger.debug("stack: %s", self.stack) + time.sleep(300) + self._monit() + servers = self.cloud.list_servers(detailed=True) self.__logger.debug("servers: %s", servers) for server in servers: if not self.check_regex_in_console( - server.name, regex='Cloud-init .* finished at ', loop=60): + server.name, regex='Cloud-init .* finished at ', loop=1): return False if 'ellis' in server.name: self.__logger.debug("server: %s", server) @@ -222,8 +225,6 @@ class HeatIms(singlevm.VmReady2): if not dns_ip: return False - self._monit() - short_result = self.clearwater.run_clearwater_live_test( dns_ip=dns_ip, public_domain=self.vnf['parameters']["zone"]) @@ -244,6 +245,7 @@ class HeatIms(singlevm.VmReady2): self.__logger.exception("Cannot calculate results") self.details['test_vnf'].update(status='FAIL') return False + self._monit() return True if vnf_test_rate > 0 else False def clean(self): -- cgit 1.2.3-korg