Merge branch 'xc-115853' into 'main'

Fix OCNE ItIstioMiiDomain test failure with restricted header host

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

Author: jshum2479

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

@@ -6,7 +6,6 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.net.http.HttpResponse;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.OffsetDateTime;
@@ -31,7 +30,6 @@
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
 import oracle.weblogic.kubernetes.utils.ExecCommand;
 import oracle.weblogic.kubernetes.utils.ExecResult;
-import oracle.weblogic.kubernetes.utils.OracleHttpClient;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Tag;
@@ -46,13 +44,15 @@
 import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
 import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
+import static oracle.weblogic.kubernetes.TestConstants.OCNE;
 import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
 import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WORK_DIR;
 import static oracle.weblogic.kubernetes.actions.TestActions.addLabelsToNamespace;
 import static oracle.weblogic.kubernetes.actions.TestActions.patchDomainResourceWithNewIntrospectVersion;
+import static oracle.weblogic.kubernetes.utils.ApplicationUtils.checkAppUsingHostHeader;
 import static oracle.weblogic.kubernetes.utils.ClusterUtils.createClusterResourceAndAddReferenceToDomain;
 import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.replaceConfigMapWithModelFiles;
 import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.verifyIntrospectorRuns;
@@ -243,25 +243,18 @@ void testIstioModelInImageDomain() throws UnknownHostException, IOException, Int
     String hostAndPort = getServiceExtIPAddrtOke(istioIngressServiceName, istioNamespace) != null
         ? getServiceExtIPAddrtOke(istioIngressServiceName, istioNamespace) : host + ":" + istioIngressPort;
 
-    Map<String, String> headers = new HashMap<>();
-    headers.put("host", domainNamespace + ".org");
-    headers.put("Authorization", ADMIN_USERNAME_DEFAULT + ":" + ADMIN_PASSWORD_DEFAULT);
-
     String workManagers = "/management/weblogic/latest/domainConfig/selfTuning/workManagers/";
     String newWM = workManagers + "newWM/";
-    if (!TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
+    if (!TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT) && !OCNE) {
       istioIngressPort = ISTIO_HTTP_HOSTPORT;
       hostAndPort = InetAddress.getLocalHost().getHostAddress() + ":" + istioIngressPort;
     }
 
     String url = "http://" + hostAndPort + "/management/tenant-monitoring/servers/";
-    HttpResponse<String> response;
-    response = OracleHttpClient.get(url, headers, true);
-    assertEquals(200, response.statusCode());
-    assertTrue(response.body().contains("RUNNING"));
-    
+    checkApp(url);
+
     String wmUrl = "http://" + hostAndPort + workManagers;
-    checkApp(wmUrl, headers);    
+    checkApp(wmUrl);
 
     if (OKE_CLUSTER) {
       // create secret for internal OKE cluster
@@ -287,9 +280,10 @@ void testIstioModelInImageDomain() throws UnknownHostException, IOException, Int
     verifyIntrospectorRuns(domainUid, domainNamespace);
 
     wmUrl = "http://" + hostAndPort + workManagers;
-    checkApp(wmUrl, headers);
+    checkApp(wmUrl);
+
     wmUrl = "http://" + hostAndPort + newWM;
-    checkApp(wmUrl, headers);
+    checkApp(wmUrl);
     logger.info("Found new work manager runtime");
 
     verifyPodsNotRolled(domainNamespace, pods);
@@ -355,12 +349,9 @@ private static void enableStrictMode(String namespace) {
     });
   }
 
-  private void checkApp(String url, Map<String, String> headers) {
+  private void checkApp(String url) {
     testUntil(
-        () -> {
-          HttpResponse<String> response = OracleHttpClient.get(url, headers, true);
-          return response.statusCode() == 200;
-        },
+        () -> checkAppUsingHostHeader(url, domainNamespace + ".org"),
         logger,
         "application to be ready {0}",
         url);