use loadBalancer as the attribute of the domainMap

Author: [email protected]

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

@@ -94,8 +94,8 @@ public void testCreateDomainTwoConfiguredCluster() throws Exception {
           "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("LB_TYPE")
-              && ((String) domainMap.get("LB_TYPE")).equalsIgnoreCase("VOYAGER"))) {
+          || (domainMap.containsKey("loadBalancer")
+              && ((String) domainMap.get("loadBalancer")).equalsIgnoreCase("VOYAGER"))) {
         domainMap.put("voyagerWebPort", new Integer("30366"));
       }
       addCluster2ToDomainTemplate();
@@ -143,7 +143,7 @@ public void testCreateDomainTwoMixedCluster() throws Exception {
           "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("LB_TYPE")
-              && ((String) domainMap.get("LB_TYPE")).equalsIgnoreCase("VOYAGER"))) {
+              && ((String) domainMap.get("loadBalancer")).equalsIgnoreCase("loadBalancer"))) {
         domainMap.put("voyagerWebPort", new Integer("30377"));
       }
       addCluster2ToDomainTemplate();

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

@@ -63,7 +63,7 @@ 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

@@ -1351,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

@@ -885,8 +885,8 @@ public static Map<String, Object> createDomainMap(int number) {
     domainMap.put("adminNodePort", 30700 + number);
     domainMap.put("t3ChannelPort", 30000 + number);
     if ((System.getenv("LB_TYPE") != null && System.getenv("LB_TYPE").equalsIgnoreCase("VOYAGER"))
-        || (domainMap.containsKey("LB_TYPE")
-            && ((String) domainMap.get("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);
     }