Remove use of routing method 'shared'

3 files changed, 10 insertions, 36 deletions

diff --git a/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java b/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java
index 90a38da8687..90a246ad424 100644
--- a/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java
+++ b/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java
@@ -10,7 +10,6 @@ import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.RoutingMethod;
 import com.yahoo.config.provision.zone.ZoneId;
-
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -24,6 +23,8 @@ import java.util.TreeMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.yahoo.cloud.config.LbServicesConfig.Tenants.Applications.Endpoints.RoutingMethod.Enum.sharedLayer4;
+
 /**
  * A routing table for a hosted Vespa zone. This holds the details necessary for the routing layer to route traffic to
  * deployments.
@@ -127,10 +128,9 @@ public class RoutingTable {
     }
 
     private static RoutingMethod routingMethodFrom(LbServicesConfig.Tenants.Applications.Endpoints endpoint) {
-        switch (endpoint.routingMethod()) {
-            case shared: return RoutingMethod.shared;
-            case sharedLayer4: return RoutingMethod.sharedLayer4;
-        }
+        if (endpoint.routingMethod() == sharedLayer4)
+            return RoutingMethod.sharedLayer4;
+
         throw new IllegalArgumentException("Unhandled routing method: " + endpoint.routingMethod());
     }
 
diff --git a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/RoutingTableTest.java b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/RoutingTableTest.java
index dc4df7d45ad..7fd88d85401 100644
--- a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/RoutingTableTest.java
+++ b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/RoutingTableTest.java
@@ -49,18 +49,6 @@ public class RoutingTableTest {
                               List.of(new Real("host1-default", 4443, 1, true),
                                       new Real("host2-default", 4443, 1, true))),
 
-                new Endpoint("rotation-02.vespa.global.routing", RoutingMethod.shared),
-                Target.create(ApplicationId.from("vespa", "music", "default"),
-                              ClusterSpec.Id.from("default"), ZoneId.from("prod.us-north-1"),
-                              List.of(new Real("host1-default", 4443, 1, true),
-                                      new Real("host2-default", 4443, 1, true))),
-
-                new Endpoint("music--vespa.global.vespa.oath.cloud", RoutingMethod.shared),
-                Target.create(ApplicationId.from("vespa", "music", "default"),
-                              ClusterSpec.Id.from("default"), ZoneId.from("prod.us-north-1"),
-                              List.of(new Real("host1-default", 4443, 1, true),
-                                      new Real("host2-default", 4443, 1, true))),
-
                 new Endpoint("use-weighted.music.vespa.us-north-1-r.vespa.oath.cloud", RoutingMethod.sharedLayer4),
                 Target.create("use-weighted.music.vespa.us-north-1-r.vespa.oath.cloud", TenantName.from("vespa"), ApplicationName.from("music"),
                               ClusterSpec.Id.from("default"), ZoneId.from("prod.us-north-1"),
diff --git a/routing-generator/src/test/resources/lbservices-config b/routing-generator/src/test/resources/lbservices-config
index 9c79a9b063f..d19fc5ee4ae 100644
--- a/routing-generator/src/test/resources/lbservices-config
+++ b/routing-generator/src/test/resources/lbservices-config
@@ -15,32 +15,18 @@ tenants.vespa.applications.music:prod:us-north-1:default.endpoints[1].routingMet
 tenants.vespa.applications.music:prod:us-north-1:default.endpoints[1].weight 1
 tenants.vespa.applications.music:prod:us-north-1:default.endpoints[2].hosts[0] "host1-default"
 tenants.vespa.applications.music:prod:us-north-1:default.endpoints[2].hosts[1] "host2-default"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[2].dnsName "music--vespa.global.vespa.oath.cloud"
+tenants.vespa.applications.music:prod:us-north-1:default.endpoints[2].dnsName "rotation-02.vespa.global.routing"
 tenants.vespa.applications.music:prod:us-north-1:default.endpoints[2].clusterId "default"
 tenants.vespa.applications.music:prod:us-north-1:default.endpoints[2].scope "global"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[2].routingMethod "shared"
+tenants.vespa.applications.music:prod:us-north-1:default.endpoints[2].routingMethod "sharedLayer4"
 tenants.vespa.applications.music:prod:us-north-1:default.endpoints[2].weight 1
 tenants.vespa.applications.music:prod:us-north-1:default.endpoints[3].hosts[0] "host1-default"
 tenants.vespa.applications.music:prod:us-north-1:default.endpoints[3].hosts[1] "host2-default"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[3].dnsName "rotation-02.vespa.global.routing"
+tenants.vespa.applications.music:prod:us-north-1:default.endpoints[3].dnsName "use-weighted.music.vespa.us-north-1-r.vespa.oath.cloud"
 tenants.vespa.applications.music:prod:us-north-1:default.endpoints[3].clusterId "default"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[3].scope "global"
+tenants.vespa.applications.music:prod:us-north-1:default.endpoints[3].scope "application"
 tenants.vespa.applications.music:prod:us-north-1:default.endpoints[3].routingMethod "sharedLayer4"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[3].weight 1
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[4].hosts[0] "host1-default"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[4].hosts[1] "host2-default"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[4].dnsName "rotation-02.vespa.global.routing"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[4].clusterId "default"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[4].scope "global"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[4].routingMethod "shared"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[4].weight 1
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[5].hosts[0] "host1-default"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[5].hosts[1] "host2-default"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[5].dnsName "use-weighted.music.vespa.us-north-1-r.vespa.oath.cloud"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[5].clusterId "default"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[5].scope "application"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[5].routingMethod "sharedLayer4"
-tenants.vespa.applications.music:prod:us-north-1:default.endpoints[5].weight 0
+tenants.vespa.applications.music:prod:us-north-1:default.endpoints[3].weight 0
 tenants.vespa.applications.music:prod:us-north-1:beta.activeRotation true
 tenants.vespa.applications.music:prod:us-north-1:beta.endpoints[0].hosts[0] "host3-beta"
 tenants.vespa.applications.music:prod:us-north-1:beta.endpoints[0].hosts[1] "host4-beta"