Use routingMethod from controller

2 files changed, 12 insertions, 2 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java
index 121f4397129..b813d56b345 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java
@@ -31,6 +31,7 @@ public class ContainerEndpointSerializer {
     private static final String scopeField = "scope";
     private static final String namesField = "names";
     private static final String weightField = "weight";
+    private static final String routingMethodField = "routingMethod";
 
     private ContainerEndpointSerializer() {}
 
@@ -39,6 +40,9 @@ public class ContainerEndpointSerializer {
         final var scope = inspector.field(scopeField).asString();
         final var namesInspector = inspector.field(namesField);
         final var weight = SlimeUtils.optionalInteger(inspector.field(weightField));
+        // assign default routingmethod. Remove when 7.507 is latest version
+        // Cannot be used before all endpoints are assigned explicit routingmethod (from controller)
+        final var routingMethod = SlimeUtils.optionalString(inspector.field(routingMethodField)).orElse(ApplicationClusterEndpoint.RoutingMethod.sharedLayer4.name());
         if (clusterId.isEmpty()) {
             throw new IllegalStateException("'clusterId' missing on serialized ContainerEndpoint");
         }
@@ -51,6 +55,10 @@ public class ContainerEndpointSerializer {
             throw new IllegalStateException("'names' missing on serialized ContainerEndpoint");
         }
 
+        if(routingMethod.isEmpty()) {
+            throw new IllegalStateException("'routingMethod' missing on serialized ContainerEndpoint");
+        }
+
         final var names = new ArrayList<String>();
 
         namesInspector.traverse((ArrayTraverser) (idx, nameInspector) -> {
@@ -58,7 +66,8 @@ public class ContainerEndpointSerializer {
             names.add(containerName);
         });
 
-        return new ContainerEndpoint(clusterId, ApplicationClusterEndpoint.Scope.valueOf(scope), names, weight);
+        return new ContainerEndpoint(clusterId, ApplicationClusterEndpoint.Scope.valueOf(scope), names, weight,
+                                     ApplicationClusterEndpoint.RoutingMethod.valueOf(routingMethod));
     }
 
     public static List<ContainerEndpoint> endpointListFromSlime(Slime slime) {
@@ -83,6 +92,7 @@ public class ContainerEndpointSerializer {
         endpoint.weight().ifPresent(w -> cursor.setLong(weightField, w));
         final var namesInspector = cursor.setArray(namesField);
         endpoint.names().forEach(namesInspector::addString);
+        cursor.setString(routingMethodField, endpoint.routingMethod().name());
     }
 
     public static Slime endpointListToSlime(List<ContainerEndpoint> endpoints) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java
index 2b746a9c1c6..9f52559e04b 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java
@@ -62,7 +62,7 @@ public class ContainerEndpointSerializerTest {
 
     @Test
     public void writeReadEndpoints() {
-        final var endpoints = List.of(new ContainerEndpoint("foo", ApplicationClusterEndpoint.Scope.global, List.of("a", "b")));
+        final var endpoints = List.of(new ContainerEndpoint("foo", ApplicationClusterEndpoint.Scope.global, List.of("a", "b"), OptionalInt.of(3), ApplicationClusterEndpoint.RoutingMethod.shared));
         final var serialized = ContainerEndpointSerializer.endpointListToSlime(endpoints);
         final var deserialized = ContainerEndpointSerializer.endpointListFromSlime(serialized);