fix the check pod status methods

Author: sankarpn

integration-tests/src/test/java/oracle/kubernetes/operator/ITPodsRestart.java

@@ -325,10 +325,7 @@ public void testAdminServerRestartVersion() throws Exception {
     Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
-    K8sTestUtils testUtil = new K8sTestUtils();
-    final String domainUid = domain.getDomainUid();
-    final String domain1LabelSelector = String.format("weblogic.domainUID in (%s)", domainUid);
-    final String podName = domain.getDomainUid() + "-" + domain.getAdminServerName();
+    String podName = domainUid + "-" + domain.getAdminServerName();
 
     try {
       // Modify the original domain yaml to include restartVersion in admin server node
@@ -349,22 +346,18 @@ public void testAdminServerRestartVersion() throws Exception {
       logger.log(Level.INFO, "kubectl apply -f {0}", path.toString());
       ExecResult exec = TestUtils.exec("kubectl apply -f " + path.toString());
       logger.info(exec.stdout());
-      logger.info("Verifying if the admin server is restarted");
-      for (int i = 0; i < 120000; i = i + 10000) {
-        String podStatus =
-            testUtil.getPodStatus(domain.getDomainNS(), domain1LabelSelector, podName);
-        Thread.sleep(10000);
-      }
+
+      logger.info("Verifying if the admin server is terminating");
+      verifyPodStatus(podName, "Terminating");
+      verifyPodStatus(podName, "Running");
+
     } finally {
       logger.log(
           Level.INFO, "Reverting back the domain to old crd\n kubectl apply -f {0}", originalYaml);
       TestUtils.exec("kubectl apply -f " + originalYaml);
-      logger.info("Verifying if the admin server is restarted");
-      for (int i = 0; i < 120000; i = i + 10000) {
-        String podStatus =
-            testUtil.getPodStatus(domain.getDomainNS(), domain1LabelSelector, podName);
-        Thread.sleep(10000);
-      }
+      logger.info("Verifying if the admin server is terminating");
+      verifyPodStatus(podName, "Terminating");
+      verifyPodStatus(podName, "Running");
     }
     logger.log(Level.INFO, "SUCCESS - {0}", testMethodName);
   }
@@ -499,4 +492,27 @@ private static void destroyPodsRestartdomain() throws Exception {
       domain.destroy();
     }
   }
+
+  private void verifyPodStatus(String podName, String podStatusExpected)
+      throws InterruptedException {
+    K8sTestUtils testUtil = new K8sTestUtils();
+    String domain1LabelSelector = String.format("weblogic.domainUID in (%s)", domainUid);
+    String namespace = domain.getDomainNS();
+    boolean gotExpected = false;
+    for (int i = 0; i < 12; i++) {
+      if (podStatusExpected.equals("Terminating")) {
+        if (testUtil.isPodTerminating(namespace, domain1LabelSelector, podName)) {
+          gotExpected = true;
+          break;
+        }
+      } else if (podStatusExpected.equals("Running")) {
+        if (testUtil.isPodRunning(namespace, domain1LabelSelector, podName)) {
+          gotExpected = true;
+          break;
+        }
+      }
+      Thread.sleep(10000);
+    }
+    Assert.assertTrue("Didn't get the expected pod status", gotExpected);
+  }
 }

integration-tests/src/test/java/oracle/kubernetes/operator/utils/K8sTestUtils.java

@@ -22,6 +22,7 @@
 import io.kubernetes.client.models.V1ConfigMapList;
 import io.kubernetes.client.models.V1DeploymentList;
 import io.kubernetes.client.models.V1JobList;
+import io.kubernetes.client.models.V1ObjectMeta;
 import io.kubernetes.client.models.V1PersistentVolumeClaimList;
 import io.kubernetes.client.models.V1PersistentVolumeList;
 import io.kubernetes.client.models.V1Pod;
@@ -372,18 +373,24 @@ public V1PodList getPods(String namespace, String labelSelectors) {
     return v1PodList;
   }
 
-  public String getPodStatus(String namespace, String labelSelectors, String podName) {
-    String status = null;
+  public V1Pod getPod(String namespace, String labelSelectors, String podName) {
     List<V1Pod> pods = getPods(namespace, labelSelectors).getItems();
     for (V1Pod pod : pods) {
-      logger.log(
-          Level.INFO,
-          "POD NAME:{0} POD STATUS :{1}",
-          new Object[] {pod.getMetadata().getName(), pod.getStatus().getPhase()});
       if (pod.getMetadata().getName().equals(podName)) {
-        status = pod.getStatus().getPhase();
+        return pod;
       }
     }
-    return status;
+    logger.info("POD NOT FOUND");
+    return null;
+  }
+
+  public boolean isPodTerminating(String namespace, String labelSelectors, String podName) {
+    V1ObjectMeta metadata = getPod(namespace, labelSelectors, podName).getMetadata();
+    logger.info(metadata.toString());
+    return metadata.getDeletionTimestamp() != null;
+  }
+
+  public boolean isPodRunning(String namespace, String labelSelectors, String podName) {
+    return !isPodTerminating(namespace, labelSelectors, podName);
   }
 }