Backport owls-96154 (#2770)

* Backport owls-96154

Author: marinakog

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

@@ -12,7 +12,6 @@
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -38,7 +37,6 @@
 import oracle.weblogic.domain.ServerPod;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
 import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
-import oracle.weblogic.kubernetes.actions.impl.primitive.HelmParams;
 import oracle.weblogic.kubernetes.annotations.IntegrationTest;
 import oracle.weblogic.kubernetes.annotations.Namespaces;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
@@ -49,7 +47,6 @@
 import org.awaitility.core.ConditionEvaluationListener;
 import org.awaitility.core.ConditionFactory;
 import org.awaitility.core.EvaluatedCondition;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.MethodOrderer;
@@ -88,7 +85,6 @@
 import static oracle.weblogic.kubernetes.actions.TestActions.now;
 import static oracle.weblogic.kubernetes.actions.TestActions.patchDomainResourceWithNewIntrospectVersion;
 import static oracle.weblogic.kubernetes.actions.TestActions.scaleCluster;
-import static oracle.weblogic.kubernetes.actions.TestActions.uninstallNginx;
 import static oracle.weblogic.kubernetes.actions.impl.Domain.patchDomainCustomResource;
 import static oracle.weblogic.kubernetes.actions.impl.Pod.getPod;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.podStateNotChanged;
@@ -107,8 +103,6 @@
 import static oracle.weblogic.kubernetes.utils.ImageUtils.dockerLoginAndPushImageToRegistry;
 import static oracle.weblogic.kubernetes.utils.JobUtils.createDomainJob;
 import static oracle.weblogic.kubernetes.utils.JobUtils.getIntrospectJobName;
-import static oracle.weblogic.kubernetes.utils.LoadBalancerUtils.createIngressForDomainAndVerify;
-import static oracle.weblogic.kubernetes.utils.LoadBalancerUtils.installAndVerifyNginx;
 import static oracle.weblogic.kubernetes.utils.OKDUtils.createRouteForOKD;
 import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
 import static oracle.weblogic.kubernetes.utils.PatchDomainUtils.patchDomainResource;
@@ -126,7 +120,6 @@
 import static oracle.weblogic.kubernetes.utils.WLSTUtils.executeWLSTScript;
 import static org.apache.commons.io.FileUtils.copyDirectory;
 import static org.apache.commons.io.FileUtils.deleteDirectory;
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.with;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -149,10 +142,6 @@ class ItIntrospectVersion {
 
   private static final String domainUid = "myintrodomain";
 
-  private static String nginxNamespace = null;
-  private static int nodeportshttp;
-  private static HelmParams nginxHelmParams = null;
-
   private final String wlSecretName = "weblogic-credentials";
 
   private static String adminSvcExtHost = null;
@@ -173,6 +162,7 @@ class ItIntrospectVersion {
 
   private static Path clusterViewAppPath;
   private static LoggingFacade logger = null;
+  private final int managedServerPort = 7100;
 
   /**
    * Assigns unique namespaces for operator and domains.
@@ -182,29 +172,18 @@ class ItIntrospectVersion {
    * @param namespaces injected by JUnit
    */
   @BeforeAll
-  public static void initAll(@Namespaces(3) List<String> namespaces) {
+  public static void initAll(@Namespaces(2) List<String> namespaces) {
     logger = getLogger();
     logger.info("Assign a unique namespace for operator");
     assertNotNull(namespaces.get(0), "Namespace is null");
     opNamespace = namespaces.get(0);
     logger.info("Assign a unique namespace for Introspect Version WebLogic domain");
     assertNotNull(namespaces.get(1), "Namespace is null");
     introDomainNamespace = namespaces.get(1);
-    logger.info("Assign a unique namespace for NGINX");
-    assertNotNull(namespaces.get(2), "Namespace is null");
-    nginxNamespace = namespaces.get(2);
 
     // install operator and verify its running in ready state
     installAndVerifyOperator(opNamespace, introDomainNamespace);
 
-    // get a free node port for NGINX
-    nodeportshttp = getNextFreePort();
-    int nodeportshttps = getNextFreePort();
-
-    if (!OKD) {
-      nginxHelmParams = installAndVerifyNginx(nginxNamespace, nodeportshttp, nodeportshttps);
-    }
-
     // create pull secrets for WebLogic image when running in non Kind Kubernetes cluster
     // this secret is used only for non-kind cluster
     createSecretForBaseImages(introDomainNamespace);
@@ -242,7 +221,6 @@ void testDomainIntrospectVersionNotRolling() {
 
     final String managedServerNameBase = "managed-server";
     String managedServerPodNamePrefix = domainUid + "-" + managedServerNameBase;
-    final int managedServerPort = 7100;
 
     int replicaCount = 2;
 
@@ -524,16 +502,6 @@ public void conditionEvaluated(EvaluatedCondition condition) {
           domainUid, introDomainNamespace, pods.get(i));
     }
 
-    //create ingress controller
-    if (!OKD) {
-      Map<String, Integer> clusterNameMsPortMap = new HashMap<>();
-      clusterNameMsPortMap.put(clusterName, managedServerPort);
-      logger.info("Creating ingress for domain {0} in namespace {1}", domainUid, introDomainNamespace);
-      createIngressForDomainAndVerify(domainUid, introDomainNamespace, clusterNameMsPortMap);
-    } else {
-      clusterRouteHost = createRouteForOKD(clusterServiceName, introDomainNamespace);
-    }
-
     managedServerNames = new ArrayList<String>();
     for (int i = 1; i <= replicaCount + 1; i++) {
       managedServerNames.add(managedServerNameBase + i);
@@ -542,28 +510,12 @@ public void conditionEvaluated(EvaluatedCondition condition) {
     //verify admin server accessibility and the health of cluster members
     verifyMemberHealth(adminServerPodName, managedServerNames, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT);
 
-    String curlRequest = null;
+    // verify each managed server can see other member in the cluster
 
-    if (OKD) {
-      logger.info("cluster svc host = {0}", clusterRouteHost);
-      logger.info("Accessing the clusterview app through cluster route");
-      curlRequest = String.format("curl --silent --show-error --noproxy '*' "
-            + "http://%s/clusterview/ClusterViewServlet"
-            + "\"?user=" + ADMIN_USERNAME_DEFAULT
-            + "&password=" + ADMIN_PASSWORD_DEFAULT + "\"", clusterRouteHost);
-    } else {
-      //access application in managed servers through NGINX load balancer
-      logger.info("Accessing the clusterview app through NGINX load balancer");
-      curlRequest = String.format("curl --silent --show-error --noproxy '*' "
-                   + "-H 'host: %s' http://%s:%s/clusterview/ClusterViewServlet"
-                   + "\"?user=" + ADMIN_USERNAME_DEFAULT
-                   + "&password=" + ADMIN_PASSWORD_DEFAULT + "\"",
-               domainUid + "." + introDomainNamespace + "." + clusterName + ".test", K8S_NODEPORT_HOST, nodeportshttp);
+    for (String managedServerName : managedServerNames) {
+      verifyConnectionBetweenClusterMembers(managedServerName, managedServerNames);
     }
 
-    // verify each managed server can see other member in the cluster
-    verifyServerCommunication(curlRequest, managedServerNames);
-
     // verify when a domain resource has spec.introspectVersion configured,
     // all WebLogic server pods will have a label "weblogic.introspectVersion"
     // set to the value of spec.introspectVersion.
@@ -704,26 +656,10 @@ void testDomainIntrospectVersionRolling() {
     //verify admin server accessibility and the health of cluster members
     verifyMemberHealth(adminServerPodName, managedServerNames, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT);
 
-    String curlRequest = null;
-    if (OKD) {
-      logger.info("cluster svc host = {0}", clusterRouteHost);
-      logger.info("Accessing the clusterview app through cluster route");
-      curlRequest = String.format("curl --silent --show-error --noproxy '*' "
-            + "http://%s/clusterview/ClusterViewServlet"
-            + "\"?user=" + ADMIN_USERNAME_DEFAULT
-            + "&password=" + ADMIN_PASSWORD_DEFAULT + "\"", clusterRouteHost);
-    } else {
-      //access application in managed servers through NGINX load balancer
-      logger.info("Accessing the clusterview app through NGINX load balancer");
-      curlRequest = String.format("curl --silent --show-error --noproxy '*' "
-                   + "-H 'host: %s' http://%s:%s/clusterview/ClusterViewServlet"
-                   + "\"?user=" + ADMIN_USERNAME_DEFAULT
-                   + "&password=" + ADMIN_PASSWORD_DEFAULT + "\"",
-               domainUid + "." + introDomainNamespace + "." + clusterName + ".test", K8S_NODEPORT_HOST, nodeportshttp);
-    }
-
     // verify each managed server can see other member in the cluster
-    verifyServerCommunication(curlRequest, managedServerNames);
+    for (String managedServerName : managedServerNames) {
+      verifyConnectionBetweenClusterMembers(managedServerName, managedServerNames);
+    }
 
     // verify when a domain/cluster is rolling restarted without changing the spec.introspectVersion,
     // all server pods' weblogic.introspectVersion label stay unchanged after the pods are restarted.
@@ -1369,22 +1305,6 @@ private void verifyIntrospectVersionLabelValue(String podName, String introspect
     }
   }
 
-  /**
-   * Uninstall Nginx.
-   * The cleanup framework does not uninstall Nginx release.
-   * Do it here for now.
-   */
-  @AfterAll
-  public void tearDownAll() {
-    // uninstall NGINX release
-    if (nginxHelmParams != null) {
-      assertThat(uninstallNginx(nginxHelmParams))
-          .as("Test uninstallNginx returns true")
-          .withFailMessage("uninstallNginx() did not return true")
-          .isTrue();
-    }
-  }
-
   // copy samples directory to a temporary location
   private static void setupSample() {
     assertDoesNotThrow(() -> {
@@ -1412,4 +1332,17 @@ private String executeLifecycleScript(String script, String extraParams) {
 
     return execResult.toString();
   }
+
+  private void verifyConnectionBetweenClusterMembers(String serverName, List<String> managedServerNames) {
+    String podName = domainUid + "-" + serverName;
+    final String command = String.format(
+        "kubectl exec -n " + introDomainNamespace + "  " + podName + " -- curl http://"
+            + ADMIN_USERNAME_DEFAULT
+            + ":"
+            + ADMIN_PASSWORD_DEFAULT
+            + "@" + podName + ":%s/clusterview/ClusterViewServlet"
+            + "\"?user=" + ADMIN_USERNAME_DEFAULT
+            + "&password=" + ADMIN_PASSWORD_DEFAULT + "\"",managedServerPort);
+    verifyServerCommunication(command, serverName, managedServerNames);
+  }
 }