From d894d32f14e90d3ad3b35700c667107df1cfca6c Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Tue, 14 May 2019 13:10:08 +0200 Subject: Display only endpoints for the relevant deployment in application/v4 --- .../com/yahoo/vespa/hosted/controller/ApplicationController.java | 7 +++++++ .../controller/restapi/application/ApplicationApiHandler.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'controller-server') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index b88f1bbb8e1..81921641a25 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -708,6 +708,13 @@ public class ApplicationController { return curator.readRoutingPolicies(application); } + /** Returns all known routing policies for given deployment */ + public Set routingPolicies(DeploymentId deployment) { + return curator.readRoutingPolicies(deployment.applicationId()).stream() + .filter(policy -> policy.zone().equals(deployment.zoneId())) + .collect(Collectors.toUnmodifiableSet()); + } + /** Sort given list of applications by application ID */ private static List sort(List applications) { return applications.stream().sorted(Comparator.comparing(Application::id)).collect(Collectors.toList()); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 27585d16be4..872f4d5d1af 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -585,7 +585,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { // Add endpoint(s) defined by routing policies var endpointArray = response.setArray("endpoints"); - for (var policy : controller.applications().routingPolicies(deploymentId.applicationId())) { + for (var policy : controller.applications().routingPolicies(deploymentId)) { Cursor endpointObject = endpointArray.addObject(); Endpoint endpoint = policy.endpointIn(controller.system()); endpointObject.setString("cluster", policy.cluster().value()); -- cgit v1.2.3