moved method from domain to testutils

Author: marinakog

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

@@ -323,31 +323,16 @@ public void testAdminT3ChannelWithJMS(Domain domain) throws Exception {
   }
 
   /**
-   * Verify Load Balancing by deploying and invoking webservicebapp
+   * Verify Load Balancing by deploying and invoking webservicebapp.
    *
-   * @throws Exception
+   * @throws Exception exception reported as a failure to build, deploy or verify load balancing for
+   *     Web Service app
    */
   public void testWSLoadBalancing(Domain domain) throws Exception {
     logger.info("Inside testWSLoadBalancing");
     TestUtils.renewK8sClusterLease(getProjectRoot(), getLeaseId());
-    Map<String, Object> domainMap = domain.getDomainMap();
-
-    ExecResult result =
-        TestUtils.kubectlexecNoCheck(
-            domain.getDomainUid() + ("-") + domainMap.get("adminServerName"),
-            "" + domainMap.get("namespace"),
-            " -- mkdir -p " + appLocationInPod);
-    if (result.exitValue() != 0) {
-      throw new RuntimeException(
-          "FAILURE: command to create directory "
-              + appLocationInPod
-              + " in the pod failed, returned "
-              + result.stderr()
-              + " "
-              + result.stdout());
-    }
-
     buildDeployWebServiceApp(domain, TESTWSAPP, TESTWSSERVICE);
+
     // invoke webservice via servlet client
     domain.verifyWebAppLoadBalancing(TESTWSSERVICE + "Servlet");
     logger.info("Done - testWSLoadBalancing");
@@ -609,8 +594,8 @@ private void buildDeployWebServiceApp(Domain domain, String testAppName, String
     String scriptName = "buildDeployWSAndWSClientAppInPod.sh";
     // Build WS and WS client WARs in the admin pod and deploy it from the admin pod to a weblogic
     // target
-    domain.buildDeployWebServiceAppInPod(
-        testAppName, scriptName, BaseTest.getUsername(), BaseTest.getPassword(), wsName);
+    TestUtils.buildDeployWebServiceAppInPod(
+        domain, testAppName, scriptName, BaseTest.getUsername(), BaseTest.getPassword(), wsName);
   }
 
   private void callWebAppAndVerifyScaling(Domain domain, int replicas) throws Exception {

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

@@ -759,6 +759,15 @@ public String getAdminServerName() {
     return adminServerName;
   }
 
+  /**
+   * Get the name of the cluster in the domain
+   *
+   * @return the name of the cluster
+   */
+  public String getClusterName() {
+    return clusterName;
+  }
+
   /**
    * Get the namespace in which the domain is running
    *
@@ -1630,7 +1639,7 @@ public void restartManagedServerUsingServerStartPolicy(String msName) throws Exc
    * @param args - optional args to add for script if needed
    * @throws Exception
    */
-  private void callShellScriptToBuildDeployAppInPod(
+  public void callShellScriptToBuildDeployAppInPod(
       String webappName, String scriptName, String username, String password, String... args)
       throws Exception {
 
@@ -1737,6 +1746,7 @@ public boolean accept(File dir, String name) {
     // Check archive file type
     if (!subDirList.contains(infoDirName)) {
       infoDirName = "META-INF";
+
       // Create .ear file or .jar file for EJB
       archiveExt = (args.length == 0) ? "ear" : args[0];
     }
@@ -1757,67 +1767,4 @@ public boolean accept(File dir, String name) {
     callShellScriptToBuildDeployAppInPod(
         appName, scriptName, username, password, infoDirName, archiveExt);
   }
-  /**
-   * Create dir to save Web App files Copy the shell script file and all App files over to the admin
-   * pod Run the shell script to build WAR, EAR or JAR file and deploy the App in the admin pod
-   *
-   * @param appName - WebService App name to be deployed
-   * @param scriptName - a shell script to build and deploy the App in the admin pod
-   * @param username - weblogic user name
-   * @param password - weblogc password
-   * @param args - by default it use TestWSApp name for webservices impl files, or add arg for
-   *     different name
-   * @throws Exception
-   */
-  public void buildDeployWebServiceAppInPod(
-      String appName, String scriptName, String username, String password, String... args)
-      throws Exception {
-    String adminServerPod = domainUid + "-" + adminServerName;
-    String appLocationOnHost = BaseTest.getAppLocationOnHost() + "/" + appName;
-    String appLocationInPod = BaseTest.getAppLocationInPod() + "/" + appName;
-    String scriptPathOnHost = BaseTest.getAppLocationOnHost() + "/" + scriptName;
-    String scriptPathInPod = BaseTest.getAppLocationInPod() + "/" + scriptName;
-
-    // Default values to build archive file
-    final String initInfoDirName = "WEB-INF";
-    String archiveExt = "war";
-    String infoDirName = initInfoDirName;
-    String wsServiceName = (args.length == 0) ? BaseTest.TESTWSSERVICE : args[0];
-    String clusterDNS =
-        getDomainUid()
-            + "-cluster-"
-            + this.clusterName
-            + "."
-            + getDomainNS()
-            + ".svc.cluster.local:8001";
-
-    logger.info(
-        "Build and deploy WebService App: "
-            + appName
-            + "."
-            + archiveExt
-            + " in the admin pod with web service name "
-            + wsServiceName);
-
-    // Create app dir in the admin pod
-    StringBuffer mkdirCmd = new StringBuffer(" -- bash -c 'mkdir -p ");
-    mkdirCmd.append(appLocationInPod).append("/WEB-INF'");
-    TestUtils.kubectlexec(adminServerPod, domainNS, mkdirCmd.toString());
-
-    // Copy shell script to the admin pod
-    TestUtils.copyFileViaCat(scriptPathOnHost, scriptPathInPod, adminServerPod, domainNS);
-
-    // Copy all App files to the admin pod
-    TestUtils.copyAppFilesToPod(appLocationOnHost, appLocationInPod, adminServerPod, domainNS);
-
-    // Copy all App files to the admin pod
-    TestUtils.copyAppFilesToPod(
-        appLocationOnHost + "/WEB-INF", appLocationInPod + "/WEB-INF", adminServerPod, domainNS);
-
-    logger.info("Creating WebService and WebService Servlet Client Applications");
-
-    // Run the script to build WAR, EAR or JAR file and deploy the App in the admin pod
-    callShellScriptToBuildDeployAppInPod(
-        appName, scriptName, username, password, clusterDNS, wsServiceName);
-  }
 }

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

@@ -1188,4 +1188,78 @@ public static void copyFile(String fromFile, String toFile) throws Exception {
     logger.info("Copying file from  " + fromFile + " to " + toFile);
     Files.copy(new File(fromFile).toPath(), Paths.get(toFile), StandardCopyOption.REPLACE_EXISTING);
   }
+
+  /**
+   * Create dir to save Web Service App files. Copy the shell script file and all App files over to
+   * the admin pod Run the shell script to build WARs files and deploy the Web Service App and it's
+   * client Servlet App in the admin pod
+   *
+   * @param domain - Domain where to build and deploy app
+   * @param appName - WebService App name to be deployed
+   * @param scriptName - a shell script to build and deploy the App in the admin pod
+   * @param username - weblogic user name
+   * @param password - weblogc password
+   * @param args - by default it use TestWSApp name for webservices impl files, or add arg for
+   *     different name
+   * @throws Exception - exception reported as a failure to build or deploy ws
+   */
+  public static void buildDeployWebServiceAppInPod(
+      Domain domain,
+      String appName,
+      String scriptName,
+      String username,
+      String password,
+      String... args)
+      throws Exception {
+    String adminServerPod = domain.getDomainUid() + "-" + domain.getAdminServerName();
+    String appLocationOnHost = BaseTest.getAppLocationOnHost() + "/" + appName;
+    String appLocationInPod = BaseTest.getAppLocationInPod() + "/" + appName;
+    String scriptPathOnHost = BaseTest.getAppLocationOnHost() + "/" + scriptName;
+    String scriptPathInPod = BaseTest.getAppLocationInPod() + "/" + scriptName;
+
+    // Default values to build archive file
+    final String initInfoDirName = "WEB-INF";
+    String archiveExt = "war";
+    String infoDirName = initInfoDirName;
+    String domainNS = domain.getDomainNS();
+    String wsServiceName = (args.length == 0) ? BaseTest.TESTWSSERVICE : args[0];
+    String clusterDNS =
+        domain.getDomainUid()
+            + "-cluster-"
+            + domain.getClusterName()
+            + "."
+            + domainNS
+            + ".svc.cluster.local:8001";
+
+    logger.info(
+        "Build and deploy WebService App: "
+            + appName
+            + "."
+            + archiveExt
+            + " in the admin pod with web service name "
+            + wsServiceName);
+
+    // Create app dir in the admin pod
+    StringBuffer mkdirCmd = new StringBuffer(" -- bash -c 'mkdir -p ");
+    kubectlexec(adminServerPod, domainNS, mkdirCmd.toString());
+    // Create WEB-INF in the app dir
+    mkdirCmd.append(appLocationInPod).append("/WEB-INF'");
+    kubectlexec(adminServerPod, domainNS, mkdirCmd.toString());
+
+    // Copy shell script to the admin pod
+    copyFileViaCat(scriptPathOnHost, scriptPathInPod, adminServerPod, domainNS);
+
+    // Copy all App files to the admin pod
+    copyAppFilesToPod(appLocationOnHost, appLocationInPod, adminServerPod, domainNS);
+
+    // Copy all App files to the admin pod
+    copyAppFilesToPod(
+        appLocationOnHost + "/WEB-INF", appLocationInPod + "/WEB-INF", adminServerPod, domainNS);
+
+    logger.info("Creating WebService and WebService Servlet Client Applications");
+
+    // Run the script to build WAR, EAR or JAR file and deploy the App in the admin pod
+    domain.callShellScriptToBuildDeployAppInPod(
+        appName, scriptName, username, password, clusterDNS, wsServiceName);
+  }
 }