Expose node indices of a container cluster via SystemInfo

2 files changed, 2 insertions, 0 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index d05650b10b5..69bcd4b87bb 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -555,6 +555,7 @@ public abstract class ContainerCluster<CONTAINER extends Container>
     public void getConfig(ClusterInfoConfig.Builder builder) {
         builder.clusterId(name);
         builder.nodeCount(containers.size());
+        containers.forEach(c -> builder.nodeIndices(c.index()));
 
         for (Service service : getDescendantServices()) {
             builder.services.add(new ClusterInfoConfig.Services.Builder()
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
index 7b5efad9647..6f575ef7ea3 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
@@ -56,6 +56,7 @@ public class ContainerClusterTest {
         ClusterInfoConfig config = getClusterInfoConfig(cluster);
         assertEquals("name", config.clusterId());
         assertEquals(2, config.nodeCount());
+        assertEquals(List.of(0, 0), config.nodeIndices());  // both containers are created with index 0
         assertEquals(2, config.services().size());
 
         Iterator<ClusterInfoConfig.Services> iterator = config.services().iterator();