Sort deployments in response

3 files changed, 11 insertions, 7 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
index 673cb7e82e9..26ccecee3e6 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
@@ -29,6 +29,7 @@ import com.yahoo.yolean.Exceptions;
 
 import java.net.URI;
 import java.time.Instant;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.logging.Level;
@@ -233,7 +234,10 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler {
                     ? application.instances().values()
                     : List.of(application.instances().get(instanceId.instance()));
             for (var instance : instances) {
-                var zones = zoneId == null ? instance.deployments().keySet() : List.of(zoneId);
+                var zones = zoneId == null
+                        ? instance.deployments().keySet().stream().sorted(Comparator.comparing(ZoneId::value))
+                                  .collect(Collectors.toList())
+                        : List.of(zoneId);
                 for (var zone : zones) {
                     var deploymentId = new DeploymentId(instance.id(), zone);
                     // Include status from rotation
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/application.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/application.json
index 9a5d919e9b4..e0b0e5e9b7a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/application.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/application.json
@@ -4,7 +4,7 @@
       "routingMethod": "shared",
       "instance": "t1:a1:default",
       "environment": "prod",
-      "region": "us-west-1",
+      "region": "us-east-3",
       "status": "in",
       "agent": "unknown",
       "changedAt": "(ignore)"
@@ -13,7 +13,7 @@
       "routingMethod": "shared",
       "instance": "t1:a1:default",
       "environment": "prod",
-      "region": "us-east-3",
+      "region": "us-west-1",
       "status": "in",
       "agent": "unknown",
       "changedAt": "(ignore)"
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/tenant.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/tenant.json
index 85db7411c40..1ee4e1b82ba 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/tenant.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/tenant.json
@@ -4,7 +4,7 @@
       "routingMethod": "shared",
       "instance": "t1:a1:default",
       "environment": "prod",
-      "region": "us-west-1",
+      "region": "us-east-3",
       "status": "in",
       "agent": "unknown",
       "changedAt": "(ignore)"
@@ -13,7 +13,7 @@
       "routingMethod": "shared",
       "instance": "t1:a1:default",
       "environment": "prod",
-      "region": "us-east-3",
+      "region": "us-west-1",
       "status": "in",
       "agent": "unknown",
       "changedAt": "(ignore)"
@@ -22,7 +22,7 @@
       "routingMethod": "shared",
       "instance": "t1:a2:default",
       "environment": "prod",
-      "region": "us-west-1",
+      "region": "us-east-3",
       "status": "in",
       "agent": "unknown",
       "changedAt": "(ignore)"
@@ -31,7 +31,7 @@
       "routingMethod": "shared",
       "instance": "t1:a2:default",
       "environment": "prod",
-      "region": "us-east-3",
+      "region": "us-west-1",
       "status": "in",
       "agent": "unknown",
       "changedAt": "(ignore)"