Add a cluster to the existing JRF domain and update the introspectVersion to trigger the introspection

Author: maggiehe00

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

@@ -10,10 +10,16 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
+import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.openapi.ApiException;
+import io.kubernetes.client.openapi.models.V1ConfigMap;
+import io.kubernetes.client.openapi.models.V1ObjectMeta;
+import oracle.weblogic.domain.ClusterResource;
 import oracle.weblogic.domain.DomainCreationImage;
 import oracle.weblogic.domain.DomainResource;
 import oracle.weblogic.kubernetes.actions.impl.primitive.HelmParams;
@@ -22,6 +28,7 @@
 import oracle.weblogic.kubernetes.annotations.Namespaces;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
 import oracle.weblogic.kubernetes.utils.ExecResult;
+import org.awaitility.core.ConditionFactory;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.MethodOrderer;
@@ -42,10 +49,17 @@
 import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
+import static oracle.weblogic.kubernetes.actions.TestActions.createConfigMap;
 import static oracle.weblogic.kubernetes.actions.TestActions.deletePod;
 import static oracle.weblogic.kubernetes.actions.TestActions.getOperatorPodName;
+import static oracle.weblogic.kubernetes.actions.TestActions.patchDomainCustomResource;
+import static oracle.weblogic.kubernetes.actions.TestActions.patchDomainResourceWithNewIntrospectVersion;
 import static oracle.weblogic.kubernetes.utils.AuxiliaryImageUtils.createAndPushAuxiliaryImage;
+import static oracle.weblogic.kubernetes.utils.ClusterUtils.createClusterAndVerify;
+import static oracle.weblogic.kubernetes.utils.ClusterUtils.createClusterResource;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.addSccToDBSvcAccount;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createCustomConditionFactory;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
@@ -63,9 +77,11 @@
 import static oracle.weblogic.kubernetes.utils.FmwUtils.verifyDomainReady;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
+import static oracle.weblogic.kubernetes.utils.JobUtils.getIntrospectJobName;
 import static oracle.weblogic.kubernetes.utils.OKDUtils.createRouteForOKD;
 import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
 import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodDoesNotExist;
+import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodExists;
 import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodLogContains;
 import static oracle.weblogic.kubernetes.utils.PodUtils.getExternalServicePodName;
 import static oracle.weblogic.kubernetes.utils.SecretUtils.createOpsswalletFileSecretWithoutFile;
@@ -697,6 +713,126 @@ void testFmwDomainOnPVwithProvidedOpss() {
     }
   }
 
+  /**
+   * User creates RCU, Operate creates PV/PVC and FMW domain.
+   * Add a cluster to the domain and update the introspectVersion to trigger the introspection
+   * Verify Operator starts the servers in the new cluster.
+   */
+  @Test
+  @Order(8)
+  @DisplayName("Create a FMW domain on PV with adding new cluster")
+  void testFmwDomainOnPvUserWithAddedCluster() {
+    String domainUid = "jrfdomainonpv-userrcu7";
+    String adminSecretName = domainUid + "-weblogic-credentials";
+    String rcuaccessSecretName = domainUid + "-rcu-credentials";
+    String opsswalletpassSecretName = domainUid + "-opss-wallet-password-secret";
+    String configMapName = domainUid + "-configmap";
+    String cluster2Res   = domainUid + "-cluster-2";
+    String cluster2Name  = "cluster-2";
+    int replicaCluster2 = 2;
+    String managedServer2Prefix = domainUid + "-c2-managed-server";
+    final String pvName = getUniqueName(domainUid + "-pv-");
+    final String pvcName = getUniqueName(domainUid + "-pvc-");
+
+    //create RCU schema
+    assertDoesNotThrow(() -> createRcuSchema(FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX + "7",
+        dbUrl, dbNamespace), "create RCU schema failed");
+
+    // create a model property file
+    File fmwModelPropFile = createWdtPropertyFile(domainUid, RCUSCHEMAPREFIX + "7");
+
+    // Create the repo secret to pull the image
+    // this secret is used only for non-kind cluster
+    createTestRepoSecret(domainNamespace);
+
+    // create secret for admin credentials
+    logger.info("Create secret for admin credentials");
+    assertDoesNotThrow(() -> createSecretWithUsernamePassword(
+        adminSecretName,
+        domainNamespace,
+        ADMIN_USERNAME_DEFAULT,
+        ADMIN_PASSWORD_DEFAULT),
+        String.format("createSecret failed for %s", adminSecretName));
+
+    // create RCU access secret
+    logger.info("Creating RCU access secret: {0}, with prefix: {1}, dbUrl: {2}, schemapassword: {3})",
+        rcuaccessSecretName, RCUSCHEMAPREFIX + "7", RCUSCHEMAPASSWORD, dbUrl);
+    assertDoesNotThrow(() -> createRcuAccessSecret(
+        rcuaccessSecretName,
+        domainNamespace,
+        RCUSCHEMAPREFIX + "7",
+        RCUSCHEMAPASSWORD,
+        dbUrl),
+        String.format("createSecret failed for %s", rcuaccessSecretName));
+
+    logger.info("Create OPSS wallet password secret");
+    assertDoesNotThrow(() -> createOpsswalletpasswordSecret(
+        opsswalletpassSecretName,
+        domainNamespace,
+        ADMIN_PASSWORD_DEFAULT),
+        String.format("createSecret failed for %s", opsswalletpassSecretName));
+
+    DomainCreationImage domainCreationImage = createImage(fmwModelFile,fmwModelPropFile,"jrf7");
+    List<DomainCreationImage> domainCreationImages7 = new ArrayList<>();
+    domainCreationImages7.add(domainCreationImage);
+
+    logger.info("create WDT configMap with extra cluster");
+    createModelConfigMap(domainUid,configMapName);
+
+    // create a domain custom resource configuration object
+    logger.info("Creating domain custom resource with pvName: {0}", pvName);
+    DomainResource domain = createDomainResourceSimplifyJrfPv(
+        domainUid, domainNamespace, adminSecretName,
+        TEST_IMAGES_REPO_SECRET_NAME,
+        rcuaccessSecretName,
+        opsswalletpassSecretName, null,
+        pvName, pvcName, domainCreationImages7, configMapName);
+
+    createDomainAndVerify(domain, domainNamespace);
+
+    // verify that all servers in the original cluster-1 are ready
+    verifyDomainReady(domainNamespace, domainUid, replicaCount, "nosuffix");
+
+    // create and deploy cluster resource
+    ClusterResource cluster2 = createClusterResource(
+        cluster2Res, cluster2Name, domainNamespace, replicaCluster2);
+    logger.info("Creating ClusterResource {0} in namespace {1}",cluster2Res, domainNamespace);
+    createClusterAndVerify(cluster2);
+
+    logger.info("Patch domain resource by adding cluster cluster-2");
+    String patchStr
+        = "["
+        + "{\"op\": \"add\",\"path\": \"/spec/clusters/-\", \"value\": {\"name\" : \"" + cluster2Res + "\"}"
+        + "}]";
+    logger.info("Updating domain configuration using patch string: {0}\n", patchStr);
+    V1Patch patch2 = new V1Patch(patchStr);
+    assertTrue(patchDomainCustomResource(domainUid, domainNamespace, patch2, V1Patch.PATCH_FORMAT_JSON_PATCH),
+        "Failed to patch domain");
+
+    patchDomainResourceWithNewIntrospectVersion(domainUid, domainNamespace);
+
+    ConditionFactory customConditionFactory = createCustomConditionFactory(0, 1, 5);
+
+    //verify the introspector pod is created and runs
+    String introspectPodNameBase2 = getIntrospectJobName(domainUid);
+    checkPodExists(customConditionFactory, introspectPodNameBase2, domainUid, domainNamespace);
+    checkPodDoesNotExist(introspectPodNameBase2, domainUid, domainNamespace);
+
+    // verify managed server pods from cluster-2 are created
+    for (int i = 1; i <= replicaCluster2; i++) {
+      logger.info("Wait for managed pod {0} to be ready in namespace {1}",
+          managedServer2Prefix + i, domainNamespace);
+      checkPodReadyAndServiceExists(managedServer2Prefix + i, domainUid, domainNamespace);
+    }
+
+    // delete the domain
+    deleteDomainResource(domainNamespace, domainUid);
+    //delete the rcu pod
+    assertDoesNotThrow(() -> deletePod("rcu", dbNamespace),
+              "Got exception while deleting server " + "rcu");
+    checkPodDoesNotExist("rcu", null, dbNamespace);
+
+  }
 
   private DomainCreationImage createImage(String fmwModelFile,  File fmwModelPropFile, String imageTagPrefix) {
 
@@ -788,5 +924,44 @@ private void verifyPodWithExpectedErrorMsg(String expectedErrorMsg, String podNa
         "Checking operator log containing the expected error msg {0}:",
         expectedErrorMsg);
   }
+
+  // create a ConfigMap with a model that adds a cluster
+  private static void createModelConfigMap(String domainid, String cfgMapName) {
+    String yamlString = "topology:\n"
+        + "  Cluster:\n"
+        + "    'cluster-2':\n"
+        + "  Server:\n"
+        + "    'c2-managed-server1':\n"
+        + "       Cluster: 'cluster-2' \n"
+        + "       ListenPort : 8001 \n"
+        + "    'c2-managed-server2':\n"
+        + "       Cluster: 'cluster-2' \n"
+        + "       ListenPort : 8001 \n"
+        + "    'c2-managed-server3':\n"
+        + "       Cluster: 'cluster-2' \n"
+        + "       ListenPort : 8001 \n"
+        + "    'c2-managed-server4':\n"
+        + "       Cluster: 'cluster-2' \n"
+        + "       ListenPort : 8001 \n"
+        + "    'c2-managed-server5':\n"
+        + "       Cluster: 'cluster-2' \n"
+        + "       ListenPort : 8001 \n";
+
+    Map<String, String> labels = new HashMap<>();
+    labels.put("weblogic.domainUid", domainid);
+    Map<String, String> data = new HashMap<>();
+    data.put("model.cluster.yaml", yamlString);
+
+    V1ConfigMap configMap = new V1ConfigMap()
+        .data(data)
+        .metadata(new V1ObjectMeta()
+            .labels(labels)
+            .name(cfgMapName)
+            .namespace(domainNamespace));
+    boolean cmCreated = assertDoesNotThrow(() -> createConfigMap(configMap),
+        String.format("Can't create ConfigMap %s", cfgMapName));
+    assertTrue(cmCreated, String.format("createConfigMap failed %s", cfgMapName));
+  }
+
 
 }