Merge pull request #1058 from oracle/voyager-integ-test

PR (ready to be merged): Voyager JIRA OWLS-73062

Author: rjeberhard

integration-tests/README.md

@@ -209,7 +209,7 @@ The tests accepts optional env var overrides:
 | RESULT_ROOT | The root directory to use for the tests temporary files. See "Directory Configuration and Structure" for                  defaults and a detailed description of test directories. |
 | PV_ROOT    |  The root directory on the kubernetes cluster used for persistent volumes. See "Directory Configuration and Structure" for defaults and a detailed description of test directories. |
 | QUICKTEST  | When set to "true", limits testing to a subset of the tests. |
-| LB_TYPE    | The default value is "TRAEFIK". Set to "VOYAGER" if you want to use it as LB. |
+| LB_TYPE    | The default value is "TRAEFIK". Set to "VOYAGER" if you want to use it as LB. Using "VOYAGER" requires unique "voyagerWebPort"|
 | INGRESSPERDOMAIN  | The defult value is true. If you want to test creating TRAEFIK LB by kubectl yaml for multiple domains, set it to false. |
 | SHARED_CLUSTER    | Set to true if invoking on shared cluster, set to false or "" if running stand-alone or from Jenkins. Default is "". |
 | JENKINS    | Set to true if invoking from Jenkins, set to false or "" if running stand-alone or on shared cluster. Default is "". |

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

@@ -93,6 +93,11 @@ public void testCreateDomainTwoConfiguredCluster() throws Exception {
           "createDomainPyScript",
           "integration-tests/src/test/resources/domain-home-on-pv/"
               + TWO_CONFIGURED_CLUSTER_SCRIPT);
+      if ((System.getenv("LB_TYPE") != null && System.getenv("LB_TYPE").equalsIgnoreCase("VOYAGER"))
+          || (domainMap.containsKey("loadBalancer")
+              && ((String) domainMap.get("loadBalancer")).equalsIgnoreCase("VOYAGER"))) {
+        domainMap.put("voyagerWebPort", new Integer("30366"));
+      }
       addCluster2ToDomainTemplate();
       domain = TestUtils.createDomain(domainMap);
       domain.verifyDomainCreated();
@@ -136,6 +141,11 @@ public void testCreateDomainTwoMixedCluster() throws Exception {
       domainMap.put(
           "createDomainPyScript",
           "integration-tests/src/test/resources/domain-home-on-pv/" + TWO_MIXED_CLUSTER_SCRIPT);
+      if ((System.getenv("LB_TYPE") != null && System.getenv("LB_TYPE").equalsIgnoreCase("VOYAGER"))
+          || (domainMap.containsKey("loadBalancer")
+              && ((String) domainMap.get("loadBalancer")).equalsIgnoreCase("VOYAGER"))) {
+        domainMap.put("voyagerWebPort", new Integer("30377"));
+      }
       addCluster2ToDomainTemplate();
       domain = TestUtils.createDomain(domainMap);
       domain.verifyDomainCreated();

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

@@ -63,7 +63,8 @@ public static void staticPrepare() throws Exception {
         logger.info("Creating WLS Domain & waiting for the script to complete execution");
         Map<String, Object> domainMap = TestUtils.loadYaml(DOMAINONPV_WLST_YAML);
         // Treafik doesn't work due to the bug 28050300. Use Voyager instead
-        domainMap.put("LB_TYPE", "VOYAGER");
+        domainMap.put("loadBalancer", "VOYAGER");
+        domainMap.put("voyagerWebPort", new Integer("30355"));
         domain = TestUtils.createDomain(domainMap);
         domain.verifyDomainCreated();
       }

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

@@ -1136,7 +1136,9 @@ protected void createLoadBalancer() throws Exception {
     lbMap.put("serviceName", domainUid + "-cluster-" + domainMap.get("clusterName"));
     if (voyager) {
       lbMap.put("loadBalancer", "VOYAGER");
-      lbMap.put("loadBalancerWebPort", domainMap.get("voyagerWebPort"));
+      lbMap.put(
+          "loadBalancerWebPort",
+          domainMap.getOrDefault("voyagerWebPort", new Integer(loadBalancerWebPort)));
     } else {
       lbMap.put("loadBalancer", domainMap.getOrDefault("loadBalancer", loadBalancer));
       lbMap.put(
@@ -1349,8 +1351,8 @@ protected void initialize(Map<String, Object> inputDomainMap) throws Exception {
 
     this.voyager =
         (System.getenv("LB_TYPE") != null && System.getenv("LB_TYPE").equalsIgnoreCase("VOYAGER"))
-            || (inputDomainMap.containsKey("LB_TYPE")
-                && ((String) inputDomainMap.get("LB_TYPE")).equalsIgnoreCase("VOYAGER"));
+            || (inputDomainMap.containsKey("loadBalancer")
+                && ((String) inputDomainMap.get("loadBalancer")).equalsIgnoreCase("VOYAGER"));
 
     if (System.getenv("INGRESSPERDOMAIN") != null) {
       INGRESSPERDOMAIN = new Boolean(System.getenv("INGRESSPERDOMAIN")).booleanValue();

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

@@ -884,6 +884,12 @@ public static Map<String, Object> createDomainMap(int number) {
     domainMap.put("exposeAdminNodePort", true);
     domainMap.put("adminNodePort", 30700 + number);
     domainMap.put("t3ChannelPort", 30000 + number);
+    if ((System.getenv("LB_TYPE") != null && System.getenv("LB_TYPE").equalsIgnoreCase("VOYAGER"))
+        || (domainMap.containsKey("loadBalancer")
+            && ((String) domainMap.get("loadBalancer")).equalsIgnoreCase("VOYAGER"))) {
+      domainMap.put("voyagerWebPort", 30344 + number);
+      logger.info("For this domain voyagerWebPort is set to: 30344 + " + number);
+    }
     return domainMap;
   }
 

integration-tests/src/test/resources/domaininimagewdt.yaml

@@ -7,6 +7,7 @@ configuredManagedServerCount: 4
 initialManagedServerReplicas: 2
 exposeAdminT3Channel: true
 exposeAdminNodePort: true
+voyagerWebPort: 30333
 domainHomeImageBuildPath: ./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt
 domainHomeImageBase: "store/oracle/weblogic:12.2.1.3"
 logHomeOnPV: true

integration-tests/src/test/resources/domaininimagewlst.yaml

@@ -7,6 +7,7 @@ configuredManagedServerCount: 4
 initialManagedServerReplicas: 2
 exposeAdminT3Channel: true
 exposeAdminNodePort: true
+voyagerWebPort: 30322
 domainHomeImageBuildPath: ./docker-images/OracleWebLogic/samples/12213-domain-home-in-image
 domainHomeImageBase: "store/oracle/weblogic:12.2.1.3"
 logHomeOnPV: true