Do valiation when checking allows

2 files changed, 7 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ValidationOverridesValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ValidationOverridesValidator.java
index 0095c2c335d..955d7924f86 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ValidationOverridesValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ValidationOverridesValidator.java
@@ -22,8 +22,8 @@ public class ValidationOverridesValidator extends Validator {
         Optional<Reader> overrides = deployState.getApplicationPackage().getValidationOverrides();
         if (overrides.isEmpty()) return;
 
-        // Dates are validated in constructor
-        ValidationOverrides.fromXml(overrides.get());
+        ValidationOverrides validationOverrides = ValidationOverrides.fromXml(overrides.get());
+        validationOverrides.validate(deployState.now());
     }
 
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationOverridesValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationOverridesValidatorTest.java
index 453bdf98ce7..90d3d80c032 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationOverridesValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationOverridesValidatorTest.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.model.application.validation;
 
 import com.yahoo.config.model.NullConfigModelRegistry;
+import com.yahoo.config.model.api.ValidationParameters;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.vespa.model.VespaModel;
@@ -35,7 +36,8 @@ public class ValidationOverridesValidatorTest {
                                      "  </validation-overrides>";
 
         var deployState = createDeployState(validationOverridesXml);
-        new VespaModel(new NullConfigModelRegistry(), deployState);
+        VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
+        Validation.validate(model, new ValidationParameters(), deployState);
     }
 
     @Test
@@ -55,7 +57,8 @@ public class ValidationOverridesValidatorTest {
     private static void assertValidationError(String message, String validationOverridesXml) {
         try {
             var deployState = createDeployState(validationOverridesXml);
-            new VespaModel(new NullConfigModelRegistry(), deployState);
+            VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
+            Validation.validate(model, new ValidationParameters(), deployState);
             fail("Did not get expected exception");
         } catch (IllegalArgumentException e) {
             assertEquals(message, e.getMessage());