Distinguish between implicit (zone-scoped) and declared endpoints

3 files changed, 15 insertions, 15 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
index e2bc1fa305d..d28d2c090a8 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
@@ -255,7 +255,7 @@ public class ControllerTest {
         assertEquals("app1--tenant1.global.vespa.oath.cloud", record.get().name().asString());
         assertEquals("rotation-fqdn-01.", record.get().data().asString());
 
-        List<String> globalDnsNames = tester.controller().routing().endpointsOf(context.instanceId())
+        List<String> globalDnsNames = tester.controller().routing().readDeclaredEndpointsOf(context.instanceId())
                                             .scope(Endpoint.Scope.global)
                                             .mapToList(Endpoint::dnsName);
         assertEquals(List.of("app1--tenant1.global.vespa.oath.cloud"), globalDnsNames);
@@ -299,7 +299,7 @@ public class ControllerTest {
         assertEquals("app1.tenant1.global.vespa.yahooapis.com", record.get().name().asString());
         assertEquals("rotation-fqdn-01.", record.get().data().asString());
 
-        List<String> globalDnsNames = tester.controller().routing().endpointsOf(context.instanceId())
+        List<String> globalDnsNames = tester.controller().routing().readDeclaredEndpointsOf(context.instanceId())
                                             .scope(Endpoint.Scope.global)
                                             .mapToList(Endpoint::dnsName);
         assertEquals(List.of("app1--tenant1.global.vespa.oath.cloud",
@@ -610,7 +610,7 @@ public class ControllerTest {
         assertEquals("DeploymentSpec is not stored", DeploymentSpec.empty, context.application().deploymentSpec());
 
         // Verify zone supports shared layer 4 and shared routing methods
-        Set<RoutingMethod> routingMethods = tester.controller().routing().endpointsOf(context.deploymentIdIn(zone))
+        Set<RoutingMethod> routingMethods = tester.controller().routing().readEndpointsOf(context.deploymentIdIn(zone))
                 .asList()
                 .stream()
                 .map(Endpoint::routingMethod)
@@ -875,7 +875,7 @@ public class ControllerTest {
         tester.controllerTester().zoneRegistry()
               .setRoutingMethod(ZoneApiMock.from(zone1), RoutingMethod.shared, RoutingMethod.sharedLayer4)
               .setRoutingMethod(ZoneApiMock.from(zone2), RoutingMethod.shared, RoutingMethod.sharedLayer4);
-        Supplier<Set<RoutingMethod>> routingMethods = () -> tester.controller().routing().endpointsOf(context.deploymentIdIn(zone1))
+        Supplier<Set<RoutingMethod>> routingMethods = () -> tester.controller().routing().readEndpointsOf(context.deploymentIdIn(zone1))
                                                                   .asList()
                                                                   .stream()
                                                                   .map(Endpoint::routingMethod)
@@ -901,7 +901,7 @@ public class ControllerTest {
                                 "application--tenant.global.vespa.oath.cloud"),
                          tester.configServer().containerEndpoints().get(context.deploymentIdIn(zone)));
         }
-        List<String> zoneDnsNames = tester.controller().routing().endpointsOf(context.deploymentIdIn(zone1))
+        List<String> zoneDnsNames = tester.controller().routing().readEndpointsOf(context.deploymentIdIn(zone1))
                                           .scope(Endpoint.Scope.zone)
                                           .mapToList(Endpoint::dnsName);
         assertEquals(List.of("application--tenant.us-west-1.vespa.oath.cloud",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/rotation/RotationRepositoryTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/rotation/RotationRepositoryTest.java
index 910e5943989..b767e8a791f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/rotation/RotationRepositoryTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/rotation/RotationRepositoryTest.java
@@ -63,7 +63,7 @@ public class RotationRepositoryTest {
 
         assertEquals(List.of(expected.id()), rotationIds(application.instance().rotations()));
         assertEquals(URI.create("https://app1--tenant1.global.vespa.oath.cloud:4443/"),
-                     tester.controller().routing().endpointsOf(application.instanceId()).primary().get().url());
+                     tester.controller().routing().readDeclaredEndpointsOf(application.instanceId()).primary().get().url());
         try (RotationLock lock = repository.lock()) {
             List<AssignedRotation> rotations = repository.getOrAssignRotations(application.application().deploymentSpec(),
                                                                                application.instance(),
@@ -158,7 +158,7 @@ public class RotationRepositoryTest {
         application2.submit(applicationPackage);
         assertEquals(List.of(new RotationId("foo-1")), rotationIds(application2.instance().rotations()));
         assertEquals("https://cd--app2--tenant2.global.vespa.oath.cloud:4443/",
-                     tester.controller().routing().endpointsOf(application2.instanceId()).primary().get().url().toString());
+                     tester.controller().routing().readDeclaredEndpointsOf(application2.instanceId()).primary().get().url().toString());
     }
 
     @Test
@@ -174,9 +174,9 @@ public class RotationRepositoryTest {
         assertEquals(List.of(new RotationId("foo-1")), rotationIds(instance1.instance().rotations()));
         assertEquals(List.of(new RotationId("foo-2")), rotationIds(instance2.instance().rotations()));
         assertEquals(URI.create("https://instance1--application1--tenant1.global.vespa.oath.cloud:4443/"),
-                     tester.controller().routing().endpointsOf(instance1.instanceId()).primary().get().url());
+                     tester.controller().routing().readDeclaredEndpointsOf(instance1.instanceId()).primary().get().url());
         assertEquals(URI.create("https://instance2--application1--tenant1.global.vespa.oath.cloud:4443/"),
-                     tester.controller().routing().endpointsOf(instance2.instanceId()).primary().get().url());
+                     tester.controller().routing().readDeclaredEndpointsOf(instance2.instanceId()).primary().get().url());
     }
 
     @Test
@@ -194,9 +194,9 @@ public class RotationRepositoryTest {
         assertEquals(List.of(new RotationId("foo-2")), rotationIds(instance2.instance().rotations()));
 
         assertEquals(URI.create("https://instance1--application1--tenant1.global.vespa.oath.cloud:4443/"),
-                     tester.controller().routing().endpointsOf(instance1.instanceId()).primary().get().url());
+                     tester.controller().routing().readDeclaredEndpointsOf(instance1.instanceId()).primary().get().url());
         assertEquals(URI.create("https://instance2--application1--tenant1.global.vespa.oath.cloud:4443/"),
-                     tester.controller().routing().endpointsOf(instance2.instanceId()).primary().get().url());
+                     tester.controller().routing().readDeclaredEndpointsOf(instance2.instanceId()).primary().get().url());
     }
 
     private void assertSingleRotation(Rotation expected, List<AssignedRotation> assignedRotations, RotationRepository repository) {
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 afcc5e14d82..c777b659461 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
@@ -789,7 +789,7 @@ public class RoutingPoliciesTest {
                              Map.of(betaZone1, 1));
         assertTrue("Endpoint removed",
                    tester.controllerTester().controller().routing()
-                         .endpointsOf(application)
+                         .readDeclaredEndpointsOf(application)
                          .named(EndpointId.of("a1")).isEmpty());
     }
 
@@ -916,7 +916,7 @@ public class RoutingPoliciesTest {
                                    int loadBalancerId, Map<DeploymentId, Integer> deploymentWeights) {
             Map<String, List<DeploymentId>> deploymentsByDnsName = new HashMap<>();
             for (var deployment : deploymentWeights.keySet()) {
-                EndpointList applicationEndpoints = tester.controller().routing().endpointsOf(application)
+                EndpointList applicationEndpoints = tester.controller().routing().readDeclaredEndpointsOf(application)
                                                           .named(endpointId)
                                                           .targets(deployment)
                                                           .cluster(cluster);
@@ -944,7 +944,7 @@ public class RoutingPoliciesTest {
             Map<String, List<ZoneId>> zonesByRegionEndpoint = new HashMap<>();
             for (var zone : zoneWeights.keySet()) {
                 DeploymentId deployment = new DeploymentId(instance, zone);
-                EndpointList regionEndpoints = tester.controller().routing().endpointsOf(deployment)
+                EndpointList regionEndpoints = tester.controller().routing().readEndpointsOf(deployment)
                                                     .cluster(cluster)
                                                     .scope(Endpoint.Scope.weighted);
                 Endpoint regionEndpoint = regionEndpoints.first().orElseThrow(() -> new IllegalArgumentException("No region endpoint found for " + cluster + " in " + deployment));
@@ -965,7 +965,7 @@ public class RoutingPoliciesTest {
                 latencyTargets.add(latencyTarget);
             });
             List<DeploymentId> deployments = zoneWeights.keySet().stream().map(z -> new DeploymentId(instance, z)).collect(Collectors.toList());
-            String globalEndpoint = tester.controller().routing().endpointsOf(instance)
+            String globalEndpoint = tester.controller().routing().readDeclaredEndpointsOf(instance)
                                           .named(endpointId)
                                           .targets(deployments)
                                           .primary()