diff options
author | Martin Polden <mpolden@mpolden.no> | 2021-11-03 10:46:26 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2021-11-03 10:48:03 +0100 |
commit | 3fd3848212d84109d524c61a0e87c96ed8c297bf (patch) | |
tree | 2a32b41c37c2244448723b930259d5677a85330f /controller-server/src/test | |
parent | 718555b87adc695c328643380f0eb05858924cdc (diff) |
Remove legacy parameter
Diffstat (limited to 'controller-server/src/test')
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java index 8de8c6b00d6..c5d0e6bbc9f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java @@ -361,7 +361,7 @@ public class RoutingPoliciesTest { tester.assertTargets(context.instanceId(), EndpointId.defaultId(), ClusterSpec.Id.from("default"), 0, - Map.of(zone1, 1L, zone2, 1L), true); + Map.of(zone1, 1L, zone2, 1L)); assertEquals("Registers expected DNS names", Set.of("app1.tenant1.aws-eu-west-1.w.vespa-app.cloud", "app1.tenant1.aws-eu-west-1a.z.vespa-app.cloud", @@ -822,10 +822,6 @@ public class RoutingPoliciesTest { } private void assertTargets(ApplicationId application, EndpointId endpointId, ClusterSpec.Id cluster, int loadBalancerId, Map<ZoneId, Long> zoneWeights) { - assertTargets(application, endpointId, cluster, loadBalancerId, zoneWeights, false); - } - - private void assertTargets(ApplicationId application, EndpointId endpointId, ClusterSpec.Id cluster, int loadBalancerId, Map<ZoneId, Long> zoneWeights, boolean legacy) { Set<String> latencyTargets = new HashSet<>(); Map<String, List<ZoneId>> zonesByRegionEndpoint = new HashMap<>(); for (var zone : zoneWeights.keySet()) { @@ -833,9 +829,6 @@ public class RoutingPoliciesTest { EndpointList regionEndpoints = tester.controller().routing().endpointsOf(deployment) .cluster(cluster) .scope(Endpoint.Scope.region); - if (!legacy) { - regionEndpoints = regionEndpoints.not().legacy(); - } Endpoint regionEndpoint = regionEndpoints.first().orElseThrow(() -> new IllegalArgumentException("No region endpoint found for " + cluster + " in " + deployment)); zonesByRegionEndpoint.computeIfAbsent(regionEndpoint.dnsName(), (k) -> new ArrayList<>()) .add(zone); |