Actually add unit test, and verify deployment spec before storing it

2 files changed, 31 insertions, 1 deletions

diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobTypeTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobTypeTest.java
new file mode 100644
index 00000000000..22486875a0b
--- /dev/null
+++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobTypeTest.java
@@ -0,0 +1,28 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.hosted.controller.api.integration.deployment;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author jonmv
+ */
+public class JobTypeTest {
+
+    @Test
+    public void test() {
+        for (JobType type : JobType.values()) {
+            if (type.isProduction()) {
+                boolean match = false;
+                for (JobType other : JobType.values())
+                    match |=    type != other
+                             && type.isTest() == other.isDeployment()
+                             && type.zones.equals(other.zones);
+
+                assertTrue(type + " should have matching job", match);
+            }
+        }
+    }
+
+}
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index cb3c84f5bd1..c867b97b544 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -90,7 +90,6 @@ import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static com.yahoo.vespa.hosted.controller.api.integration.configserver.Node.State.active;
 import static com.yahoo.vespa.hosted.controller.api.integration.configserver.Node.State.reserved;
@@ -443,6 +442,9 @@ public class ApplicationController {
             if (applicationPackage.deploymentSpec().requireInstance(instance).concerns(Environment.prod))
                 application = controller.routing().assignRotations(application, instance);
 
+        // Validate new deployment spec thoroughly before storing it.
+        controller.jobController().deploymentStatus(application.get());
+
         store(application);
         return application;
     }