remove duplicate code in JRFDomain.java

Author: xiancao

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

@@ -116,7 +116,7 @@ public void testJRFDomainOnPVUsingWLST() throws Exception {
     // TODO: reconsider the logic to check the db readiness
     // The jrfdomain can not find the db pod even the db pod shows ready, sleep more time
     logger.info("waiting for the db to be visible to rcu script ...");
-    Thread.sleep(60000);
+    Thread.sleep(30000);
 
     JRFDomain jrfdomain = null;
     boolean testCompletedSuccessfully = false;

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

@@ -1285,7 +1285,7 @@ private void callWebAppAndCheckForServerNameInResponse(
    * @throws Exception if removing the results dir fails or if create-domain-inputs.yaml cannot be
    *     accessed to read or if creating config map or secret fails for configoverrides
    */
-  private void initialize(Map<String, Object> inputDomainMap) throws Exception {
+  protected void initialize(Map<String, Object> inputDomainMap) throws Exception {
     domainMap = inputDomainMap;
     this.userProjectsDir = BaseTest.getUserProjectsDir();
     this.projectRoot = BaseTest.getProjectRoot();

integration-tests/src/test/java/oracle/kubernetes/operator/utils/JRFDomain.java

@@ -4,21 +4,15 @@
 
 package oracle.kubernetes.operator.utils;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.util.Map;
-import java.util.Objects;
 import oracle.kubernetes.operator.BaseTest;
-import org.yaml.snakeyaml.Yaml;
 
 /** JRF Domain class with all the utility methods */
 public class JRFDomain extends Domain {
 
   private static final String FMWINFRA_DOCKER_IMAGENAME =
       "phx.ocir.io/weblogick8s/oracle/fmw-infrastructure";
   private static final String FMWINFRA_DOCKER_IMAGETAG = "12.2.1.3";
-  private static final String OCIR_REPO_SERVER = "phx.ocir.io";
 
   /**
    * JRFDomain constructor
@@ -41,6 +35,7 @@ public JRFDomain(String inputYaml) throws Exception {
    */
   public JRFDomain(Map<String, Object> inputDomainMap) throws Exception {
     initialize(inputDomainMap);
+    updateDomainMapForJRF();
     createPV();
     createSecret();
     generateInputYaml();
@@ -50,166 +45,28 @@ public JRFDomain(Map<String, Object> inputDomainMap) throws Exception {
   }
 
   /**
-   * initialize the domain creation input properties
+   * update the domainMap with jrf specific information
    *
-   * @param inputDomainMap - jrf domain input properties map
    * @throws Exception - if any error occurs
    */
-  private void initialize(Map<String, Object> inputDomainMap) throws Exception {
-    domainMap = inputDomainMap;
-    this.userProjectsDir = BaseTest.getUserProjectsDir();
-    this.projectRoot = BaseTest.getProjectRoot();
+  private void updateDomainMapForJRF() throws Exception {
 
-    clusterType = (String) domainMap.getOrDefault("clusterType", "CONFIGURED");
-    domainMap.put("clusterType", clusterType);
-
-    // copy samples to RESULT_DIR
-    TestUtils.exec(
-        "cp -rf " + BaseTest.getProjectRoot() + "/kubernetes/samples " + BaseTest.getResultDir());
-
-    this.voyager =
-        System.getenv("LB_TYPE") != null && System.getenv("LB_TYPE").equalsIgnoreCase("VOYAGER");
-    if (System.getenv("INGRESSPERDOMAIN") != null) {
-      INGRESSPERDOMAIN = Boolean.parseBoolean(System.getenv("INGRESSPERDOMAIN"));
-    }
-
-    domainMap.put("domainName", domainMap.get("domainUID"));
-
-    // read sample domain inputs
-    String sampleDomainInputsFile =
-        "/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml";
-    if (domainMap.containsKey("domainHomeImageBase")) {
-      sampleDomainInputsFile =
-          "/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml";
-    }
-    Yaml dyaml = new Yaml();
-    InputStream sampleDomainInputStream =
-        new FileInputStream(new File(BaseTest.getResultDir() + sampleDomainInputsFile));
-    logger.info(
-        "loading domain inputs template file " + BaseTest.getResultDir() + sampleDomainInputsFile);
-    Map<String, Object> sampleDomainMap = dyaml.load(sampleDomainInputStream);
-    sampleDomainInputStream.close();
-
-    // add attributes with default values from sample domain inputs to domain map
-    sampleDomainMap.forEach(domainMap::putIfAbsent);
-
-    domainUid = (String) domainMap.get("domainUID");
-    // Customize the create domain job inputs
-    domainNS = (String) domainMap.get("namespace");
-    adminServerName = (String) domainMap.get("adminServerName");
-    managedServerNameBase = (String) domainMap.get("managedServerNameBase");
-
-    initialManagedServerReplicas =
-        ((Integer) domainMap.get("initialManagedServerReplicas")).intValue();
-    configuredManagedServerCount =
-        ((Integer) domainMap.get("configuredManagedServerCount")).intValue();
-    exposeAdminT3Channel = ((Boolean) domainMap.get("exposeAdminT3Channel")).booleanValue();
-    exposeAdminNodePort = ((Boolean) domainMap.get("exposeAdminNodePort")).booleanValue();
-    t3ChannelPort = ((Integer) domainMap.get("t3ChannelPort")).intValue();
-    clusterName = (String) domainMap.get("clusterName");
-    clusterType = (String) domainMap.get("clusterType");
-    serverStartPolicy = (String) domainMap.get("serverStartPolicy");
-
-    // write hostname in domain input map for public address
-    if (exposeAdminT3Channel) {
-      domainMap.put("t3PublicAddress", TestUtils.getHostName());
-    }
-
-    String imageName = FMWINFRA_DOCKER_IMAGENAME;
-    if (System.getenv("IMAGE_NAME_FMWINFRA") != null) {
-      imageName = System.getenv("IMAGE_NAME_FMWINFRA");
-      logger.info("IMAGE_NAME_FMWINFRA " + imageName);
-    }
-
-    String imageTag = FMWINFRA_DOCKER_IMAGETAG;
-    if (System.getenv("IMAGE_TAG_FMWINFRA") != null) {
-      imageTag = System.getenv("IMAGE_TAG_FMWINFRA");
-      logger.info("IMAGE_TAG_FMWINFRA " + imageTag);
-    }
-    domainMap.put("logHome", "/shared/logs/" + domainUid);
+    // jrf specific input parameter
+    domainMap.put("image", FMWINFRA_DOCKER_IMAGENAME + ":" + FMWINFRA_DOCKER_IMAGETAG);
 
     if (!domainMap.containsKey("domainHomeImageBase")) {
-      domainMap.put("domainHome", "/shared/domains/" + domainUid);
-
       // update jrf/create-domain-script.sh with domain_name and rcuprefix
       TestUtils.replaceStringInFile(
           BaseTest.getResultDir() + "/jrf/create-domain-script.sh", "%RCUPREFIX%", domainUid);
       TestUtils.replaceStringInFile(
           BaseTest.getResultDir() + "/jrf/create-domain-script.sh", "%DOMAIN_NAME%", domainUid);
       domainMap.put("createDomainFilesDir", BaseTest.getResultDir() + "/jrf");
-      domainMap.put("image", imageName + ":" + imageTag);
     }
 
-    if (domainMap.containsKey("domainHomeImageBuildPath")) {
-      domainMap.put(
-          "domainHomeImageBuildPath",
-          BaseTest.getResultDir() + "/" + domainMap.get("domainHomeImageBuildPath"));
-    }
     if (System.getenv("IMAGE_PULL_SECRET_FMWINFRA") != null) {
       domainMap.put("imagePullSecretName", System.getenv("IMAGE_PULL_SECRET_FMWINFRA"));
-      if (System.getenv("WERCKER") != null) {
-        // create docker registry secrets
-        TestUtils.createDockerRegistrySecret(
-            System.getenv("IMAGE_PULL_SECRET_FMWINFRA"),
-            System.getenv(OCIR_REPO_SERVER),
-            System.getenv("OCIR_REPO_USERNAME"),
-            System.getenv("OCIR_REPO_PASSWORD"),
-            System.getenv("OCIR_REPO_EMAIL"),
-            domainNS);
-      }
     } else {
-      domainMap.put("imagePullSecretName", "docker-store");
-    }
-    // remove null values if any attributes
-    domainMap.values().removeIf(Objects::isNull);
-
-    // create config map and secret for custom sit config
-    if ((domainMap.get("configOverrides") != null)
-        && (domainMap.get("configOverridesFile") != null)) {
-
-      String configOverridesFile = domainMap.get("configOverridesFile").toString();
-
-      String cmd =
-          "kubectl -n "
-              + domainNS
-              + " create cm "
-              + domainUid
-              + "-"
-              + domainMap.get("configOverrides")
-              + " --from-file "
-              + BaseTest.getProjectRoot()
-              + configOverridesFile;
-      ExecResult result = ExecCommand.exec(cmd);
-      if (result.exitValue() != 0) {
-        throw new Exception("FAILURE: command " + cmd + " failed, returned " + result.stderr());
-      }
-      cmd =
-          "kubectl -n "
-              + domainNS
-              + " label cm "
-              + domainUid
-              + "-"
-              + domainMap.get("configOverrides")
-              + " weblogic.domainUID="
-              + domainUid;
-      result = ExecCommand.exec(cmd);
-      if (result.exitValue() != 0) {
-        throw new Exception("FAILURE: command " + cmd + " failed, returned " + result.stderr());
-      }
-      // create secret for custom sit config t3 public address
-      cmd =
-          "kubectl -n "
-              + domainNS
-              + " create secret generic "
-              + domainUid
-              + "-"
-              + "t3publicaddress "
-              + " --from-literal=hostname="
-              + TestUtils.getHostName();
-      result = ExecCommand.exec(cmd);
-      if (result.exitValue() != 0) {
-        throw new Exception("FAILURE: command " + cmd + " failed, returned " + result.stderr());
-      }
+      domainMap.put("imagePullSecretName", "ocir-store}");
     }
   }
 }