fix

Author: sankarpn

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

@@ -17,7 +17,6 @@
 import oracle.kubernetes.operator.utils.K8sTestUtils;
 import oracle.kubernetes.operator.utils.Operator;
 import oracle.kubernetes.operator.utils.TestUtils;
-import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.BeforeClass;
@@ -75,7 +74,7 @@ public static void staticPrepare() throws Exception {
    *
    * @throws Exception
    */
-  @AfterClass
+  // @AfterClass
   public static void staticUnPrepare() throws Exception {
     if (!QUICKTEST) {
       logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
@@ -326,6 +325,11 @@ 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();
+
     try {
       // Modify the original domain yaml to include restartVersion in admin server node
       DomainCRD crd = new DomainCRD(originalYaml);
@@ -346,19 +350,21 @@ public void testAdminServerRestartVersion() throws Exception {
       ExecResult exec = TestUtils.exec("kubectl apply -f " + path.toString());
       logger.info(exec.stdout());
       logger.info("Verifying if the admin server is restarted");
-      K8sTestUtils testUtil = new K8sTestUtils();
-      for (int i = 0; i < 60000; i++) {
+      for (int i = 0; i < 120000; i = i + 10000) {
         String podStatus =
-            testUtil.getPodStatus(domain.getDomainNS(), domain.getDomainUid(), "mypod");
+            testUtil.getPodStatus(domain.getDomainNS(), domain1LabelSelector, podName);
         Thread.sleep(10000);
       }
-      // domain.verifyAdminServerRestarted();
     } 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");
-      domain.verifyAdminServerRestarted();
+      for (int i = 0; i < 120000; i = i + 10000) {
+        String podStatus =
+            testUtil.getPodStatus(domain.getDomainNS(), domain1LabelSelector, podName);
+        Thread.sleep(10000);
+      }
     }
     logger.log(Level.INFO, "SUCCESS - {0}", testMethodName);
   }

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

@@ -26,7 +26,6 @@
 import io.kubernetes.client.models.V1PersistentVolumeList;
 import io.kubernetes.client.models.V1Pod;
 import io.kubernetes.client.models.V1PodList;
-import io.kubernetes.client.models.V1PodStatus;
 import io.kubernetes.client.models.V1ReplicaSetList;
 import io.kubernetes.client.models.V1RoleBindingList;
 import io.kubernetes.client.models.V1RoleList;
@@ -38,6 +37,8 @@
 import io.kubernetes.client.util.ClientBuilder;
 import java.io.IOException;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class K8sTestUtils {
   static {
@@ -55,6 +56,7 @@ public class K8sTestUtils {
   private ExtensionsV1beta1Api extensionsV1beta1Api = new ExtensionsV1beta1Api();
   private RbacAuthorizationV1Api rbacAuthorizationV1Api = new RbacAuthorizationV1Api();
   private ApiextensionsV1beta1Api apiextensionsV1beta1Api = new ApiextensionsV1beta1Api();
+  public static final Logger logger = Logger.getLogger("OperatorIT", "OperatorIT");
 
   public void verifyDomainCrd() throws Exception {
     try {
@@ -344,33 +346,42 @@ public void verifyNoClusterRoleBindings(String labelSelectors) throws Exception
     assertEquals("Number of cluster role bindings", v1ClusterRoleBindingList.getItems().size(), 0);
   }
 
-  public V1PodList getPods(String namespace, String labelSelectors) throws ApiException {
-    V1PodList v1PodList =
-        coreV1Api.listNamespacedPod(
-            namespace,
-            Boolean.FALSE,
-            Boolean.FALSE.toString(),
-            null,
-            null,
-            labelSelectors,
-            null,
-            null,
-            null,
-            Boolean.FALSE);
+  public V1PodList getPods(String namespace, String labelSelectors) {
+    V1PodList v1PodList = null;
+    try {
+      v1PodList =
+          coreV1Api.listNamespacedPod(
+              namespace,
+              Boolean.FALSE,
+              Boolean.FALSE.toString(),
+              null,
+              null,
+              labelSelectors,
+              null,
+              null,
+              null,
+              Boolean.FALSE);
+
+    } catch (ApiException ex) {
+      Logger.getLogger(K8sTestUtils.class.getName()).log(Level.SEVERE, null, ex);
+    }
+    logger.log(
+        Level.INFO,
+        "Pods in namespace :{0} and label :{1} :{2}",
+        new Object[] {namespace, labelSelectors, v1PodList.getItems().size()});
     return v1PodList;
   }
 
-  public String getPodStatus(String namespace, String labelSelectors, String podName)
-      throws ApiException {
+  public String getPodStatus(String namespace, String labelSelectors, String podName) {
     String status = null;
     List<V1Pod> pods = getPods(namespace, labelSelectors).getItems();
     for (V1Pod pod : pods) {
-      V1PodStatus podStatus = pod.getStatus();
-      System.out.println(pod.toString() + ":" + podStatus.getMessage());
-      System.out.println(pod.toString() + ":" + podStatus.getPhase());
-      System.out.println(pod.toString() + ":" + podStatus.toString());
-      if (pod.toString().equals(podName)) {
-        status = pod.getStatus().toString();
+      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 status;