summaryrefslogtreecommitdiffstats
path: root/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java')
-rw-r--r--config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java132
1 files changed, 64 insertions, 68 deletions
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
index c33277dfc6f..134d45e35ab 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
@@ -116,8 +116,8 @@ public class DeploymentSpecTest {
<deployment version='1.0'>
<instance id='default'>
<prod>
- <region active='false'>us-east1</region>
- <region active='true'>us-west1</region>
+ <region>us-east1</region>
+ <region>us-west1</region>
</prod>
</instance>
</deployment>
@@ -128,10 +128,8 @@ public class DeploymentSpecTest {
assertEquals(2, spec.requireInstance("default").steps().size());
assertTrue(spec.requireInstance("default").steps().get(0).concerns(prod, Optional.of(RegionName.from("us-east1"))));
- assertFalse(((DeploymentSpec.DeclaredZone)spec.requireInstance("default").steps().get(0)).active());
assertTrue(spec.requireInstance("default").steps().get(1).concerns(prod, Optional.of(RegionName.from("us-west1"))));
- assertTrue(((DeploymentSpec.DeclaredZone)spec.requireInstance("default").steps().get(1)).active());
assertFalse(spec.requireInstance("default").concerns(test, Optional.empty()));
assertFalse(spec.requireInstance("default").concerns(staging, Optional.empty()));
@@ -154,14 +152,14 @@ public class DeploymentSpecTest {
"<deployment version='1.0'>" +
" <instance id='a' tags='tag1 tag2'>" +
" <prod>" +
- " <region active='false'>us-east1</region>" +
- " <region active='true'>us-west1</region>" +
+ " <region>us-east1</region>" +
+ " <region>us-west1</region>" +
" </prod>" +
" </instance>" +
" <instance id='b' tags='tag3'>" +
" <prod>" +
- " <region active='false'>us-east1</region>" +
- " <region active='true'>us-west1</region>" +
+ " <region>us-east1</region>" +
+ " <region>us-west1</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -179,9 +177,9 @@ public class DeploymentSpecTest {
" <test/>" +
" <staging/>" +
" <prod>" +
- " <region active='false'>us-east1</region>" +
+ " <region>us-east1</region>" +
" <delay hours='3' minutes='30'/>" +
- " <region active='true'>us-west1</region>" +
+ " <region>us-west1</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -199,8 +197,8 @@ public class DeploymentSpecTest {
" <test/>" +
" <staging/>" +
" <prod>" +
- " <region active='false'>us-east-1</region>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-east-1</region>" +
+ " <region>us-west-1</region>" +
" <delay hours='1' />" +
" <test>us-west-1</test>" +
" <test>us-east-1</test>" +
@@ -227,7 +225,7 @@ public class DeploymentSpecTest {
"<deployment version='1.0'>" +
" <instance id='default'>" +
" <prod>" +
- " <region active='true'>us-east1</region>" +
+ " <region>us-east1</region>" +
" <test>us-east1</test>" +
" <test>us-east1</test>" +
" </prod>" +
@@ -244,7 +242,7 @@ public class DeploymentSpecTest {
" <instance id='default'>" +
" <prod>" +
" <test>us-east1</test>" +
- " <region active='true'>us-east1</region>" +
+ " <region>us-east1</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -259,7 +257,7 @@ public class DeploymentSpecTest {
" <instance id='default'>" +
" <prod>" +
" <parallel>" +
- " <region active='true'>us-east1</region>" +
+ " <region>us-east1</region>" +
" <test>us-east1</test>" +
" </parallel>" +
" </prod>" +
@@ -277,14 +275,14 @@ public class DeploymentSpecTest {
" <test/>" +
" <staging/>" +
" <prod>" +
- " <region active='false'>us-east1</region>" +
+ " <region>us-east1</region>" +
" <delay hours='3' minutes='30'/>" +
- " <region active='true'>us-west1</region>" +
+ " <region>us-west1</region>" +
" </prod>" +
" </instance>" +
" <instance id='instance2'>" +
" <prod>" +
- " <region active='true'>us-central1</region>" +
+ " <region>us-central1</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -309,9 +307,9 @@ public class DeploymentSpecTest {
" <test/>" +
" <staging/>" +
" <prod>" +
- " <region active='false'>us-east1</region>" +
+ " <region>us-east1</region>" +
" <delay hours='3' minutes='30'/>" +
- " <region active='true'>us-west1</region>" +
+ " <region>us-west1</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -332,13 +330,11 @@ public class DeploymentSpecTest {
assertTrue(instance.steps().get(1).concerns(staging));
assertTrue(instance.steps().get(2).concerns(prod, Optional.of(RegionName.from("us-east1"))));
- assertFalse(((DeploymentSpec.DeclaredZone)instance.steps().get(2)).active());
assertTrue(instance.steps().get(3) instanceof DeploymentSpec.Delay);
assertEquals(3 * 60 * 60 + 30 * 60, instance.steps().get(3).delay().getSeconds());
assertTrue(instance.steps().get(4).concerns(prod, Optional.of(RegionName.from("us-west1"))));
- assertTrue(((DeploymentSpec.DeclaredZone)instance.steps().get(4)).active());
assertTrue(instance.concerns(test, Optional.empty()));
assertTrue(instance.concerns(test, Optional.of(RegionName.from("region1")))); // test steps specify no region
@@ -474,11 +470,11 @@ public class DeploymentSpecTest {
" <instance id='default'>" +
" <upgrade policy='canary'/>" +
" <prod>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" <delay hours='47'/>" +
- " <region active='true'>us-central-1</region>" +
+ " <region>us-central-1</region>" +
" <delay minutes='59' seconds='61'/>" +
- " <region active='true'>us-east-3</region>" +
+ " <region>us-east-3</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -515,10 +511,10 @@ public class DeploymentSpecTest {
"<deployment>" +
" <instance id='default'>" +
" <prod>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" <parallel>" +
- " <region active='true'>us-central-1</region>" +
- " <region active='true'>us-east-3</region>" +
+ " <region>us-central-1</region>" +
+ " <region>us-east-3</region>" +
" </parallel>" +
" </prod>" +
" </instance>" +
@@ -539,14 +535,14 @@ public class DeploymentSpecTest {
" <staging/>" +
" <instance id='instance0'>" +
" <prod>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" </prod>" +
" </instance>" +
" <instance id='instance1'>" +
" <test/>" +
" <staging/>" +
" <prod>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -579,25 +575,25 @@ public class DeploymentSpecTest {
" <instance id='instance' athenz-service='in-service'>" +
" <prod>" +
" <parallel>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" <steps>" +
- " <region active='true'>us-east-3</region>" +
+ " <region>us-east-3</region>" +
" <delay hours='2' />" +
- " <region active='true'>eu-west-1</region>" +
+ " <region>eu-west-1</region>" +
" <delay hours='2' />" +
" </steps>" +
" <steps>" +
" <delay hours='3' />" +
- " <region active='true'>aws-us-east-1a</region>" +
+ " <region>aws-us-east-1a</region>" +
" <parallel>" +
- " <region active='true' athenz-service='no-service'>ap-northeast-1</region>" +
- " <region active='true'>ap-southeast-2</region>" +
+ " <region athenz-service='no-service'>ap-northeast-1</region>" +
+ " <region>ap-southeast-2</region>" +
" <test>aws-us-east-1a</test>" +
" </parallel>" +
" </steps>" +
" <delay hours='3' minutes='30' />" +
" </parallel>" +
- " <region active='true'>us-north-7</region>" +
+ " <region>us-north-7</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -651,12 +647,12 @@ public class DeploymentSpecTest {
" <parallel>" +
" <instance id='instance0'>" +
" <prod>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" </prod>" +
" </instance>" +
" <instance id='instance1'>" +
" <prod>" +
- " <region active='true'>us-east-3</region>" +
+ " <region>us-east-3</region>" +
" </prod>" +
" </instance>" +
" </parallel>" +
@@ -679,13 +675,13 @@ public class DeploymentSpecTest {
"<deployment>" +
" <instance id='instance0'>" +
" <prod>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" </prod>" +
" </instance>" +
" <delay hours='12'/>" +
" <instance id='instance1'>" +
" <prod>" +
- " <region active='true'>us-east-3</region>" +
+ " <region>us-east-3</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -705,11 +701,11 @@ public class DeploymentSpecTest {
"<deployment>" +
" <instance id='default'>" +
" <prod>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" <parallel>" +
- " <region active='true'>us-west-1</region>" +
- " <region active='true'>us-central-1</region>" +
- " <region active='true'>us-east-3</region>" +
+ " <region>us-west-1</region>" +
+ " <region>us-central-1</region>" +
+ " <region>us-east-3</region>" +
" </parallel>" +
" </prod>" +
" </instance>" +
@@ -796,7 +792,7 @@ public class DeploymentSpecTest {
" <instance id='default'>" +
" <block-change days='sat' hours='10' time-zone='CET'/>" +
" <prod>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" </prod>" +
" <block-change days='mon,tue' hours='15-16'/>" +
" </instance>" +
@@ -813,7 +809,7 @@ public class DeploymentSpecTest {
" <block-change days='sat' hours='10' time-zone='CET'/>" +
" <test/>" +
" <prod>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -830,7 +826,7 @@ public class DeploymentSpecTest {
" <block-change days='sat' hours='10' time-zone='CET'/>" +
" <block-change days='mon-sun' hours='0-23' time-zone='CET' from-date='2022-01-01' to-date='2022-01-15'/>" +
" <prod>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -891,7 +887,7 @@ public class DeploymentSpecTest {
"<deployment athenz-domain='domain' athenz-service='service'>" +
" <instance id='instance1'>" +
" <prod>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -909,10 +905,10 @@ public class DeploymentSpecTest {
"<deployment athenz-domain='domain' athenz-service='service'>" +
" <instance id='instance1'>" +
" <prod athenz-service='prod-service'>" +
- " <region active='true'>us-central-1</region>" +
+ " <region>us-central-1</region>" +
" <parallel>" +
- " <region active='true'>us-west-1</region>" +
- " <region active='true'>us-east-3</region>" +
+ " <region>us-west-1</region>" +
+ " <region>us-east-3</region>" +
" </parallel>" +
" </prod>" +
" </instance>" +
@@ -939,16 +935,16 @@ public class DeploymentSpecTest {
<instance id='instance1'>
<prod>
<parallel>
- <region active='true'>us-west-1</region>
- <region active='true'>us-east-3</region>
+ <region>us-west-1</region>
+ <region>us-east-3</region>
</parallel>
</prod>
</instance>
<instance id='instance2'>
<prod>
<parallel>
- <region active='true'>us-west-1</region>
- <region active='true'>us-east-3</region>
+ <region>us-west-1</region>
+ <region>us-east-3</region>
</parallel>
</prod>
</instance>
@@ -971,7 +967,7 @@ public class DeploymentSpecTest {
"<deployment athenz-domain='domain'>" +
" <instance id='default' athenz-service='service'>" +
" <prod>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -990,7 +986,7 @@ public class DeploymentSpecTest {
" <test />" +
" <staging athenz-service='staging-service' />" +
" <prod athenz-service='prod-service'>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -1013,7 +1009,7 @@ public class DeploymentSpecTest {
"<deployment athenz-domain='domain'>" +
" <instance id='default'>" +
" <prod>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -1027,7 +1023,7 @@ public class DeploymentSpecTest {
"<deployment>" +
" <instance id='default'>" +
" <prod athenz-service='service'>" +
- " <region active='true'>us-west-1</region>" +
+ " <region>us-west-1</region>" +
" </prod>" +
" </instance>" +
"</deployment>"
@@ -1356,14 +1352,14 @@ public class DeploymentSpecTest {
<deployment>
<instance id="beta">
<prod>
- <region active='true'>us-west-1</region>
- <region active='true'>us-east-3</region>
+ <region>us-west-1</region>
+ <region>us-east-3</region>
</prod>
</instance>
<instance id="main">
<prod>
- <region active='true'>us-west-1</region>
- <region active='true'>us-east-3</region>
+ <region>us-west-1</region>
+ <region>us-east-3</region>
</prod>
</instance>
<endpoints>
@@ -1456,14 +1452,14 @@ public class DeploymentSpecTest {
<deployment>
<instance id="beta">
<prod>
- <region active='true'>us-west-1</region>
- <region active='true'>us-east-3</region>
+ <region>us-west-1</region>
+ <region>us-east-3</region>
</prod>
</instance>
<instance id="main">
<prod>
- <region active='true'>us-west-1</region>
- <region active='true'>us-east-3</region>
+ <region>us-west-1</region>
+ <region>us-east-3</region>
</prod>
<endpoints>
<endpoint id="glob" container-id="music"/>