made changes based on co-worker's review comments

Author: hzhao-github

integration-tests/README.md

@@ -102,14 +102,6 @@ Configuration Overrides Usecases
 | Primary server repick | a backup server becomes the primary server when a primary server fails|
 | HTTP session nigration | verify in-memory HTTP session State replication |
 
-| Server Discovery | Use Case |
-| --- | --- |
-| Discover a newly started server | restart Operator and verify that it discovers to newly started server by applying a modified domain.yaml  |
-| Discover running servers | restart Operator and verify that it discovers running servers and a newly started server by scaling up cluster |
-| Discover running servers | restart both Operator and admin server. Verify Operator connects to newly started server by scaling up cluster |
-| Liveness probe | restart Operator and verify the liveness probe by killing all managed servers in the cluster |
-| Liveness probe | Verify the liveness probe by killing a managed server |  
-
 Use Cases covered in integration tests for the operator is available [here](USECASES.MD)
 
 # Directory Configuration and Structure

integration-tests/USECASES.MD

@@ -90,3 +90,11 @@ Configuration Overrides Usecases
 | --- | --- |
 | Primary Server Repick | A backup server becomes the primary server when a primary server fails|
 | HTTP Session Migration | Verify in-memory HTTP session State replication |
+
+| Server Discovery | Use Case |
+| --- | --- |
+| Discover a newly started server | stop operator and apply the modified domain.yaml with replicas count increated, restart Operator and verify that the cluster is scaled up accordingly |
+| Discover running servers | restart Operator and verify that it discovers running servers and a newly started server by scaling up cluster |
+| Discover running servers | restart both Operator and admin server. Verify Operator connects to newly started server by scaling up cluster |
+| Liveness probe | restart Operator and verify the liveness probe by killing all managed servers in the cluster |
+| Liveness probe | Verify the liveness probe by killing a managed server |  

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

@@ -11,8 +11,6 @@
 import java.nio.file.StandardCopyOption;
 import java.util.Map;
 import oracle.kubernetes.operator.utils.Domain;
-import oracle.kubernetes.operator.utils.ExecCommand;
-import oracle.kubernetes.operator.utils.ExecResult;
 import oracle.kubernetes.operator.utils.Operator;
 import oracle.kubernetes.operator.utils.TestUtils;
 import org.junit.AfterClass;
@@ -101,8 +99,8 @@ public static void staticUnPrepare() throws Exception {
   }
 
   /**
-   * Stop Operator. Start a managed server by applying a modified domain.yaml. Restart Operator and
-   * verify that it connects to this newly started managed server.
+   * Stop operator and apply the modified domain.yaml with replicas count increated. Restart
+   * operator and make sure the cluster is scaled up accordingly.
    *
    * @throws Exception
    */
@@ -117,25 +115,25 @@ public void testOPConnToNewMS() throws Exception {
 
     String cmd = "kubectl apply -f " + testDomainYamlFile;
     logger.info("Start a new managed server, managed-server3 using command:\n" + cmd);
-    ExecResult result = ExecCommand.exec(cmd);
+    TestUtils.exec(cmd);
 
     logger.info("Start the Operator");
     operator.startUsingReplicas();
 
     logger.info("Check the newly created managed-server3 is running");
     int replicas = 3;
-    varifyPodReady(replicas);
+    verifyPodReady(replicas);
 
     // restore the test env
     int msDecrNum = 1;
-    scaleDownAndVarify(msDecrNum);
+    scaleDownAndverify(msDecrNum);
 
     logger.info("SUCCESS - " + testMethodName);
   }
 
   /**
    * Stop and restart Operator and verify that it discovers running servers and a newly started
-   * server by scaling up cluster. Verify that the cluster scale up is noy impacted.
+   * server by scaling up cluster. Verify that the cluster scale up is not impacted.
    *
    * @throws Exception
    */
@@ -149,11 +147,11 @@ public void testOPReconnToRunningMSAndScaleUp() throws Exception {
     operator.restartUsingReplicas();
 
     int msIncrNum = 1;
-    scaleUpAndVarify(msIncrNum);
+    scaleUpAndverify(msIncrNum);
 
     // restore the test env
     int msDecrNum = 1;
-    scaleDownAndVarify(msDecrNum);
+    scaleDownAndverify(msDecrNum);
 
     logger.info("SUCCESS - " + testMethodName);
   }
@@ -181,7 +179,7 @@ public void testOPAdminReconnToDomain() throws Exception {
 
     String cmd = "kubectl delete po/" + adminServerPodName + " -n " + domainNS;
     logger.info("Stop admin server <" + adminServerPodName + "> using command:\n" + cmd);
-    ExecResult result = ExecCommand.exec(cmd);
+    TestUtils.exec(cmd);
 
     logger.info("Checking if admin pod <" + adminServerPodName + "> is deleted");
     TestUtils.checkPodDeleted(adminServerPodName, domainNS);
@@ -193,11 +191,11 @@ public void testOPAdminReconnToDomain() throws Exception {
     TestUtils.checkPodReady(adminServerPodName, domainNS);
 
     int msIncrNum = 1;
-    scaleUpAndVarify(msIncrNum);
+    scaleUpAndverify(msIncrNum);
 
     // restore the test env
     int msDecrNum = 1;
-    scaleDownAndVarify(msDecrNum);
+    scaleDownAndverify(msDecrNum);
 
     logger.info("SUCCESS - " + testMethodName);
   }
@@ -228,7 +226,7 @@ public void testOPMSReconnToDomain() throws Exception {
       String msPodName = domainUid + "-" + managedServerNameBase + i;
       String cmd = "kubectl delete po/" + msPodName + " -n " + domainNS;
       logger.info("Stop managed server <" + msPodName + "> using command:\n" + cmd);
-      ExecResult result = ExecCommand.exec(cmd);
+      TestUtils.exec(cmd);
 
       logger.info("Checking if ms pod <" + msPodName + "> is deleted");
       TestUtils.checkPodDeleted(msPodName, domainNS);
@@ -267,7 +265,7 @@ public void testOPRestartDeadMS() throws Exception {
     String msPodName = domainUid + "-" + managedServerNameBase + "1";
     String cmd = "kubectl delete po/" + msPodName + " -n " + domainNS;
     logger.info("Stop managed server <" + msPodName + "> using command:\n" + cmd);
-    ExecResult result = ExecCommand.exec(cmd);
+    TestUtils.exec(cmd);
 
     logger.info("Wait 10 seconds for ms to be restarted");
     Thread.sleep(10);
@@ -278,7 +276,7 @@ public void testOPRestartDeadMS() throws Exception {
     logger.info("SUCCESS - " + testMethodName);
   }
 
-  private void scaleDownAndVarify(int decrNum) throws Exception {
+  private void scaleDownAndverify(int decrNum) throws Exception {
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
@@ -308,7 +306,7 @@ private void scaleDownAndVarify(int decrNum) throws Exception {
     }
   }
 
-  private void scaleUpAndVarify(int incrNum) throws Exception {
+  private void scaleUpAndverify(int incrNum) throws Exception {
     Map<String, Object> domainMap = domain.getDomainMap();
     String domainUid = domain.getDomainUid();
     String domainNS = domainMap.get("namespace").toString();
@@ -322,10 +320,10 @@ private void scaleUpAndVarify(int incrNum) throws Exception {
     logger.info("Scale domain " + domainUid + " up to " + replicas + " managed servers");
     operator.scale(domainUid, clusterName, replicas);
 
-    varifyPodReady(replicas);
+    verifyPodReady(replicas);
   }
 
-  private void varifyPodReady(int replicas) throws Exception {
+  private void verifyPodReady(int replicas) throws Exception {
     Map<String, Object> domainMap = domain.getDomainMap();
     String domainUid = domain.getDomainUid();
     String domainNS = domainMap.get("namespace").toString();