Use string ID for WeightedAliasTarget

2 files changed, 4 insertions, 6 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/WeightedAliasTarget.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/WeightedAliasTarget.java
index da296361535..6adcd1c1985 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/WeightedAliasTarget.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/WeightedAliasTarget.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.hosted.controller.api.integration.dns;
 
 import ai.vespa.http.DomainName;
-import com.yahoo.config.provision.zone.ZoneId;
 
 import java.util.Objects;
 
@@ -20,8 +19,8 @@ public final class WeightedAliasTarget extends AliasTarget {
 
     private final long weight;
 
-    public WeightedAliasTarget(DomainName name, String dnsZone, ZoneId zone, long weight) {
-        super(name, dnsZone, zone.value());
+    public WeightedAliasTarget(DomainName name, String dnsZone, String id, long weight) {
+        super(name, dnsZone, id);
         this.weight = weight;
         if (weight < 0) throw new IllegalArgumentException("Weight cannot be negative");
     }
@@ -65,8 +64,7 @@ public final class WeightedAliasTarget extends AliasTarget {
         if (!TARGET_TYPE.equals(parts[0])) {
             throw new IllegalArgumentException("Unexpected type '" + parts[0] + "'");
         }
-        return new WeightedAliasTarget(DomainName.of(parts[1]), parts[2], ZoneId.from(parts[3]),
-                                       Long.parseLong(parts[4]));
+        return new WeightedAliasTarget(DomainName.of(parts[1]), parts[2], parts[3], Long.parseLong(parts[4]));
     }
 
 }
diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/dns/AliasTargetTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/dns/AliasTargetTest.java
index 9cbba8107ef..c859cc020ab 100644
--- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/dns/AliasTargetTest.java
+++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/dns/AliasTargetTest.java
@@ -19,7 +19,7 @@ public class AliasTargetTest {
     void packing() {
         List<AliasTarget> tests = List.of(
                 new LatencyAliasTarget(HostName.of("foo.example.com"), "dns-zone-1", ZoneId.from("prod.us-north-1")),
-                new WeightedAliasTarget(HostName.of("bar.example.com"), "dns-zone-2", ZoneId.from("prod.us-north-2"), 50)
+                new WeightedAliasTarget(HostName.of("bar.example.com"), "dns-zone-2", "prod.us-north-2", 50)
         );
         for (var target : tests) {
             AliasTarget unpacked = AliasTarget.unpack(target.pack());