aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-09-12 11:31:37 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-09-12 13:54:33 +0200
commitb1337b6ef6c11d4b33aa3d9c2e1e01b064273975 (patch)
tree00bfcbf6195e37beeefde596a8092a7b270b7905
parent3c389eb0c8db78db660d6c3d25712b1d6c15c703 (diff)
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)
-rw-r--r--functest_kubernetes/ims/ims.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/functest_kubernetes/ims/ims.py b/functest_kubernetes/ims/ims.py
index 60cde887..562fc334 100644
--- a/functest_kubernetes/ims/ims.py
+++ b/functest_kubernetes/ims/ims.py
@@ -113,7 +113,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
@@ -170,8 +174,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()