Bring back the source code to use serverStartPolicy to shutdown a server jenkins-ignore

Author: hzhao-github

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

@@ -9,7 +9,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 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;
@@ -30,11 +29,8 @@
 public class ITSessionMigration extends BaseTest {
   private static final String testAppName = "httpsessionreptestapp";
   private static final String scriptName = "buildDeployAppInPod.sh";
-
   private static Map<String, String> httpAttrMap;
-
   private static String httpHeaderFile;
-
   private static Operator operator;
   private static Domain domain;
 
@@ -70,7 +66,6 @@ public static void staticPrepare() throws Exception {
       }
 
       httpHeaderFile = BaseTest.getResultDir() + "/headers";
-
       httpAttrMap = new HashMap<String, String>();
       httpAttrMap.put("sessioncreatetime", "(.*)sessioncreatetime>(.*)</sessioncreatetime(.*)");
       httpAttrMap.put("sessionid", "(.*)sessionid>(.*)</sessionid(.*)");
@@ -133,7 +128,7 @@ public void testRepickPrimary() throws Exception {
     String sessCreateTime1 = getHttpResponseAttribute(result.stdout(), sessCreateTime);
 
     // Stop primary server
-    stopPrimaryServer(primaryServName1);
+    domain.shutdownManagedServerUsingServerStartPolicy(primaryServName1);
 
     // Send the second HTTP request using HTTP header/sessionID info save before
     result = getHTTPResponse(testAppPath, " -b ");
@@ -151,6 +146,7 @@ public void testRepickPrimary() throws Exception {
         primaryServName1.trim().equals(primaryServName2.trim()));
 
     // Restore test env
+    domain.restartManagedServerUsingServerStartPolicy(primaryServName1);
     TestUtils.checkPodReady(domainUid + "-" + primaryServName1, domainNS);
 
     logger.info(
@@ -189,7 +185,7 @@ public void testHttpSessionMigr() throws Exception {
     String countattribute1 = getHttpResponseAttribute(result.stdout(), count);
 
     // Stop primary server
-    stopPrimaryServer(primaryServName1);
+    domain.shutdownManagedServerUsingServerStartPolicy(primaryServName1);
 
     // Send the second HTTP request using HTTP header/sessionID info save before
     result = getHTTPResponse(webServiceGetUrl, " -b ");
@@ -209,6 +205,7 @@ public void testHttpSessionMigr() throws Exception {
         "HTTP session state is NOT migrated!", countattribute1.equals(countattribute2));
 
     // Restore test env
+    domain.restartManagedServerUsingServerStartPolicy(primaryServName1);
     TestUtils.checkPodReady(domainUid + "-" + primaryServName1, domainNS);
 
     logger.info("SUCCESS - " + testMethodName + ". HTTP session state is migrated!");
@@ -226,45 +223,11 @@ private ExecResult getHTTPResponse(String webServiceURL, String headerOption) th
     String curlCmd = buildWebServiceUrl(webServiceURL, headerOption + httpHeaderFile);
     logger.info("Send a HTTP request: " + curlCmd);
 
-    ExecResult result = ExecCommand.exec(curlCmd);
-
-    if (result.exitValue() != 0) {
-      throw new Exception(
-          "FAILURE: command "
-              + curlCmd
-              + " failed, returned "
-              + result.stderr()
-              + "\n "
-              + result.stdout());
-    }
+    ExecResult result = TestUtils.exec(curlCmd);
 
     return result;
   }
 
-  /**
-   * Stop the primary server
-   *
-   * @param primaryServerName - weblogic primary server name
-   * @throws Exception
-   */
-  private void stopPrimaryServer(String primaryServerName) throws Exception {
-    Map<String, Object> domainMap = domain.getDomainMap();
-    String domainNS = domainMap.get("namespace").toString();
-    String domainUid = domain.getDomainUid();
-
-    // stop primary server
-    String msPodName = domainUid + "-" + primaryServerName;
-    String cmd = "kubectl delete po/" + msPodName + " -n " + domainNS;
-    logger.info("Stop managed server <" + msPodName + "> using command:\n" + cmd);
-
-    ExecResult result = ExecCommand.exec(cmd);
-    if (result.exitValue() != 0) {
-      throw new Exception("FAILURE: command " + cmd + " failed, returned " + result.stderr());
-    }
-
-    logger.info(result.stdout());
-  }
-
   /**
    * Get the value of a HTTP attribute
    *
@@ -274,11 +237,8 @@ private void stopPrimaryServer(String primaryServerName) throws Exception {
    */
   private String getHttpResponseAttribute(String httpResponseString, String attribute)
       throws Exception {
-
     String attrPatn = httpAttrMap.get(attribute);
-
     Assume.assumeNotNull(attrPatn);
-
     String httpAttribute = null;
 
     Pattern pattern = Pattern.compile(attrPatn);
@@ -316,28 +276,4 @@ private String buildWebServiceUrl(String curlURLPath, String paramToAppend) thro
 
     return webServiceUrl.toString();
   }
-
-  /**
-   * Execute a given curl command and verify the results
-   *
-   * @param curlCmd - a curl command to execute
-   * @throws Exception
-   */
-  private ExecResult execCurlCmd(String curlCmd) throws Exception {
-    logger.info("curl command to exec is:\n" + curlCmd);
-
-    ExecResult result = ExecCommand.exec(curlCmd);
-
-    if (result.exitValue() != 0) {
-      throw new Exception(
-          "FAILURE: command "
-              + curlCmd
-              + " failed, returned "
-              + result.stderr()
-              + "\n "
-              + result.stdout());
-    }
-
-    return result;
-  }
 }

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

@@ -1788,6 +1788,7 @@ public int getLoadBalancerWebPort() {
   /**
    * Shut down a ms by setting serverStartPolicy to NEVER
    *
+   * @param msName - a managed server name to be stopped
    * @throws Exception
    */
   public void shutdownManagedServerUsingServerStartPolicy(String msName) throws Exception {
@@ -1801,20 +1802,14 @@ public void shutdownManagedServerUsingServerStartPolicy(String msName) throws Ex
             + "\",\"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);
-
+    TestUtils.exec(cmd);
     TestUtils.checkPodDeleted(domainUid + "-" + msName, domainNS);
   }
 
   /**
    * Restart a ms by setting serverStartPolicy to IF_NEEDED
    *
+   * @param msName - a managed server name to be started
    * @throws Exception
    */
   public void restartManagedServerUsingServerStartPolicy(String msName) throws Exception {
@@ -1828,14 +1823,7 @@ public void restartManagedServerUsingServerStartPolicy(String msName) throws Exc
             + "\",\"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);
-
+    TestUtils.exec(cmd);
     TestUtils.checkPodCreated(domainUid + "-" + msName, domainNS);
     TestUtils.checkPodReady(domainUid + "-" + msName, domainNS);
   }
@@ -2033,4 +2021,61 @@ public boolean accept(File dir, String name) {
     callShellScriptToBuildDeployAppInPod(
         appName, scriptName, username, password, infoDirName, archiveExt);
   }
+
+  /**
+   * Shut down a ms by setting serverStartPolicy to NEVER
+   *
+   * @param msName - a managed server name to be stopped
+   * @throws Exception
+   */
+  /*
+   public void shutdownManagedServerUsingServerStartPolicy(String msName) throws Exception {
+    String cmd =
+      "kubectl patch domain "
+             + domainUid
+             + " -n "
+             + domainNS
+             + " -p '{\"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);
+
+    TestUtils.checkPodDeleted(domainUid + "-" + msName, domainNS);
+  }
+  */
+  /**
+   * Restart a ms by setting serverStartPolicy to IF_NEEDED
+   *
+   * @param msName - a managed server name to be started
+   * @throws Exception
+   */
+  /*
+  public void restartManagedServerUsingServerStartPolicy(String msName) throws Exception {
+    String cmd =
+        "kubectl patch domain "
+            + domainUid
+            + " -n "
+            + domainNS
+            + " -p '{\"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);
+
+    TestUtils.checkPodCreated(domainUid + "-" + msName, domainNS);
+    TestUtils.checkPodReady(domainUid + "-" + msName, domainNS);
+  }*/
 }