Remove use of shared routing method in controller

17 files changed, 48 insertions, 122 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 67d063c3abc..9ed808b3f01 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
@@ -391,8 +391,6 @@ public class RoutingController {
         var endpoints = new ArrayList<Endpoint>();
         var directMethods = 0;
         var availableRoutingMethods = routingMethodsOfAll(deployments);
-        boolean legacyNamesAvailable = requiresLegacyNames(deploymentSpec, routingId.instance().instance());
-
         for (var method : availableRoutingMethods) {
             if (method.isDirect() && ++directMethods > 1) {
                 throw new IllegalArgumentException("Invalid routing methods for " + routingId + ": Exceeded maximum " +
@@ -403,15 +401,6 @@ public class RoutingController {
                                   .on(Port.fromRoutingMethod(method))
                                   .routingMethod(method)
                                   .in(controller.system()));
-            // Add legacy endpoint
-            if (legacyNamesAvailable && method == RoutingMethod.shared) {
-                endpoints.add(Endpoint.of(routingId.instance())
-                                      .target(routingId.endpointId(), cluster, deployments)
-                                      .on(Port.tls(4443))
-                                      .legacy()
-                                      .routingMethod(method)
-                                      .in(controller.system()));
-            }
         }
         return endpoints;
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java
index 262730558d0..7fc6b927bdd 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java
@@ -162,7 +162,7 @@ public class Endpoint {
     private static URI createUrl(String name, TenantAndApplicationId application, Optional<InstanceName> instance,
                                  List<Target> targets, Scope scope, SystemName system, Port port, boolean legacy,
                                  RoutingMethod routingMethod) {
-        String separator = separator(system, routingMethod);
+        String separator = ".";
         String portPart = port.isDefault() ? "" : ":" + port.port;
         return URI.create("https://" +
                           sanitize(namePart(name, separator)) +
@@ -182,12 +182,6 @@ public class Endpoint {
         return part.replace('_', '-');
     }
 
-    private static String separator(SystemName system, RoutingMethod routingMethod) {
-        if (routingMethod.isDirect()) return ".";
-        if (system.isPublic()) return ".";
-        return "--";
-    }
-
     private static String namePart(String name, String separator) {
         if ("default".equals(name)) return "";
         return name + separator;
@@ -488,7 +482,7 @@ public class Endpoint {
         private ClusterSpec.Id cluster;
         private EndpointId endpointId;
         private Port port;
-        private RoutingMethod routingMethod = RoutingMethod.shared;
+        private RoutingMethod routingMethod = RoutingMethod.sharedLayer4;
         private boolean legacy = false;
         private boolean certificateName = false;
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java
index 9f6f7e4dd5c..34736c16a6b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java
@@ -13,7 +13,6 @@ import com.yahoo.vespa.hosted.controller.application.Endpoint.Port;
 import com.yahoo.vespa.hosted.controller.application.EndpointId;
 import com.yahoo.vespa.hosted.controller.application.SystemApplication;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -94,16 +93,7 @@ public class RoutingPolicy {
             return List.of(infraEndpoint.get());
         }
         DeploymentId deployment = new DeploymentId(id.owner(), id.zone());
-        List<Endpoint> endpoints = new ArrayList<>();
-        endpoints.add(endpoint(routingMethod).target(id.cluster(), deployment).in(system));
-        // Add legacy endpoint
-        if (routingMethod == RoutingMethod.shared) {
-            endpoints.add(endpoint(routingMethod).target(id.cluster(), deployment)
-                                                 .on(Port.tls(4443))
-                                                 .legacy()
-                                                 .in(system));
-        }
-        return endpoints;
+        return List.of(endpoint(routingMethod).target(id.cluster(), deployment).in(system));
     }
 
     /** Returns the region endpoint of this */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java
index e5eb1382ccf..1f205d6e577 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java
@@ -64,17 +64,14 @@ public abstract class DeploymentRoutingContext implements RoutingContext {
         return controller.policies().read(deployment).of(id);
     }
 
-    /**
-     * Extension of a {@link DeploymentRoutingContext} for deployments using either {@link RoutingMethod#shared} or
-     * {@link RoutingMethod#sharedLayer4} routing.
-     */
+    /** Extension of a {@link DeploymentRoutingContext} for deployments using {@link RoutingMethod#sharedLayer4} routing */
     public static class SharedDeploymentRoutingContext extends DeploymentRoutingContext {
 
         private final Clock clock;
         private final ConfigServer configServer;
 
         public SharedDeploymentRoutingContext(DeploymentId deployment, RoutingController controller, ConfigServer configServer, Clock clock) {
-            super(deployment, RoutingMethod.shared, controller);
+            super(deployment, RoutingMethod.sharedLayer4, controller);
             this.clock = Objects.requireNonNull(clock);
             this.configServer = Objects.requireNonNull(configServer);
         }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/SharedZoneRoutingContext.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/SharedZoneRoutingContext.java
index 2923c8dff5c..bbd2e6bbb41 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/SharedZoneRoutingContext.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/SharedZoneRoutingContext.java
@@ -10,8 +10,7 @@ import java.time.Instant;
 import java.util.Objects;
 
 /**
- * An implementation of {@link RoutingContext} for a zone, using either {@link RoutingMethod#shared} or
- * {@link RoutingMethod#sharedLayer4} routing.
+ * An implementation of {@link RoutingContext} for a zone, using {@link RoutingMethod#sharedLayer4} routing.
  *
  * @author mpolden
  */
@@ -42,7 +41,7 @@ public class SharedZoneRoutingContext implements RoutingContext {
 
     @Override
     public RoutingMethod routingMethod() {
-        return RoutingMethod.shared;
+        return RoutingMethod.sharedLayer4;
     }
 
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java
index 8e6618dc1a7..35cca0e1f1f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java
@@ -33,22 +33,6 @@ public class EndpointTest {
         EndpointId endpointId = EndpointId.defaultId();
 
         Map<String, Endpoint> tests = Map.of(
-                // Legacy endpoint with TLS
-                "https://a1--t1.global.vespa.yahooapis.com:4443/",
-                Endpoint.of(instance1).target(endpointId, cluster, List.of(deployment1)).on(Port.tls(4443)).legacy().in(SystemName.main),
-
-                // Main endpoint
-                "https://a1--t1.global.vespa.oath.cloud:4443/",
-                Endpoint.of(instance1).target(endpointId, cluster, List.of(deployment1)).on(Port.tls(4443)).in(SystemName.main),
-
-                // Main endpoint in CD
-                "https://cd--a1--t1.global.vespa.oath.cloud:4443/",
-                Endpoint.of(instance1).target(endpointId, cluster, List.of(deployment1)).on(Port.tls(4443)).in(SystemName.cd),
-
-                // Main endpoint in CD
-                "https://cd--i2--a2--t2.global.vespa.oath.cloud:4443/",
-                Endpoint.of(instance2).target(endpointId, cluster, List.of(deployment2)).on(Port.tls(4443)).in(SystemName.cd),
-
                 // Main endpoint with direct routing and default TLS port
                 "https://a1.t1.global.vespa.oath.cloud/",
                 Endpoint.of(instance1).target(endpointId, cluster, List.of(deployment1)).on(Port.tls()).routingMethod(RoutingMethod.exclusive).in(SystemName.main),
@@ -95,22 +79,6 @@ public class EndpointTest {
         EndpointId endpointId = EndpointId.defaultId();
 
         Map<String, Endpoint> tests = Map.of(
-                // Legacy endpoint with TLS
-                "https://a1--t1.global.vespa.yahooapis.com:4443/",
-                Endpoint.of(instance1).target(endpointId, cluster, List.of(deployment1)).on(Port.tls(4443)).legacy().in(SystemName.main),
-
-                // Main endpoint
-                "https://a1--t1.global.vespa.oath.cloud:4443/",
-                Endpoint.of(instance1).target(endpointId, cluster, List.of(deployment1)).on(Port.tls(4443)).in(SystemName.main),
-
-                // Main endpoint in CD
-                "https://cd--i2--a2--t2.global.vespa.oath.cloud:4443/",
-                Endpoint.of(instance2).target(endpointId, cluster, List.of(deployment2)).on(Port.tls(4443)).in(SystemName.cd),
-
-                // Main endpoint in CD
-                "https://cd--a1--t1.global.vespa.oath.cloud:4443/",
-                Endpoint.of(instance1).target(endpointId, cluster, List.of(deployment1)).on(Port.tls(4443)).in(SystemName.cd),
-
                 // Main endpoint with direct routing and default TLS port
                 "https://a1.t1.global.vespa.oath.cloud/",
                 Endpoint.of(instance1).target(endpointId, cluster, List.of(deployment1)).on(Port.tls()).routingMethod(RoutingMethod.exclusive).in(SystemName.main),
@@ -153,29 +121,25 @@ public class EndpointTest {
         var testZone = new DeploymentId(instance1, ZoneId.from("test", "us-north-2"));
 
         Map<String, Endpoint> tests = Map.of(
-                // Secure legacy endpoint
-                "https://a1--t1.us-north-1.prod.vespa.yahooapis.com:4443/",
-                Endpoint.of(instance1).target(cluster, prodZone).on(Port.tls(4443)).legacy().in(SystemName.main),
-
                 // Prod endpoint in main
-                "https://a1--t1.us-north-1.vespa.oath.cloud:4443/",
-                Endpoint.of(instance1).target(cluster, prodZone).on(Port.tls(4443)).in(SystemName.main),
+                "https://a1.t1.us-north-1.vespa.oath.cloud/",
+                Endpoint.of(instance1).target(cluster, prodZone).on(Port.tls()).in(SystemName.main),
 
                 // Prod endpoint in CD
-                "https://cd--a1--t1.us-north-1.vespa.oath.cloud:4443/",
-                Endpoint.of(instance1).target(cluster, prodZone).on(Port.tls(4443)).in(SystemName.cd),
+                "https://cd.a1.t1.us-north-1.vespa.oath.cloud/",
+                Endpoint.of(instance1).target(cluster, prodZone).on(Port.tls()).in(SystemName.cd),
 
                 // Test endpoint in main
-                "https://a1--t1.us-north-2.test.vespa.oath.cloud:4443/",
-                Endpoint.of(instance1).target(cluster, testZone).on(Port.tls(4443)).in(SystemName.main),
+                "https://a1.t1.us-north-2.test.vespa.oath.cloud/",
+                Endpoint.of(instance1).target(cluster, testZone).on(Port.tls()).in(SystemName.main),
 
                 // Non-default cluster in main
-                "https://c1--a1--t1.us-north-1.vespa.oath.cloud/",
+                "https://c1.a1.t1.us-north-1.vespa.oath.cloud/",
                 Endpoint.of(instance1).target(ClusterSpec.Id.from("c1"), prodZone).on(Port.tls()).in(SystemName.main),
 
                 // Non-default instance in main
-                "https://i2--a2--t2.us-north-1.vespa.oath.cloud:4443/",
-                Endpoint.of(instance2).target(cluster, prodZone2).on(Port.tls(4443)).in(SystemName.main),
+                "https://i2.a2.t2.us-north-1.vespa.oath.cloud/",
+                Endpoint.of(instance2).target(cluster, prodZone2).on(Port.tls()).in(SystemName.main),
 
                 // Non-default cluster in public
                 "https://c1.a1.t1.us-north-1.z.vespa-app.cloud/",
@@ -183,11 +147,7 @@ public class EndpointTest {
 
                 // Non-default cluster and instance in public
                 "https://c2.i2.a2.t2.us-north-1.z.vespa-app.cloud/",
-                Endpoint.of(instance2).target(ClusterSpec.Id.from("c2"), prodZone2).on(Port.tls()).routingMethod(RoutingMethod.exclusive).in(SystemName.Public),
-
-                // Endpoint in main using shared layer 4
-                "https://a1.t1.us-north-1.vespa.oath.cloud/",
-                Endpoint.of(instance1).target(cluster, prodZone).on(Port.tls()).routingMethod(RoutingMethod.sharedLayer4).in(SystemName.main)
+                Endpoint.of(instance2).target(ClusterSpec.Id.from("c2"), prodZone2).on(Port.tls()).routingMethod(RoutingMethod.exclusive).in(SystemName.Public)
         );
         tests.forEach((expected, endpoint) -> assertEquals(expected, endpoint.url().toString()));
 
@@ -353,11 +313,11 @@ public class EndpointTest {
         var tests1 = Map.of(
                 // With default cluster
                 "a1.t1.us-north-1.prod",
-                Endpoint.of(instance1).target(EndpointId.defaultId(), ClusterSpec.Id.from("default"), List.of(zone)).on(Port.tls(4443)).in(SystemName.main),
+                Endpoint.of(instance1).target(EndpointId.defaultId(), ClusterSpec.Id.from("default"), List.of(zone)).on(Port.tls()).in(SystemName.main),
 
                 // With non-default cluster
                 "c1.a1.t1.us-north-1.prod",
-                Endpoint.of(instance1).target(EndpointId.of("ignored1"), ClusterSpec.Id.from("c1"), List.of(zone)).on(Port.tls(4443)).in(SystemName.main),
+                Endpoint.of(instance1).target(EndpointId.of("ignored1"), ClusterSpec.Id.from("c1"), List.of(zone)).on(Port.tls()).in(SystemName.main),
 
                 // With application endpoint
                 "c2.a1.t1.us-north-1.prod",
@@ -369,11 +329,11 @@ public class EndpointTest {
         var tests2 = Map.of(
                 // With non-default instance and default cluster
                 "i2.a2.t2.us-north-1.prod",
-                Endpoint.of(instance2).target(EndpointId.defaultId(), ClusterSpec.Id.from("default"), List.of(zone2)).on(Port.tls(4443)).in(SystemName.main),
+                Endpoint.of(instance2).target(EndpointId.defaultId(), ClusterSpec.Id.from("default"), List.of(zone2)).on(Port.tls()).in(SystemName.main),
 
                 // With non-default instance and cluster
                 "c2.i2.a2.t2.us-north-1.prod",
-                Endpoint.of(instance2).target(EndpointId.of("ignored2"), ClusterSpec.Id.from("c2"), List.of(zone2)).on(Port.tls(4443)).in(SystemName.main)
+                Endpoint.of(instance2).target(EndpointId.of("ignored2"), ClusterSpec.Id.from("c2"), List.of(zone2)).on(Port.tls()).in(SystemName.main)
         );
         tests1.forEach((expected, endpoint) -> assertEquals(expected, endpoint.upstreamName(zone)));
         tests2.forEach((expected, endpoint) -> assertEquals(expected, endpoint.upstreamName(zone2)));
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java
index 53a92c78c6f..a4c30cca29e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java
@@ -128,9 +128,6 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry
     }
 
     private ZoneRegistryMock setRoutingMethod(ZoneApi zone, Set<RoutingMethod> routingMethods) {
-        if (routingMethods.stream().anyMatch(method -> method == RoutingMethod.shared)) {
-            throw new IllegalArgumentException(RoutingMethod.shared + " is not supported");
-        }
         this.zoneRoutingMethods.put(zone, List.copyOf(routingMethods));
         return this;
     }
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 e0b0e5e9b7a..06fb2b92c53 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
@@ -1,7 +1,7 @@
 {
   "deployments": [
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "instance": "t1:a1:default",
       "environment": "prod",
       "region": "us-east-3",
@@ -10,7 +10,7 @@
       "changedAt": "(ignore)"
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "instance": "t1:a1:default",
       "environment": "prod",
       "region": "us-west-1",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/environment.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/environment.json
index f0dd0b7310d..1711bb1f856 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/environment.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/environment.json
@@ -1,7 +1,7 @@
 {
   "zones": [
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "environment": "test",
       "region": "us-east-1",
       "status": "in",
@@ -9,7 +9,7 @@
       "changedAt": 0
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "environment": "staging",
       "region": "us-east-3",
       "status": "in",
@@ -17,7 +17,7 @@
       "changedAt": 0
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "environment": "dev",
       "region": "us-east-1",
       "status": "in",
@@ -25,7 +25,7 @@
       "changedAt": 0
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "environment": "dev",
       "region": "aws-us-east-2a",
       "status": "in",
@@ -33,7 +33,7 @@
       "changedAt": 0
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "environment": "perf",
       "region": "us-east-3",
       "status": "in",
@@ -41,7 +41,7 @@
       "changedAt": 0
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "environment": "prod",
       "region": "aws-us-east-1a",
       "status": "in",
@@ -49,7 +49,7 @@
       "changedAt": 0
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "environment": "prod",
       "region": "ap-northeast-1",
       "status": "in",
@@ -57,7 +57,7 @@
       "changedAt": 0
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "environment": "prod",
       "region": "ap-northeast-2",
       "status": "in",
@@ -65,7 +65,7 @@
       "changedAt": 0
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "environment": "prod",
       "region": "ap-southeast-1",
       "status": "in",
@@ -73,7 +73,7 @@
       "changedAt": 0
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "environment": "prod",
       "region": "us-east-3",
       "status": "in",
@@ -81,7 +81,7 @@
       "changedAt": 0
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "environment": "prod",
       "region": "us-west-1",
       "status": "in",
@@ -89,7 +89,7 @@
       "changedAt": 0
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "environment": "prod",
       "region": "us-central-1",
       "status": "in",
@@ -97,7 +97,7 @@
       "changedAt": 0
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "environment": "prod",
       "region": "eu-west-1",
       "status": "in",
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 1ee4e1b82ba..5de12d9b1ec 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
@@ -1,7 +1,7 @@
 {
   "deployments": [
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "instance": "t1:a1:default",
       "environment": "prod",
       "region": "us-east-3",
@@ -10,7 +10,7 @@
       "changedAt": "(ignore)"
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "instance": "t1:a1:default",
       "environment": "prod",
       "region": "us-west-1",
@@ -19,7 +19,7 @@
       "changedAt": "(ignore)"
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "instance": "t1:a2:default",
       "environment": "prod",
       "region": "us-east-3",
@@ -28,7 +28,7 @@
       "changedAt": "(ignore)"
     },
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "instance": "t1:a2:default",
       "environment": "prod",
       "region": "us-west-1",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-in.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-in.json
index 5b15b72752c..4eb51c1e907 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-in.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-in.json
@@ -1,7 +1,7 @@
 {
   "deployments": [
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "instance": "tenant:application:default",
       "environment": "prod",
       "region": "us-west-1",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-initial.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-initial.json
index 90b2317c1b3..615ce4b4a6e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-initial.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-initial.json
@@ -1,7 +1,7 @@
 {
   "deployments": [
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "instance": "tenant:application:default",
       "environment": "prod",
       "region": "us-west-1",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-out.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-out.json
index 85e345c01d0..816bc810048 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-out.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-out.json
@@ -1,7 +1,7 @@
 {
   "deployments": [
     {
-      "routingMethod": "shared",
+      "routingMethod": "sharedLayer4",
       "instance": "tenant:application:default",
       "environment": "prod",
       "region": "us-west-1",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-in.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-in.json
index eb06e9ee11d..8460cc5ec8a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-in.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-in.json
@@ -1,5 +1,5 @@
 {
-  "routingMethod": "shared",
+  "routingMethod": "sharedLayer4",
   "environment": "prod",
   "region": "us-west-1",
   "status": "in",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-initial.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-initial.json
index eb06e9ee11d..8460cc5ec8a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-initial.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-initial.json
@@ -1,5 +1,5 @@
 {
-  "routingMethod": "shared",
+  "routingMethod": "sharedLayer4",
   "environment": "prod",
   "region": "us-west-1",
   "status": "in",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-out.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-out.json
index 440b80bc4d0..88fddcbd955 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-out.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-out.json
@@ -1,5 +1,5 @@
 {
-  "routingMethod": "shared",
+  "routingMethod": "sharedLayer4",
   "environment": "prod",
   "region": "us-west-1",
   "status": "out",
diff --git a/controller-server/src/test/resources/testConfig.json b/controller-server/src/test/resources/testConfig.json
index 48bf4792176..7b91b4930a1 100644
--- a/controller-server/src/test/resources/testConfig.json
+++ b/controller-server/src/test/resources/testConfig.json
@@ -5,12 +5,12 @@
   "isCI": true,
   "endpoints": {
     "test.aws-us-east-1c": [
-      "https://ai--default--default.global.vespa.oath.cloud/"
+      "https://ai.default.default.global.vespa.oath.cloud/"
     ]
   },
   "zoneEndpoints": {
     "test.aws-us-east-1c": {
-      "ai": "https://ai--default--default.global.vespa.oath.cloud/"
+      "ai": "https://ai.default.default.global.vespa.oath.cloud/"
     }
   },
   "clusters": {