Merge pull request #996 from oracle/sitConfigMS

Sit config ms

Author: rjeberhard

integration-tests/USECASES.MD

@@ -74,9 +74,11 @@ Basic Use Cases described above are verified in all the domain configurations. A
 | Server pods restarted by changing includeServerOutInPodLog | Verify admin and managed server pods being restarted by property change: includeServerOutInPodLog: true --> includeServerOutInPodLog: false |
 | Server pods restarted by changing logHomeEnable | Verify admin and managed server pods being restarted by property change: logHomeEnabled: true --> logHomeEnabled: false |
 
-| Overrides | Usecase |
+Configuration Overrides Usecases
+
+| Override | Usecase |
 | --- | --- |
-| 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 |
+| Configuration override | Override the administration server  `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 dynamic cluster server template's `max-message-size` is overridden for managed servers. 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.  |

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

@@ -112,12 +112,13 @@ public static void staticUnPrepare() throws Exception {
   }
 
   /**
-   * This test covers custom configuration override use cases for config.xml.
+   * This test covers custom configuration override use cases for config.xml for administration
+   * server.
    *
    * <p>The test checks the overridden config.xml attributes connect-timeout, max-message-size,
    * restart-max, JMXCore and ServerLifeCycle debug flags, the T3Channel public address. The
-   * overridden are verified against the ServerConfig MBean tree. It does not verifies whether the
-   * overridden values are applied to the runtime.
+   * overridden values are verified against the ServerConfig MBean tree. It does not verifies
+   * whether the overridden values are applied to the runtime.
    *
    * @throws Exception when the assertion fails due to unmatched values
    */
@@ -142,6 +143,36 @@ public void testCustomSitConfigOverridesForDomain() throws Exception {
     logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
   }
 
+  /**
+   * This test covers custom configuration override use cases for config.xml for managed server.
+   *
+   * <p>The test checks the overridden config.xml server template attribute max-message-size. The
+   * overridden values are verified against the ServerConfig MBean tree. It does not verifies
+   * whether the overridden values are applied to the runtime.
+   *
+   * @throws Exception when the assertion fails due to unmatched values
+   */
+  @Test
+  public void testCustomSitConfigOverridesForDomainMS() throws Exception {
+    Assume.assumeFalse(QUICKTEST);
+    boolean testCompletedSuccessfully = false;
+    String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
+    logTestBegin(testMethod);
+    ExecResult result =
+        TestUtils.exec(
+            KUBE_EXEC_CMD
+                + " 'sh runSitConfigTests.sh "
+                + fqdn
+                + " "
+                + T3CHANNELPORT
+                + " weblogic welcome1 "
+                + testMethod
+                + " managed-server1'");
+    assertResult(result);
+    testCompletedSuccessfully = true;
+    logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
+  }
+
   /**
    * This test covers custom resource override use cases for JDBC resource.
    *

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

@@ -14,4 +14,8 @@
             <d:public-address f:combine-mode="replace">${secret:customsitconfigdomain-test-secrets.hostname}</d:public-address>
         </d:network-access-point>
     </d:server>
+    <d:server-template>
+        <d:name>cluster-1-template</d:name>
+        <d:max-message-size f:combine-mode="add">77777777</d:max-message-size>
+    </d:server-template>
 </d:domain>

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

@@ -68,8 +68,8 @@ public class SitConfigTests {
   private ServerRuntimeMBean serverRuntime;
   private static final String JNDI = "/jndi/";
 
-  private final String adminHost;
-  private final String adminPort;
+  private String adminHost;
+  private String adminPort;
   private final String adminUser;
   private final String adminPassword;
 
@@ -109,6 +109,14 @@ public static void main(String args[]) throws Exception {
       test.verifyT3ChannelPublicPort(30091);
     }
 
+    if (testName.equals("testCustomSitConfigOverridesForDomainMS")) {
+      // the values passed to these verify methods are the attribute values overrrideen in the
+      // config.xml. These are just randomly chosen attributes and values to override
+      String serverName = args[5];
+      test.connectToManagedServer(serverName);
+      test.verifyMaxMessageSize(77777777);
+    }
+
     if (testName.equals("testCustomSitConfigOverridesForJdbc")) {
       String JDBC_URL = args[5];
       test.testSystemResourcesJDBCAttributeChange("JdbcTestDataSource-0", JDBC_URL);
@@ -574,6 +582,28 @@ protected WLDFSystemResourceMBean getWLDFSystemModule(String resourceName) {
     return wldfResource;
   }
 
+  /**
+   * Looks up the managed server public listen address and port, closes the existing MBeanServer
+   * connection to admin server and creates MBeanServer connection to the given managed server
+   *
+   * @param serverName name of the managed server to which to create MBeanServerConnection
+   * @throws Exception when connection close fails or when new connection to managed server fails.
+   */
+  private void connectToManagedServer(String serverName) throws Exception {
+    ServerMBean[] servers = runtimeServiceMBean.getDomainConfiguration().getServers();
+    try {
+      for (ServerMBean server : servers) {
+        if (server.getName().equals(serverName)) {
+          adminHost = server.getListenAddress();
+          adminPort = String.valueOf(server.getListenPort());
+        }
+      }
+    } finally {
+      jmxConnector.close();
+      createConnections();
+    }
+  }
+
   /**
    * Prints message in standard out. Short name method to System.out.println.
    *