Merge remote-tracking branch 'origin/develop' into checkstyle-enforcement

Author: rjeberhard

integration-tests/USECASES.MD

@@ -19,14 +19,16 @@ Java integration tests cover the below use cases:
 
 **Advanced Use Cases**
 
-6. Verify domain life cycle (destroy and create) should not have any impact on operator managing the domain and web app load balancing and admin external service.
+6. set precreateService true and verify that the services are created for the managed servers that are not started
 7. Cluster scale up/down using operator REST endpoint, webapp load balancing should adjust accordingly.
-8. Operator life cycle (destroy and create) should not impact the running domain.
+8. Verify that the services are created for the managed servers that are not started
+9. Verify domain life cycle (destroy and create) should not have any impact on operator managing the domain and web app load balancing and admin external service.
+10. Operator life cycle (destroy and create) should not impact the running domain.
 
 Also the below use cases are covered for Quick test:
 
-9. Verify the liveness probe by killing managed server 1 process 3 times to kick pod auto-restart.
-10. Shutdown the domain by changing domain `serverStartPolicy` to `NEVER`.
+11. Verify the liveness probe by killing managed server 1 process 3 times to kick pod auto-restart.
+12. Shutdown the domain by changing domain `serverStartPolicy` to `NEVER`.
 
 
 ## Full test Configuration & Use Cases - Runs Quick test Configuration & Use cases and the below

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

@@ -508,7 +508,9 @@ public void testDomainInImageUsingWdt() throws Exception {
 
   private Domain testAdvancedUseCasesForADomain(Operator operator, Domain domain) throws Exception {
     if (!SMOKETEST) {
+      domain.enablePrecreateService();
       testClusterScaling(operator, domain);
+      domain.verifyServicesCreated(true);
       testDomainLifecyle(operator, domain);
       testOperatorLifecycle(operator, domain);
     }

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

@@ -218,7 +218,7 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
     logTestBegin(testMethodName);
 
     try {
-      TestUtils.execAndPrintLog("docker images");
+      TestUtils.exec("docker images", true);
       logger.info(
           "About to verifyDomainServerPodRestart for Domain: "
               + domain.getDomainUid()
@@ -235,8 +235,8 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
         // tag image with repo name
         String tag =
             "docker tag " + getWeblogicImageName() + ":" + getWeblogicImageTag() + " " + newImage;
-        TestUtils.execAndPrintLog(tag);
-        TestUtils.execAndPrintLog("docker images");
+        TestUtils.exec(tag, true);
+        TestUtils.exec("docker images", true);
 
         // login and push image to ocir
         TestUtils.loginAndPushImageToOcir(newImage);

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

@@ -139,6 +139,17 @@ public void verifyPodsCreated() throws Exception {
    * @throws Exception exception
    */
   public void verifyServicesCreated() throws Exception {
+    verifyServicesCreated(false);
+  }
+
+  /**
+   * verify services are created.
+   *
+   * @param precreateService - if true check services are created for configuredManagedServerCount
+   *     number of servers else check for initialManagedServerReplicas number of servers
+   * @throws Exception exception
+   */
+  public void verifyServicesCreated(boolean precreateService) throws Exception {
     // check admin service
     logger.info("Checking if admin service(" + domainUid + "-" + adminServerName + ") is created");
     TestUtils.checkServiceCreated(domainUid + "-" + adminServerName, domainNS);
@@ -155,7 +166,9 @@ public void verifyServicesCreated() throws Exception {
 
     if (!serverStartPolicy.equals("ADMIN_ONLY")) {
       // check managed server services
-      for (int i = 1; i <= initialManagedServerReplicas; i++) {
+      for (int i = 1;
+          i <= (precreateService ? configuredManagedServerCount : initialManagedServerReplicas);
+          i++) {
         logger.info(
             "Checking if managed service("
                 + domainUid
@@ -595,9 +608,7 @@ public void destroy() throws Exception {
   public void shutdown() throws Exception {
     int replicas = TestUtils.getClusterReplicas(domainUid, clusterName, domainNS);
     String cmd = "kubectl delete domain " + domainUid + " -n " + domainNS;
-    ExecResult result = TestUtils.exec(cmd.toString());
-    String output = result.stdout().trim();
-    logger.info("command to delete domain " + cmd + " \n returned " + output);
+    ExecResult result = TestUtils.exec(cmd.toString(), true);
     verifyDomainDeleted(replicas);
   }
 
@@ -608,15 +619,8 @@ public void shutdown() throws Exception {
    */
   public void shutdownUsingServerStartPolicy() throws Exception {
     int replicas = TestUtils.getClusterReplicas(domainUid, clusterName, domainNS);
-    String cmd =
-        "kubectl patch domain "
-            + domainUid
-            + " -n "
-            + domainNS
-            + " -p '{\"spec\":{\"serverStartPolicy\":\"NEVER\"}}' --type merge";
-    ExecResult result = TestUtils.exec(cmd);
-    String output = result.stdout().trim();
-    logger.info("command to shutdown domain " + cmd + " \n returned " + output);
+    String patchStr = "'{\"spec\":{\"serverStartPolicy\":\"NEVER\"}}' ";
+    TestUtils.kubectlpatch(domainUid, domainNS, patchStr);
     verifyServerPodsDeleted(replicas);
   }
 
@@ -626,19 +630,23 @@ public void shutdownUsingServerStartPolicy() throws Exception {
    * @throws Exception exception
    */
   public void restartUsingServerStartPolicy() throws Exception {
-    String cmd =
-        "kubectl patch domain "
-            + domainUid
-            + " -n "
-            + domainNS
-            + " -p '{\"spec\":{\"serverStartPolicy\":\"IF_NEEDED\"}}' --type merge";
-    ExecResult result = TestUtils.exec(cmd);
-    String output = result.stdout().trim();
-    logger.info("command to restart domain " + cmd + " \n returned " + output);
+    String patchStr = "'{\"spec\":{\"serverStartPolicy\":\"IF_NEEDED\"}}'";
+    TestUtils.kubectlpatch(domainUid, domainNS, patchStr);
     verifyPodsCreated();
     verifyServersReady();
   }
 
+  /**
+   * add precreateService true in domain.yaml.
+   *
+   * @throws Exception exception
+   */
+  public void enablePrecreateService() throws Exception {
+    String patchStr = "'{\"spec\":{\"serverService\":{\"precreateService\":true}}}'";
+    TestUtils.kubectlpatch(domainUid, domainNS, patchStr);
+    verifyServicesCreated(true);
+  }
+
   /**
    * verify domain is deleted.
    *
@@ -1792,23 +1800,12 @@ public int getLoadBalancerWebPort() {
    * @throws Exception exception
    */
   public void shutdownManagedServerUsingServerStartPolicy(String msName) throws Exception {
-    String cmd =
-        "kubectl patch domain "
-            + domainUid
-            + " -n "
-            + domainNS
-            + " -p '{\"spec\":{\"managedServers\":[{\"serverName\":\""
+    logger.info("About to shutdown managed server <" + msName + ">");
+    String patchStr =
+        "'{\"spec\":{\"managedServers\":[{\"serverName\":\""
             + msName
-            + "\",\"serverStartPolicy\":\"NEVER\"}]}}' --type merge";
-
-    logger.info("command to shutdown managed server <" + msName + "> is: " + cmd);
-
-    ExecResult result = ExecCommand.exec(cmd);
-    if (result.exitValue() != 0) {
-      throw new Exception("FAILURE: command " + cmd + " failed, returned " + result.stderr());
-    }
-    String output = result.stdout().trim();
-    logger.info("output from shutting down managed server:\n" + output);
+            + "\",\"serverStartPolicy\":\"NEVER\"}]}}' ";
+    TestUtils.kubectlpatch(domainUid, domainNS, patchStr);
 
     TestUtils.checkPodDeleted(domainUid + "-" + msName, domainNS);
   }
@@ -1819,23 +1816,12 @@ public void shutdownManagedServerUsingServerStartPolicy(String msName) throws Ex
    * @throws Exception exception
    */
   public void restartManagedServerUsingServerStartPolicy(String msName) throws Exception {
-    String cmd =
-        "kubectl patch domain "
-            + domainUid
-            + " -n "
-            + domainNS
-            + " -p '{\"spec\":{\"managedServers\":[{\"serverName\":\""
+    logger.info("About to restart managed server <" + msName + "> ");
+    String patchStr =
+        "'{\"spec\":{\"managedServers\":[{\"serverName\":\""
             + msName
-            + "\",\"serverStartPolicy\":\"IF_NEEDED\"}]}}' --type merge";
-
-    logger.info("command to restart managed server <" + msName + "> is: " + cmd);
-
-    ExecResult result = ExecCommand.exec(cmd);
-    if (result.exitValue() != 0) {
-      throw new Exception("FAILURE: command " + cmd + " failed, returned " + result.stderr());
-    }
-    String output = result.stdout().trim();
-    logger.info("output from restarting managed server:\n" + output);
+            + "\",\"serverStartPolicy\":\"IF_NEEDED\"}]}}'";
+    TestUtils.kubectlpatch(domainUid, domainNS, patchStr);
 
     TestUtils.checkPodCreated(domainUid + "-" + msName, domainNS);
     TestUtils.checkPodReady(domainUid + "-" + msName, domainNS);

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

@@ -244,17 +244,23 @@ public static void deletePvc(String pvcName, String namespace, String domainUid,
   }
 
   public static ExecResult exec(String cmd) throws Exception {
+    return exec(cmd, false);
+  }
+
+  public static ExecResult exec(String cmd, boolean debug) throws Exception {
     ExecResult result = ExecCommand.exec(cmd);
-    if (result.exitValue() != 0) {
+    if (result.exitValue() != 0 || debug) {
       logger.info(
-          "Command "
+          "\nCommand "
               + cmd
-              + " return value "
+              + "\nreturn value: "
               + result.exitValue()
-              + " \n failed with stderr = "
+              + "\nstderr = "
               + result.stderr()
-              + " \n stdout = "
+              + "\nstdout = "
               + result.stdout());
+    }
+    if (result.exitValue() != 0) {
       throw new RuntimeException(
           "FAILURE: Command "
               + cmd
@@ -263,6 +269,7 @@ public static ExecResult exec(String cmd) throws Exception {
               + " \n stdout = "
               + result.stdout());
     }
+
     return result;
   }
 
@@ -1415,16 +1422,16 @@ public static ExecResult loginAndPushImageToOcir(String image) throws Exception
     return result;
   }
 
-  public static void execAndPrintLog(String command) throws Exception {
-    ExecResult result = ExecCommand.exec(command);
-    logger.info(
-        "\nCommand "
-            + command
-            + "\nreturn value: "
-            + result.exitValue()
-            + "\nstderr = "
-            + result.stderr()
-            + "\nstdout = "
-            + result.stdout());
+  public static ExecResult kubectlpatch(String domainUid, String domainNS, String patchStr)
+      throws Exception {
+    String cmd =
+        "kubectl patch domain "
+            + domainUid
+            + " -n "
+            + domainNS
+            + " -p "
+            + patchStr
+            + " --type merge";
+    return exec(cmd, true);
   }
 }