ItMiiDynamicUpdate - maintain model changes in the tests (#2304)

* fix changes in model

Author: vanajamukkara

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdate.java

@@ -129,6 +129,7 @@ class ItMiiDynamicUpdate {
   private final String workManagerName = "newWM";
   private static Path pathToChangeTargetYaml = null;
   private static Path pathToAddClusterYaml = null;
+  private static Path pathToChangReadsYaml = null;
   private static LoggingFacade logger = null;
 
   /**
@@ -246,6 +247,14 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
         + "            ListenPort : 8001";
 
     assertDoesNotThrow(() -> Files.write(pathToAddClusterYaml, yamlToAddCluster.getBytes()));
+
+    // write sparse yaml to change ScatteredReadsEnabled for adminserver
+    pathToChangReadsYaml = Paths.get(WORK_DIR + "/changereads.yaml");
+    String yamlToChangeReads = "topology:\n"
+        + "    Server:\n"
+        + "        \"admin-server\":\n"
+        + "            ScatteredReadsEnabled: true";
+    assertDoesNotThrow(() -> Files.write(pathToChangReadsYaml, yamlToChangeReads.getBytes()));
   }
 
   /**
@@ -910,14 +919,6 @@ public void testOnNonDynamicChangesCommitUpdateOnly() {
     // BeforeEach method ensures that the server pods are running
     LinkedHashMap<String, OffsetDateTime> pods = addDataSourceAndVerify(false);
 
-    // write sparse yaml to change ScatteredReadsEnabled for adminserver
-    Path pathToChangReadsYaml = Paths.get(WORK_DIR + "/changereads.yaml");
-    String yamlToChangeReads = "topology:\n"
-        + "    Server:\n"
-        + "        \"admin-server\":\n"
-        + "            ScatteredReadsEnabled: true";
-    assertDoesNotThrow(() -> Files.write(pathToChangReadsYaml, yamlToChangeReads.getBytes()));
-
     // make two non-dynamic changes, add  datasource JDBC driver params and change scatteredreadenabled
     replaceConfigMapWithModelFiles(configMapName, domainUid, domainNamespace,
         Arrays.asList(MODEL_DIR + "/model.config.wm.yaml", pathToAddClusterYaml.toString(),
@@ -1052,7 +1053,8 @@ public void testMiiUpdateDynamicClusterSize() {
     // after the cluster is scaled.
     replaceConfigMapWithModelFiles(configMapName, domainUid, domainNamespace,
         Arrays.asList(MODEL_DIR + "/model.config.wm.yaml", pathToAddClusterYaml.toString(),
-            MODEL_DIR + "/model.jdbc2.yaml", MODEL_DIR + "/model.cluster.size.yaml"), withStandardRetryPolicy);
+            MODEL_DIR + "/model.jdbc2.updatejdbcdriverparams.yaml", pathToChangReadsYaml.toString(),
+            MODEL_DIR + "/model.cluster.size.yaml"), withStandardRetryPolicy);
 
     // Patch a running domain with introspectVersion.
     String introspectVersion = patchDomainResourceWithNewIntrospectVersion(domainUid, domainNamespace);
@@ -1158,7 +1160,8 @@ public void testMiiRemoveTarget() {
     // Replace contents of an existing configMap
     replaceConfigMapWithModelFiles(configMapName, domainUid, domainNamespace,
         Arrays.asList(MODEL_DIR + "/model.config.wm.yaml", pathToAddClusterYaml.toString(),
-            MODEL_DIR + "/model.jdbc2.yaml", MODEL_DIR + "/model.cluster.size.yaml",
+            MODEL_DIR + "/model.jdbc2.updatejdbcdriverparams.yaml",
+            pathToChangReadsYaml.toString(), MODEL_DIR + "/model.cluster.size.yaml",
             pathToRemoveTargetYaml.toString()), withStandardRetryPolicy);
 
     // Patch a running domain with introspectVersion.

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/CommonMiiTestUtils.java

@@ -57,6 +57,7 @@
 import static oracle.weblogic.kubernetes.actions.TestActions.createSecret;
 import static oracle.weblogic.kubernetes.actions.TestActions.deleteConfigMap;
 import static oracle.weblogic.kubernetes.actions.TestActions.getJob;
+import static oracle.weblogic.kubernetes.actions.TestActions.getPod;
 import static oracle.weblogic.kubernetes.actions.TestActions.getPodLog;
 import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
 import static oracle.weblogic.kubernetes.actions.TestActions.listPods;
@@ -752,6 +753,20 @@ public static void verifyIntrospectorRuns(String domainUid, String domainNamespa
     logger.info("Verifying introspector pod is created, runs and deleted");
     String introspectJobName = getIntrospectJobName(domainUid);
     checkPodExists(introspectJobName, domainUid, domainNamespace);
+
+    String labelSelector = String.format("weblogic.domainUID in (%s)", domainUid);
+    V1Pod introspectorPod = assertDoesNotThrow(() -> getPod(domainNamespace, labelSelector, introspectJobName),
+        "Could not get introspector pod");
+    assertTrue(introspectorPod != null && introspectorPod.getMetadata() != null,
+        "introspector pod or metadata is null");
+    try {
+      String introspectorLog = getPodLog(introspectorPod.getMetadata().getName(), domainNamespace);
+      logger.info("Introspector pod log START");
+      logger.info(introspectorLog);
+      logger.info("Introspector pod log END");
+    } catch (Exception ex) {
+      logger.info("Failed to get introspector pod log", ex);
+    }
     checkPodDoesNotExist(introspectJobName, domainUid, domainNamespace);
   }