diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-02-18 11:57:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-18 11:57:46 +0100 |
commit | 44a85a951f80aaf78082fd029f13c71a2e7ff2c5 (patch) | |
tree | cf8ae1acca82c082006b2a45a0e94c069efc8947 /controller-server | |
parent | 67f7e2aa307b00f2d10db3d249e0b16f9f92bd69 (diff) | |
parent | b21d5d34436e42a9b1bb6cc67553a474aa67b9c9 (diff) |
Merge pull request #12236 from vespa-engine/freva/support-production-filter-short-list
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.java | 6 |
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); } |