refine the code with TestUtils.domainMapUpdateWithLbInfor

Author: maggiehe00

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

@@ -154,16 +154,9 @@ public void testDomainOnPVUsingWLST() throws Exception {
     Domain domain = null;
     boolean testCompletedSuccessfully = false;
     try {
-      // domain = TestUtils.createDomain(domainonpvwlstFile);TODO
       if (VOYAGER) {
         Map<String, Object> wlstDomainMap = TestUtils.loadYaml(domainonpvwlstFile);
-        wlstDomainMap.put("loadBalancer", "VOYAGER");
-        wlstDomainMap.put("loadBalancerWebPort", new Integer("30305"));
-        logger.info(
-            "domainonpvwlst loadBalancer is set to: "
-                + wlstDomainMap.get("loadBalancer")
-                + " with loadBalancerWebPort:"
-                + wlstDomainMap.get("loadBalancerWebPort"));
+        TestUtils.domainMapUpdateWithLbInfor(wlstDomainMap, "VOYAGER", new Integer("30305"));
         domain = TestUtils.createDomain(wlstDomainMap);
       } else {
         domain = TestUtils.createDomain(domainonpvwlstFile);
@@ -207,16 +200,9 @@ public void testDomainOnPVUsingWDT() throws Exception {
     boolean testCompletedSuccessfully = false;
     try {
       // create domain
-      // domain = TestUtils.createDomain(domainonpvwdtFile); TODO
       if (VOYAGER) {
         Map<String, Object> wdtDomainMap = TestUtils.loadYaml(domainonpvwdtFile);
-        wdtDomainMap.put("loadBalancer", "VOYAGER");
-        wdtDomainMap.put("loadBalancerWebPort", new Integer("30306"));
-        logger.info(
-            "domainonpvwdt loadBalancer is set to: "
-                + wdtDomainMap.get("loadBalancer")
-                + " with loadBalancerWebPort:"
-                + wdtDomainMap.get("loadBalancerWebPort"));
+        TestUtils.domainMapUpdateWithLbInfor(wdtDomainMap, "VOYAGER", new Integer("30306"));
         domain = TestUtils.createDomain(wdtDomainMap);
       } else {
         domain = TestUtils.createDomain(domainonpvwdtFile);
@@ -271,13 +257,7 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
       wlstDomainMap.put("adminNodePort", new Integer("30702"));
       wlstDomainMap.put("t3ChannelPort", new Integer("30031"));
       if (VOYAGER) {
-        wlstDomainMap.put("loadBalancer", "VOYAGER");
-        wlstDomainMap.put("loadBalancerWebPort", new Integer("30307"));
-        logger.info(
-            "domain1onpvwlst loadBalancer is set to: "
-                + wlstDomainMap.get("loadBalancer")
-                + " with loadBalancerWebPort:"
-                + wlstDomainMap.get("loadBalancerWebPort"));
+        TestUtils.domainMapUpdateWithLbInfor(wlstDomainMap, "VOYAGER", new Integer("30307"));
       }
       if (!INGRESSPERDOMAIN) {
         wlstDomainMap.put("ingressPerDomain", new Boolean("false"));
@@ -301,13 +281,7 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
       wdtDomainMap.put("t3ChannelPort", new Integer("30041"));
       // wdtDomainMap.put("clusterType", "Configured");
       if (VOYAGER) {
-        wdtDomainMap.put("loadBalancer", "VOYAGER");
-        wdtDomainMap.put("loadBalancerWebPort", new Integer("30308"));
-        logger.info(
-            "domain2onpvwdt loadBalancer is set to: "
-                + wdtDomainMap.get("loadBalancer")
-                + " with loadBalancerWebPort:"
-                + wdtDomainMap.get("loadBalancerWebPort"));
+        TestUtils.domainMapUpdateWithLbInfor(wdtDomainMap, "VOYAGER", new Integer("30308"));
       }
       if (!INGRESSPERDOMAIN) {
         wdtDomainMap.put("ingressPerDomain", new Boolean("false"));
@@ -373,16 +347,9 @@ public void testCreateDomainWithStartPolicyAdminOnly() throws Exception {
     Domain domain = null;
     boolean testCompletedSuccessfully = false;
     try {
-      // domain = TestUtils.createDomain(domainadminonlyFile);TODO
       if (VOYAGER) {
         Map<String, Object> domainMap = TestUtils.loadYaml(domainadminonlyFile);
-        domainMap.put("loadBalancer", "VOYAGER");
-        domainMap.put("loadBalancerWebPort", new Integer("30309"));
-        logger.info(
-            "domainadminonly loadBalancer is set to: "
-                + domainMap.get("loadBalancer")
-                + " with loadBalancerWebPort:"
-                + domainMap.get("loadBalancerWebPort"));
+        TestUtils.domainMapUpdateWithLbInfor(domainMap, "VOYAGER", new Integer("30309"));
         domain = TestUtils.createDomain(domainMap);
       } else {
         domain = TestUtils.createDomain(domainadminonlyFile);
@@ -420,16 +387,9 @@ public void testCreateDomainPVReclaimPolicyRecycle() throws Exception {
     Domain domain = null;
 
     try {
-      // domain = TestUtils.createDomain(domainrecyclepolicyFile); TODO
       if (VOYAGER) {
         Map<String, Object> domainMap = TestUtils.loadYaml(domainrecyclepolicyFile);
-        domainMap.put("loadBalancer", "VOYAGER");
-        domainMap.put("loadBalancerWebPort", new Integer("30310"));
-        logger.info(
-            "domainrecyclepolicy loadBalancer is set to: "
-                + domainMap.get("loadBalancer")
-                + " with loadBalancerWebPort:"
-                + domainMap.get("loadBalancerWebPort"));
+        TestUtils.domainMapUpdateWithLbInfor(domainMap, "VOYAGER", new Integer("30310"));
         domain = TestUtils.createDomain(domainMap);
       } else {
         domain = TestUtils.createDomain(domainrecyclepolicyFile);
@@ -466,16 +426,9 @@ public void testCreateDomainWithDefaultValuesInSampleInputs() throws Exception {
     Domain domain = null;
     boolean testCompletedSuccessfully = false;
     try {
-      // domain = TestUtils.createDomain(domainsampledefaultsFile);TODO
       if (VOYAGER) {
         Map<String, Object> domainMap = TestUtils.loadYaml(domainsampledefaultsFile);
-        domainMap.put("loadBalancer", "VOYAGER");
-        domainMap.put("loadBalancerWebPort", new Integer("30311"));
-        logger.info(
-            "domainsampledefaultsFile loadBalancer is set to: "
-                + domainMap.get("loadBalancer")
-                + " with loadBalancerWebPort:"
-                + domainMap.get("loadBalancerWebPort"));
+        TestUtils.domainMapUpdateWithLbInfor(domainMap, "VOYAGER", new Integer("30311"));
         domain = TestUtils.createDomain(domainMap);
       } else {
         domain = TestUtils.createDomain(domainsampledefaultsFile);
@@ -525,13 +478,7 @@ public void testAutoAndCustomSitConfigOverrides() throws Exception {
       domainMap.put("adminNodePort", new Integer("30704"));
       domainMap.put("t3ChannelPort", new Integer("30051"));
       if (VOYAGER) {
-        domainMap.put("loadBalancer", "VOYAGER");
-        domainMap.put("loadBalancerWebPort", new Integer("30312"));
-        logger.info(
-            " AutoAndCustomSitConfigOverrides loadBalancer is set to: "
-                + domainMap.get("loadBalancer")
-                + " with loadBalancerWebPort:"
-                + domainMap.get("loadBalancerWebPort"));
+        TestUtils.domainMapUpdateWithLbInfor(domainMap, "VOYAGER", new Integer("30312"));
       }
       // use NFS for this domain on Jenkins, defaultis HOST_PATH
       if (System.getenv("JENKINS") != null && System.getenv("JENKINS").equalsIgnoreCase("true")) {

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

@@ -561,6 +561,18 @@ public static Map<String, Object> loadYaml(String yamlFile) throws Exception {
     return map;
   }
 
+  // This method is to set a certain LB type with an unique lbWebPort
+  public static void domainMapUpdateWithLbInfor(
+      Map<String, Object> domainMap, String lbType, Integer lbWebPort) throws Exception {
+    domainMap.put("loadBalancer", lbType);
+    domainMap.put("loadBalancerWebPort", lbWebPort);
+    logger.info(
+        " loadBalancer is set to: "
+            + domainMap.get("loadBalancer")
+            + " with loadBalancerWebPort:"
+            + domainMap.get("loadBalancerWebPort"));
+  }
+
   public static Properties loadProps(String propsFile) throws Exception {
     Properties props = new Properties();
     // check file exists