changes for Ryan's review feedback

Author: sankarpn

integration-tests/README.md

@@ -78,12 +78,12 @@ Basic Use Cases described above are verified in all the domain configurations. A
 | Two Operators using same target domains namespace | create chart using target domains namespace as already running first operator, verify that deployment fails with expected error |
 | Operator Helm Chart using not preexisted target domains namespace | create chart using not preexisted target domains namespace as already running first operator, verify that deployment fails with expected error |
 
-Situational Configuration Override Usecases
+Configuration Overrides Usecases
 
 | Override | Usecase |
 | --- | --- |
-| Domain override | Override the admin server properties connect-timeout, max-message-size, restart-max, JMXCore and Serverlifecycle 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/pass by getting the data source connection and verifies the db name it is connected to. |
+| Domain override | Override the administration server properties connect-timeout, max-message-size, restart-max, JMXCore and Serverlifecycle 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/pass by getting the data source connection and verifies the DB name 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 deliver failure parameters, redelivery limit and expiration policy. |
 | WLDF Resource Override | Override instrumentation monitors and harvesters 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.  |
 

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

@@ -2,8 +2,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>
         <d:name>admin-server</d:name>
-        <d:connect-timeout f:combine-mode="add">12</d:connect-timeout>
-        <d:restart-max f:combine-mode="add">22</d:restart-max>
+        <d:connect-timeout f:combine-mode="add">120</d:connect-timeout>
+        <d:restart-max f:combine-mode="add">5</d:restart-max>
         <d:max-message-size f:combine-mode="add">78787878</d:max-message-size>
         <d:server-debug f:combine-mode="add">
             <d:debug-server-life-cycle f:combine-mode="add">true</d:debug-server-life-cycle>

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

@@ -69,7 +69,6 @@ public static void main(String args[]) throws Exception {
     String testName = args[4];
 
     SitConfigTests test = new SitConfigTests(adminHost, adminPort, adminUser, adminPassword);
-    // SitConfigTests test = new SitConfigTests("slc11vjg", "30051", "weblogic", "welcome1");
 
     ServerRuntimeMBean runtimeMBean = test.runtimeServiceMBean.getServerRuntime();
     println("Sitconfig State:" + runtimeMBean.isInSitConfigState());
@@ -78,8 +77,8 @@ public static void main(String args[]) throws Exception {
       test.verifyDebugFlagJMXCore(true);
       test.verifyDebugFlagServerLifeCycle(true);
       test.verifyMaxMessageSize(78787878);
-      test.verifyConnectTimeout(12);
-      test.verifyRestartMax(22);
+      test.verifyConnectTimeout(120);
+      test.verifyRestartMax(5);
       test.verifyT3ChannelPublicAddress(adminHost);
       test.verifyT3ChannelPublicPort(30091);
     }
@@ -302,24 +301,13 @@ public void testSystemResourcesJDBCAttributeChange(String jdbcResourceName) {
         : "Didn't get the expected value "
             + inactiveConnectionTimeoutSeconds
             + " for inactiveConnectionTimeoutSeconds";
-    // testMaxPoolSize(resourceName, jcpb.getMaxCapacity());
 
     // Assert the jdbc driver param properties
     JDBCDriverParamsBean jdbcDriverParams = jdbcDataSourceBean.getJDBCDriverParams();
     println("Data Source URL:" + jdbcDriverParams.getUrl());
     assert dsUrl.equals(jdbcDriverParams.getUrl())
         : "Didn't get the expected url for datasource " + dsUrl;
 
-    // println("jdbcDriverParams.getPasswordEncrypted()" +
-    // jdbcDriverParams.getPasswordEncrypted()[0]);
-    // Assert datasource user property
-    /*
-    JDBCPropertiesBean properties = jdbcDriverParams.getProperties();
-    JDBCPropertyBean[] properties1 = properties.getProperties();
-    for (JDBCPropertyBean jDBCPropertyBean : properties1) {
-        println(jDBCPropertyBean.getName());
-    }
-     */
     // Assert datasource is working with overiridden value
     DataSource dataSource = getDataSource("jdbc/" + jdbcResourceName);
 
@@ -333,26 +321,6 @@ public void testSystemResourcesJDBCAttributeChange(String jdbcResourceName) {
         println("HOST_NAME:" + rs.getString("HOST_NAME"));
         assert dbHostName.equals(rs.getString("HOST_NAME"));
       }
-      /*
-      ResultSetMetaData meta = rs.getMetaData();
-      int colCount = meta.getColumnCount();
-      println(colCount + "");
-      for (int col = 1; col <= colCount; col++) {
-          System.out.print(meta.getColumnName(col) + " ");
-      }
-      println("");
-      while (rs.next()) {
-          println("INSTANCE_NAME:" + rs.getString("INSTANCE_NAME"));
-          println("HOST_NAME:" + rs.getString("HOST_NAME"));
-          for (int col = 1; col <= colCount; col++) {
-              Object value = rs.getObject(col);
-              if (value != null) {
-                  System.out.print("@" + value.toString() + "@ ");
-              }
-          }
-          println("");
-      }
-       */
     } catch (SQLException ex) {
       Logger.getLogger(SitConfigTests.class.getName()).log(Level.SEVERE, null, ex);
     }