Fix phase conditions 14/70514/1
authorCédric Ollivier <cedric.ollivier@orange.com>
Sun, 15 Mar 2020 16:15:38 +0000 (17:15 +0100)
committerCédric Ollivier <cedric.ollivier@orange.com>
Tue, 7 Jul 2020 17:49:42 +0000 (19:49 +0200)
Else it waits 20 minutes for nothing [1]

[1] https://build.opnfv.org/ci/job/functest-kubernetes-opnfv-functest-kubernetes-cnf-latest-k8s_vims-run/5/console

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

functest_kubernetes/ims/ims.py

index e12c002..5eb5084 100644 (file)
@@ -7,7 +7,7 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
-"""Deploy and Test Clearwater vIMS using Kubernetes"""
+"""Deploy and test Clearwater vIMS using Kubernetes"""
 
 from __future__ import division
 
@@ -25,7 +25,7 @@ from xtesting.core import testcase
 
 
 class Vims(testcase.TestCase):
-    """Deploy and Test Clearwater vIMS using Kubernetes
+    """Deploy and test Clearwater vIMS using Kubernetes
 
     It leverage on the Python kubernetes client to apply operation proposed by
     clearwater-docker.
@@ -97,6 +97,7 @@ class Vims(testcase.TestCase):
         for event in watch_deployment.stream(
                 func=self.appsv1.list_namespaced_deployment,
                 namespace=self.namespace, timeout_seconds=self.watch_timeout):
+            self.__logger.debug(event)
             if event["object"].status.ready_replicas == 1:
                 if event['object'].metadata.name in status:
                     status.remove(event['object'].metadata.name)
@@ -126,9 +127,10 @@ class Vims(testcase.TestCase):
         for event in watch_deployment.stream(
                 func=self.corev1.list_namespaced_pod,
                 namespace=self.namespace, timeout_seconds=self.watch_timeout):
+            self.__logger.debug(event)
             if event["object"].metadata.name == self.test_container_name:
                 if (event["object"].status.phase == 'Succeeded' or
-                        event["object"].status.phase == 'Error'):
+                        event["object"].status.phase == 'Failed'):
                     watch_deployment.stop()
         api_response = self.corev1.read_namespaced_pod_log(
             name=self.test_container_name, namespace=self.namespace)