summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2020-02-18 09:43:04 +0100
committerValerij Fredriksen <valerijf@verizonmedia.com>2020-02-18 09:43:04 +0100
commitb21d5d34436e42a9b1bb6cc67553a474aa67b9c9 (patch)
treec351cdabcbe6f80c1328d6932c6002c24fafbd91 /controller-server
parent7814e2aec7b3396d6a9bbc66b7b8627817a04c33 (diff)
Add production filter to application instances list
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java6
1 files changed, 4 insertions, 2 deletions
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 0f4eca6fd58..b43ad28fcec 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
@@ -434,9 +434,11 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
Slime slime = new Slime();
Cursor array = slime.setArray();
for (Application application : controller.applications().asList(tenant)) {
- if (applicationName.map(application.id().application().value()::equals).orElse(true))
- for (InstanceName instance : application.instances().keySet())
+ if (applicationName.map(application.id().application().value()::equals).orElse(true)) {
+ for (InstanceName instance : showOnlyProductionInstances(request) ? application.productionInstances().keySet()
+ : application.instances().keySet())
toSlime(application.id().instance(instance), array.addObject(), request);
+ }
}
return new SlimeJsonResponse(slime);
}