diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-04-12 12:43:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-12 12:43:06 +0200 |
| commit | 443af2d30c56122be3095e7e7c407cb38ef622d2 (patch) | |
| tree | 90159e44bc05f8e0bd1f2f82bb9e136c2007a7cc /config-model | |
| parent | 2aa11fa4aa657ef668a34b34b3fee2d1aae4e526 (diff) | |
| parent | 27af44b14a95177126ec4c1cd3deaf9a1fb4c6e5 (diff) | |
Merge pull request #22077 from vespa-engine/jonmv/deployment-risk-2
Jonmv/deployment risk 2
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/resources/schema/deployment.rnc | 3 | ||||
| -rwxr-xr-x | config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java | 10 |
2 files changed, 8 insertions, 5 deletions
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/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java index 737a2cee3e5..7af81b3b9b1 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java @@ -74,11 +74,11 @@ public class VespaDomBuilderTest { GenericConfig.GenericConfigBuilder builder = new GenericConfig.GenericConfigBuilder(new ConfigDefinitionKey("testnamespace", "foo"), new ConfigPayloadBuilder()); model.getConfig(builder, "admin"); - assertEquals(builder.getPayload().toString(), "{\n" + - " \"basicStruct\": {\n" + - " \"stringVal\": \"default\"\n" + - " }\n" + - "}\n"); + assertEquals("{\n" + + " \"basicStruct\": {\n" + + " \"stringVal\": \"default\"\n" + + " }\n" + + "}\n", builder.getPayload().toString()); } @Test |