From a82cebd766ca79beb1bb0b539d6b12fd9aa72261 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Tue, 10 May 2022 14:48:44 +0200 Subject: Remove use of routing method 'shared' --- .../vespa/hosted/routing/RoutingTableTest.java | 12 ----------- .../src/test/resources/lbservices-config | 24 +++++----------------- 2 files changed, 5 insertions(+), 31 deletions(-) (limited to 'routing-generator/src/test') 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" -- cgit v1.2.3