diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-02-28 13:48:01 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2020-02-28 13:52:39 +0100 |
commit | 5f98e5f59956b3e13bd90679f5b8d7bc5d5ee851 (patch) | |
tree | 8a17e4ed9a2c700a3bbf7ba0339f23951f678fb2 /controller-api | |
parent | 526ea78c82b2d466d663ef4d9734545bb31c686a (diff) |
Prefer endpoints from routing generator
Diffstat (limited to 'controller-api')
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGeneratorMock.java | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGeneratorMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGeneratorMock.java index c335b55729a..e768a090188 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGeneratorMock.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGeneratorMock.java @@ -2,9 +2,7 @@ package com.yahoo.vespa.hosted.controller.api.integration.routing; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.zone.RoutingMethod; import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; -import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry; import java.net.URI; import java.util.List; @@ -21,29 +19,10 @@ import java.util.stream.Collectors; // TODO(mpolden): Remove public class RoutingGeneratorMock implements RoutingGenerator { - public static final List<RoutingEndpoint> TEST_ENDPOINTS = - List.of(new RoutingEndpoint("http://old-endpoint.vespa.yahooapis.com:4080", "host1", false, "upstream3"), - new RoutingEndpoint("http://qrs-endpoint.vespa.yahooapis.com:4080", "host1", false, "upstream1"), - new RoutingEndpoint("http://feeding-endpoint.vespa.yahooapis.com:4080", "host2", false, "upstream2"), - new RoutingEndpoint("http://global-endpoint.vespa.yahooapis.com:4080", "host1", true, "upstream1"), - new RoutingEndpoint("http://alias-endpoint.vespa.yahooapis.com:4080", "host1", true, "upstream1")); - private final Map<DeploymentId, List<RoutingEndpoint>> routingTable = new ConcurrentHashMap<>(); - private final List<RoutingEndpoint> defaultEndpoints; - private final ZoneRegistry zoneRegistry; - - public RoutingGeneratorMock(List<RoutingEndpoint> endpoints, ZoneRegistry zoneRegistry) { - this.defaultEndpoints = List.copyOf(endpoints); - this.zoneRegistry = zoneRegistry; - } @Override public List<RoutingEndpoint> endpoints(DeploymentId deployment) { - if (!zoneRegistry.zones().routingMethod(RoutingMethod.shared).ids().contains(deployment.zoneId())) { - throw new IllegalArgumentException(deployment.zoneId() + " does not support routing method " + - RoutingMethod.shared); - } - if (routingTable.isEmpty()) return defaultEndpoints; return routingTable.getOrDefault(deployment, List.of()); } |