diff options
Diffstat (limited to 'controller-server/src/test')
2 files changed, 13 insertions, 16 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java index 5ec949dfe0c..b27c206e215 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java @@ -25,18 +25,18 @@ import java.util.stream.Collectors; public class ZoneFilterMock implements ZoneList { private final List<ZoneApi> zones; - private final Map<ZoneApi, List<RoutingMethod>> zoneRoutingMethods; + private final Map<ZoneApi, RoutingMethod> zoneRoutingMethods; private final Set<ZoneApi> reprovisionToUpgradeOs; private final boolean negate; - private ZoneFilterMock(List<ZoneApi> zones, Map<ZoneApi, List<RoutingMethod>> zoneRoutingMethods, Set<ZoneApi> reprovisionToUpgradeOs, boolean negate) { + private ZoneFilterMock(List<ZoneApi> zones, Map<ZoneApi, RoutingMethod> zoneRoutingMethods, Set<ZoneApi> reprovisionToUpgradeOs, boolean negate) { this.zones = zones; this.zoneRoutingMethods = zoneRoutingMethods; this.reprovisionToUpgradeOs = reprovisionToUpgradeOs; this.negate = negate; } - public static ZoneFilter from(Collection<? extends ZoneApi> zones, Map<ZoneApi, List<RoutingMethod>> routingMethods, Set<ZoneApi> reprovisionToUpgradeOs) { + public static ZoneFilter from(Collection<? extends ZoneApi> zones, Map<ZoneApi, RoutingMethod> routingMethods, Set<ZoneApi> reprovisionToUpgradeOs) { return new ZoneFilterMock(List.copyOf(zones), Map.copyOf(routingMethods), reprovisionToUpgradeOs, false); } @@ -62,7 +62,7 @@ public class ZoneFilterMock implements ZoneList { @Override public ZoneList routingMethod(RoutingMethod method) { - return filter(zone -> zoneRoutingMethods.getOrDefault(zone, List.of()).contains(method)); + return filter(zone -> zoneRoutingMethods.get(zone) == method); } @Override diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java index 0211a052f76..7f40172db2d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java @@ -32,6 +32,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.Set; @@ -43,7 +44,7 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry private final Map<ZoneId, Duration> deploymentTimeToLive = new HashMap<>(); private final Map<Environment, RegionName> defaultRegionForEnvironment = new HashMap<>(); private final Map<CloudName, UpgradePolicy> osUpgradePolicies = new HashMap<>(); - private final Map<ZoneApi, List<RoutingMethod>> zoneRoutingMethods = new HashMap<>(); + private final Map<ZoneApi, RoutingMethod> zoneRoutingMethods = new HashMap<>(); private final Map<CloudAccount, Set<ZoneId>> cloudAccountZones = new HashMap<>(); private final Set<ZoneApi> reprovisionToUpgradeOs = new HashSet<>(); private final SystemName system; // Don't even think about making it non-final! ƪ(`▿▿▿▿´ƪ) @@ -125,17 +126,13 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry return setRoutingMethod(zones, RoutingMethod.exclusive); } - public ZoneRegistryMock setRoutingMethod(ZoneApi zone, RoutingMethod... routingMethods) { - return setRoutingMethod(zone, Set.of(routingMethods)); - } - - public ZoneRegistryMock setRoutingMethod(List<? extends ZoneApi> zones, RoutingMethod... routingMethods) { - zones.forEach(zone -> setRoutingMethod(zone, Set.of(routingMethods))); + public ZoneRegistryMock setRoutingMethod(List<? extends ZoneApi> zones, RoutingMethod routingMethod) { + zones.forEach(zone -> setRoutingMethod(zone, routingMethod)); return this; } - private ZoneRegistryMock setRoutingMethod(ZoneApi zone, Set<RoutingMethod> routingMethods) { - this.zoneRoutingMethods.put(zone, List.copyOf(routingMethods)); + public ZoneRegistryMock setRoutingMethod(ZoneApi zone, RoutingMethod routingMethod) { + this.zoneRoutingMethods.put(zone, routingMethod); return this; } @@ -214,8 +211,8 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry } @Override - public List<RoutingMethod> routingMethods(ZoneId zone) { - return List.copyOf(zoneRoutingMethods.getOrDefault(ZoneApiMock.from(zone), List.of())); + public RoutingMethod routingMethod(ZoneId zone) { + return Objects.requireNonNull(zoneRoutingMethods.get(ZoneApiMock.from(zone))); } @Override @@ -272,7 +269,7 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry @Override public Optional<String> getVipHostname(ZoneId zoneId) { - if (routingMethods(zoneId).stream().anyMatch(RoutingMethod::isShared)) { + if (routingMethod(zoneId).isShared()) { return Optional.of("vip." + zoneId.value()); } return Optional.empty(); |