Denser convergence log output

2 files changed, 14 insertions, 0 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
index f45f33befaa..58122b04712 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
@@ -38,6 +38,8 @@ public interface NodeRepository {
 
     NodeList listNodes(ZoneId zone, ApplicationId application);
 
+    NodeList listNodes(ZoneId zone, List<HostName> hostnames);
+
     /** List all nodes in given zone */
     default List<Node> list(ZoneId zone) {
         return listNodes(zone).nodes().stream()
@@ -46,6 +48,13 @@ public interface NodeRepository {
     }
 
     /** List all nodes in zone owned by given application */
+    default List<Node> list(ZoneId zone, List<HostName> hostnames) {
+        return listNodes(zone, hostnames).nodes().stream()
+                                         .map(NodeRepository::toNode)
+                                         .collect(Collectors.toUnmodifiableList());
+    }
+
+    /** List all nodes in zone owned by given application */
     default List<Node> list(ZoneId zone, ApplicationId application) {
         return listNodes(zone, application).nodes().stream()
                                            .map(NodeRepository::toNode)
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ProvisionResource.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ProvisionResource.java
index 3b062514e65..5eeb1f7401e 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ProvisionResource.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ProvisionResource.java
@@ -50,6 +50,11 @@ public interface ProvisionResource {
 
     @GET
     @Path("/node/")
+    NodeList listNodes(@QueryParam("recursive") boolean recursive,
+                       @QueryParam("hostname") String hostnamesString);
+
+    @GET
+    @Path("/node/")
     NodeList listNodesWithParent(@QueryParam("recursive") boolean recursive,
                                  @QueryParam("parentHost") String parentHostname);