Fix testMiiRemoveTarget by not setting datahome on domain resource (#2307)

vanajamukkara · rjeberhard · web-flow · commit f835f62b7213 · 2021-04-13T08:11:33.000-04:00
* fix changes in model

Co-authored-by: Ryan Eberhard &lt;ryan.eberhard@oracle.com&gt;
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiCustomSslStore.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiCustomSslStore.java
@@ -144,7 +144,8 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
     createDomainResourceWithLogHome(domainUid, domainNamespace,
         MII_BASIC_IMAGE_NAME + ":" + MII_BASIC_IMAGE_TAG,
         adminSecretName, OCIR_SECRET_NAME, encryptionSecretName,
-        replicaCount, pvName, pvcName, "cluster-1", configMapName, null, false, false);
+        replicaCount, pvName, pvcName, "cluster-1", configMapName,
+        null, false, false, false);
 
     // wait for the domain to exist
     logger.info("Check for domain custom resource in namespace {0}", domainNamespace);
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdate.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdate.java
@@ -203,10 +203,14 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
     createJobToChangePermissionsOnPvHostPath(pvName, pvcName, domainNamespace);
 
     // create the domain CR with a pre-defined configmap
+    // setting setDataHome to false, testMiiRemoveTarget fails when data home is set at domain resource level
+    // because of bug OWLS-88679
+    // testMiiRemoveTarget should work fine after the bug is fixed with setDataHome set to true
     createDomainResourceWithLogHome(domainUid, domainNamespace,
         MII_BASIC_IMAGE_NAME + ":" + MII_BASIC_IMAGE_TAG,
         adminSecretName, OCIR_SECRET_NAME, encryptionSecretName,
-        replicaCount, pvName, pvcName, "cluster-1", configMapName, dbSecretName, false, true);
+        replicaCount, pvName, pvcName, "cluster-1", configMapName,
+        dbSecretName, false, true, false);
 
     // wait for the domain to exist
     logger.info("Check for domain custom resource in namespace {0}", domainNamespace);
@@ -457,7 +461,7 @@ public void testMiiAddCluster() {
     }
 
     // Replace contents of an existing configMap with cm config and application target as
-    // there are issues with removing them, https://jira.oraclecorp.com/jira/browse/WDT-535
+    // there are issues with removing them, WDT-535
     replaceConfigMapWithModelFiles(configMapName, domainUid, domainNamespace,
         Arrays.asList(MODEL_DIR + "/model.config.wm.yaml",
             pathToAddClusterYaml.toString()), withStandardRetryPolicy);
@@ -519,7 +523,7 @@ public void testMiiChangeDataSourceParameterWithCommitUpdateAndRoll() {
     LinkedHashMap<String, OffsetDateTime> pods = addDataSourceAndVerify(false);
 
     // Replace contents of an existing configMap with cm config and application target as
-    // there are issues with removing them, https://jira.oraclecorp.com/jira/browse/WDT-535
+    // there are issues with removing them, WDT-535
     replaceConfigMapWithModelFiles(configMapName, domainUid, domainNamespace,
         Arrays.asList(MODEL_DIR + "/model.config.wm.yaml", pathToAddClusterYaml.toString(),
             MODEL_DIR + "/model.update.jdbc2.yaml"), withStandardRetryPolicy);
@@ -610,7 +614,7 @@ public void testMiiDeleteAppChangeDBUrlWithCommitUpdateAndRoll() {
     assertDoesNotThrow(() -> Files.write(pathToUndeployAppYaml, yamlToUndeployApp.getBytes()));
 
     // Replace contents of an existing configMap with cm config and application target as
-    // there are issues with removing them, https://jira.oraclecorp.com/jira/browse/WDT-535
+    // there are issues with removing them, WDT-535
     replaceConfigMapWithModelFiles(configMapName, domainUid, domainNamespace,
         Arrays.asList(MODEL_DIR + "/model.config.wm.yaml", pathToAddClusterYaml.toString(),
             MODEL_DIR + "/model.jdbc2.update2.yaml", pathToUndeployAppYaml.toString()), withStandardRetryPolicy);
@@ -1499,7 +1503,7 @@ private LinkedHashMap<String, OffsetDateTime> addDataSourceAndVerify(boolean int
     }
 
     // Replace contents of an existing configMap with cm config and application target as
-    // there are issues with removing them, https://jira.oraclecorp.com/jira/browse/WDT-535
+    // there are issues with removing them, WDT-535
     replaceConfigMapWithModelFiles(configMapName, domainUid, domainNamespace,
         Arrays.asList(MODEL_DIR + "/model.config.wm.yaml", pathToAddClusterYaml.toString(),
             MODEL_DIR + "/model.jdbc2.yaml"), withStandardRetryPolicy);
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiJmsRecovery.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiJmsRecovery.java
@@ -186,7 +186,8 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
     createDomainResourceWithLogHome(domainUid, domainNamespace,
         MII_BASIC_IMAGE_NAME + ":" + MII_BASIC_IMAGE_TAG,
         adminSecretName, OCIR_SECRET_NAME, encryptionSecretName,
-        replicaCount, pvName, pvcName, "cluster-1", configMapName, dbSecretName, false, false);
+        replicaCount, pvName, pvcName, "cluster-1", configMapName,
+        dbSecretName, false, false, true);
 
     // wait for the domain to exist
     logger.info("Check for domain custom resource in namespace {0}", domainNamespace);
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/CommonMiiTestUtils.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/CommonMiiTestUtils.java
@@ -259,6 +259,7 @@ public static Domain createDomainResource(
    * @param dbSecretName name of the Secret for WebLogic configuration overrides
    * @param allowReplicasBelowMinDynClusterSize whether to allow scaling below min dynamic cluster size
    * @param onlineUpdateEnabled whether to enable onlineUpdate feature for mii dynamic update
+   * @param setDataHome whether to set data home at domain resource
    * @return domain object of the domain resource
    */
   public static Domain createDomainResourceWithLogHome(
@@ -275,69 +276,74 @@ public static Domain createDomainResourceWithLogHome(
       String configMapName,
       String dbSecretName,
       boolean allowReplicasBelowMinDynClusterSize,
-      boolean onlineUpdateEnabled) {
+      boolean onlineUpdateEnabled,
+      boolean setDataHome) {
     LoggingFacade logger = getLogger();
 
     List<String> securityList = new ArrayList<>();
     if (dbSecretName != null) {
       securityList.add(dbSecretName);
     }
 
+    DomainSpec domainSpec = new DomainSpec()
+        .domainUid(domainResourceName)
+        .domainHomeSourceType("FromModel")
+        .allowReplicasBelowMinDynClusterSize(allowReplicasBelowMinDynClusterSize)
+        .image(imageName)
+        .addImagePullSecretsItem(new V1LocalObjectReference()
+            .name(repoSecretName))
+        .webLogicCredentialsSecret(new V1SecretReference()
+            .name(adminSecretName)
+            .namespace(domNamespace))
+        .includeServerOutInPodLog(true)
+        .logHomeEnabled(Boolean.TRUE)
+        .logHome("/shared/logs")
+        .serverStartPolicy("IF_NEEDED")
+        .serverPod(new ServerPod()
+            .addEnvItem(new V1EnvVar()
+                .name("JAVA_OPTIONS")
+                .value("-Dweblogic.security.SSL.ignoreHostnameVerification=true"))
+            .addEnvItem(new V1EnvVar()
+                .name("USER_MEM_ARGS")
+                .value("-Djava.security.egd=file:/dev/./urandom "))
+            .addVolumesItem(new V1Volume()
+                .name(pvName)
+                .persistentVolumeClaim(new V1PersistentVolumeClaimVolumeSource()
+                    .claimName(pvcName)))
+            .addVolumeMountsItem(new V1VolumeMount()
+                .mountPath("/shared")
+                .name(pvName)))
+        .adminServer(new AdminServer()
+            .serverStartState("RUNNING")
+            .adminService(new AdminService()
+                .addChannelsItem(new Channel()
+                    .channelName("default")
+                    .nodePort(0))))
+        .addClustersItem(new Cluster()
+            .clusterName(clusterName)
+            .replicas(replicaCount)
+            .serverStartState("RUNNING"))
+        .configuration(new Configuration()
+            .secrets(securityList)
+            .model(new Model()
+                .domainType("WLS")
+                .configMap(configMapName)
+                .runtimeEncryptionSecret(encryptionSecretName)
+                .onlineUpdate(new OnlineUpdate()
+                    .enabled(onlineUpdateEnabled)))
+            .introspectorJobActiveDeadlineSeconds(300L));
+
+    if (setDataHome) {
+      domainSpec.dataHome("/shared/data");
+    }
     // create the domain CR
     Domain domain = new Domain()
         .apiVersion(DOMAIN_API_VERSION)
         .kind("Domain")
         .metadata(new V1ObjectMeta()
             .name(domainResourceName)
             .namespace(domNamespace))
-        .spec(new DomainSpec()
-            .domainUid(domainResourceName)
-            .domainHomeSourceType("FromModel")
-            .allowReplicasBelowMinDynClusterSize(allowReplicasBelowMinDynClusterSize)
-            .image(imageName)
-            .addImagePullSecretsItem(new V1LocalObjectReference()
-                .name(repoSecretName))
-            .webLogicCredentialsSecret(new V1SecretReference()
-                .name(adminSecretName)
-                .namespace(domNamespace))
-            .includeServerOutInPodLog(true)
-            .logHomeEnabled(Boolean.TRUE)
-            .logHome("/shared/logs")
-            .dataHome("/shared/data")
-            .serverStartPolicy("IF_NEEDED")
-            .serverPod(new ServerPod()
-                .addEnvItem(new V1EnvVar()
-                    .name("JAVA_OPTIONS")
-                    .value("-Dweblogic.security.SSL.ignoreHostnameVerification=true"))
-                .addEnvItem(new V1EnvVar()
-                    .name("USER_MEM_ARGS")
-                    .value("-Djava.security.egd=file:/dev/./urandom "))
-                .addVolumesItem(new V1Volume()
-                    .name(pvName)
-                    .persistentVolumeClaim(new V1PersistentVolumeClaimVolumeSource()
-                        .claimName(pvcName)))
-                .addVolumeMountsItem(new V1VolumeMount()
-                    .mountPath("/shared")
-                    .name(pvName)))
-            .adminServer(new AdminServer()
-                .serverStartState("RUNNING")
-                .adminService(new AdminService()
-                    .addChannelsItem(new Channel()
-                        .channelName("default")
-                        .nodePort(0))))
-            .addClustersItem(new Cluster()
-                .clusterName(clusterName)
-                .replicas(replicaCount)
-                .serverStartState("RUNNING"))
-            .configuration(new Configuration()
-                .secrets(securityList)
-                .model(new Model()
-                    .domainType("WLS")
-                    .configMap(configMapName)
-                    .runtimeEncryptionSecret(encryptionSecretName)
-                    .onlineUpdate(new OnlineUpdate()
-                        .enabled(onlineUpdateEnabled)))
-                .introspectorJobActiveDeadlineSeconds(300L)));
+        .spec(domainSpec);
 
     logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
         domainResourceName, domNamespace);
