new setenv.sh

Author: xiancao

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

@@ -4,6 +4,7 @@
 
 package oracle.kubernetes.operator;
 
+import oracle.kubernetes.operator.utils.DBUtils;
 import oracle.kubernetes.operator.utils.JRFDomain;
 import oracle.kubernetes.operator.utils.Operator;
 import oracle.kubernetes.operator.utils.OracleDB;
@@ -24,18 +25,11 @@
 public class JrfInOperatorTest extends BaseTest {
 
   // property file used to customize operator properties for operator inputs yaml
-
-  private static String operator1File = "jrfoperator1.yaml";
-
+  private static final String JRF_OPERATOR_FILE_1 = "jrfoperator1.yaml";
   // file used to customize domain properties for domain, PV and LB inputs yaml
-  private static String jrfdomainonpvwlstFile = "jrfdomainonpvwlst.yaml";
-
+  private static final String JRF_DOMAIN_ON_PV_WLST_FILE = "jrfdomainonpvwlst.yaml";
   // property file for oracle db information
-  private static String dbPropsFile = "oracledb.properties";
-
-  // property file used to configure constants for integration tests
-  private static String appPropsFile = "OperatorIT.properties";
-
+  private static final String DB_PROP_FILE = "oracledb.properties";
   private static Operator operator1;
 
   /**
@@ -49,10 +43,10 @@ public class JrfInOperatorTest extends BaseTest {
   @BeforeClass
   public static void staticPrepare() throws Exception {
     // initialize test properties and create the directories
-    initialize(appPropsFile);
+    initialize(APP_PROPS_FILE);
 
     // create DB used for jrf domain
-    OracleDB db = TestUtils.createOracleDB(dbPropsFile);
+    OracleDB db = DBUtils.createOracleDB(DB_PROP_FILE);
 
     // populate the jrf/create-domain-script.sh
     // copy the integration-tests/src/test/resources/domain-home-on-pv/jrf to
@@ -110,7 +104,7 @@ public void testJRFDomainOnPVUsingWLST() throws Exception {
     logger.info("Creating Operator & waiting for the script to complete execution");
     // create operator1
     if (operator1 == null) {
-      operator1 = TestUtils.createOperator(operator1File);
+      operator1 = TestUtils.createOperator(JRF_OPERATOR_FILE_1);
     }
 
     // TODO: reconsider the logic to check the db readiness
@@ -122,7 +116,7 @@ public void testJRFDomainOnPVUsingWLST() throws Exception {
     boolean testCompletedSuccessfully = false;
 
     try {
-      jrfdomain = new JRFDomain(jrfdomainonpvwlstFile);
+      jrfdomain = new JRFDomain(JRF_DOMAIN_ON_PV_WLST_FILE);
       jrfdomain.verifyDomainCreated();
 
       if (!SMOKETEST) {

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

@@ -0,0 +1,39 @@
+// Copyright 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.operator.utils;
+
+import java.util.logging.Logger;
+
+public class DBUtils {
+  private static final Logger logger = Logger.getLogger("OperatorIT", "OperatorIT");
+
+  /**
+   * create oracle db pod in the k8s cluster
+   *
+   * @param dbPropsFile - db properties file
+   * @return - OracleDB instance
+   * @throws Exception - if any error occurs when creating Oracle DB pod
+   */
+  public static OracleDB createOracleDB(String dbPropsFile) throws Exception {
+    OracleDB oracledb = new OracleDB(dbPropsFile);
+
+    // check the db is ready
+    String dbnamespace = oracledb.getNamespace();
+
+    String cmd = "kubectl get pod -n " + dbnamespace + " -o jsonpath=\"{.items[0].metadata.name}\"";
+    ExecResult result = ExecCommand.exec(cmd);
+    String podName = result.stdout();
+
+    logger.info("DEBUG: db namespace=" + dbnamespace);
+    logger.info("DEBUG: podname=" + podName);
+    TestUtils.checkPodReady("", dbnamespace);
+
+    // check the db is ready to use
+    cmd = "kubectl logs " + podName + " -n " + dbnamespace;
+    TestUtils.checkCmdInLoop(cmd, "The database is ready for use", podName);
+
+    return oracledb;
+  }
+}

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

@@ -38,40 +38,40 @@ public class Domain {
   protected static final Logger logger = Logger.getLogger("OperatorIT", "OperatorIT");
 
   protected Map<String, Object> domainMap;
-  protected Map<String, Object> pvMap;
+  private Map<String, Object> pvMap;
 
   // attributes from domain properties
   protected String domainUid = "";
   // default values as in create-weblogic-domain-inputs.yaml, generated yaml file will have the
   // customized property values
-  protected String domainNS;
-  protected String adminServerName;
-  protected String managedServerNameBase;
-  protected int initialManagedServerReplicas;
-  protected int configuredManagedServerCount;
-  protected boolean exposeAdminT3Channel;
-  protected boolean exposeAdminNodePort;
-  protected int t3ChannelPort;
-  protected String clusterName;
-  protected String clusterType;
-  protected String serverStartPolicy;
-  protected String loadBalancer = "TRAEFIK";
-  protected int loadBalancerWebPort = 30305;
-  protected String domainHomeImageBuildPath = "";
+  private String domainNS;
+  private String adminServerName;
+  private String managedServerNameBase;
+  private int initialManagedServerReplicas;
+  private int configuredManagedServerCount;
+  private boolean exposeAdminT3Channel;
+  private boolean exposeAdminNodePort;
+  private int t3ChannelPort;
+  private String clusterName;
+  private String clusterType;
+  private String serverStartPolicy;
+  private String loadBalancer = "TRAEFIK";
+  private int loadBalancerWebPort = 30305;
+  private String domainHomeImageBuildPath = "";
   protected String userProjectsDir = "";
-  protected String projectRoot = "";
-  protected boolean ingressPerDomain = true;
+  private String projectRoot = "";
+  private boolean ingressPerDomain = true;
 
-  protected String generatedInputYamlFile;
+  private String generatedInputYamlFile;
 
-  protected static int maxIterations = BaseTest.getMaxIterationsPod(); // 50 * 5 = 250 seconds
-  protected static int waitTime = BaseTest.getWaitTimePod();
+  private static int maxIterations = BaseTest.getMaxIterationsPod(); // 50 * 5 = 250 seconds
+  private static int waitTime = BaseTest.getWaitTimePod();
 
-  protected boolean voyager;
+  private boolean voyager;
   // LB_TYPE is an evn var. Set to "VOYAGER" to use it as loadBalancer
-  protected static String LB_TYPE;
+  private static String LB_TYPE;
   // set INGRESSPERDOMAIN to false to create LB's ingress by kubectl yaml file
-  protected static boolean INGRESSPERDOMAIN = true;
+  private static boolean INGRESSPERDOMAIN = true;
 
   public Domain() throws Exception {
     domainMap = new HashMap<>();

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

@@ -10,9 +10,9 @@
 /** JRF Domain class with all the utility methods */
 public class JRFDomain extends Domain {
 
-  private static final String FMWINFRA_DOCKER_IMAGENAME =
+  private static final String DEFAULT_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 DEFAULT_FMWINFRA_DOCKER_IMAGETAG = "12.2.1.3";
 
   /**
    * JRFDomain constructor
@@ -50,9 +50,9 @@ public JRFDomain(Map<String, Object> inputDomainMap) throws Exception {
    * @throws Exception - if any error occurs
    */
   private void updateDomainMapForJRF() throws Exception {
-
     // jrf specific input parameter
-    domainMap.put("image", FMWINFRA_DOCKER_IMAGENAME + ":" + FMWINFRA_DOCKER_IMAGETAG);
+    domainMap.put(
+        "image", DEFAULT_FMWINFRA_DOCKER_IMAGENAME + ":" + DEFAULT_FMWINFRA_DOCKER_IMAGETAG);
 
     if (!domainMap.containsKey("domainHomeImageBase")) {
       // update jrf/create-domain-script.sh with domain_name and rcuprefix
@@ -66,7 +66,7 @@ private void updateDomainMapForJRF() throws Exception {
     if (System.getenv("IMAGE_PULL_SECRET_FMWINFRA") != null) {
       domainMap.put("imagePullSecretName", System.getenv("IMAGE_PULL_SECRET_FMWINFRA"));
     } else {
-      domainMap.put("imagePullSecretName", "ocir-store}");
+      domainMap.put("imagePullSecretName", "ocir-store");
     }
   }
 }

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

@@ -51,7 +51,7 @@ public OracleDB(String dbPropFile) throws Exception {
     if (!namespace.equalsIgnoreCase("default")) {
       command = "kubectl create ns " + namespace;
       logger.info("Running " + command);
-      ExecCommand.exec(command);
+      TestUtils.exec(command);
     }
 
     // create db

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

@@ -1057,34 +1057,6 @@ public static void verifyAfterDeletion(Domain domain) throws Exception {
     k8sTestUtils.verifyNoClusterRoleBindings(domain1LabelSelector);
   }
 
-  /**
-   * create oracle db pod in the k8s cluster
-   *
-   * @param dbPropsFile - db properties file
-   * @return - OracleDB instance
-   * @throws Exception - if any error occurs when creating Oracle DB pod
-   */
-  public static OracleDB createOracleDB(String dbPropsFile) throws Exception {
-    OracleDB oracledb = new OracleDB(dbPropsFile);
-
-    // check the db is ready
-    String dbnamespace = oracledb.getNamespace();
-
-    String cmd = "kubectl get pod -n " + dbnamespace + " -o jsonpath=\"{.items[0].metadata.name}\"";
-    ExecResult result = ExecCommand.exec(cmd);
-    String podName = result.stdout();
-
-    logger.info("DEBUG: db namespace=" + dbnamespace);
-    logger.info("DEBUG: podname=" + podName);
-    TestUtils.checkPodReady("", dbnamespace);
-
-    // check the db is ready to use
-    cmd = "kubectl logs " + podName + " -n " + dbnamespace;
-    checkCmdInLoop(cmd, "The database is ready for use", podName);
-
-    return oracledb;
-  }
-
   /**
    * Replaces the string matching the given search pattern with a new string.
    *
@@ -1128,7 +1100,7 @@ private static KeyStore createKeyStore(Operator operator) throws Exception {
     return myKeyStore;
   }
 
-  private static void checkCmdInLoop(String cmd, String matchStr, String k8sObjName)
+  public static void checkCmdInLoop(String cmd, String matchStr, String k8sObjName)
       throws Exception {
     int i = 0;
     while (i < BaseTest.getMaxIterationsPod()) {

integration-tests/src/test/resources/domain-home-on-pv/jrf/create-domain-script.sh

@@ -164,8 +164,6 @@ then
                 echo  "RCU Ignore error"
             else
                 echo "RCU Loading Failed.. Please check the RCU logs"
-                echo "sleeping for debugging ..."
-                sleep 2h
                 exit
             fi
         fi

integration-tests/src/test/resources/jrfdomainonpvwlst.yaml

@@ -9,16 +9,10 @@ clusterName: infracluster
 configuredManagedServerCount: 1
 initialManagedServerReplicas: 1
 managedServerNameBase: infraserver
-#weblogicDomainStoragePath will be ignored, PV dir will be created at /<baseDir>/<USER>/acceptance_test_pv
-#weblogicDomainStoragePath: /scratch/external-domain-home/pv001/
 exposeAdminT3Channel: true
 t3ChannelPort: 30013
 exposeAdminNodePort: true
 namespace: jrfdomains
-#loadBalancer: TRAEFIK
-#ingressPerDomain: true
-#createDomainPyScript: integration-tests/src/test/resources/domain-home-on-pv/create-domain-custom-nap.py
-#voyagerWebPort: 30305
 image: phx.ocir.io/weblogick8s/oracle/fmw-infrastructure:12.2.1.3
 logHome: /shared/logs/jrfdomain1
 createDomainScriptsMountPath: /u01/weblogic