Extract RoutingPolicyId

9 files changed, 113 insertions, 72 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 1285a6012ee..0aa5815b0ff 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
@@ -688,7 +688,7 @@ public class ApplicationController {
         }
         return routingPolicies.get(id).stream()
                               .filter(policy -> policy.endpointIn(controller.system()).scope() == Endpoint.Scope.zone)
-                              .collect(Collectors.toUnmodifiableMap(policy -> policy.cluster(),
+                              .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/persistence/RoutingPolicySerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java
index bacc783e173..b599ce6c344 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
@@ -9,6 +9,7 @@ import com.yahoo.slime.ArrayTraverser;
 import com.yahoo.slime.Slime;
 import com.yahoo.vespa.hosted.controller.application.EndpointId;
 import com.yahoo.vespa.hosted.controller.routing.RoutingPolicy;
+import com.yahoo.vespa.hosted.controller.routing.RoutingPolicyId;
 
 import java.util.Collections;
 import java.util.LinkedHashSet;
@@ -43,8 +44,8 @@ public class RoutingPolicySerializer {
         var policyArray = root.setArray(routingPoliciesField);
         routingPolicies.forEach(policy -> {
             var policyObject = policyArray.addObject();
-            policyObject.setString(clusterField, policy.cluster().value());
-            policyObject.setString(zoneField, policy.zone().value());
+            policyObject.setString(clusterField, policy.id().cluster().value());
+            policyObject.setString(zoneField, policy.id().zone().value());
             policyObject.setString(canonicalNameField, policy.canonicalName().value());
             policy.dnsZone().ifPresent(dnsZone -> policyObject.setString(dnsZoneField, dnsZone));
             var rotationArray = policyObject.setArray(rotationsField);
@@ -63,9 +64,9 @@ public class RoutingPolicySerializer {
         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(owner,
-                                           ClusterSpec.Id.from(inspect.field(clusterField).asString()),
-                                           ZoneId.from(inspect.field(zoneField).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,
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 de7b0630a91..f3b02afa39b 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
@@ -1041,7 +1041,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
             if (!policy.loadBalancerActive()) continue;
             Cursor endpointObject = endpointArray.addObject();
             Endpoint endpoint = policy.endpointIn(controller.system());
-            endpointObject.setString("cluster", policy.cluster().value());
+            endpointObject.setString("cluster", policy.id().cluster().value());
             endpointObject.setBool("tls", endpoint.tls());
             endpointObject.setString("url", endpoint.url().toString());
         }
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 f9a329c5c82..6122d9b65b1 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
@@ -62,7 +62,7 @@ public class RoutingPolicies {
     /** Read all known routing policies for given deployment */
     public Set<RoutingPolicy> get(ApplicationId application, ZoneId zone) {
         return db.readRoutingPolicies(application).stream()
-                 .filter(policy -> policy.zone().equals(zone))
+                 .filter(policy -> policy.id().zone().equals(zone))
                  .collect(Collectors.toUnmodifiableSet());
     }
 
@@ -95,7 +95,7 @@ public class RoutingPolicies {
                                                  .filter(policy -> policy.dnsZone().isPresent())
                                                  .map(policy -> new AliasTarget(policy.canonicalName(),
                                                                                 policy.dnsZone().get(),
-                                                                                policy.zone()))
+                                                                                policy.id().zone()))
                                                  .collect(Collectors.toSet());
             controller.nameServiceForwarder().createAlias(RecordName.from(endpoint.dnsName()), targets, Priority.normal);
         }
@@ -119,7 +119,8 @@ public class RoutingPolicies {
     /** Create a policy for given load balancer and register a CNAME for it */
     private RoutingPolicy createPolicy(ApplicationId application, ZoneId zone, LoadBalancer loadBalancer,
                                        Set<EndpointId> endpointIds) {
-        var routingPolicy = new RoutingPolicy(application, loadBalancer.cluster(), zone, loadBalancer.hostname(),
+        var routingPolicy = new RoutingPolicy(new RoutingPolicyId(application, loadBalancer.cluster(), zone),
+                                              loadBalancer.hostname(),
                                               loadBalancer.dnsZone(), endpointIds, isActive(loadBalancer));
         var name = RecordName.from(routingPolicy.endpointIn(controller.system()).dnsName());
         var data = RecordData.fqdn(loadBalancer.hostname().value());
@@ -136,7 +137,7 @@ public class RoutingPolicies {
                                                     .collect(Collectors.toSet());
         // Remove active load balancers and irrelevant zones from candidates
         removalCandidates.removeIf(policy -> activeLoadBalancers.contains(policy.canonicalName()) ||
-                                             !policy.zone().equals(loadBalancers.zone));
+                                             !policy.id().zone().equals(loadBalancers.zone));
         for (var policy : removalCandidates) {
             var dnsName = policy.endpointIn(controller.system()).dnsName();
             controller.nameServiceForwarder().removeRecords(Record.Type.CNAME, RecordName.from(dnsName), Priority.normal);
@@ -173,7 +174,7 @@ public class RoutingPolicies {
         var routingTable = new LinkedHashMap<RoutingId, List<RoutingPolicy>>();
         for (var policy : routingPolicies) {
             for (var rotation : policy.endpoints()) {
-                var id = new RoutingId(policy.owner(), rotation);
+                var id = new RoutingId(policy.id().owner(), rotation);
                 routingTable.putIfAbsent(id, new ArrayList<>());
                 routingTable.get(id).add(policy);
             }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java
index 2305ffedb17..49be82e15d8 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java
@@ -3,10 +3,8 @@ package com.yahoo.vespa.hosted.controller.routing;
 
 import com.google.common.collect.ImmutableSortedSet;
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.SystemName;
-import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.application.Endpoint;
 import com.yahoo.vespa.hosted.controller.application.Endpoint.Port;
 import com.yahoo.vespa.hosted.controller.application.EndpointId;
@@ -17,47 +15,32 @@ import java.util.Optional;
 import java.util.Set;
 
 /**
- * Represents the DNS routing policy for a load balancer. A routing policy is uniquely identified by its owner, cluster
- * and zone.
+ * Represents the DNS routing policy for a load balancer.
  *
  * @author mortent
  * @author mpolden
  */
 public class RoutingPolicy {
 
-    private final ApplicationId owner;
-    private final ClusterSpec.Id cluster;
-    private final ZoneId zone;
+    private final RoutingPolicyId id;
     private final HostName canonicalName;
     private final Optional<String> dnsZone;
     private final Set<EndpointId> endpoints;
     private final boolean loadBalancerActive;
 
     /** DO NOT USE. Public for serialization purposes */
-    public RoutingPolicy(ApplicationId owner, ClusterSpec.Id cluster, ZoneId zone, HostName canonicalName,
+    public RoutingPolicy(RoutingPolicyId id, HostName canonicalName,
                          Optional<String> dnsZone, Set<EndpointId> endpoints, boolean loadBalancerActive) {
-        this.owner = Objects.requireNonNull(owner, "owner must be non-null");
-        this.cluster = Objects.requireNonNull(cluster, "cluster must be non-null");
-        this.zone = Objects.requireNonNull(zone, "zone must be non-null");
+        this.id = Objects.requireNonNull(id, "id must be non-null");
         this.canonicalName = Objects.requireNonNull(canonicalName, "canonicalName must be non-null");
         this.dnsZone = Objects.requireNonNull(dnsZone, "dnsZone must be non-null");
         this.endpoints = ImmutableSortedSet.copyOf(Objects.requireNonNull(endpoints, "endpoints must be non-null"));
         this.loadBalancerActive = loadBalancerActive;
     }
 
-    /** The application owning this */
-    public ApplicationId owner() {
-        return owner;
-    }
-
-    /** The zone this applies to */
-    public ZoneId zone() {
-        return zone;
-    }
-
-    /** The cluster this applies to */
-    public ClusterSpec.Id cluster() {
-        return cluster;
+    /** The ID of this */
+    public RoutingPolicyId id() {
+        return id;
     }
 
     /** The canonical name for this (rhs of a CNAME or ALIAS record) */
@@ -82,12 +65,12 @@ public class RoutingPolicy {
 
     /** Returns the endpoint of this */
     public Endpoint endpointIn(SystemName system) {
-        return Endpoint.of(owner).target(cluster, zone).on(Port.tls()).directRouting().in(system);
+        return Endpoint.of(id.owner()).target(id.cluster(), id.zone()).on(Port.tls()).directRouting().in(system);
     }
 
     /** Returns global endpoints which this is a member of */
     public EndpointList globalEndpointsIn(SystemName system) {
-        return EndpointList.of(endpoints.stream().map(endpointId -> globalEndpointOf(owner, endpointId, system)));
+        return EndpointList.of(endpoints.stream().map(endpointId -> globalEndpointOf(id.owner(), endpointId, system)));
     }
 
     @Override
@@ -95,21 +78,19 @@ public class RoutingPolicy {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         RoutingPolicy that = (RoutingPolicy) o;
-        return owner.equals(that.owner) &&
-               cluster.equals(that.cluster) &&
-               zone.equals(that.zone);
+        return id.equals(that.id);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(owner, cluster, zone);
+        return Objects.hash(id);
     }
 
     @Override
     public String toString() {
         return String.format("%s [rotations: %s%s], %s owned by %s, in %s", canonicalName, endpoints,
-                             dnsZone.map(z -> ", DNS zone: " + z).orElse(""), cluster, owner.toShortString(),
-                             zone.value());
+                             dnsZone.map(z -> ", DNS zone: " + z).orElse(""), id.cluster(), id.owner().toShortString(),
+                             id.zone().value());
     }
 
     /** Creates a global endpoint for given application */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicyId.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicyId.java
new file mode 100644
index 00000000000..06002e874f1
--- /dev/null
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicyId.java
@@ -0,0 +1,57 @@
+// 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.routing;
+
+import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.config.provision.zone.ZoneId;
+
+import java.util.Objects;
+
+/**
+ * Unique identifier for a {@link RoutingPolicy}.
+ *
+ * @author mpolden
+ */
+public class RoutingPolicyId {
+
+    private final ApplicationId owner;
+    private final ClusterSpec.Id cluster;
+    private final ZoneId zone;
+
+    public RoutingPolicyId(ApplicationId owner, ClusterSpec.Id cluster, ZoneId zone) {
+        this.owner = Objects.requireNonNull(owner, "owner must be non-null");
+        this.cluster = Objects.requireNonNull(cluster, "cluster must be non-null");
+        this.zone = Objects.requireNonNull(zone, "zone must be non-null");
+    }
+
+    /** The application owning this */
+    public ApplicationId owner() {
+        return owner;
+    }
+
+    /** The zone this applies to */
+    public ZoneId zone() {
+        return zone;
+    }
+
+    /** The cluster this applies to */
+    public ClusterSpec.Id cluster() {
+        return cluster;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        RoutingPolicyId that = (RoutingPolicyId) o;
+        return owner.equals(that.owner) &&
+               cluster.equals(that.cluster) &&
+               zone.equals(that.zone);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(owner, cluster, zone);
+    }
+
+}
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 c91e5ecf1ad..89e8f8b71ad 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
@@ -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.deployment;
 
 import com.google.common.collect.ImmutableList;
@@ -24,8 +24,9 @@ import com.yahoo.vespa.hosted.controller.api.integration.deployment.RunId;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.TesterCloud;
 import com.yahoo.vespa.hosted.controller.api.integration.stubs.MockMailer;
 import com.yahoo.vespa.hosted.controller.application.ApplicationPackage;
-import com.yahoo.vespa.hosted.controller.routing.RoutingPolicy;
 import com.yahoo.vespa.hosted.controller.integration.ZoneApiMock;
+import com.yahoo.vespa.hosted.controller.routing.RoutingPolicy;
+import com.yahoo.vespa.hosted.controller.routing.RoutingPolicyId;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -50,9 +51,9 @@ import java.util.concurrent.Future;
 import static com.yahoo.vespa.hosted.controller.api.integration.LogEntry.Type.error;
 import static com.yahoo.vespa.hosted.controller.api.integration.LogEntry.Type.info;
 import static com.yahoo.vespa.hosted.controller.api.integration.LogEntry.Type.warning;
-import static com.yahoo.vespa.hosted.controller.deployment.DeploymentTester.instanceId;
 import static com.yahoo.vespa.hosted.controller.deployment.DeploymentContext.applicationPackage;
 import static com.yahoo.vespa.hosted.controller.deployment.DeploymentContext.publicCdApplicationPackage;
+import static com.yahoo.vespa.hosted.controller.deployment.DeploymentTester.instanceId;
 import static com.yahoo.vespa.hosted.controller.deployment.Step.Status.failed;
 import static com.yahoo.vespa.hosted.controller.deployment.Step.Status.succeeded;
 import static com.yahoo.vespa.hosted.controller.deployment.Step.Status.unfinished;
@@ -209,15 +210,15 @@ 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(app.instanceId(),
-                                                                                                      ClusterSpec.Id.from("default"),
-                                                                                                      JobType.systemTest.zone(system()),
+        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(app.testerId().id(),
-                                                                                                         ClusterSpec.Id.from("default"),
-                                                                                                         JobType.systemTest.zone(system()),
+        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)));
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 479ae6bceba..2c39a9a18f6 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
@@ -8,6 +8,7 @@ import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.application.EndpointId;
 import com.yahoo.vespa.hosted.controller.routing.RoutingPolicy;
+import com.yahoo.vespa.hosted.controller.routing.RoutingPolicyId;
 import org.junit.Test;
 
 import java.util.Iterator;
@@ -27,15 +28,15 @@ 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(owner,
-                                                         ClusterSpec.Id.from("my-cluster1"),
-                                                         ZoneId.from("prod", "us-north-1"),
+        var policies = ImmutableSet.of(new RoutingPolicy(new RoutingPolicyId(owner,
+                                                                             ClusterSpec.Id.from("my-cluster1"),
+                                                                             ZoneId.from("prod", "us-north-1")),
                                                          HostName.from("long-and-ugly-name"),
                                                          Optional.of("zone1"),
                                                          endpoints, true),
-                                       new RoutingPolicy(owner,
-                                                         ClusterSpec.Id.from("my-cluster2"),
-                                                         ZoneId.from("prod", "us-north-2"),
+                                       new RoutingPolicy(new RoutingPolicyId(owner,
+                                                                             ClusterSpec.Id.from("my-cluster2"),
+                                                                             ZoneId.from("prod", "us-north-2")),
                                                          HostName.from("long-and-ugly-name-2"),
                                                          Optional.empty(),
                                                          endpoints, false));
@@ -44,9 +45,7 @@ public class RoutingPolicySerializerTest {
         for (Iterator<RoutingPolicy> it1 = policies.iterator(), it2 = serialized.iterator(); it1.hasNext();) {
             var expected = it1.next();
             var actual = it2.next();
-            assertEquals(expected.owner(), actual.owner());
-            assertEquals(expected.cluster(), actual.cluster());
-            assertEquals(expected.zone(), actual.zone());
+            assertEquals(expected.id(), actual.id());
             assertEquals(expected.canonicalName(), actual.canonicalName());
             assertEquals(expected.dnsZone(), actual.dnsZone());
             assertEquals(expected.endpoints(), actual.endpoints());
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 ec79c9f0e64..27b8b0d12ea 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
@@ -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.restapi.application;
 
 import ai.vespa.hosted.api.MultiPartStreamer;
@@ -53,7 +53,6 @@ import com.yahoo.vespa.hosted.controller.application.ClusterInfo;
 import com.yahoo.vespa.hosted.controller.application.Deployment;
 import com.yahoo.vespa.hosted.controller.application.DeploymentMetrics;
 import com.yahoo.vespa.hosted.controller.application.EndpointId;
-import com.yahoo.vespa.hosted.controller.routing.RoutingPolicy;
 import com.yahoo.vespa.hosted.controller.application.TenantAndApplicationId;
 import com.yahoo.vespa.hosted.controller.athenz.HostedAthenzIdentities;
 import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder;
@@ -66,6 +65,8 @@ import com.yahoo.vespa.hosted.controller.maintenance.RotationStatusUpdater;
 import com.yahoo.vespa.hosted.controller.metric.ApplicationMetrics;
 import com.yahoo.vespa.hosted.controller.restapi.ContainerTester;
 import com.yahoo.vespa.hosted.controller.restapi.ControllerContainerTest;
+import com.yahoo.vespa.hosted.controller.routing.RoutingPolicy;
+import com.yahoo.vespa.hosted.controller.routing.RoutingPolicyId;
 import com.yahoo.vespa.hosted.controller.security.AthenzCredentials;
 import com.yahoo.vespa.hosted.controller.security.AthenzTenantSpec;
 import com.yahoo.vespa.hosted.controller.tenant.AthenzTenant;
@@ -1429,15 +1430,15 @@ public class ApplicationApiTest extends ControllerContainerTest {
                 .region("us-west-1")
                 .build();
         app.submit(applicationPackage).deploy();
-        Set<RoutingPolicy> policies = Set.of(new RoutingPolicy(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),
+        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(app.instanceId(),
-                                                             ClusterSpec.Id.from("deleted-cluster"),
-                                                             ZoneId.from(Environment.prod, RegionName.from("us-west-1")),
+                                           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));
         tester.controller().curator().writeRoutingPolicies(app.instanceId(), policies);