clusterType create domain job input param - update valid values to upper case, add validation and unit tests

alai8 · alai8 · commit 349efe1bc0de · 2018-03-26T14:56:52.000-07:00
diff --git a/kubernetes/create-weblogic-domain-inputs.yaml b/kubernetes/create-weblogic-domain-inputs.yaml
@@ -14,8 +14,9 @@ domainName: base_domain
 # This id must be lowercase and unique across all domains in a Kubernetes cluster.
 #domainUID: domain1
 
-# Type of WebLogic Cluster (configured or dynamic)
-clusterType: dynamic
+# Type of WebLogic Cluster
+# Legal values are "CONFIGURED" or "DYNAMIC" 
+clusterType: DYNAMIC
 
 # Determines which WebLogic Servers the Operator will start up
 # Legal values are "NONE", "ALL", "ADMIN", "SPECIFIED", or "AUTO"
diff --git a/kubernetes/internal/create-weblogic-domain-job-template.yaml b/kubernetes/internal/create-weblogic-domain-job-template.yaml
@@ -186,7 +186,7 @@ data:
 
     # Configure machines
     # ======================
-    if cluster_type == "configured":
+    if cluster_type == "CONFIGURED":
 
       for index in range(0, number_of_ms):
 
@@ -203,7 +203,7 @@ data:
     cd('/')
     cl=create(cluster_name, 'Cluster')
 
-    if cluster_type == "configured":
+    if cluster_type == "CONFIGURED":
 
       # Create managed servers
       for index in range(0, number_of_ms):
diff --git a/kubernetes/internal/create-weblogic-domain.sh b/kubernetes/internal/create-weblogic-domain.sh
@@ -258,7 +258,25 @@ function validateStartupControl {
       "AUTO")
       ;;
       *)
-        validationError "Invalid valid for startupControl: ${startupControl}. Valid values are 'NONE', 'ALL', 'ADMIN', 'SPECIFIED', and 'AUTO'."
+        validationError "Invalid value for startupControl: ${startupControl}. Valid values are 'NONE', 'ALL', 'ADMIN', 'SPECIFIED', and 'AUTO'."
+      ;;
+    esac
+  fi
+}
+
+#
+# Function to validate the cluster type value
+#
+function validateClusterType {
+  validateInputParamsSpecified clusterType
+  if [ ! -z "${clusterType}" ]; then
+    case ${clusterType} in
+      "CONFIGURED")
+      ;;
+      "DYNAMIC")
+      ;;
+      *)
+        validationError "Invalid value for clusterType: ${clusterType}. Valid values are 'CONFIGURED' and 'DYNAMIC'."
       ;;
     esac
   fi
@@ -362,6 +380,7 @@ function initialize {
   validateLoadBalancer
   initAndValidateOutputDir
   validateStartupControl
+  validateClusterType
   failIfValidationErrors
 }
 
@@ -466,7 +485,6 @@ function createYamlFiles {
   sed -i -e "s:%INITIAL_MANAGED_SERVER_REPLICAS%:${initialManagedServerReplicas}:g" ${dcrOutput}
   sed -i -e "s:%EXPOSE_T3_CHANNEL_PREFIX%:${exposeAdminT3ChannelPrefix}:g" ${dcrOutput}
   sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${dcrOutput}
-  sed -i -e "s:%CLUSTER_TYPE%:${clusterType}:g" ${dcrOutput}
   sed -i -e "s:%EXPOSE_ADMIN_PORT_PREFIX%:${exposeAdminNodePortPrefix}:g" ${dcrOutput}
   sed -i -e "s:%ADMIN_NODE_PORT%:${adminNodePort}:g" ${dcrOutput}
   sed -i -e "s:%JAVA_OPTIONS%:${javaOptions}:g" ${dcrOutput}
diff --git a/src/integration-tests/bash/run.sh b/src/integration-tests/bash/run.sh
@@ -2625,12 +2625,12 @@ function test_suite {
     op_define  oper2   weblogic-operator-2  test2              32001
 
     #          DOM_KEY  OP_KEY  NAMESPACE DOMAIN_UID STARTUP_CONTROL WL_CLUSTER_NAME WL_CLUSTER_TYPE  MS_BASE_NAME   ADMIN_PORT ADMIN_WLST_PORT ADMIN_NODE_PORT MS_PORT LOAD_BALANCER_WEB_PORT LOAD_BALANCER_DASHBOARD_PORT
-    dom_define domain1  oper1   default   domain1    AUTO            cluster-1       dynamic          managed-server 7001       30012           30701           8001    30305                  30315
-    dom_define domain2  oper1   default   domain2    AUTO            cluster-1       dynamic          managed-server 7011       30031           30702           8021    30306                  30316
-    dom_define domain3  oper1   test1     domain3    AUTO            cluster-1       dynamic          managed-server 7021       30041           30703           8031    30307                  30317
-    dom_define domain4  oper2   test2     domain4    AUTO            cluster-1       configured       managed-server 7041       30051           30704           8041    30308                  30318
-    dom_define domain5  oper1   default   domain5    ADMIN           cluster-1       dynamic          managed-server 7051       30061           30705           8051    30309                  30319
-    dom_define domain6  oper1   default   domain6    AUTO            cluster-1       dynamic          managed-server 7061       30071           30706           8061    30310                  30320
+    dom_define domain1  oper1   default   domain1    AUTO            cluster-1       DYNAMIC          managed-server 7001       30012           30701           8001    30305                  30315
+    dom_define domain2  oper1   default   domain2    AUTO            cluster-1       DYNAMIC          managed-server 7011       30031           30702           8021    30306                  30316
+    dom_define domain3  oper1   test1     domain3    AUTO            cluster-1       DYNAMIC          managed-server 7021       30041           30703           8031    30307                  30317
+    dom_define domain4  oper2   test2     domain4    AUTO            cluster-1       CONFIGURED       managed-server 7041       30051           30704           8041    30308                  30318
+    dom_define domain5  oper1   default   domain5    ADMIN           cluster-1       DYNAMIC          managed-server 7051       30061           30705           8051    30309                  30319
+    dom_define domain6  oper1   default   domain6    AUTO            cluster-1       DYNAMIC          managed-server 7061       30071           30706           8061    30310                  30320
 
     # create namespaces for domains (the operator job creates a namespace if needed)
     # TODO have the op_define commands themselves create target namespace if it doesn't already exist, or test if the namespace creation is needed in the first place, and if so, ask MikeG to create them as part of domain create job
diff --git a/src/test/java/oracle/kubernetes/operator/create/CreateDomainGeneratedFilesBaseTest.java b/src/test/java/oracle/kubernetes/operator/create/CreateDomainGeneratedFilesBaseTest.java
@@ -290,6 +290,7 @@ protected void assertThatActualCreateDomainPyIsCorrect(String actualCreateDomain
         server_port        = %MANAGED_SERVER_PORT%
         cluster_name       = "%CLUSTER_NAME%"
         number_of_ms       = %NUMBER_OF_MS%
+        cluster_type       = "%CLUSTER_TYPE%"
         print('domain_name        : [%DOMAIN_NAME%]');
         print('admin_port         : [%ADMIN_PORT%]');
         set('Name', '%DOMAIN_NAME%')
diff --git a/src/test/java/oracle/kubernetes/operator/create/CreateDomainGeneratedFilesOptionalFeaturesEnabledTest.java b/src/test/java/oracle/kubernetes/operator/create/CreateDomainGeneratedFilesOptionalFeaturesEnabledTest.java
@@ -25,6 +25,7 @@ public static void setup() throws Exception {
       CreateDomainInputs.newInputs()
         .exposeAdminNodePort("true")
         .exposeAdminT3Channel("true")
+        .clusterType("CONFIGURED")
         .weblogicImagePullSecretName("test-weblogic-image-pull-secret-name")
         .loadBalancer(LOAD_BALANCER_TRAEFIK)
         .weblogicDomainStorageType(STORAGE_TYPE_NFS)
diff --git a/src/test/java/oracle/kubernetes/operator/create/CreateDomainInputs.java b/src/test/java/oracle/kubernetes/operator/create/CreateDomainInputs.java
@@ -39,6 +39,8 @@ public class CreateDomainInputs {
   public static final String STARTUP_CONTROL_ADMIN = "ADMIN";
   public static final String STARTUP_CONTROL_SPECIFIED = "SPECIFIED";
   public static final String STARTUP_CONTROL_AUTO = "AUTO";
+  public static final String CLUSTER_TYPE_CONFIGURED = "CONFIGURED";
+  public static final String CLUSTER_TYPE_DYNAMIC = "DYNAMIC";
 
   private static final String DEFAULT_INPUTS = "kubernetes/create-weblogic-domain-inputs.yaml";
 
@@ -79,6 +81,7 @@ public static CreateDomainInputs newInputs() throws Exception {
         .adminPort("7002")
         .adminServerName("TestAdminServer")
         .clusterName("TestCluster")
+        .clusterType(CLUSTER_TYPE_DYNAMIC)
         .domainName("TestDomain")
         .domainUID("test-domain-uid")
         .javaOptions("TestJavaOptions")
diff --git a/src/test/java/oracle/kubernetes/operator/create/CreateDomainInputsFileTest.java b/src/test/java/oracle/kubernetes/operator/create/CreateDomainInputsFileTest.java
@@ -47,7 +47,7 @@ public void defaultInputsFile_hasCorrectContents() throws Exception {
         .adminPort("7001")
         .adminServerName("admin-server")
         .clusterName("cluster-1")
-        .clusterType("dynamic")
+        .clusterType("DYNAMIC")
         .domainName("base_domain")
         .domainUID("")
         .exposeAdminNodePort("false")
diff --git a/src/test/java/oracle/kubernetes/operator/create/CreateDomainInputsValidationTest.java b/src/test/java/oracle/kubernetes/operator/create/CreateDomainInputsValidationTest.java
@@ -26,6 +26,7 @@ public class CreateDomainInputsValidationTest {
   private static final String PARAM_DOMAIN_UID = "domainUID";
   private static final String PARAM_STARTUP_CONTROL = "startupControl";
   private static final String PARAM_CLUSTER_NAME = "clusterName";
+  private static final String PARAM_CLUSTER_TYPE = "clusterType";
   private static final String PARAM_CONFIGURED_MANAGED_SERVER_COUNT = "configuredManagedServerCount";
   private static final String PARAM_INITIAL_MANAGED_SERVER_REPLICAS = "initialManagedServerReplicas";
   private static final String PARAM_MANAGED_SERVER_NAME_BASE = "managedServerNameBase";
@@ -155,6 +156,31 @@ public void createDomain_with_invalidStartupControl_failsAndReturnsError() throw
       failsAndPrints(invalidEnumParamValueError(PARAM_STARTUP_CONTROL, val)));
   }
 
+  @Test
+  public void createDomain_with_missingClusterType_failsAndReturnsError() throws Exception {
+    assertThat(
+      execCreateDomain(newInputs().clusterType("")),
+      failsAndPrints(paramMissingError(PARAM_CLUSTER_TYPE)));
+  }
+
+  @Test
+  public void createDomain_with_clusterTypeConfigured_succeeds() throws Exception {
+    createDomain_with_validClusterType_succeeds(CLUSTER_TYPE_CONFIGURED);
+  }
+
+  @Test
+  public void createDomain_with_clusterTypeDynamic_succeeds() throws Exception {
+    createDomain_with_validClusterType_succeeds(CLUSTER_TYPE_DYNAMIC);
+  }
+
+  @Test
+  public void createDomain_with_invalidClusterType_failsAndReturnsError() throws Exception {
+    String val = "Invalid-cluster-type";
+    assertThat(
+      execCreateDomain(newInputs().clusterType(val)),
+      failsAndPrints(invalidEnumParamValueError(PARAM_CLUSTER_TYPE, val)));
+  }
+
   @Test
   public void createDomain_with_missingClusterName_failsAndReturnsError() throws Exception {
     assertThat(
@@ -487,6 +513,10 @@ private void createDomain_with_validStartupControl_succeeds(String startupContro
     createDomain_with_validInputs_succeeds(newInputs().startupControl(startupControl));
   }
 
+  private void createDomain_with_validClusterType_succeeds(String clusterType) throws Exception {
+    createDomain_with_validInputs_succeeds(newInputs().clusterType(clusterType));
+  }
+
   private void createDomain_with_validInputs_succeeds(CreateDomainInputs inputs) throws Exception {
     // throws an error if the inputs are not valid, succeeds otherwise:
     GeneratedDomainYamlFiles.generateDomainYamlFiles(inputs).remove();
