Merge pull request #997 from oracle/wsapp

Added WebService app to test load balancing, and utility to build WebServices and its Servlet client

Author: rjeberhard

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

@@ -26,6 +26,8 @@
 public class BaseTest {
   public static final Logger logger = Logger.getLogger("OperatorIT", "OperatorIT");
   public static final String TESTWEBAPP = "testwebapp";
+  public static final String TESTWSAPP = "testwsapp";
+  public static final String TESTWSSERVICE = "TestWSApp";
 
   // property file used to customize operator properties for operator inputs yaml
 
@@ -320,6 +322,23 @@ public void testAdminT3ChannelWithJMS(Domain domain) throws Exception {
     logger.info("Done - testAdminT3ChannelWithJMS");
   }
 
+  /**
+   * Verify Load Balancing by deploying and invoking webservicebapp.
+   *
+   * @param domain - domain where the app will be tested
+   * @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());
+    buildDeployWebServiceApp(domain, TESTWSAPP, TESTWSSERVICE);
+
+    // invoke webservice via servlet client
+    domain.verifyWebAppLoadBalancing(TESTWSSERVICE + "Servlet");
+    logger.info("Done - testWSLoadBalancing");
+  }
+
   /**
    * Restarting the domain should not have any impact on Operator managing the domain, web app load
    * balancing and node port service
@@ -339,6 +358,9 @@ public void testDomainLifecyle(Operator operator, Domain domain) throws Exceptio
     } else {
       domain.verifyWebAppLoadBalancing(TESTWEBAPP);
     }
+
+    // intermittent failure, see OWLS-73416
+    // testWSLoadBalancing(domain);
     domain.verifyAdminServerExternalService(getUsername(), getPassword());
     domain.verifyHasClusterServiceChannelPort("TCP", 8011, TESTWEBAPP + "/");
     logger.info("Done - testDomainLifecyle");
@@ -570,6 +592,15 @@ private void copyScalingScriptToPod(
         domainNS);
   }
 
+  private void buildDeployWebServiceApp(Domain domain, String testAppName, String wsName)
+      throws Exception {
+    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
+    TestUtils.buildDeployWebServiceAppInPod(
+        domain, testAppName, scriptName, BaseTest.getUsername(), BaseTest.getPassword(), wsName);
+  }
+
   private void callWebAppAndVerifyScaling(Domain domain, int replicas) throws Exception {
     Map<String, Object> domainMap = domain.getDomainMap();
     String domainNS = domainMap.get("namespace").toString();

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

@@ -468,7 +468,6 @@ public void callWebAppAndVerifyLoadBalancing(String webappName, boolean verifyLo
           .append(domainUid)
           .append(".org' ")
           .append(testAppUrl.toString());
-
       // curl cmd to get response code
       StringBuffer curlCmdResCode = new StringBuffer(curlCmd.toString());
       curlCmdResCode.append(" --write-out %{http_code} -o /dev/null");
@@ -705,6 +704,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
    *
@@ -1198,43 +1206,47 @@ private void callWebAppAndWaitTillReady(String curlCmd) throws Exception {
       String responseCode = result.stdout().trim();
       if (!responseCode.equals("200")) {
         logger.info(
-            "testwebapp did not return 200 status code, got "
+            "callWebApp did not return 200 status code, got "
                 + responseCode
                 + ", iteration "
                 + i
                 + " of "
                 + maxIterations);
         if (i == (maxIterations - 1)) {
           throw new RuntimeException(
-              "FAILURE: testwebapp did not return 200 status code, got " + responseCode);
+              "FAILURE: callWebApp did not return 200 status code, got " + responseCode);
         }
         try {
           Thread.sleep(waitTime * 1000);
         } catch (InterruptedException ignore) {
         }
       } else {
-        logger.info("testwebapp returned 200 response code, iteration " + i);
+        logger.info("callWebApp returned 200 response code, iteration " + i);
         break;
       }
     }
   }
 
   private void callWebAppAndCheckForServerNameInResponse(
       String curlCmd, boolean verifyLoadBalancing) throws Exception {
+    callWebAppAndCheckForServerNameInResponse(curlCmd, verifyLoadBalancing, 50);
+  }
+
+  private void callWebAppAndCheckForServerNameInResponse(
+      String curlCmd, boolean verifyLoadBalancing, int maxIterations) throws Exception {
     // map with server names and boolean values
     HashMap<String, Boolean> managedServers = new HashMap<String, Boolean>();
     for (int i = 1; i <= TestUtils.getClusterReplicas(domainUid, clusterName, domainNS); i++) {
       managedServers.put(domainUid + "-" + managedServerNameBase + i, new Boolean(false));
     }
-    logger.info("Calling webapp 20 times " + curlCmd);
+    logger.info("Calling webapp " + maxIterations + " times " + curlCmd);
     // number of times to call webapp
-    for (int i = 0; i < 20; i++) {
-      ExecResult result = TestUtils.exec(curlCmd);
 
+    for (int i = 0; i < maxIterations; i++) {
+      ExecResult result = ExecCommand.exec(curlCmd.toString());
       logger.info("webapp invoked successfully for curlCmd:" + curlCmd);
       if (verifyLoadBalancing) {
         String response = result.stdout().trim();
-        // logger.info("response: " + response);
         for (String key : managedServers.keySet()) {
           if (response.contains(key)) {
             managedServers.put(key, new Boolean(true));
@@ -1243,6 +1255,7 @@ private void callWebAppAndCheckForServerNameInResponse(
         }
       }
     }
+
     logger.info("ManagedServers " + managedServers);
 
     // error if any managedserver value is false
@@ -1643,19 +1656,13 @@ public void restartManagedServerUsingServerStartPolicy(String msName) throws Exc
    * @param webappName - Web App Name to be deployed
    * @param scriptName - a shell script to build WAR, EAR or JAR file and deploy the App in the
    *     admin pod
-   * @param archiveExt - archive extention
-   * @param infoDirNames - archive information dir location
    * @param username - weblogic user name
    * @param password - weblogc password
+   * @param args - optional args to add for script if needed
    * @throws Exception
    */
-  private void callShellScriptToBuildDeployAppInPod(
-      String webappName,
-      String scriptName,
-      String archiveExt,
-      String infoDirNames,
-      String username,
-      String password)
+  public void callShellScriptToBuildDeployAppInPod(
+      String webappName, String scriptName, String username, String password, String... args)
       throws Exception {
 
     String nodeHost = getHostNameForCurl();
@@ -1692,9 +1699,7 @@ private void callShellScriptToBuildDeployAppInPod(
         .append(" ")
         .append(clusterName)
         .append(" ")
-        .append(infoDirNames)
-        .append(" ")
-        .append(archiveExt)
+        .append(String.join(" ", args).toString())
         .append("'");
 
     logger.info("Command to exec script file: " + cmdKubectlSh);
@@ -1795,7 +1800,7 @@ public void buildDeployJavaAppInPod(
     String scriptPathOnHost = BaseTest.getAppLocationOnHost() + "/" + scriptName;
     String scriptPathInPod = BaseTest.getAppLocationInPod() + "/" + scriptName;
 
-    // Default velues to build archive file
+    // Default values to build archive file
     final String initInfoDirName = "WEB-INF";
     String archiveExt = "war";
     String infoDirName = initInfoDirName;
@@ -1817,6 +1822,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];
     }
@@ -1833,9 +1839,8 @@ public boolean accept(File dir, String name) {
 
     // Copy all App files to the admin pod
     TestUtils.copyAppFilesToPod(appLocationOnHost, appLocationInPod, adminServerPod, domainNS);
-
     // Run the script to build WAR, EAR or JAR file and deploy the App in the admin pod
     callShellScriptToBuildDeployAppInPod(
-        appName, scriptName, archiveExt, infoDirName, username, password);
+        appName, scriptName, username, password, infoDirName, archiveExt);
   }
 }

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

@@ -1199,4 +1199,113 @@ 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);
   }
+
+  /**
+   * retrieve IP address info for cluster service.
+   *
+   * @param domainUID - name of domain.
+   * @param clusterName - name Web Logic cluster
+   * @param domainNS - domain namespace
+   * @throws Exception - exception will be thrown if kubectl command will fail
+   */
+  public static String retrieveClusterIP(String domainUID, String clusterName, String domainNS)
+      throws Exception {
+    // kubectl get service domainonpvwlst-cluster-cluster-1 | grep ClusterIP | awk '{print $3}'
+    StringBuffer cmd = new StringBuffer("kubectl get service ");
+    cmd.append(domainUID);
+    cmd.append("-cluster-");
+    cmd.append(clusterName);
+    cmd.append(" -n ").append(domainNS);
+    cmd.append(" | grep ClusterIP | awk '{print $3}' ");
+    logger.info(
+        " Get ClusterIP for "
+            + clusterName
+            + " in namespace "
+            + domainNS
+            + " with command: '"
+            + cmd
+            + "'");
+
+    ExecResult result = ExecCommand.exec(cmd.toString());
+    String stdout = result.stdout();
+    logger.info(" ClusterIP for cluster: " + clusterName + " found: ");
+    logger.info(stdout);
+    return stdout;
+  }
+
+  /**
+   * 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();
+    int managedServerPort = ((Integer) (domain.getDomainMap()).get("managedServerPort")).intValue();
+    String wsServiceName = (args.length == 0) ? BaseTest.TESTWSSERVICE : args[0];
+    String clusterURL =
+        retrieveClusterIP(domain.getDomainUid(), domain.getClusterName(), domainNS)
+            + ":"
+            + managedServerPort;
+    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 + "'");
+
+    // Create app dir in the admin pod
+    kubectlexec(adminServerPod, domainNS, mkdirCmd.toString());
+
+    // Create WEB-INF in the app dir
+    mkdirCmd = new StringBuffer(" -- bash -c 'mkdir -p ");
+    mkdirCmd.append(appLocationInPod + "/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, clusterURL, wsServiceName);
+  }
 }

integration-tests/src/test/resources/OperatorIT.properties

@@ -6,4 +6,4 @@ baseDir=/scratch
 username=weblogic
 password=welcome1
 maxIterationsPod=25
-waitTimePod=10
+waitTimePod=10