From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 12 Sep 2020 09:31:37 +0000 (+0200)
Subject: Avoid running VNF testing if deployment failed
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F71095%2F1;p=functest-kubernetes.git

Avoid running VNF testing if deployment failed

Change-Id: Id7642e47ec2cc438c5fe3a0ec9447f72b358adab
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 3afa7d700eebf2bfcaabab7bdd3aa09198ba4fe0)
---

diff --git a/functest_kubernetes/ims/ims.py b/functest_kubernetes/ims/ims.py
index ee9d6935..95aa1c69 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()