diff options
| author | Martin Polden <mpolden@mpolden.no> | 2023-01-19 11:50:41 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2023-01-19 11:51:46 +0100 |
| commit | 2f282f7199f46d65511fdbee9a3bb9c708dd0079 (patch) | |
| tree | 3ae02e17289926b13723f7dcac3f1d88f1e29365 /controller-server | |
| parent | ffba12c231f17e69dcd3f72edf6308772113fd0a (diff) | |
Use string ID for WeightedAliasTarget
Diffstat (limited to 'controller-server')
2 files changed, 3 insertions, 3 deletions
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 03db932dbb3..25ad7da98e7 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 @@ -233,7 +233,7 @@ public class RoutingPolicies { if (policy.canonicalName().isPresent()) { var weightedTarget = new WeightedAliasTarget( - policy.canonicalName().get(), policy.dnsZone().get(), policy.id().zone(), weight); + policy.canonicalName().get(), policy.dnsZone().get(), policy.id().zone().value(), weight); regionEndpoint.add(weightedTarget); } else { var weightedTarget = new WeightedDirectTarget( @@ -655,7 +655,7 @@ public class RoutingPolicies { return new Target(Record.Type.DIRECT, wt.recordData(), wt); } var wt = new WeightedAliasTarget(policy.canonicalName().get(), policy.dnsZone().get(), - endpointTarget.deployment().zoneId(), endpointTarget.weight()); + endpointTarget.deployment().zoneId().value(), endpointTarget.weight()); return new Target(Record.Type.ALIAS, RecordData.fqdn(wt.name().value()), wt); } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java index db96c265363..a049b614e25 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java @@ -1020,7 +1020,7 @@ public class ControllerTest { new Record(Record.Type.ALIAS, RecordName.from("application.tenant.us-east-3-w.vespa.oath.cloud"), new WeightedAliasTarget(HostName.of("lb-0--tenant.application.default--prod.us-east-3"), - "dns-zone-1", ZoneId.from("prod.us-east-3"), 1).pack()), + "dns-zone-1", "prod.us-east-3", 1).pack()), // The 'east' global endpoint, pointing to the weighted record for zone 2's region new Record(Record.Type.ALIAS, |