Merge branch 'jrf_newopss' into 'main'

Create  JRF domain and RCU with CreateIfNotExists.DOMAIN_AND_RCU and provided OPSS file secret

See merge request weblogic-cloud/weblogic-kubernetes-operator!4314

Author: rjeberhard

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

@@ -57,6 +57,7 @@
 import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
 import static oracle.weblogic.kubernetes.utils.DomainUtils.deleteDomainResource;
 import static oracle.weblogic.kubernetes.utils.FmwUtils.createDomainResourceSimplifyJrfPv;
+import static oracle.weblogic.kubernetes.utils.FmwUtils.createSimplifyJrfPvDomainAndRCU;
 import static oracle.weblogic.kubernetes.utils.FmwUtils.restoreOpssWalletfileSecret;
 import static oracle.weblogic.kubernetes.utils.FmwUtils.saveAndRestoreOpssWalletfileSecret;
 import static oracle.weblogic.kubernetes.utils.FmwUtils.verifyDomainReady;
@@ -99,21 +100,27 @@ public class ItFmwDomainInPvUserCreateRcu {
   private static LoggingFacade logger = null;
   private static String DOMAINHOMEPREFIX = null;
   private static final String domainUid1 = "jrfdomainonpv-userrcu1";
+  private static final String domainUid3 = "jrfdomainonpv-userrcu3";
   private static final String domainUid4 = "jrfdomainonpv-userrcu4";
   private static final String miiAuxiliaryImage1Tag = "jrf1" + MII_BASIC_IMAGE_TAG;
   private final String adminSecretName1 = domainUid1 + "-weblogic-credentials";
-  private final String rcuaccessSecretName1 = domainUid1 + "-rcu-credentials";
-  private final String opsswalletpassSecretName1 = domainUid1 + "-opss-wallet-password-secret";
-  private final String opsswalletfileSecretName1 = domainUid1 + "-opss-wallet-file-secret";
+  private final String adminSecretName3 = domainUid3 + "-weblogic-credentials";
   private final String adminSecretName4 = domainUid4 + "-weblogic-credentials";
+  private final String rcuaccessSecretName1 = domainUid1 + "-rcu-credentials";
+  private final String rcuaccessSecretName3 = domainUid3 + "-rcu-credentials";
   private final String rcuaccessSecretName4 = domainUid4 + "-rcu-credentials";
+  private final String opsswalletpassSecretName1 = domainUid1 + "-opss-wallet-password-secret";
+  private final String opsswalletpassSecretName3 = domainUid3 + "-opss-wallet-password-secret";
   private final String opsswalletpassSecretName4 = domainUid4 + "-opss-wallet-password-secret";
+  private final String opsswalletfileSecretName1 = domainUid1 + "-opss-wallet-file-secret";
+  private final String opsswalletfileSecretName3 = domainUid3 + "-opss-wallet-file-secret";
   private final String opsswalletfileSecretName4 = domainUid4 + "-opss-wallet-file-secret";
   private static final int replicaCount = 1;
 
   private final String fmwModelFilePrefix = "model-fmwdomainonpv-rcu-wdt";
   private final String fmwModelFile = fmwModelFilePrefix + ".yaml";
   private static DomainCreationImage domainCreationImage1 = null;
+  private static List<DomainCreationImage> domainCreationImages3 = new ArrayList<>();
   private static List<DomainCreationImage> domainCreationImages4 = new ArrayList<>();
   private static String configMapName = null;
 
@@ -390,117 +397,13 @@ void testFmwDomainOnPvUserProvideOpssNotexist() {
     checkPodDoesNotExist("rcu", null, dbNamespace);
 
   }
-
-  /**
-   * User creates RCU, Operate creates PV/PVC and FMW domain with multiple images
-   * Verify Pod is ready and service exists for both admin server and managed servers.
-   */
-  @Test
-  @Order(4)
-  @DisplayName("Create a FMW domain on PV with multiple images when user per-creates RCU")
-  void testFmwDomainOnPvUserCreatesRCUMultiImages() {
-    String domainUid = "jrfdomainonpv-userrcu3";
-    String adminSecretName = domainUid + "-weblogic-credentials";
-    String rcuaccessSecretName = domainUid + "-rcu-credentials";
-    String opsswalletpassSecretName = domainUid + "-opss-wallet-password-secret";
-    final String pvName = getUniqueName(domainUid + "-pv-");
-    final String pvcName = getUniqueName(domainUid + "-pvc-");
-
-    //create RCU schema
-    assertDoesNotThrow(() -> createRcuSchema(FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX + "3",
-        dbUrl, dbNamespace), "create RCU schema failed");
-
-    // create a model property file
-    File fmwModelPropFile = createWdtPropertyFile(domainUid, RCUSCHEMAPREFIX + "3");
-
-    // 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 + "3", RCUSCHEMAPASSWORD, dbUrl);
-    assertDoesNotThrow(() -> createRcuAccessSecret(
-        rcuaccessSecretName,
-        domainNamespace,
-        RCUSCHEMAPREFIX + "3",
-        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 domainCreationImage1 = createImage(fmwModelFile,fmwModelPropFile,"jrf3");
-
-    // image2 with model files for jms config
-    List modelList = new ArrayList<>();
-    modelList.add(MODEL_DIR + "/model.jms2.yaml");
-    String miiAuxiliaryImageTag = "jrf3jms" + MII_BASIC_IMAGE_TAG;
-    WitParams witParams =
-        new WitParams()
-            .modelImageName(MII_AUXILIARY_IMAGE_NAME)
-            .modelImageTag(miiAuxiliaryImageTag)
-            .wdtModelOnly(true)
-            .modelFiles(modelList)
-            .wdtVersion("NONE");
-    createAndPushAuxiliaryImage(MII_AUXILIARY_IMAGE_NAME, miiAuxiliaryImageTag, witParams);
-    DomainCreationImage domainCreationImage2 = new DomainCreationImage().image(MII_AUXILIARY_IMAGE_NAME
-        + ":" + miiAuxiliaryImageTag);
-    List<DomainCreationImage> domainCreationImages = new ArrayList<>();
-    domainCreationImages.add(domainCreationImage1);
-    domainCreationImages.add(domainCreationImage2);
-
-    // 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, domainCreationImages, null);
-
-    createDomainAndVerify(domain, domainNamespace);
-
-    // verify that all servers are ready
-    verifyDomainReady(domainNamespace, domainUid, replicaCount, "nosuffix");
-
-    //create router for admin service on OKD
-    String adminServerPodName = domainUid + "-admin-server";
-    String adminSvcExtHost = createRouteForOKD(getExternalServicePodName(adminServerPodName), domainNamespace);
-    logger.info("admin svc host = {0}", adminSvcExtHost);
-
-    // check configuration for JMS
-    checkConfiguredJMSresouce(domainNamespace, adminServerPodName, adminSvcExtHost);
-
-    // delete the domain
-    deleteDomainResource(domainNamespace, domainUid);
-    //delete the rcu pod
-    assertDoesNotThrow(() -> deletePod("rcu", dbNamespace),
-              "Got exception while deleting server " + "rcu");
-    checkPodDoesNotExist("rcu", null, dbNamespace);
-
-  }
-
+  
   /**
    * User creates RCU, Operate creates PV/PVC and FMW domain with additional WDT config map.
    * Verify Pod is ready and service exists for both admin server and managed servers.
    */
   @Test
-  @Order(5)
+  @Order(4)
   @DisplayName("Create a FMW domain on PV with additional WDT config map when user per-creates RCU")
   void testFmwDomainOnPvUserCreatesRCUwdtConfigMap() {
 
@@ -586,7 +489,7 @@ void testFmwDomainOnPvUserCreatesRCUwdtConfigMap() {
    * The operator will not mount the secret but proceed with normal domain creation without error
    */
   @Test
-  @Order(6)
+  @Order(5)
   @DisplayName("Create a FMW domain on PV when user provide OPSS wallet file is empty")
   void testFmwDomainOnPvUserProvideEmptyOpss() {
 
@@ -651,6 +554,150 @@ void testFmwDomainOnPvUserProvideEmptyOpss() {
 
   }
 
+  /**
+   * User creates RCU, Operate creates PV/PVC and FMW domain with multiple images
+   * Verify Pod is ready and service exists for both admin server and managed servers.
+   */
+  @Test
+  @Order(6)
+  @DisplayName("Create a FMW domain on PV with multiple images when user per-creates RCU")
+  void testFmwDomainOnPvUserCreatesRCUMultiImages() {
+
+    final String pvName = getUniqueName(domainUid3 + "-pv-");
+    final String pvcName = getUniqueName(domainUid3 + "-pvc-");
+
+    //create RCU schema
+    assertDoesNotThrow(() -> createRcuSchema(FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX + "3",
+        dbUrl, dbNamespace), "create RCU schema failed");
+
+    // create a model property file
+    File fmwModelPropFile = createWdtPropertyFile(domainUid3, RCUSCHEMAPREFIX + "3");
+
+    // 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(
+        adminSecretName3,
+        domainNamespace,
+        ADMIN_USERNAME_DEFAULT,
+        ADMIN_PASSWORD_DEFAULT),
+        String.format("createSecret failed for %s", adminSecretName3));
+
+    // create RCU access secret
+    logger.info("Creating RCU access secret: {0}, with prefix: {1}, dbUrl: {2}, schemapassword: {3})",
+        rcuaccessSecretName3, RCUSCHEMAPREFIX + "3", RCUSCHEMAPASSWORD, dbUrl);
+    assertDoesNotThrow(() -> createRcuAccessSecret(
+        rcuaccessSecretName3,
+        domainNamespace,
+        RCUSCHEMAPREFIX + "3",
+        RCUSCHEMAPASSWORD,
+        dbUrl),
+        String.format("createSecret failed for %s", rcuaccessSecretName3));
+
+    logger.info("Create OPSS wallet password secret");
+    assertDoesNotThrow(() -> createOpsswalletpasswordSecret(
+        opsswalletpassSecretName3,
+        domainNamespace,
+        ADMIN_PASSWORD_DEFAULT),
+        String.format("createSecret failed for %s", opsswalletpassSecretName3));
+
+    DomainCreationImage domainCreationImage1 = createImage(fmwModelFile,fmwModelPropFile,"jrf3");
+
+    // image2 with model files for jms config
+    List modelList = new ArrayList<>();
+    modelList.add(MODEL_DIR + "/model.jms2.yaml");
+    String miiAuxiliaryImageTag = "jrf3jms" + MII_BASIC_IMAGE_TAG;
+    WitParams witParams =
+        new WitParams()
+            .modelImageName(MII_AUXILIARY_IMAGE_NAME)
+            .modelImageTag(miiAuxiliaryImageTag)
+            .wdtModelOnly(true)
+            .modelFiles(modelList)
+            .wdtVersion("NONE");
+    createAndPushAuxiliaryImage(MII_AUXILIARY_IMAGE_NAME, miiAuxiliaryImageTag, witParams);
+    DomainCreationImage domainCreationImage2 = new DomainCreationImage().image(MII_AUXILIARY_IMAGE_NAME
+        + ":" + miiAuxiliaryImageTag);
+    domainCreationImages3.add(domainCreationImage1);
+    domainCreationImages3.add(domainCreationImage2);
+
+    // create a domain custom resource configuration object
+    logger.info("Creating domain custom resource with pvName: {0}", pvName);
+    DomainResource domain = createDomainResourceSimplifyJrfPv(
+        domainUid3, domainNamespace, adminSecretName3,
+        TEST_IMAGES_REPO_SECRET_NAME,
+        rcuaccessSecretName3,
+        opsswalletpassSecretName3, null,
+        pvName, pvcName, domainCreationImages3, null);
+
+    createDomainAndVerify(domain, domainNamespace);
+
+    // verify that all servers are ready
+    verifyDomainReady(domainNamespace, domainUid3, replicaCount, "nosuffix");
+
+    //create router for admin service on OKD
+    String adminServerPodName = domainUid3 + "-admin-server";
+    String adminSvcExtHost = createRouteForOKD(getExternalServicePodName(adminServerPodName), domainNamespace);
+    logger.info("admin svc host = {0}", adminSvcExtHost);
+
+    // check configuration for JMS
+    checkConfiguredJMSresouce(domainNamespace, adminServerPodName, adminSvcExtHost);
+
+  }
+
+  /**
+   * Export the OPSS wallet file secret of Fmw domain from the previous run
+   * CrateIfNotExists set to domainAndRCU
+   * Use this OPSS wallet file secret to create Fmw domain on PV to connect to the same database
+   * Verify Pod is ready and service exists for both admin server and managed servers.
+   */
+  @Test
+  @Order(7)
+  @DisplayName("Create a FMW domain on PV with provided OPSS wallet file secret")
+  void testFmwDomainOnPVwithProvidedOpss() {
+
+    final String pvName = getUniqueName(domainUid3 + "-pv-");
+    final String pvcName = getUniqueName(domainUid3 + "-pvc-");
+
+    saveAndRestoreOpssWalletfileSecret(domainNamespace, domainUid3, opsswalletfileSecretName3);
+    logger.info("Deleting domain custom resource with namespace: {0}, domainUid {1}", domainNamespace, domainUid3);
+    deleteDomainResource(domainNamespace, domainUid3);
+    try {
+      deleteDirectory(Paths.get("/share").toFile());
+    } catch (IOException ioe) {
+      logger.severe("Failed to cleanup directory /share", ioe);
+    }
+    logger.info("Creating domain custom resource with pvName: {0}", pvName);
+    DomainResource domain = createSimplifyJrfPvDomainAndRCU(
+        domainUid3, domainNamespace, adminSecretName3,
+        TEST_IMAGES_REPO_SECRET_NAME,
+        rcuaccessSecretName3,
+        opsswalletpassSecretName3, opsswalletfileSecretName3,
+        pvName, pvcName, domainCreationImages3, null);
+
+    createDomainAndVerify(domain, domainNamespace);
+
+    // verify that all servers are ready
+    verifyDomainReady(domainNamespace, domainUid3, replicaCount, "nosuffix");
+
+    // delete the domain
+    deleteDomainResource(domainNamespace, domainUid3);
+    //delete the rcu pod
+    assertDoesNotThrow(() -> deletePod("rcu", dbNamespace),
+        "Got exception while deleting server " + "rcu");
+    checkPodDoesNotExist("rcu", null, dbNamespace);
+    //delete the wallet file ewallet.p12
+    try {
+      delete(new File("./ewallet.p12"));
+      logger.info("Wallet file ewallet.p12 is deleted");
+    } catch (IOException ioe) {
+      logger.severe("Failed to delete file ewallet.p12", ioe);
+    }
+  }
+
+
   private DomainCreationImage createImage(String fmwModelFile,  File fmwModelPropFile, String imageTagPrefix) {
 
     List<String> modelList = new ArrayList<>();