move the major voyager/unqiue webport and INGRESSPERDOMAIN logic to class Domain

Author: maggiehe00

integration-tests/README.md

@@ -211,7 +211,7 @@ The tests accepts optional env var overrides:
 | 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. |
-| INGRESSPERDOMAIN  | The defult value is true. If you want to test creating LB by kubectl yaml for multiple domains, set it to false. |
+| INGRESSPERDOMAIN  | The defult value is true. If you want to test creating TRAEFIK LB by kubectl yaml for multiple domains, set it to false. |
 | WERCKER    | Set to true if invoking from Wercker, 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 from Wercker. Default is "". |
 | K8S_NODEPORT_HOST | DNS name of a Kubernetes worker node. Default is the local host's hostname. |

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

@@ -57,7 +57,7 @@ public class Domain {
   private int loadBalancerWebPort = 30305;
   private String userProjectsDir = "";
   private String projectRoot = "";
-  private boolean ingressPerDomain = false;
+  private boolean ingressPerDomain = true;
 
   private String createDomainScript = "";
   private String inputTemplateFile = "";
@@ -66,6 +66,12 @@ public class Domain {
   private static int maxIterations = BaseTest.getMaxIterationsPod(); // 50 * 5 = 250 seconds
   private static int waitTime = BaseTest.getWaitTimePod();
 
+  private boolean voyager;
+  // LB_TYPE is an evn var. Set to "VOYAGER" to use it as loadBalancer
+  private static String LB_TYPE;
+  // set INGRESSPERDOMAIN to false to create LB's ingress by kubectl yaml file
+  private static boolean INGRESSPERDOMAIN = true;
+
   public Domain(String inputYaml) throws Exception {
     // read input domain yaml to test
     this(TestUtils.loadYaml(inputYaml));
@@ -858,10 +864,23 @@ private void createLoadBalancer() throws Exception {
     lbMap.put("namespace", domainNS);
     lbMap.put("host", domainUid + ".org");
     lbMap.put("serviceName", domainUid + "-cluster-" + domainMap.get("clusterName"));
-    lbMap.put("loadBalancer", domainMap.getOrDefault("loadBalancer", loadBalancer));
-    lbMap.put("ingressPerDomain", domainMap.getOrDefault("ingressPerDomain", ingressPerDomain));
-    lbMap.put(
-        "loadBalancerWebPort", domainMap.getOrDefault("loadBalancerWebPort", loadBalancerWebPort));
+    if (voyager) {
+      lbMap.put("loadBalancer", "VOYAGER");
+      lbMap.put("loadBalancerWebPort", domainMap.get("voyagerWebPort"));
+    } else {
+      lbMap.put("loadBalancer", domainMap.getOrDefault("loadBalancer", loadBalancer));
+      lbMap.put(
+          "loadBalancerWebPort",
+          domainMap.getOrDefault("loadBalancerWebPort", new Integer(loadBalancerWebPort)));
+    }
+    if (!INGRESSPERDOMAIN) {
+      lbMap.put("ingressPerDomain", new Boolean("false"));
+      logger.info("For this domain, INGRESSPERDOMAIN is set to false");
+    } else {
+      lbMap.put(
+          "ingressPerDomain",
+          domainMap.getOrDefault("ingressPerDomain", new Boolean(ingressPerDomain)));
+    }
     lbMap.put("clusterName", domainMap.get("clusterName"));
 
     loadBalancer = (String) lbMap.get("loadBalancer");
@@ -1025,7 +1044,11 @@ private void initialize(Map<String, Object> inputDomainMap) throws Exception {
     domainMap = inputDomainMap;
     this.userProjectsDir = BaseTest.getUserProjectsDir();
     this.projectRoot = BaseTest.getProjectRoot();
-
+    this.voyager =
+        System.getenv("LB_TYPE") != null && System.getenv("LB_TYPE").equalsIgnoreCase("VOYAGER");
+    if (System.getenv("INGRESSPERDOMAIN") != null) {
+      INGRESSPERDOMAIN = new Boolean(System.getenv("INGRESSPERDOMAIN")).booleanValue();
+    }
     domainMap.put("domainName", domainMap.get("domainUID"));
 
     // read sample domain inputs

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

@@ -19,3 +19,4 @@ namespace: default
 serverStartPolicy: ADMIN_ONLY
 loadBalancer: TRAEFIK
 ingressPerDomain: true
+voyagerWebPort: 30309

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

@@ -22,3 +22,4 @@ createDomainFilesDir: wdt
 #loadBalancerDashboardPort: 30321
 loadBalancer: TRAEFIK
 ingressPerDomain: true
+voyagerWebPort: 30306

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

@@ -16,4 +16,5 @@ exposeAdminNodePort: true
 namespace: default
 loadBalancer: TRAEFIK
 ingressPerDomain: true
+voyagerWebPort: 30305
 

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

@@ -19,3 +19,4 @@ namespace: default
 weblogicDomainStorageReclaimPolicy: Recycle
 loadBalancer: TRAEFIK
 ingressPerDomain: true
+voyagerWebPort: 30311

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

@@ -7,3 +7,4 @@ domainUID: domainsampledefaults
 configuredManagedServerCount: 4
 loadBalancer: TRAEFIK
 ingressPerDomain: true
+voyagerWebPort: 30310