Mark old endpoints as legacy if generated exist

1 files changed, 30 insertions, 5 deletions

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 b2b34441219..22523103208 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
@@ -141,6 +141,13 @@ public class RoutingPoliciesTest {
         assertEquals(numberOfDeployments * clustersPerZone,
                 tester.policiesOf(context1.instance().id()).size(),
                 "Routing policy count is equal to cluster count");
+        assertEquals(List.of(),
+                     tester.controllerTester().controller().routing()
+                           .readDeclaredEndpointsOf(context1.instanceId())
+                           .scope(Endpoint.Scope.zone)
+                           .legacy()
+                           .asList(),
+                     "No endpoints marked as legacy");
 
         // Applications gains a new deployment
         ApplicationPackage applicationPackage2 = applicationPackageBuilder()
@@ -305,6 +312,13 @@ public class RoutingPoliciesTest {
         );
         assertEquals(expectedRecords, tester.recordNames());
         assertEquals(4, tester.policiesOf(context1.instanceId()).size());
+        assertEquals(List.of(),
+                     tester.controllerTester().controller().routing()
+                           .readEndpointsOf(context1.deploymentIdIn(zone1))
+                           .scope(Endpoint.Scope.zone)
+                           .legacy()
+                           .asList(),
+                     "No endpoints marked as legacy");
 
         // Next deploy does nothing
         context1.submit(applicationPackage).deferLoadBalancerProvisioningIn(Environment.prod).deploy();
@@ -1107,16 +1121,27 @@ public class RoutingPoliciesTest {
         assertEquals(6, tester.policiesOf(context.instanceId()).size());
         ClusterSpec.Id cluster0 = ClusterSpec.Id.from("c0");
         ClusterSpec.Id cluster1 = ClusterSpec.Id.from("c1");
+        // The expected number of endpoints are created
         for (var zone : List.of(zone1, zone2)) {
-            EndpointList generated = tester.controllerTester().controller().routing()
-                                           .readEndpointsOf(context.deploymentIdIn(zone))
-                                           .scope(Endpoint.Scope.zone)
-                                           .generated();
+            EndpointList zoneEndpoints = tester.controllerTester().controller().routing()
+                                               .readEndpointsOf(context.deploymentIdIn(zone))
+                                               .scope(Endpoint.Scope.zone);
+            EndpointList generated = zoneEndpoints.generated();
             assertEquals(1, generated.cluster(cluster0).size());
             assertEquals(0, generated.cluster(cluster0).authMethod(AuthMethod.token).size());
             assertEquals(2, generated.cluster(cluster1).size());
             assertEquals(1, generated.cluster(cluster1).authMethod(AuthMethod.token).size());
+            EndpointList legacy = zoneEndpoints.legacy();
+            assertEquals(1, legacy.cluster(cluster0).size());
+            assertEquals(0, legacy.cluster(cluster0).authMethod(AuthMethod.token).size());
+            assertEquals(1, legacy.cluster(cluster1).size());
+            assertEquals(0, legacy.cluster(cluster1).authMethod(AuthMethod.token).size());
         }
+        EndpointList declaredEndpoints = tester.controllerTester().controller().routing().readDeclaredEndpointsOf(context.application());
+        assertEquals(1, declaredEndpoints.scope(Endpoint.Scope.global).generated().size());
+        assertEquals(1, declaredEndpoints.scope(Endpoint.Scope.global).legacy().size());
+        assertEquals(1, declaredEndpoints.scope(Endpoint.Scope.application).generated().size());
+        assertEquals(1, declaredEndpoints.scope(Endpoint.Scope.application).legacy().size());
         Map<DeploymentId, Set<ContainerEndpoint>> containerEndpointsInProd = tester.containerEndpoints(Environment.prod);
 
         // Ordinary endpoints point to expected targets
@@ -1555,7 +1580,7 @@ public class RoutingPoliciesTest {
             } else {
                 global = global.not().generated();
             }
-            String globalEndpoint = global.primary()
+            String globalEndpoint = global.first()
                                           .map(Endpoint::dnsName)
                                           .orElse("<none>");
             assertEquals(latencyTargets, Set.copyOf(aliasDataOf(globalEndpoint)), "Global endpoint " + globalEndpoint + " points to expected latency targets");