tests optimization and some code refactoring

Author: vanajamukkara

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

@@ -64,8 +64,12 @@ public class Domain {
   private static int waitTime = BaseTest.getWaitTimePod();
 
   public Domain(String inputYaml) throws Exception {
+    // read input domain yaml to test
+    this(TestUtils.loadYaml(inputYaml));
+  }
 
-    initialize(inputYaml);
+  public Domain(Map<String, Object> inputDomainMap) throws Exception {
+    initialize(inputDomainMap);
     createPV();
     createSecret();
     generateInputYaml();
@@ -698,16 +702,8 @@ private void createPV() throws Exception {
     weblogicDomainStorageReclaimPolicy = (String) pvMap.get("weblogicDomainStorageReclaimPolicy");
     weblogicDomainStorageSize = (String) pvMap.get("weblogicDomainStorageSize");
 
-    // test NFS for domain5 on JENKINS
-    if (domainUid.equals("domain6")
-        && (System.getenv("JENKINS") != null
-            && System.getenv("JENKINS").equalsIgnoreCase("true"))) {
-      pvMap.put("weblogicDomainStorageType", "NFS");
-      pvMap.put("weblogicDomainStorageNFSServer", TestUtils.getHostName());
-    } else {
-      pvMap.put("weblogicDomainStorageType", "HOST_PATH");
-      pvMap.put("weblogicDomainStorageNFSServer", TestUtils.getHostName());
-    }
+    pvMap.put("weblogicDomainStorageNFSServer", TestUtils.getHostName());
+
     // set pv path
     domainMap.put(
         "weblogicDomainStoragePath",
@@ -820,7 +816,7 @@ private void createLoadBalancer() throws Exception {
 
     loadBalancer = (String) lbMap.get("loadBalancer");
 
-    if (domainUid.equals("domain7") && loadBalancer.equals("APACHE")) {
+    if (loadBalancer.equals("APACHE")) {
       /* lbMap.put("loadBalancerAppPrepath", "/weblogic");
       lbMap.put("loadBalancerExposeAdminPort", new Boolean(true)); */
     }
@@ -943,12 +939,11 @@ private void callWebAppAndCheckForServerNameInResponse(
     }
   }
 
-  private void initialize(String inputYaml) throws Exception {
+  private void initialize(Map<String, Object> inputDomainMap) throws Exception {
+    domainMap = inputDomainMap;
     this.userProjectsDir = BaseTest.getUserProjectsDir();
     this.projectRoot = BaseTest.getProjectRoot();
 
-    // read input domain yaml to test
-    domainMap = TestUtils.loadYaml(inputYaml);
     domainMap.put("domainName", domainMap.get("domainUID"));
 
     // read sample domain inputs
@@ -990,9 +985,9 @@ private void initialize(String inputYaml) throws Exception {
 
     domainMap.put("domainHome", "/shared/domains/" + domainUid);
     domainMap.put("logHome", "/shared/logs/" + domainUid);
-    domainMap.put(
-        "createDomainFilesDir",
-        BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/domain-home-on-pv");
+    /* domainMap.put(
+    "createDomainFilesDir",
+    BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/domain-home-on-pv"); */
     String imageName = "store/oracle/weblogic";
     if (System.getenv("IMAGE_NAME_WEBLOGIC") != null) {
       imageName = System.getenv("IMAGE_NAME_WEBLOGIC");

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

@@ -500,8 +500,11 @@ public static Operator createOperator(String opYamlFile) throws Exception {
   public static Domain createDomain(String inputYaml) throws Exception {
     logger.info("Creating domain with yaml, waiting for the script to complete execution");
     return new Domain(inputYaml);
-    /* domain.verifyDomainCreated();
-    return domain; */
+  }
+
+  public static Domain createDomain(Map<String, Object> inputDomainMap) throws Exception {
+    logger.info("Creating domain with Map, waiting for the script to complete execution");
+    return new Domain(inputDomainMap);
   }
 
   public static Map<String, Object> loadYaml(String yamlFile) throws Exception {

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

@@ -2,16 +2,19 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 adminServerName: admin-server
-domainUID: domain3
+domainUID: domainonpvwdt
 clusterName: cluster-1
 configuredManagedServerCount: 4
 initialManagedServerReplicas: 2
 managedServerNameBase: managed-server
 #weblogicDomainStoragePath will be ignored, PV dir will be created at /<baseDir>/<USER>/acceptance_test_pv
 #weblogicDomainStoragePath: /scratch/external-domain-home/pv001/
 exposeAdminT3Channel: true
-t3ChannelPort: 30041
+t3ChannelPort: 30091
 exposeAdminNodePort: true
-adminNodePort: 30703
-namespace: test1
+adminNodePort: 30708
+namespace: test2
 createDomainFilesDir: wdt
+#loadBalancer: APACHE
+#loadBalancerWebPort: 30311
+#loadBalancerDashboardPort: 30321

integration-tests/src/test/resources/domain3.yaml renamed to integration-tests/src/test/resources/DomainOnPVUsingWDT.yaml

@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 adminServerName: admin-server
-domainUID: domain1
+domainUID: domainonpvwlst
 clusterName: cluster-1
 configuredManagedServerCount: 4
 initialManagedServerReplicas: 2
@@ -12,3 +12,4 @@ managedServerNameBase: managed-server
 exposeAdminT3Channel: true
 exposeAdminNodePort: true
 namespace: default
+

integration-tests/src/test/resources/domain1.yaml renamed to integration-tests/src/test/resources/DomainOnPVUsingWLST.yaml

@@ -1,7 +1,7 @@
 # Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
-domainUID: domain12
+domainUID: domainwithsitconfig
 namespace: default
 configuredManagedServerCount: 4
 initialManagedServerReplicas: 2

integration-tests/src/test/resources/domain12.yaml renamed to integration-tests/src/test/resources/DomainWithAutoAndCustomSitConfig.yaml

@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 adminServerName: admin-server
-domainUID: domain6
+domainUID: domainwithadminonly
 clusterName: cluster-1
 configuredManagedServerCount: 4
 initialManagedServerReplicas: 2

integration-tests/src/test/resources/domain6.yaml renamed to integration-tests/src/test/resources/DomainWithServerStartPolicyAsAdminOnly.yaml

@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 adminServerName: admin-server
-domainUID: domain7
+domainUID: domainwithreclaimpolicy
 clusterName: cluster-1
 configuredManagedServerCount: 4
 initialManagedServerReplicas: 2