From c7cf1bb46e959eb6b5f2b6f504244f7a226048cb Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sat, 12 Sep 2020 11:31:37 +0200 Subject: [PATCH] Avoid running VNF testing if deployment failed MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Id7642e47ec2cc438c5fe3a0ec9447f72b358adab Signed-off-by: Cédric Ollivier (cherry picked from commit 3afa7d700eebf2bfcaabab7bdd3aa09198ba4fe0) --- functest_kubernetes/ims/ims.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/functest_kubernetes/ims/ims.py b/functest_kubernetes/ims/ims.py index b3c0b844..fd796a57 100644 --- a/functest_kubernetes/ims/ims.py +++ b/functest_kubernetes/ims/ims.py @@ -110,7 +110,11 @@ class Vims(testcase.TestCase): # pylint: disable=too-many-instance-attributes time.time()-self.start_time) if not status: watch_deployment.stop() - self.result = 1/2 * 100 + if not status: + self.result = 1/2 * 100 + return True + self.__logger.error("Cannot deploy vIMS") + return False def test_vnf(self): """Test vIMS as proposed by clearwater-live-test @@ -167,8 +171,8 @@ class Vims(testcase.TestCase): # pylint: disable=too-many-instance-attributes def run(self, **kwargs): self.start_time = time.time() try: - self.deploy_vnf() - self.test_vnf() + if self.deploy_vnf(): + self.test_vnf() except client.rest.ApiException: self.__logger.exception("Cannot deploy and test vIms") self.stop_time = time.time() -- 2.16.6