modified initialize for Operator

Author: marinakog

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

@@ -8,8 +8,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 import oracle.kubernetes.operator.BaseTest;
@@ -95,7 +93,7 @@ public Operator(
       RESTCertType restCertType)
       throws Exception {
     this.restCertType = restCertType;
-    initializeCustom(inputMap, opNS, opSA, targetdomainNS);
+    initialize(inputMap, opNS, opSA, targetdomainNS);
     generateInputYaml();
   }
   /**
@@ -107,7 +105,7 @@ public Operator(
    */
   public Operator(Map<String, Object> inputMap, RESTCertType restCertType) throws Exception {
     this.restCertType = restCertType;
-    initializeCustom(inputMap, true, true, true);
+    initialize(inputMap, true, true, true);
     generateInputYaml();
   }
 
@@ -390,101 +388,10 @@ private void runCommandInLoop(String command) throws Exception {
   }
 
   private void initialize(String inputYaml) throws Exception {
-    operatorMap = TestUtils.loadYaml(inputYaml);
-    userProjectsDir = BaseTest.getUserProjectsDir();
-    operatorNS = (String) operatorMap.getOrDefault("namespace", operatorNS);
-
-    if (operatorMap.get("releaseName") == null) {
-      throw new RuntimeException("FAILURE: releaseName cann't be null");
-    }
-    // customize the inputs yaml file to generate a self-signed cert for the external Operator REST
-    // https port
-    externalRestEnabled =
-        (boolean) operatorMap.getOrDefault("externalRestEnabled", externalRestEnabled);
-    if (externalRestEnabled) {
-      if (operatorMap.get("externalRestHttpsPort") != null) {
-        try {
-          externalRestHttpsPort = ((Integer) operatorMap.get("externalRestHttpsPort")).intValue();
-
-        } catch (NumberFormatException nfe) {
-          throw new IllegalArgumentException(
-              "FAILURE: Invalid value for " + "externalRestHttpsPort " + externalRestHttpsPort);
-        }
-      } else {
-        operatorMap.put("externalRestHttpsPort", externalRestHttpsPort);
-      }
-    }
-
-    // customize the inputs yaml file to use our pre-built docker image
-    // IMAGE_NAME_OPERATOR & IMAGE_TAG_OPERATOR variables are used for wercker
-    if (System.getenv("IMAGE_NAME_OPERATOR") != null
-        && System.getenv("IMAGE_TAG_OPERATOR") != null) {
-      operatorMap.put(
-          "image",
-          System.getenv("IMAGE_NAME_OPERATOR") + ":" + System.getenv("IMAGE_TAG_OPERATOR"));
-    } else {
-      operatorMap.put(
-          "image",
-          "wlsldi-v2.docker.oraclecorp.com/weblogic-operator"
-              + ":test_"
-              + BaseTest.getBranchName().replaceAll("/", "_"));
-    }
-
-    if (System.getenv("IMAGE_PULL_POLICY_OPERATOR") != null) {
-      operatorMap.put("imagePullPolicy", System.getenv("IMAGE_PULL_POLICY_OPERATOR"));
-    }
-
-    ExecCommand.exec("kubectl delete namespace " + operatorNS);
-
-    // create opeartor namespace
-    ExecCommand.exec("kubectl create namespace " + operatorNS);
-
-    // create operator service account
-    String serviceAccount = (String) operatorMap.get("serviceAccount");
-    if (serviceAccount != null && !serviceAccount.equals("default")) {
-      ExecResult result =
-          ExecCommand.exec("kubectl create serviceaccount " + serviceAccount + " -n " + operatorNS);
-      if (result.exitValue() != 0) {
-        throw new RuntimeException(
-            "FAILURE: Couldn't create serviceaccount "
-                + serviceAccount
-                + ". Cmd returned "
-                + result.stdout()
-                + "\n"
-                + result.stderr());
-      }
-    }
-
-    // create domain namespaces
-
-    ArrayList<String> domainNamespaces = (ArrayList<String>) operatorMap.get("domainNamespaces");
-    for (int i = 0; i < domainNamespaces.size(); i++) {
-      String domainNS = domainNamespaces.get(i);
-      logger.info("domainNamespace " + domainNS);
-      if (!domainNS.equals("default")) {
-        logger.info("Creating domain namespace " + domainNS);
-        ExecCommand.exec("kubectl create namespace " + domainNS);
-      }
-    }
-
-    if (System.getenv("IMAGE_PULL_SECRET_OPERATOR") != null) {
-      Map<String, String> m = new HashMap<>();
-      m.put("name", System.getenv("IMAGE_PULL_SECRET_OPERATOR"));
-      List<Map<String, String>> l = new ArrayList<>();
-      l.add(m);
-      operatorMap.put("imagePullSecrets", l);
-      // create docker registry secrets
-      TestUtils.createDockerRegistrySecret(
-          System.getenv("IMAGE_PULL_SECRET_OPERATOR"),
-          System.getenv("REPO_SERVER"),
-          System.getenv("REPO_USERNAME"),
-          System.getenv("REPO_PASSWORD"),
-          System.getenv("REPO_EMAIL"),
-          operatorNS);
-    }
+    initialize(TestUtils.loadYaml(inputYaml), true, true, true);
   }
 
-  private void initializeCustom(
+  private void initialize(
       Map<String, Object> inputMap, boolean opNS, boolean opSA, boolean targetdomainNS)
       throws Exception {
     operatorMap = inputMap;