Include only sharedLayer4 endpoints in Nginx config

4 files changed, 30 insertions, 14 deletions

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 288eabe16f7..dc4df7d45ad 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
@@ -5,6 +5,7 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.TenantName;
+import com.yahoo.config.provision.zone.RoutingMethod;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.hosted.routing.RoutingTable.Endpoint;
 import com.yahoo.vespa.hosted.routing.RoutingTable.Real;
@@ -24,31 +25,43 @@ public class RoutingTableTest {
     @Test
     public void translate_from_lb_services_config() {
         RoutingTable expected = new RoutingTable(Map.of(
-                new Endpoint("beta.music.vespa.us-north-1.vespa.oath.cloud"),
+                new Endpoint("beta.music.vespa.us-north-1.vespa.oath.cloud", RoutingMethod.sharedLayer4),
                 Target.create(ApplicationId.from("vespa", "music", "beta"),
                               ClusterSpec.Id.from("default"), ZoneId.from("prod.us-north-1"),
                               List.of(new Real("host3-beta", 4443, 1, true),
                                       new Real("host4-beta", 4443, 1, true))),
 
-                new Endpoint("music.vespa.global.vespa.oath.cloud"),
+                new Endpoint("music.vespa.global.vespa.oath.cloud", RoutingMethod.sharedLayer4),
                 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.us-north-1.vespa.oath.cloud"),
+                new Endpoint("music.vespa.us-north-1.vespa.oath.cloud", RoutingMethod.sharedLayer4),
                 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("rotation-02.vespa.global.routing"),
+                new Endpoint("rotation-02.vespa.global.routing", RoutingMethod.sharedLayer4),
                 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"),
+                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"),
                               List.of(new Real("host3-beta", 4443, 1, true),
diff --git a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxMetricsReporterTest.java b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxMetricsReporterTest.java
index 72014047db7..eea3724e7e9 100644
--- a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxMetricsReporterTest.java
+++ b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxMetricsReporterTest.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.hosted.routing.nginx;
 import com.google.common.jimfs.Jimfs;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.config.provision.zone.RoutingMethod;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.jdisc.test.MockMetric;
 import com.yahoo.vespa.hosted.routing.RoutingTable;
@@ -152,10 +153,10 @@ public class NginxMetricsReporterTest {
     }
 
     private static RoutingTable createRoutingTable() {
-        return new RoutingTable(Map.of(new Endpoint("endpoint0"), target0,
-                                       new Endpoint("endpoint1"), target1,
-                                       new Endpoint("endpoint2"), target2,
-                                       new Endpoint("endpoint3"), target3),
+        return new RoutingTable(Map.of(new Endpoint("endpoint0", RoutingMethod.sharedLayer4), target0,
+                                       new Endpoint("endpoint1", RoutingMethod.sharedLayer4), target1,
+                                       new Endpoint("endpoint2", RoutingMethod.sharedLayer4), target2,
+                                       new Endpoint("endpoint3", RoutingMethod.sharedLayer4), target3),
                                 42);
     }
 
diff --git a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxTest.java b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxTest.java
index bea4d2a822c..f422ae411db 100644
--- a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxTest.java
+++ b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxTest.java
@@ -5,6 +5,7 @@ import com.google.common.jimfs.Jimfs;
 import com.yahoo.collections.Pair;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.config.provision.zone.RoutingMethod;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.jdisc.test.MockMetric;
 import com.yahoo.system.ProcessExecuter;
@@ -65,7 +66,7 @@ public class NginxTest {
 
         // A new table is loaded
         Map<RoutingTable.Endpoint, RoutingTable.Target> newEntries = new HashMap<>(table0.asMap());
-        newEntries.put(new RoutingTable.Endpoint("endpoint1"),
+        newEntries.put(new RoutingTable.Endpoint("endpoint1", RoutingMethod.sharedLayer4),
                        RoutingTable.Target.create(ApplicationId.from("t1", "a1", "i1"),
                                                   ClusterSpec.Id.from("default"),
                                                   ZoneId.from("prod", "us-north-1"),
diff --git a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/restapi/AkamaiHandlerTest.java b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/restapi/AkamaiHandlerTest.java
index e38d5a654f7..2814fcff8f7 100644
--- a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/restapi/AkamaiHandlerTest.java
+++ b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/restapi/AkamaiHandlerTest.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.routing.restapi;
 
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.config.provision.zone.RoutingMethod;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpRequestBuilder;
@@ -93,10 +94,10 @@ public class AkamaiHandlerTest {
 
     private static RoutingTable makeRoutingTable() {
         return new RoutingTable(Map.of(
-                new Endpoint(ENDPOINT_OK), createTarget("t1", "a1", "i1", "default", true),
-                new Endpoint(ENDPOINT_UNAVAILABLE), createTarget("t3", "a3", "i3", "default", true),
-                new Endpoint(ENDPOINT_UNHEALTHY), createTarget("t2", "a2", "i2", "default", true),
-                new Endpoint(ENDPOINT_INACTIVE), createTarget("t1", "a1", "i1", "default", false)
+                new Endpoint(ENDPOINT_OK, RoutingMethod.sharedLayer4), createTarget("t1", "a1", "i1", "default", true),
+                new Endpoint(ENDPOINT_UNAVAILABLE, RoutingMethod.sharedLayer4), createTarget("t3", "a3", "i3", "default", true),
+                new Endpoint(ENDPOINT_UNHEALTHY, RoutingMethod.sharedLayer4), createTarget("t2", "a2", "i2", "default", true),
+                new Endpoint(ENDPOINT_INACTIVE, RoutingMethod.sharedLayer4), createTarget("t1", "a1", "i1", "default", false)
         ), 42);
     }