summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorApeksha D Khakharia <akhakhar@redhat.com>2018-06-29 15:35:36 +0530
committerApeksha D Khakharia <akhakhar@redhat.com>2018-06-29 15:51:43 +0530
commit64e2276a1929ccc6d52abb92ee7a2267cc05f696 (patch)
tree6f4c545153e681ca6e4c6887d35fe92efad3a7f9
parent9c0b9533376fd365140e1091b0abae8d0ee099ee (diff)
CNS: fixing pod status lib
Change-Id: Ic4ebb29be6070e982c53cfa63730e6dc4d955711 Signed-off-by: Apeksha D Khakharia <akhakhar@redhat.com>
-rw-r--r--cns-libs/cnslibs/common/dynamic_provisioning.py23
1 files changed, 14 insertions, 9 deletions
diff --git a/cns-libs/cnslibs/common/dynamic_provisioning.py b/cns-libs/cnslibs/common/dynamic_provisioning.py
index 6285239a..c02c499b 100644
--- a/cns-libs/cnslibs/common/dynamic_provisioning.py
+++ b/cns-libs/cnslibs/common/dynamic_provisioning.py
@@ -226,12 +226,12 @@ def verify_pod_status_running(hostname, pod_name,
break
output = out.strip().split("\n")[0].strip()
if output == "":
- g.log.info("pod not found sleeping for %s "
- "sec" % wait_step)
+ g.log.info("pod %s not found sleeping for %s "
+ "sec" % (pod_name, wait_step))
continue
elif output == "ContainerCreating":
- g.log.info("pod creating sleeping for %s "
- "sec" % wait_step)
+ g.log.info("pod %s creating sleeping for %s "
+ "sec" % (pod_name, wait_step))
continue
elif output == "Running":
status_flag = True
@@ -241,13 +241,18 @@ def verify_pod_status_running(hostname, pod_name,
g.log.error("pod %s status error" % pod_name)
break
elif output == "Terminating":
- g.log.info("pod is terminating state sleeping "
- "for %s sec" % wait_step)
+ g.log.info("pod %s is terminating state sleeping "
+ "for %s sec" % (pod_name, wait_step))
+ continue
+ elif output == "Pending":
+ g.log.info("pod %s is pending state sleeping "
+ "for %s sec" % (pod_name, wait_step))
continue
else:
- g.log.error("pod %s has different status - "
- "%s" % (pod_name, output))
- break
+ g.log.error("pod %s has different status - %s "
+ "sleeping for %s sec" % (
+ pod_name, output, wait_step))
+ continue
if w.expired:
g.log.error("exceeded timeout %s for verifying running "
"status of pod %s" % (timeout, pod_name))