Merge pull request #873 from oracle/optimize-sitconfig-tests

Optimization and refactoring of java integration tests

Author: rjeberhard

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

@@ -520,8 +520,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

@@ -48,17 +48,17 @@ def getEnvVar(var):
 # Configure the Administration Server
 # ===================================
 cd('/Servers/AdminServer')
-# Give incorrect listenaddress, introspector overrides with sit-config
-set('ListenAddress', '%s-%s' % (domain_uid, admin_server_name_svc))
+# Dont set listenaddress, introspector overrides automatically with sit-config
+#set('ListenAddress', '%s-%s' % (domain_uid, admin_server_name_svc))
 set('ListenPort', admin_port)
 set('Name', admin_server_name)
 
 create('T3Channel', 'NetworkAccessPoint')
 cd('/Servers/%s/NetworkAccessPoints/T3Channel' % admin_server_name)
 set('PublicPort', t3_channel_port)
 set('PublicAddress', 'junkvalue')
-# Give incorrect listenaddress, introspector overrides with sit-config
-set('ListenAddress', '%s-%s' % (domain_uid, admin_server_name_svc))
+# Dont set listenaddress, introspector overrides automatically with sit-config
+#set('ListenAddress', '%s-%s' % (domain_uid, admin_server_name_svc))
 set('ListenPort', t3_channel_port)
 
 cd('/Servers/%s' % admin_server_name)

integration-tests/src/test/resources/domain-home-on-pv/create-domain-custom-sit-config.py renamed to integration-tests/src/test/resources/domain-home-on-pv/create-domain-auto-custom-sit-config.py

@@ -48,17 +48,27 @@ def getEnvVar(var):
 # Configure the Administration Server
 # ===================================
 cd('/Servers/AdminServer')
-set('ListenAddress', '%s-%s' % (domain_uid, admin_server_name_svc))
+# Dont set listenaddress, introspector overrides automatically with sit-config
+#set('ListenAddress', '%s-%s' % (domain_uid, admin_server_name_svc))
 set('ListenPort', admin_port)
 set('Name', admin_server_name)
 
 create('T3Channel', 'NetworkAccessPoint')
 cd('/Servers/%s/NetworkAccessPoints/T3Channel' % admin_server_name)
 set('PublicPort', t3_channel_port)
-set('PublicAddress', t3_public_address)
-set('ListenAddress', '%s-%s' % (domain_uid, admin_server_name_svc))
+set('PublicAddress', 'junkvalue')
+# Dont set listenaddress, introspector overrides automatically with sit-config
+#set('ListenAddress', '%s-%s' % (domain_uid, admin_server_name_svc))
 set('ListenPort', t3_channel_port)
 
+cd('/Servers/%s' % admin_server_name)
+create(admin_server_name,'Log')
+cd('/Servers/%s/Log/%s' % (admin_server_name, admin_server_name))
+# Give incorrect filelog, introspector overrides with sit-config
+set('FileName', 'dirdoesnotexist')
+
+
+
 # Set the admin user's username and password
 # ==========================================
 cd('/Security/%s/User/weblogic' % domain_name)

integration-tests/src/test/resources/domain-home-on-pv/create-domain-auto-sit-config.py

@@ -3,7 +3,7 @@
     <name>admin-server</name>
     <network-access-point>
       <name>T3Channel</name>
-      <public-address f:combine-mode="replace">${secret:domain12-t3publicaddress.hostname}</public-address>
+      <public-address f:combine-mode="replace">${secret:customsitdomain-t3publicaddress.hostname}</public-address>
     </network-access-point>
   </server>
   </domain>