Remove active attribute

3 files changed, 12 insertions, 43 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
index a70125815b1..fb3026e1d80 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
@@ -156,15 +156,8 @@ public class ApplicationPackageBuilder {
         return this;
     }
 
-    public ApplicationPackageBuilder region(RegionName regionName) {
-        return region(regionName, true);
-    }
-
     public ApplicationPackageBuilder region(String regionName) {
-        prodBody.append("      <region>")
-                .append(regionName)
-                .append("</region>\n");
-        return this;
+        return region(RegionName.from(regionName));
     }
 
     public ApplicationPackageBuilder region(String regionName, String cloudAccount) {
@@ -181,10 +174,8 @@ public class ApplicationPackageBuilder {
         return this;
     }
 
-    public ApplicationPackageBuilder region(RegionName regionName, boolean active) {
-        prodBody.append("      <region active='")
-                .append(active)
-                .append("'>")
+    public ApplicationPackageBuilder region(RegionName regionName) {
+        prodBody.append("      <region>")
                 .append(regionName.value())
                 .append("</region>\n");
         return this;
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
index e5a10bb5889..3fb4a040e0d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
@@ -1312,19 +1312,19 @@ public class DeploymentTriggerTest {
                             <staging />
                             <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'>us-central-1</region>
+                                        <region>us-central-1</region>
                                         <parallel>
-                                            <region active='true' athenz-service='no-service'>ap-northeast-1</region>
-                                            <region active='true'>ap-northeast-2</region>
+                                            <region athenz-service='no-service'>ap-northeast-1</region>
+                                            <region>ap-northeast-2</region>
                                             <test>us-central-1</test>
                                         </parallel>
                                     </steps>
@@ -1335,7 +1335,7 @@ public class DeploymentTriggerTest {
                                    <test>ap-northeast-1</test>
                                 </parallel>
                                 <test>us-east-3</test>
-                                <region active='true'>ap-southeast-1</region>
+                                <region>ap-southeast-1</region>
                             </prod>
                             <endpoints>
                                 <endpoint id='foo' container-id='bar'>
@@ -1350,7 +1350,7 @@ public class DeploymentTriggerTest {
                             <test />
                             <block-change revision='true' version='false' days='sat' hours='0-23' time-zone='CET' />
                             <prod>
-                                <region active='true'>eu-west-1</region>
+                                <region>eu-west-1</region>
                                 <test>eu-west-1</test>
                             </prod>
                             <notifications when='failing'>
@@ -1363,7 +1363,7 @@ public class DeploymentTriggerTest {
                     <instance id='last'>
                         <upgrade policy='conservative' />
                         <prod>
-                            <region active='true'>eu-west-1</region>
+                            <region>eu-west-1</region>
                         </prod>
                     </instance>
                 </deployment>
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
index e41856b0c3d..46ec42cab8f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
@@ -642,28 +642,6 @@ public class RoutingPoliciesTest {
         assertEquals(RoutingStatus.Value.in, policy1.routingStatus().value());
         assertEquals(RoutingStatus.Agent.tenant, policy1.routingStatus().agent());
         assertEquals(changedAt.truncatedTo(ChronoUnit.MILLIS), policy1.routingStatus().changedAt());
-
-        // Deployment is set out through a new deployment.xml
-        var applicationPackage2 = applicationPackageBuilder()
-                .region(zone1.region())
-                .region(zone2.region(), false)
-                .endpoint("r0", "c0", zone1.region().value(), zone2.region().value())
-                .endpoint("r1", "c0", zone1.region().value(), zone2.region().value())
-                .build();
-        context.submit(applicationPackage2).deferLoadBalancerProvisioningIn(Environment.prod).deploy();
-        tester.assertTargets(context.instanceId(), EndpointId.of("r0"), 0, zone1);
-        tester.assertTargets(context.instanceId(), EndpointId.of("r1"), 0, zone1);
-
-        // ... back in
-        var applicationPackage3 = applicationPackageBuilder()
-                .region(zone1.region())
-                .region(zone2.region())
-                .endpoint("r0", "c0", zone1.region().value(), zone2.region().value())
-                .endpoint("r1", "c0", zone1.region().value(), zone2.region().value())
-                .build();
-        context.submit(applicationPackage3).deferLoadBalancerProvisioningIn(Environment.prod).deploy();
-        tester.assertTargets(context.instanceId(), EndpointId.of("r0"), 0, zone1, zone2);
-        tester.assertTargets(context.instanceId(), EndpointId.of("r1"), 0, zone1, zone2);
     }
 
     @Test