Update deployment.rnc, and configserver veratime JSON test files

3 files changed, 13 insertions, 19 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
index ddb2a53b767..ad33377c6ae 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
@@ -396,7 +396,7 @@ public class DeploymentSpecXmlReader {
     }
 
     /**
-     * Returns the given attribute as an integer, or 0 if it is not present
+     * Returns the given attribute as an integer, or {@code empty()} if it is not present
      */
     private Optional<Integer> optionalIntegerAttribute(String attributeName, Element tag) {
         String value = tag.getAttribute(attributeName);
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc
index 1aaf002b703..08b23f77bc9 100644
--- a/config-model/src/main/resources/schema/deployment.rnc
+++ b/config-model/src/main/resources/schema/deployment.rnc
@@ -54,6 +54,9 @@ Upgrade = element upgrade {
     attribute policy { xsd:string }? &
     attribute revision-target { xsd:string }? &
     attribute revision-change { xsd:string }? &
+    attribute min-risk { xsd:long }? &
+    attribute max-risk { xsd:long }? &
+    attribute max-idle-hours { xsd:long }? &
     attribute rollout { xsd:string }?
 }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsSlimeConverterTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsSlimeConverterTest.java
index 9fa673d4486..21f286590b4 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsSlimeConverterTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsSlimeConverterTest.java
@@ -32,12 +32,9 @@ public class ConfigChangeActionsSlimeConverterTest {
         ConfigChangeActions actions = new ConfigChangeActionsBuilder().build();
         assertEquals(   "{\n" +
                         " \"configChangeActions\": {\n" +
-                        "  \"restart\": [\n" +
-                        "  ],\n" +
-                        "  \"refeed\": [\n" +
-                        "  ],\n" +
-                        "  \"reindex\": [\n" +
-                        "  ]\n" +
+                        "  \"restart\": [ ],\n" +
+                        "  \"refeed\": [ ],\n" +
+                        "  \"reindex\": [ ]\n" +
                         " }\n" +
                         "}\n",
                      toJson(actions));
@@ -77,10 +74,8 @@ public class ConfigChangeActionsSlimeConverterTest {
                         "    ]\n" +
                         "   }\n" +
                         "  ],\n" +
-                        "  \"refeed\": [\n" +
-                        "  ],\n" +
-                        "  \"reindex\": [\n" +
-                        "  ]\n" +
+                        "  \"refeed\": [ ],\n" +
+                        "  \"reindex\": [ ]\n" +
                         " }\n" +
                         "}\n",
                      toJson(actions));
@@ -93,8 +88,7 @@ public class ConfigChangeActionsSlimeConverterTest {
                 refeed(CHANGE_ID_2, CHANGE_MSG, DOC_TYPE_2, CLUSTER, SERVICE_TYPE).build();
         assertEquals("{\n" +
                         " \"configChangeActions\": {\n" +
-                        "  \"restart\": [\n" +
-                        "  ],\n" +
+                        "  \"restart\": [ ],\n" +
                         "  \"refeed\": [\n" +
                         "   {\n" +
                         "    \"name\": \"field-type-change\",\n" +
@@ -129,8 +123,7 @@ public class ConfigChangeActionsSlimeConverterTest {
                         "    ]\n" +
                         "   }\n" +
                         "  ],\n" +
-                        "  \"reindex\": [\n" +
-                        "  ]\n" +
+                        "  \"reindex\": [ ]\n" +
                         " }\n" +
                         "}\n",
                 toJson(actions));
@@ -143,10 +136,8 @@ public class ConfigChangeActionsSlimeConverterTest {
             assertEquals(
                     "{\n" +
                             " \"configChangeActions\": {\n" +
-                            "  \"restart\": [\n" +
-                            "  ],\n" +
-                            "  \"refeed\": [\n" +
-                            "  ],\n" +
+                            "  \"restart\": [ ],\n" +
+                            "  \"refeed\": [ ],\n" +
                             "  \"reindex\": [\n" +
                             "   {\n" +
                             "    \"name\": \"field-type-change\",\n" +