Group routing policies by RoutingPolicyId

10 files changed, 92 insertions, 84 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 0aa5815b0ff..82120f13b75 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -686,7 +686,7 @@ public class ApplicationController {
         catch (RuntimeException e) {
             log.log(Level.WARNING, "Failed to get endpoint information for " + id, e);
         }
-        return routingPolicies.get(id).stream()
+        return routingPolicies.get(id).values().stream()
                               .filter(policy -> policy.endpointIn(controller.system()).scope() == Endpoint.Scope.zone)
                               .collect(Collectors.toUnmodifiableMap(policy -> policy.id().cluster(),
                                                                     policy -> policy.endpointIn(controller.system()).url()));
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index 811daed256e..702d3ae9292 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -1,4 +1,4 @@
-// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.deployment;
 
 import com.yahoo.component.Version;
@@ -526,7 +526,7 @@ public class JobController {
         DeploymentId testerId = new DeploymentId(id.tester().id(), id.type().zone(controller.system()));
         return controller.applications().getDeploymentEndpoints(testerId)
                          .stream().findAny()
-                         .or(() -> controller.applications().routingPolicies().get(testerId).stream()
+                         .or(() -> controller.applications().routingPolicies().get(testerId).values().stream()
                                              .findAny()
                                              .map(policy -> policy.endpointIn(controller.system()).url()));
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
index 378c73b4d1a..504a64e9063 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
@@ -1,4 +1,4 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.persistence;
 
 import com.google.common.util.concurrent.UncheckedTimeoutException;
@@ -24,6 +24,7 @@ import com.yahoo.vespa.hosted.controller.auditlog.AuditLog;
 import com.yahoo.vespa.hosted.controller.deployment.Run;
 import com.yahoo.vespa.hosted.controller.deployment.Step;
 import com.yahoo.vespa.hosted.controller.dns.NameServiceQueue;
+import com.yahoo.vespa.hosted.controller.routing.RoutingPolicyId;
 import com.yahoo.vespa.hosted.controller.tenant.Tenant;
 import com.yahoo.vespa.hosted.controller.versions.ControllerVersion;
 import com.yahoo.vespa.hosted.controller.versions.OsVersion;
@@ -484,19 +485,19 @@ public class CuratorDb {
 
     // -------------- Routing policies ----------------------------------------
 
-    public void writeRoutingPolicies(ApplicationId application, Set<RoutingPolicy> policies) {
+    public void writeRoutingPolicies(ApplicationId application, Map<RoutingPolicyId, RoutingPolicy> policies) {
         curator.set(routingPolicyPath(application), asJson(routingPolicySerializer.toSlime(policies)));
     }
 
-    public Map<ApplicationId, Set<RoutingPolicy>> readRoutingPolicies() {
+    public Map<ApplicationId, Map<RoutingPolicyId, RoutingPolicy>> readRoutingPolicies() {
         return curator.getChildren(routingPoliciesRoot).stream()
                       .map(ApplicationId::fromSerializedForm)
                       .collect(Collectors.toUnmodifiableMap(Function.identity(), this::readRoutingPolicies));
     }
 
-    public Set<RoutingPolicy> readRoutingPolicies(ApplicationId application) {
+    public Map<RoutingPolicyId, RoutingPolicy> readRoutingPolicies(ApplicationId application) {
         return readSlime(routingPolicyPath(application)).map(slime -> routingPolicySerializer.fromSlime(application, slime))
-                                                        .orElseGet(Collections::emptySet);
+                                                        .orElseGet(Map::of);
     }
 
     // -------------- Application web certificates ----------------------------
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java
index b599ce6c344..0e9b91b6ba5 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java
@@ -12,7 +12,9 @@ import com.yahoo.vespa.hosted.controller.routing.RoutingPolicy;
 import com.yahoo.vespa.hosted.controller.routing.RoutingPolicyId;
 
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -38,11 +40,11 @@ public class RoutingPolicySerializer {
     private static final String rotationsField = "rotations";
     private static final String loadBalancerActiveField = "active";
 
-    public Slime toSlime(Set<RoutingPolicy> routingPolicies) {
+    public Slime toSlime(Map<RoutingPolicyId, RoutingPolicy> routingPolicies) {
         var slime = new Slime();
         var root = slime.setObject();
         var policyArray = root.setArray(routingPoliciesField);
-        routingPolicies.forEach(policy -> {
+        routingPolicies.values().forEach(policy -> {
             var policyObject = policyArray.addObject();
             policyObject.setString(clusterField, policy.id().cluster().value());
             policyObject.setString(zoneField, policy.id().zone().value());
@@ -57,22 +59,23 @@ public class RoutingPolicySerializer {
         return slime;
     }
 
-    public Set<RoutingPolicy> fromSlime(ApplicationId owner, Slime slime) {
-        var policies = new LinkedHashSet<RoutingPolicy>();
+    public Map<RoutingPolicyId, RoutingPolicy> fromSlime(ApplicationId owner, Slime slime) {
+        var policies = new LinkedHashMap<RoutingPolicyId, RoutingPolicy>();
         var root = slime.get();
         var field = root.field(routingPoliciesField);
         field.traverse((ArrayTraverser) (i, inspect) -> {
             var endpointIds = new LinkedHashSet<EndpointId>();
             inspect.field(rotationsField).traverse((ArrayTraverser) (j, endpointId) -> endpointIds.add(EndpointId.of(endpointId.asString())));
-            policies.add(new RoutingPolicy(new RoutingPolicyId(owner,
-                                                               ClusterSpec.Id.from(inspect.field(clusterField).asString()),
-                                                               ZoneId.from(inspect.field(zoneField).asString())),
-                                           HostName.from(inspect.field(canonicalNameField).asString()),
-                                           Serializers.optionalString(inspect.field(dnsZoneField)),
-                                           endpointIds,
-                                           inspect.field(loadBalancerActiveField).asBool()));
+            var id = new RoutingPolicyId(owner,
+                                         ClusterSpec.Id.from(inspect.field(clusterField).asString()),
+                                         ZoneId.from(inspect.field(zoneField).asString()));
+            policies.put(id, new RoutingPolicy(id,
+                                               HostName.from(inspect.field(canonicalNameField).asString()),
+                                               Serializers.optionalString(inspect.field(dnsZoneField)),
+                                               endpointIds,
+                                               inspect.field(loadBalancerActiveField).asBool()));
         });
-        return Collections.unmodifiableSet(policies);
+        return Collections.unmodifiableMap(policies);
     }
 
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index f3b02afa39b..f2cc9844820 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -68,7 +68,6 @@ import com.yahoo.vespa.hosted.controller.application.Deployment;
 import com.yahoo.vespa.hosted.controller.application.DeploymentCost;
 import com.yahoo.vespa.hosted.controller.application.DeploymentMetrics;
 import com.yahoo.vespa.hosted.controller.application.Endpoint;
-import com.yahoo.vespa.hosted.controller.routing.RoutingPolicy;
 import com.yahoo.vespa.hosted.controller.application.SystemApplication;
 import com.yahoo.vespa.hosted.controller.application.TenantAndApplicationId;
 import com.yahoo.vespa.hosted.controller.deployment.DeploymentStatus;
@@ -798,7 +797,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
                 .forEach(globalEndpointUrls::add);
 
         // Per-cluster endpoints. These are backed by load balancers.
-        Set<RoutingPolicy> routingPolicies = controller.applications().routingPolicies().get(instance.id());
+        var routingPolicies = controller.applications().routingPolicies().get(instance.id()).values();
         for (var policy : routingPolicies) {
             policy.globalEndpointsIn(controller.system()).asList().stream()
                   .map(Endpoint::url)
@@ -923,8 +922,8 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
                 .ifPresent(rotation -> object.setString("rotationId", rotation.asString()));
 
         // Per-cluster rotations
-        Set<RoutingPolicy> routingPolicies = controller.applications().routingPolicies().get(instance.id());
-        for (RoutingPolicy policy : routingPolicies) {
+        var routingPolicies = controller.applications().routingPolicies().get(instance.id()).values();
+        for (var policy : routingPolicies) {
             if (!policy.loadBalancerActive()) continue;
             policy.globalEndpointsIn(controller.system()).asList().stream()
                   .map(Endpoint::url)
@@ -1037,7 +1036,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
 
         // Add endpoint(s) defined by routing policies
         var endpointArray = response.setArray("endpoints");
-        for (var policy : controller.applications().routingPolicies().get(deploymentId)) {
+        for (var policy : controller.applications().routingPolicies().get(deploymentId).values()) {
             if (!policy.loadBalancerActive()) continue;
             Cursor endpointObject = endpointArray.addObject();
             Endpoint endpoint = policy.endpointIn(controller.system());
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
index 6122d9b65b1..2b32321bc66 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
@@ -18,8 +18,8 @@ import com.yahoo.vespa.hosted.controller.dns.NameServiceQueue.Priority;
 import com.yahoo.vespa.hosted.controller.persistence.CuratorDb;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -50,20 +50,21 @@ public class RoutingPolicies {
     }
 
     /** Read all known routing policies for given instance */
-    public Set<RoutingPolicy> get(ApplicationId application) {
+    public Map<RoutingPolicyId, RoutingPolicy> get(ApplicationId application) {
         return db.readRoutingPolicies(application);
     }
 
     /** Read all known routing policies for given deployment */
-    public Set<RoutingPolicy> get(DeploymentId deployment) {
+    public Map<RoutingPolicyId, RoutingPolicy> get(DeploymentId deployment) {
         return get(deployment.applicationId(), deployment.zoneId());
     }
 
     /** Read all known routing policies for given deployment */
-    public Set<RoutingPolicy> get(ApplicationId application, ZoneId zone) {
-        return db.readRoutingPolicies(application).stream()
-                 .filter(policy -> policy.id().zone().equals(zone))
-                 .collect(Collectors.toUnmodifiableSet());
+    public Map<RoutingPolicyId, RoutingPolicy> get(ApplicationId application, ZoneId zone) {
+        return db.readRoutingPolicies(application).entrySet()
+                 .stream()
+                 .filter(kv -> kv.getKey().zone().equals(zone))
+                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
     }
 
     /**
@@ -84,7 +85,7 @@ public class RoutingPolicies {
 
     /** Create global endpoints for given route, if any */
     private void registerEndpointsInDns(AllocatedLoadBalancers loadBalancers, @SuppressWarnings("unused") Lock lock) {
-        Map<RoutingId, List<RoutingPolicy>> routingTable = routingTableFrom(get(loadBalancers.application));
+        Map<RoutingId, List<RoutingPolicy>> routingTable = routingTableFrom(get(loadBalancers.application).values());
 
         // Create DNS record for each routing ID
         for (Map.Entry<RoutingId, List<RoutingPolicy>> routeEntry : routingTable.entrySet()) {
@@ -103,15 +104,11 @@ public class RoutingPolicies {
 
     /** Store routing policies for given route. Returns the persisted policies. */
     private void storePoliciesOf(AllocatedLoadBalancers loadBalancers, @SuppressWarnings("unused") Lock lock) {
-        var policies = new LinkedHashSet<>(get(loadBalancers.application));
+        var policies = new LinkedHashMap<>(get(loadBalancers.application));
         for (LoadBalancer loadBalancer : loadBalancers.list) {
             var endpointIds = loadBalancers.endpointIdsOf(loadBalancer);
             var policy = createPolicy(loadBalancers.application, loadBalancers.zone, loadBalancer, endpointIds);
-            if (!policies.add(policy)) {
-                // Update existing policy
-                policies.remove(policy);
-                policies.add(policy);
-            }
+            policies.put(policy.id(), policy);
         }
         db.writeRoutingPolicies(loadBalancers.application, policies);
     }
@@ -130,26 +127,27 @@ public class RoutingPolicies {
 
     /** Remove obsolete policies for given route and their CNAME records */
     private void removeObsoletePolicies(AllocatedLoadBalancers loadBalancers, @SuppressWarnings("unused") Lock lock) {
-        var allPolicies = new LinkedHashSet<>(get(loadBalancers.application));
-        var removalCandidates = new HashSet<>(allPolicies);
+        var policies = get(loadBalancers.application);
+        var newPolicies = new LinkedHashMap<>(policies);
         var activeLoadBalancers = loadBalancers.list.stream()
                                                     .map(LoadBalancer::hostname)
                                                     .collect(Collectors.toSet());
-        // Remove active load balancers and irrelevant zones from candidates
-        removalCandidates.removeIf(policy -> activeLoadBalancers.contains(policy.canonicalName()) ||
-                                             !policy.id().zone().equals(loadBalancers.zone));
-        for (var policy : removalCandidates) {
+        for (var policy : policies.values()) {
+            // Skip active load balancers and irrelevant zones from candidates
+            if (activeLoadBalancers.contains(policy.canonicalName()) ||
+                !policy.id().zone().equals(loadBalancers.zone)) continue;
+
             var dnsName = policy.endpointIn(controller.system()).dnsName();
             controller.nameServiceForwarder().removeRecords(Record.Type.CNAME, RecordName.from(dnsName), Priority.normal);
-            allPolicies.remove(policy);
+            newPolicies.remove(policy.id());
         }
-        db.writeRoutingPolicies(loadBalancers.application, allPolicies);
+        db.writeRoutingPolicies(loadBalancers.application, newPolicies);
     }
 
     /** Remove unreferenced global endpoints for given route from DNS */
     private void removeObsoleteEndpointsFromDns(AllocatedLoadBalancers loadBalancers, @SuppressWarnings("unused") Lock lock) {
         var zonePolicies = get(loadBalancers.application, loadBalancers.zone);
-        var removalCandidates = routingTableFrom(zonePolicies).keySet();
+        var removalCandidates = routingTableFrom(zonePolicies.values()).keySet();
         var activeRoutingIds = routingIdsFrom(loadBalancers);
         removalCandidates.removeAll(activeRoutingIds);
         for (var id : removalCandidates) {
@@ -170,7 +168,7 @@ public class RoutingPolicies {
     }
 
     /** Compute a routing table from given policies */
-    private static Map<RoutingId, List<RoutingPolicy>> routingTableFrom(Set<RoutingPolicy> routingPolicies) {
+    private static Map<RoutingId, List<RoutingPolicy>> routingTableFrom(Collection<RoutingPolicy> routingPolicies) {
         var routingTable = new LinkedHashMap<RoutingId, List<RoutingPolicy>>();
         for (var policy : routingPolicies) {
             for (var rotation : policy.endpoints()) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
index 89e8f8b71ad..f9094935444 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
@@ -43,8 +43,8 @@ import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
@@ -210,18 +210,20 @@ public class InternalStepRunnerTest {
         assertEquals(unfinished, tester.jobs().last(app.instanceId(), JobType.systemTest).get().stepStatuses().get(Step.installReal));
         assertEquals(unfinished, tester.jobs().last(app.instanceId(), JobType.systemTest).get().stepStatuses().get(Step.installTester));
 
-        tester.controller().curator().writeRoutingPolicies(app.instanceId(), Set.of(new RoutingPolicy(new RoutingPolicyId(app.instanceId(),
-                                                                                                                          ClusterSpec.Id.from("default"),
-                                                                                                                          JobType.systemTest.zone(system())),
-                                                                                                      HostName.from("host"),
-                                                                                                      Optional.empty(),
-                                                                                                      emptySet(), true)));
-        tester.controller().curator().writeRoutingPolicies(app.testerId().id(), Set.of(new RoutingPolicy(new RoutingPolicyId(app.testerId().id(),
-                                                                                                                             ClusterSpec.Id.from("default"),
-                                                                                                                             JobType.systemTest.zone(system())),
-                                                                                                         HostName.from("host"),
-                                                                                                         Optional.empty(),
-                                                                                                         emptySet(), true)));
+        var id1 = new RoutingPolicyId(app.instanceId(),
+                                      ClusterSpec.Id.from("default"),
+                                      JobType.systemTest.zone(system()));
+        tester.controller().curator().writeRoutingPolicies(app.instanceId(), Map.of(id1, new RoutingPolicy(id1,
+                                                                                                           HostName.from("host"),
+                                                                                                           Optional.empty(),
+                                                                                                           emptySet(), true)));
+        var id2 = new RoutingPolicyId(app.testerId().id(),
+                                      ClusterSpec.Id.from("default"),
+                                      JobType.systemTest.zone(system()));
+        tester.controller().curator().writeRoutingPolicies(app.testerId().id(), Map.of(id2, new RoutingPolicy(id2,
+                                                                                                              HostName.from("host"),
+                                                                                                              Optional.empty(),
+                                                                                                              emptySet(), true)));
         tester.runner().run();;
         assertEquals(succeeded, tester.jobs().last(app.instanceId(), JobType.systemTest).get().stepStatuses().get(Step.installReal));
         assertEquals(succeeded, tester.jobs().last(app.instanceId(), JobType.systemTest).get().stepStatuses().get(Step.installTester));
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java
index 2c39a9a18f6..b14a81ec758 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java
@@ -1,7 +1,7 @@
 // Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.persistence;
 
-import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableMap;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostName;
@@ -28,21 +28,23 @@ public class RoutingPolicySerializerTest {
     public void serialization() {
         var owner = ApplicationId.defaultId();
         var endpoints = Set.of(EndpointId.of("r1"), EndpointId.of("r2"));
-        var policies = ImmutableSet.of(new RoutingPolicy(new RoutingPolicyId(owner,
-                                                                             ClusterSpec.Id.from("my-cluster1"),
-                                                                             ZoneId.from("prod", "us-north-1")),
+        var id1 = new RoutingPolicyId(owner,
+                                      ClusterSpec.Id.from("my-cluster1"),
+                                      ZoneId.from("prod", "us-north-1"));
+        var id2 = new RoutingPolicyId(owner,
+                                      ClusterSpec.Id.from("my-cluster2"),
+                                      ZoneId.from("prod", "us-north-2"));
+        var policies = ImmutableMap.of(id1, new RoutingPolicy(id1,
                                                          HostName.from("long-and-ugly-name"),
                                                          Optional.of("zone1"),
                                                          endpoints, true),
-                                       new RoutingPolicy(new RoutingPolicyId(owner,
-                                                                             ClusterSpec.Id.from("my-cluster2"),
-                                                                             ZoneId.from("prod", "us-north-2")),
+                                       id2, new RoutingPolicy(id2,
                                                          HostName.from("long-and-ugly-name-2"),
                                                          Optional.empty(),
                                                          endpoints, false));
         var serialized = serializer.fromSlime(owner, serializer.toSlime(policies));
         assertEquals(policies.size(), serialized.size());
-        for (Iterator<RoutingPolicy> it1 = policies.iterator(), it2 = serialized.iterator(); it1.hasNext();) {
+        for (Iterator<RoutingPolicy> it1 = policies.values().iterator(), it2 = serialized.values().iterator(); it1.hasNext();) {
             var expected = it1.next();
             var actual = it2.next();
             assertEquals(expected.id(), actual.id());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 27b8b0d12ea..c88250bd816 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -1430,17 +1430,19 @@ public class ApplicationApiTest extends ControllerContainerTest {
                 .region("us-west-1")
                 .build();
         app.submit(applicationPackage).deploy();
-        Set<RoutingPolicy> policies = Set.of(new RoutingPolicy(new RoutingPolicyId(app.instanceId(),
-                                                                                   ClusterSpec.Id.from("default"),
-                                                                                   ZoneId.from(Environment.prod, RegionName.from("us-west-1"))),
-                                                               HostName.from("lb-0-canonical-name"),
-                                                               Optional.of("dns-zone-1"), Set.of(EndpointId.of("c0")), true),
-                                           // Inactive policy is not included
-                                           new RoutingPolicy(new RoutingPolicyId(app.instanceId(),
-                                                                                 ClusterSpec.Id.from("deleted-cluster"),
-                                                                                 ZoneId.from(Environment.prod, RegionName.from("us-west-1"))),
-                                                             HostName.from("lb-1-canonical-name"),
-                                                             Optional.of("dns-zone-1"), Set.of(), false));
+        var id1 = new RoutingPolicyId(app.instanceId(),
+                                      ClusterSpec.Id.from("default"),
+                                      ZoneId.from(Environment.prod, RegionName.from("us-west-1")));
+        var id2 = new RoutingPolicyId(app.instanceId(),
+                                      ClusterSpec.Id.from("deleted-cluster"),
+                                      ZoneId.from(Environment.prod, RegionName.from("us-west-1")));
+        var policies = Map.of(id1, new RoutingPolicy(id1,
+                                                     HostName.from("lb-0-canonical-name"),
+                                                     Optional.of("dns-zone-1"), Set.of(EndpointId.of("c0")), true),
+                              // Inactive policy is not included
+                              id2, new RoutingPolicy(id2,
+                                                     HostName.from("lb-1-canonical-name"),
+                                                     Optional.of("dns-zone-1"), Set.of(), false));
         tester.controller().curator().writeRoutingPolicies(app.instanceId(), policies);
 
         // GET application
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 f51c190317b..b460e1ebd44 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
@@ -24,6 +24,7 @@ import org.junit.Test;
 
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -131,7 +132,7 @@ public class RoutingPoliciesTest {
         assertEquals("DNS records are removed", List.of(), tester.aliasDataOf(endpoint1));
         assertEquals("DNS records are removed", List.of(), tester.aliasDataOf(endpoint2));
         assertEquals("DNS records are removed", List.of(), tester.aliasDataOf(endpoint3));
-        Set<RoutingPolicy> policies = tester.policiesOf(context1.instanceId());
+        var policies = tester.policiesOf(context1.instanceId());
         assertEquals(clustersPerZone * numberOfDeployments, policies.size());
         assertTrue("Rotation membership is removed from all policies",
                    policies.stream().allMatch(policy -> policy.endpoints().isEmpty()));
@@ -390,8 +391,8 @@ public class RoutingPoliciesTest {
             }
         }
 
-        private Set<RoutingPolicy> policiesOf(ApplicationId instance) {
-            return tester.controller().curator().readRoutingPolicies(instance);
+        private Collection<RoutingPolicy> policiesOf(ApplicationId instance) {
+            return tester.controller().curator().readRoutingPolicies(instance).values();
         }
 
         private Set<String> recordNames() {