refactor callShellScriptByExecToPod

Author: vanajamukkara

integration-tests/USECASES.MD

@@ -43,7 +43,7 @@ Basic Use Cases described above are verified in all the domain configurations. A
 | Domain | Use Case |
 | --- | --- |
 | Domain on PV using WDT | WLDF scaling |
-| Domain with ADMIN_ONLY | making sure only admin server is started and managed servers are not started. Shutdown domain by deleting domain CRD. Create domain on existing PV dir, pv is already populated by a shutdown domain. |
+| Domain with ADMIN_ONLY | making sure only admin server is started and managed servers are not started. Make some changes in domain configuration by changing admin server tuning backlog configuration and restart domain. Shutdown domain by deleting domain CRD. Create domain on existing PV dir, pv is already populated by a shutdown domain. |
 | Domain with situational config | create domain with listen address not set for admin server and t3 channel/NAP and incorrect file for admin server log location. Introspector should override these with sit-config automatically. Also, with some junk value for t3 channel public address and using custom situational config override replace with valid public address using secret. Also, on Jenkins this domain uses NFS instead of HOSTPATH PV storage |	
 | Two domains managed by two operators | verify scaling and restart of one domain doesn't impact another domain. Delete domain resources using delete script from samples. |			
 | Domain with Recycle policy | create domain with pvReclaimPolicy="Recycle" and using Configured cluster. Verify that the PV is deleted once the domain and PVC are deleted |

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

@@ -251,16 +251,18 @@ public void testCreateDomainWithStartPolicyAdminOnly() throws Exception {
     try {
       domain = TestUtils.createDomain(DOMAIN_ADMINONLY_YAML);
       domain.verifyDomainCreated();
+      // change domain config by modifying accept backlog on adminserver tuning
       modifyDomainConfig(domain);
-
+      domain.shutdownUsingServerStartPolicy();
+      domain.restartUsingServerStartPolicy();
     } finally {
       if (domain != null) {
         // create domain on existing dir
-        // domain.destroy();
+        domain.destroy();
       }
     }
 
-    // domain.createDomainOnExistingDirectory();
+    domain.createDomainOnExistingDirectory();
 
     logger.info("SUCCESS - " + testMethodName);
   }
@@ -515,24 +517,25 @@ private Domain testAdvancedUseCasesForADomain(Operator operator, Domain domain)
 
   private void modifyDomainConfig(Domain domain) throws Exception {
     String adminPod = domain.getDomainUid() + "-" + domain.getAdminServerName();
+    String scriptsLocInPod = "/u01/oracle";
     TestUtils.copyFileViaCat(
         BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/modifyAcceptBacklog.py",
-        appLocationInPod + "/modifyAcceptBacklog.py",
+        scriptsLocInPod + "/modifyAcceptBacklog.py",
         adminPod,
         domain.getDomainNS());
 
     TestUtils.copyFileViaCat(
         BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/callpyscript.sh",
-        appLocationInPod + "/callpyscript.sh",
+        scriptsLocInPod + "/callpyscript.sh",
         adminPod,
         domain.getDomainNS());
     String[] args = {
-      appLocationInPod + "/modifyAcceptBacklog.py",
+      scriptsLocInPod + "/modifyAcceptBacklog.py",
       BaseTest.getUsername(),
       BaseTest.getPassword(),
       "t3://" + adminPod + ":" + domain.getDomainMap().get("t3ChannelPort")
     };
-    domain.callShellScriptByExecToPod(
-        adminPod, domain.getDomainNS(), appLocationInPod, "callpyscript.sh", args);
+    TestUtils.callShellScriptByExecToPod(
+        adminPod, domain.getDomainNS(), scriptsLocInPod, "callpyscript.sh", args);
   }
 }

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

@@ -487,8 +487,20 @@ public void deployWebAppViaWLST(
         adminPod,
         domainNS);
 
-    callShellScriptByExecToPod(
-        username, password, webappName, appLocationInPod, useAdminPortToDeploy);
+    String[] args = {
+      appLocationInPod + "/deploywebapp.py",
+      BaseTest.getUsername(),
+      BaseTest.getPassword(),
+      useAdminPortToDeploy
+          ? (domainMap.getOrDefault("adminPort", 7001)).toString()
+          : "t3://" + adminPod + ":" + t3ChannelPort,
+      webappName,
+      appLocationInPod + "/" + webappName + ".war",
+      clusterName
+    };
+
+    TestUtils.callShellScriptByExecToPod(
+        adminPod, domainNS, appLocationInPod, "callpyscript.sh", args);
   }
 
   /**
@@ -1273,87 +1285,6 @@ protected void createLoadBalancer() throws Exception {
     new LoadBalancer(lbMap);
   }
 
-  public void callShellScriptByExecToPod(
-      String podName, String domainNS, String scriptsLocInPod, String shScriptName, String[] args)
-      throws Exception {
-    StringBuffer cmdKubectlSh = new StringBuffer("kubectl -n ");
-    cmdKubectlSh
-        .append(domainNS)
-        .append(" exec -it ")
-        .append(podName)
-        .append(" -- bash -c 'chmod +x ")
-        .append(scriptsLocInPod)
-        .append("  && ")
-        .append(scriptsLocInPod)
-        .append("/")
-        .append(shScriptName)
-        .append(" ")
-        .append(String.join(" ", args).toString())
-        .append("'");
-
-    logger.info("Command to call kubectl sh file " + cmdKubectlSh);
-    TestUtils.exec(cmdKubectlSh.toString());
-  }
-
-  private void callShellScriptByExecToPod(
-      String username, String password, String webappName, String appLocationInPod)
-      throws Exception {
-    callShellScriptByExecToPod(username, password, webappName, appLocationInPod, false);
-  }
-
-  private void callShellScriptByExecToPod(
-      String username,
-      String password,
-      String webappName,
-      String appLocationInPod,
-      boolean usingAdminPortToDeploy)
-      throws Exception {
-
-    StringBuffer cmdKubectlSh = new StringBuffer("kubectl -n ");
-    cmdKubectlSh
-        .append(domainNS)
-        .append(" exec -it ")
-        .append(domainUid)
-        .append("-")
-        .append(adminServerName)
-        .append(" -- bash -c 'chmod +x -R ")
-        .append(appLocationInPod)
-        .append("  && ")
-        .append(appLocationInPod)
-        .append("/callpyscript.sh ")
-        .append(appLocationInPod)
-        .append("/deploywebapp.py ")
-        .append(username)
-        .append(" ")
-        .append(password)
-        .append(" t3://")
-        // .append(TestUtils.getHostName())
-        .append(domainUid)
-        .append("-")
-        .append(adminServerName)
-        .append(":");
-
-    if (usingAdminPortToDeploy) {
-      String adminPort = (domainMap.getOrDefault("adminPort", 7001)).toString();
-      cmdKubectlSh.append(adminPort);
-    } else {
-      cmdKubectlSh.append(t3ChannelPort);
-    }
-
-    cmdKubectlSh
-        .append(" ")
-        .append(webappName)
-        .append(" ")
-        .append(appLocationInPod)
-        .append("/")
-        .append(webappName)
-        .append(".war ")
-        .append(clusterName)
-        .append("'");
-    logger.info("Command to call kubectl sh file " + cmdKubectlSh);
-    TestUtils.exec(cmdKubectlSh.toString());
-  }
-
   private void callWebAppAndWaitTillReady(String curlCmd) throws Exception {
     for (int i = 0; i < maxIterations; i++) {
       ExecResult result = TestUtils.exec(curlCmd);

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

@@ -1422,4 +1422,26 @@ public static ExecResult kubectlpatch(String domainUid, String domainNS, String
             + " --type merge";
     return exec(cmd, true);
   }
+
+  public static void callShellScriptByExecToPod(
+      String podName, String domainNS, String scriptsLocInPod, String shScriptName, String[] args)
+      throws Exception {
+    StringBuffer cmdKubectlSh = new StringBuffer("kubectl -n ");
+    cmdKubectlSh
+        .append(domainNS)
+        .append(" exec -it ")
+        .append(podName)
+        .append(" -- bash -c 'chmod +x -R ")
+        .append(scriptsLocInPod)
+        .append("  && ")
+        .append(scriptsLocInPod)
+        .append("/")
+        .append(shScriptName)
+        .append(" ")
+        .append(String.join(" ", args).toString())
+        .append("'");
+
+    logger.info("Command to call kubectl sh file " + cmdKubectlSh);
+    TestUtils.exec(cmdKubectlSh.toString());
+  }
 }

integration-tests/src/test/resources/modifyAcceptBacklog.py

@@ -4,7 +4,9 @@
 import time as systime
 
 connect(sys.argv[1],sys.argv[2],sys.argv[3])
+edit()
+startEdit()
 cd('/Servers/admin-server')
 cmo.setAcceptBacklog(4000)
-
+save()
 activate()