Merge branch 'wls-cert' into 'main'

Modify wdt model and py scriprt to verify WLS 14.1.2.0 Image

See merge request weblogic-cloud/weblogic-kubernetes-operator!4575

Author: rjeberhard

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItProductionSecureMode.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -88,7 +88,7 @@
 /**
  * The test verifies the enablement of ProductionSecureMode in WebLogic Operator
  * environment. Make sure all the servers in the domain comes up and WebLogic
- * console is accessible thru default-admin NodePort service
+ * readyapp is accessible thru default-admin NodePort service
  * In order to enable ProductionSecureMode in WebLogic Operator environment
  * (a) add channel called `default-admin` to domain resource
  * (b) JAVA_OPTIONS to -Dweblogic.security.SSL.ignoreHostnameVerification=true
@@ -208,7 +208,7 @@ public void beforeEach() {
    * Create a WebLogic domain with ProductionModeEnabled.
    * Create a domain resource with a channel with the name `default-admin`.
    * Verify a NodePort service is available thru default-admin channel.
-   * Verify WebLogic console is accessible through the `default-admin` service.
+   * Verify WebLogic readyapp is accessible through the `default-admin` service.
    * Verify no NodePort service is available thru default channel since
    * clear text default port (7001) is disabled.
    * Check the `default-secure` and `default-admin` port on cluster service.
@@ -241,7 +241,7 @@ void testVerifyProductionSecureMode() {
               "Getting Default Admin Cluster Service port failed");
     assertEquals(9002, defaultAdminSecurePort, "Default Admin Cluster port is not set to 9002");
 
-    //expose the admin server external service to access the console in OKD cluster
+    //expose the admin server external service to access the readyapp in OKD cluster
     //set the sslPort as the target port
     adminSvcSslPortExtHost = createRouteForOKD(getExternalServicePodName(adminServerPodName),
                     domainNamespace, "admin-server-sslport-ext");
@@ -250,33 +250,33 @@ void testVerifyProductionSecureMode() {
     String hostAndPort = getHostAndPort(adminSvcSslPortExtHost, defaultAdminPort);
     logger.info("The hostAndPort is {0}", hostAndPort);
 
-    String resourcePath = "/console/login/LoginForm.jsp";
+    String resourcePath = "/weblogic/ready";
     if (!WEBLOGIC_SLIM) {
       if (OKE_CLUSTER) {
         ExecResult result = exeAppInServerPod(domainNamespace, adminServerPodName,7002, resourcePath);
         logger.info("result in OKE_CLUSTER is {0}", result.toString());
-        assertEquals(0, result.exitValue(), "Failed to access WebLogic console");
+        assertEquals(0, result.exitValue(), "Failed to access WebLogic readyapp");
       } else {
         String curlCmd = "curl -g -sk --show-error --noproxy '*' "
             + " https://" + hostAndPort
-            + "/console/login/LoginForm.jsp --write-out %{http_code} "
+            + "/weblogic/ready --write-out %{http_code} "
             + " -o /dev/null";
         logger.info("Executing default-admin nodeport curl command {0}", curlCmd);
         assertTrue(callWebAppAndWaitTillReady(curlCmd, 10));
       }
-      logger.info("WebLogic console is accessible thru default-admin service");
+      logger.info("WebLogic readyapp is accessible thru default-admin service");
 
       String localhost = "localhost";
       String forwardPort = startPortForwardProcess(localhost, domainNamespace, domainUid, 9002);
       assertNotNull(forwardPort, "port-forward fails to assign local port");
       logger.info("Forwarded admin-port is {0}", forwardPort);
       String curlCmd = "curl -sk --show-error --noproxy '*' "
           + " https://" + localhost + ":" + forwardPort
-          + "/console/login/LoginForm.jsp --write-out %{http_code} "
+          + "/weblogic/ready --write-out %{http_code} "
           + " -o /dev/null";
       logger.info("Executing default-admin port-fwd curl command {0}", curlCmd);
       assertTrue(callWebAppAndWaitTillReady(curlCmd, 10));
-      logger.info("WebLogic console is accessible thru admin port forwarding");
+      logger.info("WebLogic readyapp is accessible thru admin port forwarding");
 
       // When port-forwarding is happening on admin-port, port-forwarding will
       // not work for SSL port i.e. 7002
@@ -285,14 +285,14 @@ void testVerifyProductionSecureMode() {
       logger.info("Forwarded ssl port is {0}", forwardPort);
       curlCmd = "curl -g -sk --show-error --noproxy '*' "
           + " https://" + localhost + ":" + forwardPort
-          + "/console/login/LoginForm.jsp --write-out %{http_code} "
+          + "/weblogic/ready --write-out %{http_code} "
           + " -o /dev/null";
       logger.info("Executing default-admin port-fwd curl command {0}", curlCmd);
       assertFalse(callWebAppAndWaitTillReady(curlCmd, 10));
-      logger.info("WebLogic console should not be accessible thru ssl port forwarding");
+      logger.info("WebLogic readyapp should not be accessible thru ssl port forwarding");
       stopPortForwardProcess(domainNamespace);
     } else {
-      logger.info("Skipping WebLogic console in WebLogic slim image");
+      logger.info("Skipping WebLogic reeadyapp check in WebLogic slim image");
     }
 
     int nodePort = getServiceNodePort(
@@ -345,7 +345,7 @@ void testMiiDynamicChangeWithSSLEnabled() {
     if (OKE_CLUSTER) {
       ExecResult result = exeAppInServerPod(domainNamespace, managedServerPrefix + "1",9002, resourcePath);
       logger.info("result in OKE_CLUSTER is {0}", result.toString());
-      assertEquals(0, result.exitValue(), "Failed to access WebLogic console");
+      assertEquals(0, result.exitValue(), "Failed to access WebLogic rest endpoint");
     } else {
       testUntil(
           () -> checkWeblogicMBean(

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/CommonLBTestUtils.java

@@ -17,10 +17,6 @@
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import io.kubernetes.client.custom.Quantity;
 import io.kubernetes.client.openapi.models.V1ConfigMapVolumeSource;
 import io.kubernetes.client.openapi.models.V1Container;
@@ -50,8 +46,6 @@
 import oracle.weblogic.domain.DomainSpec;
 import oracle.weblogic.domain.ServerPod;
 import oracle.weblogic.kubernetes.TestConstants;
-import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
-import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
 
 import static java.nio.file.Files.copy;
@@ -73,7 +67,6 @@
 import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
 import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
-import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_SLIM;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.APP_DIR;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
 import static oracle.weblogic.kubernetes.actions.TestActions.getPodLog;
@@ -445,14 +438,13 @@ private static DomainResource createDomainCustomResource(String domainUid,
    */
   private static boolean adminNodePortAccessible(int nodePort)
       throws IOException {
-    if (WEBLOGIC_SLIM) {
-      getLogger().info("Check REST Console for WebLogic slim image");
-      StringBuffer curlCmd = new StringBuffer("status=$(curl -g --user ");
-      String host = K8S_NODEPORT_HOST;
-      if (host.contains(":")) {
-        host = "[" + host + "]";
-      }
-      curlCmd.append(ADMIN_USERNAME_DEFAULT)
+    getLogger().info("Check REST Console for WebLogic Image");
+    StringBuffer curlCmd = new StringBuffer("status=$(curl -g --user ");
+    String host = K8S_NODEPORT_HOST;
+    if (host.contains(":")) {
+      host = "[" + host + "]";
+    }
+    curlCmd.append(ADMIN_USERNAME_DEFAULT)
           .append(":")
           .append(ADMIN_PASSWORD_DEFAULT)
           .append(" http://")
@@ -461,72 +453,36 @@ private static boolean adminNodePortAccessible(int nodePort)
           .append(nodePort)
           .append("/management/tenant-monitoring/servers/ --silent --show-error -o /dev/null -w %{http_code}); ")
           .append("echo ${status}");
-      getLogger().info("checkRestConsole : curl command {0}", new String(curlCmd));
-      try {
-        ExecResult result = ExecCommand.exec(new String(curlCmd), true);
-        String response = result.stdout().trim();
-        getLogger().info("exitCode: {0}, \nstdout: {1}, \nstderr: {2}",
+    getLogger().info("checkRestConsole : curl command {0}", new String(curlCmd));
+    try {
+      ExecResult result = ExecCommand.exec(new String(curlCmd), true);
+      String response = result.stdout().trim();
+      getLogger().info("exitCode: {0}, \nstdout: {1}, \nstderr: {2}",
             result.exitValue(), response, result.stderr());
-        return response.contains("200");
-      } catch (IOException | InterruptedException ex) {
-        getLogger().info("Exception in checkRestConsole {0}", ex);
-        return false;
-      }
-    } else {
-      // generic/dev Image
-      String host = K8S_NODEPORT_HOST;
-      if (host.contains(":")) {
-        host = "[" + host + "]";
-      }
-      getLogger().info("Check administration Console for generic/dev image");
-      String consoleUrl = new StringBuffer()
-          .append("http://")
-          .append(host)
-          .append(":")
-          .append(nodePort)
-          .append("/console/login/LoginForm.jsp").toString();
-
-      boolean adminAccessible = false;
-      for (int i = 1; i <= 10; i++) {
-        getLogger().info("Iteration {0} out of 10: Accessing WebLogic console with url {1}", i, consoleUrl);
-        final WebClient webClient = new WebClient();
-        webClient.getOptions().setThrowExceptionOnFailingStatusCode(false);
-        final HtmlPage loginPage = assertDoesNotThrow(() -> webClient.getPage(consoleUrl),
-            "connection to the WebLogic admin console failed");
-        HtmlForm form = loginPage.getFormByName("loginData");
-        form.getInputByName("j_username").type(ADMIN_USERNAME_DEFAULT);
-        form.getInputByName("j_password").type(ADMIN_PASSWORD_DEFAULT);
-        HtmlElement submit = form.getOneHtmlElementByAttribute("input", "type", "submit");
-        getLogger().info("Clicking login button");
-        HtmlPage home = submit.click();
-        if (home.asNormalizedText().contains("Persistent Stores")) {
-          getLogger().info("Console login passed");
-          adminAccessible = true;
-          break;
-        }
-      }
-      return adminAccessible;
+      return response.contains("200");
+    } catch (IOException | InterruptedException ex) {
+      getLogger().info("Exception in checkRestConsole {0}", ex);
+      return false;
     }
   }
 
   /**
-   * Verify admin console is accessible by login to WebLogic console.
+   * Verify REST console is accessible by login to WebLogic Server.
    *
    * @param adminServerPodName admin server pod
    * @param adminPort admin port
    * @param namespace admin server pod namespace
    * @param userName WebLogic administration server user name
    * @param password WebLogic administration server password
-   * @return true if login to WebLogic administration console is successful
+   * @return true if login to WebLogic REST console is successful
    * @throws IOException when connection to console fails
    */
   public static boolean adminLoginPageAccessible(String adminServerPodName, String adminPort, String namespace,
                                                  String userName, String password)
       throws IOException {
     LoggingFacade logger = getLogger();
-    if (WEBLOGIC_SLIM) {
-      logger.info("Check REST Console for WebLogic slim image");
-      StringBuffer curlCmd = new StringBuffer(KUBERNETES_CLI + " exec -n "
+    logger.info("Check REST Console for WebLogic Image");
+    StringBuffer curlCmd = new StringBuffer(KUBERNETES_CLI + " exec -n "
           + namespace + " " + adminServerPodName)
           .append(" -- /bin/bash -c \"")
           .append("curl -g --user ")
@@ -535,48 +491,17 @@ public static boolean adminLoginPageAccessible(String adminServerPodName, String
           .append(password)
           .append(" http://" + adminServerPodName + ":" + adminPort)
           .append("/management/tenant-monitoring/servers/ --silent --show-error -o /dev/null -w %{http_code} && ")
-          .append("echo ${status}");
-      logger.info("checkRestConsole : curl command {0}", new String(curlCmd));
-      try {
-        ExecResult result = ExecCommand.exec(new String(curlCmd), true);
-        String response = result.stdout().trim();
-        logger.info("exitCode: {0}, \nstdout: {1}, \nstderr: {2}",
+          .append("echo ${status}\"");
+    logger.info("checkRestConsole : k8s exec command {0}", new String(curlCmd));
+    try {
+      ExecResult result = ExecCommand.exec(new String(curlCmd), true);
+      String response = result.stdout().trim();
+      logger.info("exitCode: {0}, \nstdout: {1}, \nstderr: {2}",
             result.exitValue(), response, result.stderr());
-        return response.contains("200");
-      } catch (IOException | InterruptedException ex) {
-        logger.info("Exception in checkRestConsole {0}", ex);
-        return false;
-      }
-    } else {
-      // generic/dev Image
-      logger.info("Check administration Console for generic/dev image");
-      String curlCmd = new StringBuffer(KUBERNETES_CLI + " exec -n "
-          + namespace + " " + adminServerPodName)
-          .append(" -- /bin/bash -c \"")
-          .append("curl --user ")
-          .append(userName)
-          .append(":")
-          .append(password)
-          .append(" http://" + adminServerPodName + ":" + adminPort)
-          .append("/console/login/LoginForm.jsp")
-          .append("\"").toString();
-
-      boolean adminAccessible = false;
-      String expectedValue = "Oracle WebLogic Server Administration Console";
-      for (int i = 1; i <= 10; i++) {
-        logger.info("Iteration {0} out of 10: Accessing WebLogic console ", i);
-        logger.info("check administration console: curl command {0} expectedValue {1}", curlCmd, expectedValue);
-        adminAccessible = Command
-            .withParams(new CommandParams()
-                .command(curlCmd))
-            .executeAndVerify(expectedValue);
-
-        if (adminAccessible) {
-          getLogger().info("Console login passed");
-          break;
-        }
-      }
-      return adminAccessible;
+      return response.contains("200");
+    } catch (IOException | InterruptedException ex) {
+      logger.info("Exception in checkRestConsole {0}", ex);
+      return false;
     }
   }
 
@@ -923,7 +848,7 @@ public static void verifyAdminServerAccess(boolean isTLS,
       consoleUrl.append(pathLocation);
     }
 
-    consoleUrl.append("/console/login/LoginForm.jsp");
+    consoleUrl.append("/weblogic/ready");
     String curlCmd;
     if (isHostRouting) {
       curlCmd = String.format("curl -g -ks --show-error --noproxy '*' -H 'host: %s' %s",

integration-tests/src/test/resources/python-scripts/sit-config-create-domain.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 import sys
@@ -207,6 +207,11 @@ def create_domain():
   cd('/')
   if production_mode_enabled == "true":
     cmo.setProductionModeEnabled(true)
+    cd('/SecurityConfiguration/'+domain_name)
+    secm=create('mySecureMode','SecureMode')
+    cd('SecureMode/mySecureMode')
+    set('SecureModeEnabled','false')
+    #setOption('ServerStartMode', 'prod')
   else: 
     cmo.setProductionModeEnabled(false)
   updateDomain()

integration-tests/src/test/resources/python-scripts/wlst-create-domain-onpv.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 import sys
@@ -89,6 +89,11 @@ def create_domain():
   cd('/')
   if production_mode_enabled == "true":
     cmo.setProductionModeEnabled(true)
+    cd('/SecurityConfiguration/'+domain_name)
+    secm=create('mySecureMode','SecureMode')
+    cd('SecureMode/mySecureMode')
+    set('SecureModeEnabled','false')
+    #setOption('ServerStartMode', 'prod')
   else: 
     cmo.setProductionModeEnabled(false)
   updateDomain()

integration-tests/src/test/resources/python-scripts/wlst-create-istio-domain-onpv.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 import sys
@@ -90,6 +90,11 @@ def create_domain():
   cd('/')
   if production_mode_enabled == "true":
     cmo.setProductionModeEnabled(true)
+    cd('/SecurityConfiguration/'+domain_name)
+    secm=create('mySecureMode','SecureMode')
+    cd('SecureMode/mySecureMode')
+    set('SecureModeEnabled','false')
+    #setOption('ServerStartMode', 'prod')
   else: 
     cmo.setProductionModeEnabled(false)
   updateDomain()

integration-tests/src/test/resources/wdt-models/coherence-managed-wdt-config.yaml

@@ -1,13 +1,15 @@
-# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 domainInfo:
     AdminUserName: '@@PROP:AdminUserName@@'
     AdminPassword: '@@PROP:AdminPassword@@'
-    ServerStartMode: 'prod'
 topology:
     AdminServerName: 'admin-server'
     ProductionModeEnabled: true
+    SecurityConfiguration:
+      SecureMode:
+        SecureModeEnabled: false  
     Log:
         FileName: domain1.log
     Cluster:

integration-tests/src/test/resources/wdt-models/coherence-wdt-config.yaml

@@ -1,13 +1,15 @@
-# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 domainInfo:
     AdminUserName: '@@PROP:AdminUserName@@'
     AdminPassword: '@@PROP:AdminPassword@@'
-    ServerStartMode: 'prod'
 topology:
     AdminServerName: 'admin-server'
     ProductionModeEnabled: true
+    SecurityConfiguration:
+      SecureMode:
+        SecureModeEnabled: false   
     Log:
         FileName: domain1.log
     Cluster: