addressed all the review comments

Author: sankarpn

integration-tests/README.md

@@ -85,7 +85,7 @@ Configuration Overrides Usecases
 | Configuration override | Override the administration server properties `connect-timeout`, `max-message-size`, `restart-max`, `debug-server-life-cycle` and `debug-jmx-core` debug flags. Also T3Channel public address using Kubernetes secret. The override is verified by JMX client connecting to the serverConfig MBean tree and the values are checked against the expected values. The test client connects to the overridden T3 public address and port to connect to the MBean servers |
 | JDBC Resource Override | Override JDBC connection pool properties; `initialCapacity`, `maxCapacity`, `test-connections-on-reserve`, `connection-harvest-max-count`, `inactive-connection-timeout-seconds`. Override the JDBC driver parameters like data source `URL`, `DB` `user` and `password` using kubernetes secret. The test verifies the overridden functionality datasource `URL`, `user`, `password` by getting the data source connection and running DDL statement it is connected to. |
 | JMS Resource Override | Override UniformDistributedTopic Delivery Failure Parameters, `redelivery-limit` and `expiration-policy`. The JMX test client verifies the serverConfig MBean tree for the expected delivery failure parameters, `redelivery-limit` and `expiration-policy`. |
-| WLDF Resource Override | Override `wldf-instrumentation-monitor` and `harvester` in a diagnostics module. The test client verifies the new instrumentation monitors / harvesters set by getting the WLDF resource from serverConfig tree with expected values.  |
+| WLDF Resource Override | Override `wldf-instrumentation-monitor` and `harvester` in a diagnostics module. The test client verifies the new instrumentation monitors/harvesters set by getting the WLDF resource from serverConfig tree with expected values.  |
 
 # Directory Configuration and Structure
 

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

@@ -12,7 +12,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.Map;
 import java.util.logging.Level;
 import oracle.kubernetes.operator.utils.Domain;
 import oracle.kubernetes.operator.utils.ExecResult;
@@ -24,6 +24,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+/** JUnit test class used for testing configuration override use cases. */
 public class ITSitConfig extends BaseTest {
 
   private static String TESTSCRIPTDIR;
@@ -35,7 +36,6 @@ public class ITSitConfig extends BaseTest {
   private static String fqdn;
   private static String JDBC_URL;
   private static String KUBE_EXEC_CMD;
-
   private static Domain domain;
   private static Operator operator1;
 
@@ -94,16 +94,11 @@ public static void staticPrepare() throws Exception {
   @AfterClass
   public static void staticUnPrepare() throws Exception {
     if (!QUICKTEST) {
-      logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
-      logger.info("BEGIN");
-      logger.info("Run once, release cluster lease");
-
       destroySitConfigDomain();
       tearDown();
       ExecResult result =
           TestUtils.exec(
               "kubectl delete -f " + TESTSCRIPTDIR + "/sitconfig/mysql/mysql-dbservices.yml");
-      logger.info("SUCCESS");
     }
   }
 

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

@@ -1283,8 +1283,7 @@ private void initialize(Map<String, Object> inputDomainMap) throws Exception {
               + domainNS
               + " create secret generic "
               + domainUid
-              + "-"
-              + "test-secrets"
+              + "-test-secrets"
               + " --from-literal=hostname="
               + TestUtils.getHostName()
               + " --from-literal=dbusername=root"

integration-tests/src/test/resources/sitconfig/configoverrides/config.xml

@@ -1,3 +1,6 @@
+<!-- Copyright 2019, 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. -->
 <?xml version='1.0' encoding='UTF-8'?>
 <d:domain xmlns:d="http://xmlns.oracle.com/weblogic/domain" xmlns:f="http://xmlns.oracle.com/weblogic/domain-fragment" xmlns:s="http://xmlns.oracle.com/weblogic/situational-config" >
     <d:server>

integration-tests/src/test/resources/sitconfig/configoverrides/diagnostics-WLDF-MODULE-0.xml

@@ -1,3 +1,6 @@
+<!-- Copyright 2019, 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. -->
 <?xml version='1.0' encoding='UTF-8'?>
 <wldf:wldf-resource
     xmlns:wldf="http://xmlns.oracle.com/weblogic/weblogic-diagnostics"

integration-tests/src/test/resources/sitconfig/configoverrides/jdbc-JdbcTestDataSource-0.xml

@@ -1,3 +1,6 @@
+<!-- Copyright 2019, 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. -->
 <?xml version='1.0' encoding='UTF-8'?>
 <jdbc:jdbc-data-source
     xmlns:jdbc="http://xmlns.oracle.com/weblogic/jdbc-data-source"

integration-tests/src/test/resources/sitconfig/configoverrides/jms-ClusterJmsSystemResource.xml

@@ -1,3 +1,6 @@
+<!-- Copyright 2019, 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. -->
 <?xml version='1.0' encoding='UTF-8'?>
 <jms:weblogic-jms
     xmlns:jms="http://xmlns.oracle.com/weblogic/weblogic-jms"

integration-tests/src/test/resources/sitconfig/java/SitConfigTests.java

@@ -1,4 +1,4 @@
-// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2019, 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.
 package oracle.kubernetes.operator;
@@ -8,11 +8,13 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.*;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.management.MBeanServerConnection;
+import javax.management.MBeanServerInvocationHandler;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.management.remote.JMXConnector;
@@ -29,7 +31,13 @@
 import weblogic.j2ee.descriptor.wl.JDBCDriverParamsBean;
 import weblogic.j2ee.descriptor.wl.JMSBean;
 import weblogic.j2ee.descriptor.wl.UniformDistributedTopicBean;
-import weblogic.management.configuration.*;
+import weblogic.management.configuration.DomainMBean;
+import weblogic.management.configuration.JDBCSystemResourceMBean;
+import weblogic.management.configuration.JMSSystemResourceMBean;
+import weblogic.management.configuration.NetworkAccessPointMBean;
+import weblogic.management.configuration.ServerDebugMBean;
+import weblogic.management.configuration.ServerMBean;
+import weblogic.management.configuration.WLDFSystemResourceMBean;
 import weblogic.management.jmx.MBeanServerInvocationHandler;
 import weblogic.management.mbeanservers.domainruntime.DomainRuntimeServiceMBean;
 import weblogic.management.mbeanservers.edit.ConfigurationManagerMBean;
@@ -84,6 +92,7 @@ public class SitConfigTests {
    * @throws Exception
    */
   public static void main(String args[]) throws Exception {
+
     String adminHost = args[0];
     String adminPort = args[1];
     String adminUser = args[2];
@@ -106,13 +115,16 @@ public static void main(String args[]) throws Exception {
       test.verifyT3ChannelPublicAddress(adminHost);
       test.verifyT3ChannelPublicPort(30091);
     }
+
     if (testName.equals("testCustomSitConfigOverridesForJdbc")) {
       String JDBC_URL = args[5];
       test.testSystemResourcesJDBCAttributeChange("JdbcTestDataSource-0", JDBC_URL);
     }
+
     if (testName.equals("testCustomSitConfigOverridesForJms")) {
       test.testSystemResourcesJMSAttributeChange();
     }
+
     if (testName.equals("testCustomSitConfigOverridesForWldf")) {
       test.testSystemResourcesWLDFAttributeAdd();
     }
@@ -214,6 +226,7 @@ private MBeanServerConnection lookupMBeanServerConnection(
     if (mBeanServerConnection == null) {
       throw new Exception("MBean server connection is null");
     }
+
     return mBeanServerConnection;
   }
 
@@ -287,6 +300,7 @@ protected void verifyT3ChannelPublicAddress(String expectedValue) {
     boolean got = false;
     ServerMBean serverMBean = getServerMBean();
     NetworkAccessPointMBean[] networkAccessPoints = serverMBean.getNetworkAccessPoints();
+
     for (NetworkAccessPointMBean networkAccessPoint : networkAccessPoints) {
       if (networkAccessPoint.getName().equals("T3Channel")) {
         assert expectedValue.equals(networkAccessPoint.getPublicAddress())
@@ -303,6 +317,7 @@ protected void verifyT3ChannelPublicPort(int expectedValue) {
     boolean got = false;
     ServerMBean serverMBean = getServerMBean();
     NetworkAccessPointMBean[] networkAccessPoints = serverMBean.getNetworkAccessPoints();
+
     for (NetworkAccessPointMBean networkAccessPoint : networkAccessPoints) {
       if (networkAccessPoint.getName().equals("T3Channel")) {
         assert expectedValue == networkAccessPoint.getPublicPort()

integration-tests/src/test/resources/sitconfig/scripts/create-domain-auto-custom-sit-config20.py

@@ -17,7 +17,6 @@ def createWLDFSystemResource(sysName, sysTarget):
 def createJMSSystemResource(sysResTarget):
     filestore = 'ClusterFileStore'
     jmsserver = 'ClusterJmsServer'
-    #sysResTarget='mycluster'
 
     jmsmodule = 'ClusterJmsSystemResource'
     subdeployment = 'ClusterSubDeployment'
@@ -51,7 +50,6 @@ def createJMSSystemResource(sysResTarget):
     cd('/JMSSystemResource/' + jmsmodule + '/JmsResource/NO_NAME_0')
     myt = create(urt, 'UniformDistributedTopic')
     myt.setJNDIName('jms/' + urt)
-    #myt.setSubDeploymentName(subdeployment)
     myt.setDefaultTargetingEnabled(true)
 
     cd('UniformDistributedTopic/' + urt)
@@ -149,23 +147,21 @@ def createDataSource(dsName, dsJNDI, dsUrl, dsUser, dsPassword, dsTarget):
 # Configure the Administration Server
 # ===================================
 cd('/Servers/AdminServer')
-# Dont set listenaddress, introspector overrides automatically with sit-config
-#set('ListenAddress', '%s-%s' % (domain_uid, admin_server_name_svc))
+# Dont set listenaddress, introspector overrides automatically with config override
 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')
-# Dont set listenaddress, introspector overrides automatically with sit-config
-#set('ListenAddress', '%s-%s' % (domain_uid, admin_server_name_svc))
+# Dont set listenaddress, introspector overrides automatically with config override
 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
+# Give incorrect filelog, introspector overrides with config override
 set('FileName', 'dirdoesnotexist')
 
 
@@ -226,7 +222,6 @@ def createDataSource(dsName, dsJNDI, dsUrl, dsUser, dsPassword, dsTarget):
     set('DynamicClusterSize', number_of_ms)
     set('MaxDynamicClusterSize', number_of_ms)
     set('CalculatedListenPorts', false)
-    # set('Id', 1)
 
     print('Done setting attributes for Dynamic Cluster: %s' % cluster_name);
 
@@ -235,7 +230,6 @@ def createDataSource(dsName, dsJNDI, dsUrl, dsUser, dsPassword, dsTarget):
 createWLDFSystemResource("WLDF-MODULE-0", admin_server_name)
 
 # Write Domain
-# ============
 writeDomain(domain_path)
 closeTemplate()
 print 'Domain Created'
@@ -253,5 +247,4 @@ def createDataSource(dsName, dsJNDI, dsUrl, dsUser, dsPassword, dsTarget):
 print 'Done'
 
 # Exit WLST
-# =========
 exit()