Fix operator typos in domain files, add tests for the traefik deployment artifact, test that the copy of the inputs file in the generated directories match the ones specified on the command line, test the valid startup control options, use constants for enum properties

Author: moreaut

src/test/java/oracle/kubernetes/operator/create/CreateDomainGeneratedFilesBaseTest.java

@@ -6,6 +6,7 @@
 import java.util.Map;
 import static java.util.Arrays.asList;
 
+import io.kubernetes.client.models.ExtensionsV1beta1Deployment;
 import io.kubernetes.client.models.V1beta1ClusterRole;
 import io.kubernetes.client.models.V1beta1ClusterRoleBinding;
 import io.kubernetes.client.models.V1ConfigMap;
@@ -14,16 +15,17 @@
 import io.kubernetes.client.models.V1PersistentVolumeClaim;
 import io.kubernetes.client.models.V1Service;
 import io.kubernetes.client.models.V1ServiceAccount;
+import static oracle.kubernetes.operator.create.CreateDomainInputs.readInputsYamlFile;
 import static oracle.kubernetes.operator.create.KubernetesArtifactUtils.*;
-import static oracle.kubernetes.operator.create.YamlUtils.*;
+import static oracle.kubernetes.operator.create.YamlUtils.yamlEqualTo;
 import oracle.kubernetes.weblogic.domain.v1.Domain;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import org.junit.AfterClass;
 import org.junit.Test;
 
 /**
- * Tests that the all artifacts in the yaml files that create-domain-operator.sh
+ * Tests that the all artifacts in the yaml files that create-weblogic-domain.sh
  * creates are correct when the admin node port is disabled, the t3 channel is disabled,
  * there is no image pull secret, and production mode is disabled.
  */
@@ -84,8 +86,10 @@ public static void tearDown() throws Exception {
   }
 
   @Test
-  public void generatedCorrect_weblogicDomainInputsYaml() {
-    // TBD
+  public void generatedCorrect_weblogicDomainInputsYaml() throws Exception {
+    assertThat(
+      readInputsYamlFile(generatedFiles.getDomainFiles().getCreateWeblogicDomainInputsYamlPath()),
+      yamlEqualTo(readInputsYamlFile(generatedFiles.getInputsYamlPath())));
   }
 
   @Test
@@ -410,80 +414,80 @@ protected V1ServiceAccount getExpectedTraefikServiceAccount() {
           .putLabelsItem("weblogic.clusterName", getClusterNameLC()));
   }
 
-/*
   @Test
   public void generatesCorrect_traefikDeployment() throws Exception {
-//System.out.println("MOREAUT_DEBUG traefik deployment =\n" + newYaml().dump(generatedFiles.getTraefikYaml().getTraefikDeployment()));
-
-//
-kind: Deployment
-apiVersion: extensions/v1beta1
-metadata:
-  name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
-  namespace: %NAMESPACE%
-  labels:
-    app: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
-    weblogic.domainUID: %DOMAIN_UID%
-    weblogic.clusterName: %CLUSTER_NAME_LC%
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
-  template:
-    metadata:
-      labels:
-        app: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
-        weblogic.domainUID: %DOMAIN_UID%
-        weblogic.clusterName: %CLUSTER_NAME_LC%
-    spec:
-      serviceAccountName: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
-      terminationGracePeriodSeconds: 60
-      containers:
-      - image: traefik:1.4.5
-        name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
-        resources:
-          requests:
-            cpu: "100m"
-            memory: "20Mi"
-          limits:
-            cpu: "100m"
-            memory: "30Mi"
-        readinessProbe:
-          tcpSocket:
-            port: 80
-          failureThreshold: 1
-          initialDelaySeconds: 10
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 2
-        livenessProbe:
-          tcpSocket:
-            port: 80
-          failureThreshold: 3
-          initialDelaySeconds: 10
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 2
-        volumeMounts:
-        - mountPath: /config
-          name: config
-        ports:
-        - name: http
-          containerPort: 80
-          protocol: TCP
-        - name: dash
-          containerPort: 8080
-          protocol: TCP
-        args:
-        - --configfile=/config/traefik.toml
-      volumes:
-      - name: config
-        configMap:
-          name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
-//
-  }
-*/
+    assertThat(
+      getActualTraefikDeployment(),
+      yamlEqualTo(getExpectedTraefikDeployment()));
+  }
+
+  protected ExtensionsV1beta1Deployment getActualTraefikDeployment() {
+    return getTraefikYaml().getTraefikDeployment();
+  }
+
+  protected ExtensionsV1beta1Deployment getExpectedTraefikDeployment() {
+    return
+      newDeployment()
+        .apiVersion(API_VERSION_EXTENSIONS_V1BETA1) // TBD - why is traefik using this older version?
+        .metadata(newObjectMeta()
+          .name(getTraefikScope())
+          .namespace(getInputs().getNamespace())
+          .putLabelsItem("app", getTraefikScope())
+          .putLabelsItem("weblogic.domainUID", getInputs().getDomainUid())
+          .putLabelsItem("weblogic.clusterName", getClusterNameLC()))
+        .spec(newDeploymentSpec()
+          .replicas(1)
+          .selector(newLabelSelector()
+            .putMatchLabelsItem("app", getTraefikScope()))
+          .template(newPodTemplateSpec()
+            .metadata(newObjectMeta()
+              .putLabelsItem("app", getTraefikScope())
+              .putLabelsItem("weblogic.domainUID", getInputs().getDomainUid())
+              .putLabelsItem("weblogic.clusterName", getClusterNameLC()))
+            .spec(newPodSpec()
+              .serviceAccountName(getTraefikScope())
+              .terminationGracePeriodSeconds(60L)
+              .addContainersItem(newContainer()
+                .name(getTraefikScope())
+                .image("traefik:1.4.5")
+                .resources(newResourceRequirements()
+                  .putRequestsItem("cpu", "100m")
+                  .putRequestsItem("memory", "20Mi")
+                  .putLimitsItem("cpu", "100m")
+                  .putLimitsItem("memory", "30Mi"))
+                .readinessProbe(newProbe()
+                  .tcpSocket(newTCPSocketAction()
+                    .port(newIntOrString(80)))
+                  .failureThreshold(1)
+                  .initialDelaySeconds(10)
+                  .periodSeconds(10)
+                  .successThreshold(1)
+                  .timeoutSeconds(2))
+                .livenessProbe(newProbe()
+                  .tcpSocket(newTCPSocketAction()
+                    .port(newIntOrString(80)))
+                  .failureThreshold(3)
+                  .initialDelaySeconds(10)
+                  .periodSeconds(10)
+                  .successThreshold(1)
+                  .timeoutSeconds(2))
+                .addVolumeMountsItem(newVolumeMount()
+                  .name("config")
+                  .mountPath("/config"))
+                .addPortsItem(newContainerPort()
+                  .name("http")
+                  .containerPort(80)
+                  .protocol("TCP"))
+                .addPortsItem(newContainerPort()
+                  .name("dash")
+                  .containerPort(8080)
+                  .protocol("TCP"))
+                .addArgsItem("--configfile=/config/traefik.toml"))
+              .addVolumesItem(newVolume()
+                .name("config")
+                  .configMap(newConfigMapVolumeSource()
+                    .name(getTraefikScope()))))));
+  }
 
   @Test
   public void generatesCorrect_traefikConfigMap() throws Exception {

src/test/java/oracle/kubernetes/operator/create/CreateDomainGeneratedFilesOptionalFeaturesDisabledTest.java

@@ -6,7 +6,7 @@
 import org.junit.BeforeClass;
 
 /**
- * Tests that the all artifacts in the yaml files that create-domain-operator.sh
+ * Tests that the all artifacts in the yaml files that create-weblogic-domain.sh
  * creates are correct when the admin node port is disabled, the t3 channel is disabled,
  * there is no image pull secret, production mode is disabled and the persistence type
  * is hostPath

src/test/java/oracle/kubernetes/operator/create/CreateDomainGeneratedFilesOptionalFeaturesEnabledTest.java

@@ -10,7 +10,7 @@
 import org.junit.BeforeClass;
 
 /**
- * Tests that the all artifacts in the yaml files that create-domain-operator.sh
+ * Tests that the all artifacts in the yaml files that create-weblogic-domain.sh
  * creates are correct when the admin node port is enabled, the t3 channel is enabled,
  * there is an image pull secret, production mode is enabled, and the persistence type
  * is nfs

src/test/java/oracle/kubernetes/operator/create/CreateDomainInputs.java

@@ -11,10 +11,10 @@
 import static oracle.kubernetes.operator.create.YamlUtils.newYaml;
 
 /**
- * Class that mirrors create-weblogic-operator-inputs.yaml
+ * Class that mirrors create-weblogic-domain-inputs.yaml
  *
- * Used to parse create-weblogic-operator-inputs.yaml into java
- * and convert java to create-weblogic-operator-inputs.yaml
+ * Used to parse create-weblogic-domain-inputs.yaml into java
+ * and convert java to create-weblogic-domain-inputs.yaml
  *
  * Note: use strings to represent params that must be ints or booleans at runtime
  * so that we can test more invalid input options (e.g. missing value, not int value)
@@ -97,8 +97,12 @@ public static CreateDomainInputs newInputs() throws Exception {
         .t3ChannelPort("30013");
   }
 
-  public static CreateDomainInputs readDefaultInputsFile() throws IOException {
-    Reader r = Files.newBufferedReader(defaultInputsPath(), Charset.forName("UTF-8"));
+  public static CreateDomainInputs readDefaultInputsFile() throws Exception {
+    return readInputsYamlFile(defaultInputsPath());
+  }
+
+  public static CreateDomainInputs readInputsYamlFile(Path path) throws Exception {
+    Reader r = Files.newBufferedReader(path, Charset.forName("UTF-8"));
     return (CreateDomainInputs)newYaml().loadAs(r, CreateDomainInputs.class);
   }
 

src/test/java/oracle/kubernetes/operator/create/CreateDomainInputsFileTest.java

@@ -52,7 +52,7 @@ public void defaultInputsFile_hasCorrectContents() throws Exception {
         .exposeAdminT3Channel("false")
         .imagePullSecretName("")
         .javaOptions("-Dweblogic.StdoutDebugEnabled=false")
-        .loadBalancer("traefik")
+        .loadBalancer(LOAD_BALANCER_TRAEFIK)
         .loadBalancerAdminPort("30315")
         .loadBalancerWebPort("30305")
         .managedServerCount("2")
@@ -63,12 +63,12 @@ public void defaultInputsFile_hasCorrectContents() throws Exception {
         .nfsServer("nfsServer")
         .persistencePath("/scratch/k8s_dir/persistentVolume001")
         .persistenceSize("10Gi")
-        .persistenceType("hostPath")
+        .persistenceType(PERSISTENCE_TYPE_HOST_PATH)
         .persistenceVolumeClaimName("pv001-claim")
         .persistenceVolumeName("pv001")
         .productionModeEnabled("true")
         .secretName("domain1-weblogic-credentials")
-        .startupControl("AUTO")
+        .startupControl(STARTUP_CONTROL_AUTO)
         .t3ChannelPort("30012")
         .t3PublicAddress("kubernetes")));
   }