Merge reindexing responses with multiple clusters in client in cfg server

2 files changed, 14 insertions, 10 deletions

diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/http/ReindexingV1ApiHandler.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/http/ReindexingV1ApiHandler.java
index 495821759ea..b1c0d012325 100644
--- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/http/ReindexingV1ApiHandler.java
+++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/http/ReindexingV1ApiHandler.java
@@ -77,9 +77,9 @@ public class ReindexingV1ApiHandler extends ThreadedHttpRequestHandler {
         Slime slime = new Slime();
         Cursor clustersObject = slime.setObject().setObject("clusters");
         for (String clusterName : clusterNames) {
-            Cursor clusterObject = clustersObject.setObject(clusterName);
+            Cursor documentTypesObject = clustersObject.setObject(clusterName).setObject("documentTypes");
             database.readReindexing(clusterName).status().forEach((type, status) -> {
-                Cursor statusObject = clusterObject.setObject(type.getName());
+                Cursor statusObject = documentTypesObject.setObject(type.getName());
                 statusObject.setLong("startedMillis", status.startedAt().toEpochMilli());
                 status.endedAt().ifPresent(endedAt -> statusObject.setLong("endedMillis", endedAt.toEpochMilli()));
                 status.progress().ifPresent(progress -> statusObject.setString("progress", progress.serializeToString()));
diff --git a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/http/ReindexingV1ApiTest.java b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/http/ReindexingV1ApiTest.java
index 0649c2e611f..b8f62050347 100644
--- a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/http/ReindexingV1ApiTest.java
+++ b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/http/ReindexingV1ApiTest.java
@@ -45,7 +45,7 @@ class ReindexingV1ApiTest {
 
         // GET at status with empty database
         response = driver.sendRequest("http://localhost/reindexing/v1/status");
-        assertEquals("{\"clusters\":{\"cluster\":{},\"oyster\":{}}}", response.readAll());
+        assertEquals("{\"clusters\":{\"cluster\":{\"documentTypes\":{}},\"oyster\":{\"documentTypes\":{}}}}", response.readAll());
         assertEquals(200, response.getStatus());
 
         // GET at status with a failed status
@@ -58,14 +58,18 @@ class ReindexingV1ApiTest {
         assertEquals("{" +
                      "\"clusters\":{" +
                        "\"cluster\":{" +
-                         "\"music\":{" +
-                           "\"startedMillis\":0," +
-                           "\"endedMillis\":123," +
-                           "\"progress\":\"" + new ProgressToken().serializeToString() + "\"," +
-                           "\"state\":\"failed\"," +
-                           "\"message\":\"ヽ(。_°)ノ\"}" +
+                         "\"documentTypes\":{" +
+                           "\"music\":{" +
+                             "\"startedMillis\":0," +
+                             "\"endedMillis\":123," +
+                             "\"progress\":\"" + new ProgressToken().serializeToString() + "\"," +
+                             "\"state\":\"failed\"," +
+                             "\"message\":\"ヽ(。_°)ノ\"}" +
+                           "}" +
                          "}," +
-                         "\"oyster\":{}" +
+                         "\"oyster\":{" +
+                           "\"documentTypes\":{}" +
+                         "}" +
                        "}" +
                      "}",
                      response.readAll());