Integration Test : Default ListenPort assignment in sever template (#2309)

anpanigr · ANTARYAMI.PANIGRAHI@ORACLE.COM · ANTARYAMI.PANIGRAHI@ORACLE.COM · web-flow · commit 3dffa8d0878f · 2021-04-19T16:14:37.000-04:00
* Integration Test : Default ListenPort assignment in sever template

Co-authored-by: ANTARYAMI.PANIGRAHI@ORACLE.COM &lt;anpanigr@phx3182b0a.subnet4ad3phx.devweblogicphx.oraclevcn.com&gt;
Co-authored-by: ANTARYAMI.PANIGRAHI@ORACLE.COM &lt;anpanigr@anpanigr-2.subnet1ad3phx.devweblogicphx.oraclevcn.com&gt;
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java
@@ -227,7 +227,7 @@ public void testDomainIntrospectVersionNotRolling() {
 
     final String managedServerNameBase = "managed-server";
     String managedServerPodNamePrefix = domainUid + "-" + managedServerNameBase;
-    final int managedServerPort = 8001;
+    final int managedServerPort = 7100;
 
     int replicaCount = 2;
 
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiCustomSslStore.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiCustomSslStore.java
@@ -55,7 +55,7 @@
  * This test class verifies usage of CustomIdentityCustomTrust on PV.
  * Create a MII domain with an attached persistent volume.
  * Configure custom identity and custom trust on server template
- * Enable SSL on server template with port 8002 (default 7002 does not work) 
+ * Donot set the SSL port on server template. The default will be set to 8100.
  * Put the IdentityKeyStore.jks  and TrustKeyStore.jks on /shared directory 
  *  after administration server pod is started so that it can be accessible 
  *  from all managed server pods
@@ -224,6 +224,6 @@ private void runClientOnAdminPod() {
                 condition.getElapsedTimeInMS(),
                 condition.getRemainingTimeInMS()))
         .until(runClientInsidePod(adminServerPodName, domainNamespace,
-            "/u01", extOpts.toString() + " SslTestClient", "t3s://" + domainUid + "-cluster-cluster-1:8002"));
+            "/u01", extOpts.toString() + " SslTestClient", "t3s://" + domainUid + "-cluster-cluster-1:8100"));
   }
 }
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItProductionSecureMode.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItProductionSecureMode.java
@@ -53,6 +53,7 @@
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WORK_DIR;
 import static oracle.weblogic.kubernetes.actions.TestActions.createDomainCustomResource;
 import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
+import static oracle.weblogic.kubernetes.actions.TestActions.getServicePort;
 import static oracle.weblogic.kubernetes.actions.TestActions.patchDomainResourceWithNewIntrospectVersion;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.domainExists;
 import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.checkWeblogicMBean;
@@ -72,6 +73,7 @@
 import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
 import static org.awaitility.Awaitility.with;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -151,9 +153,10 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
         + "         SecureModeEnabled: true \n"
         + "  ServerTemplate: \n" 
         + "    \"cluster-1-template\": \n"
+        + "       ListenPort: '7001' \n"
         + "       SSL: \n"
         + "         Enabled: true \n"
-        + "         ListenPort: '7003' \n";
+        + "         ListenPort: '7002' \n";
 
     assertDoesNotThrow(() -> Files.write(pathToEnableSSLYaml, yamlString.getBytes()));
     createConfigMapAndVerify(configMapName, domainUid, domainNamespace, Arrays.asList(pathToEnableSSLYaml.toString()));
@@ -200,20 +203,37 @@ public void beforeEach() {
    * Verify WebLogic console 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.
    */
   @Test
   @Order(1)
   @DisplayName("Verify the secure service through administration port")
   public void testVerifyProductionSecureMode() {
-    int sslNodePort = getServiceNodePort(
+    int defaultAdminPort = getServiceNodePort(
          domainNamespace, getExternalServicePodName(adminServerPodName), "default-admin");
-    assertTrue(sslNodePort != -1,
+    assertTrue(defaultAdminPort != -1,
           "Could not get the default-admin external service node port");    
-    logger.info("Found the administration service nodePort {0}", sslNodePort);
+    logger.info("Found the administration service nodePort {0}", defaultAdminPort);
+
+    // Here the SSL port is explicitly set to 7002 (on-prem default) in
+    // in ServerTemplate section on topology file. Here the generated 
+    // config.xml has no SSL port assigned, but the default-secure service i
+    // must be active with port 7002 
+    int defaultClusterSecurePort = assertDoesNotThrow(()
+        -> getServicePort(domainNamespace, 
+              domainUid + "-cluster-cluster-1", "default-secure"),
+              "Getting Default Secure Cluster Service port failed");
+    assertEquals(7002, defaultClusterSecurePort, "Default Secure Cluster port is not set to 7002");
+
+    int defaultAdminSecurePort = assertDoesNotThrow(()
+        -> getServicePort(domainNamespace, 
+              domainUid + "-cluster-cluster-1", "default-admin"),
+              "Getting Default Admin Cluster Service port failed");
+    assertEquals(9002, defaultAdminSecurePort, "Default Admin Cluster port is not set to 9002");
 
     if (!WEBLOGIC_SLIM) {
       String curlCmd = "curl -sk --show-error --noproxy '*' "
-          + " https://" + K8S_NODEPORT_HOST + ":" + sslNodePort
+          + " https://" + K8S_NODEPORT_HOST + ":" + defaultAdminPort
           + "/console/login/LoginForm.jsp --write-out %{http_code} " 
           + " -o /dev/null";
       logger.info("Executing default-admin nodeport curl command {0}", curlCmd);
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSessionMigration.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSessionMigration.java
@@ -95,7 +95,10 @@ class ItSessionMigration {
   private static String adminServerPodName = domainUid + "-" + ADMIN_SERVER_NAME_BASE;
   private static String managedServerPrefix = domainUid + "-" + MANAGED_SERVER_NAME_BASE;
   private static String finalPrimaryServerName = null;
-  private static int managedServerPort = 8001;
+  // Since the ServerTemplate section of the model file model.sessmigr.yaml
+  // does not explicitly specify ListenPort, the introspector/wdt generated 
+  // default ListenPort for each dynamic server is set to 7100
+  private static int managedServerPort = 7100;
   private static int replicaCount = 2;
   private static String opNamespace = null;
   private static String domainNamespace = null;
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItT3Channel.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItT3Channel.java
@@ -45,13 +45,15 @@
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO_SECRET;
+import static oracle.weblogic.kubernetes.TestConstants.DEFAULT_LISTEN_PORT;
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
 import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
 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.getServiceNodePort;
+import static oracle.weblogic.kubernetes.actions.TestActions.getServicePort;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createConfigMapForDomainCreation;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createDomainAndVerify;
@@ -119,6 +121,8 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
    * Test t3 channel access by deploying a app using WLST.
    * Test Creates a domain in persistent volume using WLST.
    * Verifies that the pods comes up and sample application deployment works.
+   * Verify the default service port is set to 7100 since ListenPort is not 
+   * explicitly set on WLST offline script to create the domain configuration.
    */
   @Test
   @DisplayName("Test admin server t3 channel access by deploying a application")
@@ -290,6 +294,28 @@ public void testAdminServerT3Channel() {
 
     //verify admin server accessibility and the health of cluster members
     verifyMemberHealth(adminServerPodName, managedServerNames, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT);
+
+    // Since the ListenPort is not set explicitly on ServerTemplate 
+    // in wlst offline script wlst-create-domain-onpv.py, the default 
+    // ListenPort on each manged server is set to 7100. This can be confirmed
+    // by intorospecting the corresponding cluster service port (default)
+    int servicePort = assertDoesNotThrow(()
+        -> getServicePort(domainNamespace, 
+              domainUid + "-cluster-" + clusterName, "default"),
+              "Getting Cluster Service default port failed");
+    assertEquals(DEFAULT_LISTEN_PORT, servicePort, "Default Service Port is not set to 7100");
+    int napPort = assertDoesNotThrow(()
+        -> getServicePort(domainNamespace, 
+              domainUid + "-cluster-" + clusterName, "ms-nap"),
+              "Getting Cluster Service nap port failed");
+    assertEquals(8011, napPort, "Nap Service Port is not set to 8011");
+
+    servicePort = assertDoesNotThrow(()
+        -> getServicePort(domainNamespace, 
+              domainUid + "-managed-server1", "default"),
+              "Getting Managed Server Service default port failed");
+    assertEquals(DEFAULT_LISTEN_PORT, servicePort, "Default Managed Service Port is not 7100");
+
   }
 
   private static void verifyMemberHealth(String adminServerPodName, List<String> managedServerNames,
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItTwoDomainsLoadBalancers.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItTwoDomainsLoadBalancers.java
@@ -212,7 +212,7 @@ public class ItTwoDomainsLoadBalancers {
   // domain constants
   private final String clusterName = "cluster-1";
   private final int replicaCount = 2;
-  private static final int MANAGED_SERVER_PORT = 8001;
+  private static final int MANAGED_SERVER_PORT = 7100;
   private static final int ADMIN_SERVER_PORT = 7001;
 
   private int t3ChannelPort = 0;
@@ -425,7 +425,7 @@ public void testDeployAppAndInstallIngressControllers() {
 
     // install and verify Apache for default sample
     apacheHelmParams1 = assertDoesNotThrow(
-        () -> installAndVerifyApache(domain1Namespace, kindRepoApacheImage, 0, 0, domain1Uid));
+        () -> installAndVerifyApache(domain1Namespace, kindRepoApacheImage, 0, 0, MANAGED_SERVER_PORT, domain1Uid));
 
     // install and verify Apache for custom sample
     LinkedHashMap<String, String> clusterNamePortMap = new LinkedHashMap<>();
@@ -434,7 +434,7 @@ public void testDeployAppAndInstallIngressControllers() {
     }
     createPVPVCForApacheCustomConfiguration(defaultNamespace);
     apacheHelmParams2 = assertDoesNotThrow(
-        () -> installAndVerifyApache(defaultNamespace, kindRepoApacheImage, 0, 0, domain1Uid,
+        () -> installAndVerifyApache(defaultNamespace, kindRepoApacheImage, 0, 0, MANAGED_SERVER_PORT, domain1Uid,
             apachePvcName, "apache-sample-host", ADMIN_SERVER_PORT, clusterNamePortMap));
   }
 
@@ -540,7 +540,7 @@ public void testTraefikHttpHostRoutingAcrossDomains() {
   @Order(9)
   @Test
   @DisplayName("Verify Traefik host routing with HTTPS protocol across two domains")
-  public void testTraefikHostHttpsRoutingAcrossDomains() {
+  public void testTraefikHttpsHostRoutingAcrossDomains() {
 
     logger.info("Verifying Traefik host routing with HTTPS protocol across two domains");
     for (String domainUid : domainUids) {
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java
@@ -185,8 +185,10 @@ public interface TestConstants {
       .orElse("v1.3.3-debian-elasticsearch-1.3");
   public static final String ELASTICSEARCH_IMAGE = ELASTICSEARCH_NAME + ":" + ELK_STACK_VERSION;
   public static final String ELASTICSEARCH_HOST = "elasticsearch.default.svc.cluster.local";
+  public static final int DEFAULT_LISTEN_PORT = 7100;
   public static final int ELASTICSEARCH_HTTP_PORT = 9200;
   public static final int ELASTICSEARCH_HTTPS_PORT = 9300;
+  public static final int DEFAULT_SSL_LISTEN_PORT = 8100;
   public static final String ELKSTACK_NAMESPACE = "default";
   public static final String LOGSTASH_INDEX_KEY = "logstash";
   public static final String FLUENTD_INDEX_KEY = "fluentd";
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/ApacheParams.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/ApacheParams.java
@@ -22,6 +22,7 @@ public class ApacheParams {
   private static final String PVC_NAME = "persistentVolumeClaimName";
   private static final String HTTP_NODEPORT = "httpNodePort";
   private static final String HTTPS_NODEPORT = "httpsNodePort";
+  private static final String MANAGED_SERVER_PORT = "managedServerPort";
   private static final String VIRTUAL_HOSTNAME = "virtualHostName";
   private static final String CUSTOM_CERT = "customCert";
   private static final String CUSTOM_KEY = "customKey";
@@ -33,6 +34,7 @@ public class ApacheParams {
   private String pvcName = null;
   private int httpNodePort = 0;
   private int httpsNodePort = 0;
+  private int managedServerPort = 0;
   private String virtualHostName = null;
   private String customCert = null;
   private String customKey = null;
@@ -69,6 +71,11 @@ public ApacheParams httpsNodePort(int httpsNodePort) {
     return this;
   }
 
+  public ApacheParams managedServerPort(int managedServerPort) {
+    this.managedServerPort = managedServerPort;
+    return this;
+  }
+
   public ApacheParams virtualHostName(String virtualHostName) {
     this.virtualHostName = virtualHostName;
     return this;
@@ -117,6 +124,9 @@ public Map<String, Object> getValues() {
     if (httpsNodePort >= 0) {
       values.put(HTTPS_NODEPORT, httpsNodePort);
     }
+    if (managedServerPort >= 0) {
+      values.put(MANAGED_SERVER_PORT, managedServerPort);
+    }
 
     values.put(VIRTUAL_HOSTNAME, virtualHostName);
     values.put(CUSTOM_CERT, customCert);
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/CommonTestUtils.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/CommonTestUtils.java
@@ -813,15 +813,17 @@ public static HelmParams installAndVerifyVoyager(String voyagerNamespace,
    * @param image the image name of Apache webtier
    * @param httpNodePort the http nodeport of Apache
    * @param httpsNodePort the https nodeport of Apache
+   * @param managedServerPort the listenport of each managed server in cluster
    * @param domainUid the uid of the domain to which Apache will route the services
    * @return the Apache Helm installation parameters
    */
   public static HelmParams installAndVerifyApache(String apacheNamespace,
                                                   String image,
                                                   int httpNodePort,
                                                   int httpsNodePort,
+                                                  int managedServerPort,
                                                   String domainUid) throws IOException {
-    return installAndVerifyApache(apacheNamespace, image, httpNodePort, httpsNodePort, domainUid,
+    return installAndVerifyApache(apacheNamespace, image, httpNodePort, httpsNodePort, managedServerPort, domainUid,
         null, null, 0, null);
   }
 
@@ -832,6 +834,7 @@ public static HelmParams installAndVerifyApache(String apacheNamespace,
    * @param image the image name of Apache webtier
    * @param httpNodePort the http nodeport of Apache
    * @param httpsNodePort the https nodeport of Apache
+   * @param managedServerPort the listenport of each managed server in cluster
    * @param domainUid the uid of the domain to which Apache will route the services
    * @param pvcName name of the Persistent Volume Claim which contains your own custom_mod_wl_apache.conf file
    * @param virtualHostName the VirtualHostName of the Apache HTTP server which is used to enable custom SSL config
@@ -843,6 +846,7 @@ public static HelmParams installAndVerifyApache(String apacheNamespace,
                                                   String image,
                                                   int httpNodePort,
                                                   int httpsNodePort,
+                                                  int managedServerPort,
                                                   String domainUid,
                                                   String pvcName,
                                                   String virtualHostName,
@@ -882,6 +886,9 @@ public static HelmParams installAndVerifyApache(String apacheNamespace,
           .httpNodePort(httpNodePort)
           .httpsNodePort(httpsNodePort);
     }
+    if (managedServerPort >= 0) {
+      apacheParams.managedServerPort(managedServerPort);
+    }
 
     if (pvcName != null && clusterNamePortMap != null) {
       // create a custom Apache plugin configuration file named custom_mod_wl_apache.conf
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/LoggingUtil.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/LoggingUtil.java
@@ -347,7 +347,7 @@ private static V1Pod setupPVPod(String namespace, String pvcName, String pvName)
             .containers(Arrays.asList(
                 new V1Container()
                     .name("pv-container")
-                    .image("oraclelinux:7")
+                    .image("ghcr.io/oracle/oraclelinux:7")
                     .imagePullPolicy("IfNotPresent")
                     .volumeMounts(Arrays.asList(
                         new V1VolumeMount()
diff --git a/integration-tests/src/test/resources/python-scripts/wlst-create-domain-onpv.py b/integration-tests/src/test/resources/python-scripts/wlst-create-domain-onpv.py
@@ -50,8 +50,9 @@ def create_domain():
   st=create(template_name, 'ServerTemplate')
   print('Done creating server template: %s' % template_name)
   cd('/ServerTemplates/%s' % template_name)
-  print('Set managed server port in template')
-  cmo.setListenPort(int(managed_server_port))
+  print('(SKIP) Set managed server port in template')
+  # If no explicit listenport is set, operator infra will pick 7100
+  #cmo.setListenPort(int(managed_server_port))
   cmo.setCluster(cl)
   cmo.setResolveDNSName(true)
 
diff --git a/integration-tests/src/test/resources/traefik/traefik-ingress-rules.yaml b/integration-tests/src/test/resources/traefik/traefik-ingress-rules.yaml
@@ -17,7 +17,7 @@ spec:
     services:
     - kind: Service
       name: @domain1uid@-cluster-cluster-1
-      port: 8001
+      port: 7100
 ---
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
@@ -35,7 +35,7 @@ spec:
     services:
     - kind: Service
       name: @domain1uid@-cluster-cluster-1
-      port: 8001
+      port: 7100
   tls:
      secretName: @domain1uid@-traefik-tls-secret
 ---
@@ -55,7 +55,7 @@ spec:
     services:
     - kind: Service
       name: @domain2uid@-cluster-cluster-1
-      port: 8001
+      port: 7100
 ---
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
@@ -73,7 +73,7 @@ spec:
     services:
     - kind: Service
       name: @domain2uid@-cluster-cluster-1
-      port: 8001
+      port: 7100
   tls:
      secretName: @domain2uid@-tls-secret
 ---
@@ -130,7 +130,7 @@ spec:
     services:
     - kind: Service
       name: @domain1uid@-cluster-cluster-1
-      port: 8001
+      port: 7100
 ---
 apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
@@ -159,7 +159,7 @@ spec:
     services:
     - kind: Service
       name: @domain2uid@-cluster-cluster-1
-      port: 8001
+      port: 7100
 ---
 apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
@@ -231,7 +231,7 @@ spec:
     - kind: Service
       name: @domain1uid@-cluster-cluster-1
       namespace: default
-      port: 8001
+      port: 7100
   tls:
     secretName: @domain1uid@-traefik-tls-secret
 ---
@@ -267,7 +267,7 @@ spec:
     - kind: Service
       name: @domain2uid@-cluster-cluster-1
       namespace: default
-      port: 8001
+      port: 7100
   tls:
     secretName: @domain2uid@-traefik-tls-secret
 ---
@@ -280,4 +280,4 @@ spec:
   replacePathRegex:
     regex: ^/domain2(.*)
     replacement: /$1
-  sslRedirect: true
+  sslRedirect: true
diff --git a/integration-tests/src/test/resources/voyager/voyager-tls-pathrouting.yaml b/integration-tests/src/test/resources/voyager/voyager-tls-pathrouting.yaml
diff --git a/integration-tests/src/test/resources/wdt-models/mii.ssl.yaml b/integration-tests/src/test/resources/wdt-models/mii.ssl.yaml
diff --git a/integration-tests/src/test/resources/wdt-models/model.sessmigr.yaml b/integration-tests/src/test/resources/wdt-models/model.sessmigr.yaml
