Prefer generated endpoints in test runner

1 files changed, 4 insertions, 0 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
index 88f20b49941..65f4c851e3c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
@@ -210,6 +210,10 @@ public class RoutingController {
             if (!directEndpoints.isEmpty()) {
                 zoneEndpoints = directEndpoints; // Use only direct endpoints if we have any
             }
+            EndpointList generatedEndpoints = zoneEndpoints.generated();
+            if (!generatedEndpoints.isEmpty()) {
+                zoneEndpoints = generatedEndpoints; // Use generated endpoints if we have any
+            }
             if  ( ! zoneEndpoints.isEmpty()) {
                 endpoints.put(deployment.zoneId(), zoneEndpoints.asList());
             }