diff options
Diffstat (limited to 'controller-server')
35 files changed, 111 insertions, 112 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java index c35e8c5a7ac..d9664fd0475 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java @@ -283,7 +283,7 @@ public class Controller extends AbstractComponent { /** Returns the hostname of this controller */ public com.yahoo.config.provision.HostName hostname() { - return com.yahoo.config.provision.HostName.from(hostnameSupplier.get()); + return com.yahoo.config.provision.HostName.of(hostnameSupplier.get()); } public SystemName system() { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index beef090d214..ae61c98cffb 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.deployment; +import ai.vespa.http.DomainName; import com.yahoo.component.Version; import com.yahoo.config.application.api.DeploymentInstanceSpec; import com.yahoo.config.application.api.DeploymentSpec; @@ -23,7 +24,6 @@ import com.yahoo.security.X509CertificateBuilder; import com.yahoo.security.X509CertificateUtils; import com.yahoo.text.Text; import com.yahoo.vespa.flags.FetchVector; -import com.yahoo.vespa.flags.FlagSource; import com.yahoo.vespa.flags.Flags; import com.yahoo.vespa.hosted.controller.Application; import com.yahoo.vespa.hosted.controller.Controller; @@ -512,7 +512,7 @@ public class InternalStepRunner implements StepRunner { return false; } for (var endpoint : endpoints.get(zone)) { - HostName endpointName = HostName.from(endpoint.dnsName()); + DomainName endpointName = DomainName.of(endpoint.dnsName()); var ipAddress = controller.jobController().cloud().resolveHostName(endpointName); if (ipAddress.isEmpty()) { logger.log(INFO, "DNS lookup yielded no IP address for '" + endpointName + "'."); @@ -533,7 +533,7 @@ public class InternalStepRunner implements StepRunner { var loadBalancerAddress = controller.jobController().cloud().resolveHostName(policy.canonicalName()); if ( ! loadBalancerAddress.equals(ipAddress)) { logger.log(INFO, "IP address of CNAME '" + endpointName + "' (" + ipAddress.get() + ") and load balancer '" + - policy.canonicalName() + "' (" + loadBalancerAddress.orElse("empty") + ") are not equal"); + policy.canonicalName() + "' (" + loadBalancerAddress.orElse(null) + ") are not equal"); return false; } } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NodeVersionSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NodeVersionSerializer.java index 10ec9dce5f7..0f1f531d589 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NodeVersionSerializer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NodeVersionSerializer.java @@ -46,7 +46,7 @@ public class NodeVersionSerializer { public List<NodeVersion> nodeVersionsFromSlime(Inspector array, Version version) { List<NodeVersion> nodeVersions = new ArrayList<>(); array.traverse((ArrayTraverser) (i, entry) -> { - var hostname = HostName.from(entry.field(hostnameField).asString()); + var hostname = HostName.of(entry.field(hostnameField).asString()); var zone = ZoneId.from(entry.field(zoneField).asString()); var wantedVersion = Version.fromString(entry.field(wantedVersionField).asString()); var suspendedAt = SlimeUtils.optionalInstant(entry.field(suspendedAtField)); 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 17337f823c0..72c16ae0110 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 @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.persistence; +import ai.vespa.http.DomainName; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.slime.ArrayTraverser; import com.yahoo.slime.Cursor; @@ -83,7 +83,7 @@ public class RoutingPolicySerializer { ClusterSpec.Id.from(inspect.field(clusterField).asString()), ZoneId.from(inspect.field(zoneField).asString())); policies.add(new RoutingPolicy(id, - HostName.from(inspect.field(canonicalNameField).asString()), + DomainName.of(inspect.field(canonicalNameField).asString()), SlimeUtils.optionalString(inspect.field(dnsZoneField)), instanceEndpoints, applicationEndpoints, 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 924f7c0b0a5..dcc916cc5a3 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 @@ -53,7 +53,6 @@ import com.yahoo.vespa.hosted.controller.api.application.v4.model.configserverbi import com.yahoo.vespa.hosted.controller.api.application.v4.model.configserverbindings.RestartAction; import com.yahoo.vespa.hosted.controller.api.application.v4.model.configserverbindings.ServiceInfo; import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; -import com.yahoo.vespa.hosted.controller.api.identifiers.Hostname; import com.yahoo.vespa.hosted.controller.api.identifiers.TenantId; import com.yahoo.vespa.hosted.controller.api.integration.aws.TenantRoles; import com.yahoo.vespa.hosted.controller.api.integration.billing.Quota; @@ -2053,7 +2052,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { DeploymentId deploymentId = new DeploymentId(ApplicationId.from(tenantName, applicationName, instanceName), requireZone(environment, region)); RestartFilter restartFilter = new RestartFilter() - .withHostName(Optional.ofNullable(request.getProperty("hostname")).map(HostName::from)) + .withHostName(Optional.ofNullable(request.getProperty("hostname")).map(HostName::of)) .withClusterType(Optional.ofNullable(request.getProperty("clusterType")).map(ClusterSpec.Type::from)) .withClusterId(Optional.ofNullable(request.getProperty("clusterId")).map(ClusterSpec.Id::from)); @@ -2295,7 +2294,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { try { node = nodeRepository.getNode(zone, hostname); } catch (IllegalArgumentException e) { - throw new NotExistsException(new Hostname(hostname)); + throw new NotExistsException(hostname); } ApplicationId app = ApplicationId.from(tenant, application, instance); ApplicationId owner = node.owner().orElseThrow(() -> new IllegalArgumentException("Node has no owner")); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java index e1fc68974cc..c72d8ceb089 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java @@ -280,7 +280,7 @@ public class ChangeManagementApiHandler extends AuditLoggingRequestHandler { private Optional<ZoneId> affectedZone(List<String> hosts) { NodeFilter affectedHosts = NodeFilter.all().hostnames(hosts.stream() - .map(HostName::from) + .map(HostName::of) .collect(Collectors.toSet())); for (var zone : getProdZones()) { var affectedHostsInZone = controller.serviceRegistry().configServer().nodeRepository().list(zone, affectedHosts); 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 b98ef717dd3..850a8cab123 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 @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.routing; +import ai.vespa.http.DomainName; import com.yahoo.config.application.api.DeploymentSpec; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.zone.RoutingMethod; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.vespa.curator.Lock; @@ -215,7 +215,7 @@ public class RoutingPolicies { } var weightedTarget = new WeightedAliasTarget(policy.canonicalName(), policy.dnsZone().get(), policy.id().zone(), weight); - endpoints.computeIfAbsent(regionEndpoint, (k) -> new RegionEndpoint(new LatencyAliasTarget(HostName.from(regionEndpoint.dnsName()), + endpoints.computeIfAbsent(regionEndpoint, (k) -> new RegionEndpoint(new LatencyAliasTarget(DomainName.of(regionEndpoint.dnsName()), policy.dnsZone().get(), policy.id().zone()))) .zoneTargets() 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 34736c16a6b..1ccb3205816 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 @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.routing; +import ai.vespa.http.DomainName; import com.google.common.collect.ImmutableSortedSet; -import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.zone.RoutingMethod; import com.yahoo.text.Text; @@ -27,14 +27,14 @@ import java.util.Set; public class RoutingPolicy { private final RoutingPolicyId id; - private final HostName canonicalName; + private final DomainName canonicalName; private final Optional<String> dnsZone; private final Set<EndpointId> instanceEndpoints; private final Set<EndpointId> applicationEndpoints; private final Status status; /** DO NOT USE. Public for serialization purposes */ - public RoutingPolicy(RoutingPolicyId id, HostName canonicalName, Optional<String> dnsZone, + public RoutingPolicy(RoutingPolicyId id, DomainName canonicalName, Optional<String> dnsZone, Set<EndpointId> instanceEndpoints, Set<EndpointId> applicationEndpoints, Status status) { this.id = Objects.requireNonNull(id, "id must be non-null"); this.canonicalName = Objects.requireNonNull(canonicalName, "canonicalName must be non-null"); @@ -50,7 +50,7 @@ public class RoutingPolicy { } /** The canonical name for the load balancer this applies to (rhs of a CNAME or ALIAS record) */ - public HostName canonicalName() { + public DomainName canonicalName() { return canonicalName; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java index 3fa440e694e..a2f0948193c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java @@ -197,7 +197,7 @@ public class VersionStatus { .add(controller.hostname()); } else { for (String host : controller.curator().cluster()) { - HostName hostname = HostName.from(host); + HostName hostname = HostName.of(host); versions.computeIfAbsent(controller.curator().readControllerVersion(hostname), (k) -> new ArrayList<>()) .add(hostname); } 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 5ababdd8250..816a7370bcd 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 @@ -940,19 +940,19 @@ public class ControllerTest { // The weighted record for zone 2's region new Record(Record.Type.ALIAS, RecordName.from("application.tenant.us-east-3-w.vespa.oath.cloud"), - new WeightedAliasTarget(HostName.from("lb-0--tenant:application:default--prod.us-east-3"), + new WeightedAliasTarget(HostName.of("lb-0--tenant.application.default--prod.us-east-3"), "dns-zone-1", ZoneId.from("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, RecordName.from("east.application.tenant.global.vespa.oath.cloud"), - new LatencyAliasTarget(HostName.from("application.tenant.us-east-3-w.vespa.oath.cloud"), + new LatencyAliasTarget(HostName.of("application.tenant.us-east-3-w.vespa.oath.cloud"), "dns-zone-1", ZoneId.from("prod.us-east-3")).pack()), // The zone-scoped endpoint pointing to zone 2 with exclusive routing new Record(Record.Type.CNAME, RecordName.from("application.tenant.us-east-3.vespa.oath.cloud"), - RecordData.from("lb-0--tenant:application:default--prod.us-east-3."))); + RecordData.from("lb-0--tenant.application.default--prod.us-east-3."))); assertEquals(expectedRecords, List.copyOf(tester.controllerTester().nameService().records())); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java index 75c33952754..b39e59d4420 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java @@ -239,7 +239,7 @@ public final class ControllerTester { /** Upgrade controller to given version */ public void upgradeController(Version version, String commitSha, Instant commitDate) { for (var hostname : controller().curator().cluster()) { - upgradeController(HostName.from(hostname), version, commitSha, commitDate); + upgradeController(HostName.of(hostname), version, commitSha, commitDate); } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java index 86c21839c96..896f5355129 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java @@ -247,7 +247,7 @@ public class DeploymentContext { var clusterId = "default-inactive"; var id = new RoutingPolicyId(instanceId, ClusterSpec.Id.from(clusterId), zone); var policies = new LinkedHashMap<>(tester.controller().routing().policies().read(instanceId).asMap()); - policies.put(id, new RoutingPolicy(id, HostName.from("lb-host"), + policies.put(id, new RoutingPolicy(id, HostName.of("lb-host"), Optional.empty(), Set.of(EndpointId.of("default")), Set.of(), diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueueTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueueTest.java index 44bcbcfb4fa..b5fd3d750ef 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueueTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueueTest.java @@ -28,11 +28,11 @@ public class NameServiceQueueTest { var r1 = new Record(Record.Type.CNAME, RecordName.from("cname.vespa.oath.cloud"), RecordData.from("example.com")); var r2 = new Record(Record.Type.TXT, RecordName.from("txt.example.com"), RecordData.from("text")); var r3 = List.of(new Record(Record.Type.ALIAS, RecordName.from("alias.example.com"), - new LatencyAliasTarget(HostName.from("alias1"), + new LatencyAliasTarget(HostName.of("alias1"), "dns-zone-01", ZoneId.from("prod", "us-north-1")).pack()), new Record(Record.Type.ALIAS, RecordName.from("alias.example.com"), - new LatencyAliasTarget(HostName.from("alias2"), + new LatencyAliasTarget(HostName.of("alias2"), "dns-zone-02", ZoneId.from("prod", "us-north-2")).pack())); var req1 = new CreateRecord(r1); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java index e98ff71884d..fc87f3f8be6 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java @@ -159,7 +159,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer } public HostName hostFor(ApplicationId application, ZoneId zone) { - return HostName.from("host-" + application.serializedForm() + "-" + zone.value()); + return HostName.of("host-" + application.toFullString() + "-" + zone.value()); } public void bootstrap(List<ZoneId> zones, SystemApplication... applications) { @@ -176,8 +176,8 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer for (SystemApplication application : applications) { for (int i = 1; i <= 3; i++) { Node node = Node.builder() - .hostname(HostName.from("node-" + i + "-" + application.id().application() - .value() + "-" + zone.value())) + .hostname(HostName.of("node-" + i + "-" + application.id().application() + .value() + "-" + zone.value())) .state(Node.State.active) .type(application.nodeType()) .owner(application.id()) @@ -402,7 +402,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer putLoadBalancers(id.zoneId(), List.of(new LoadBalancer(UUID.randomUUID().toString(), id.applicationId(), cluster, - Optional.of(HostName.from("lb-0--" + id.applicationId().serializedForm() + "--" + id.zoneId().toString())), + Optional.of(HostName.of("lb-0--" + id.applicationId().toFullString() + "--" + id.zoneId().toString())), LoadBalancer.State.active, Optional.of("dns-zone-1")))); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java index 7b67db39350..3f1ca3f9706 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java @@ -60,7 +60,7 @@ public class NodeRepositoryMock implements NodeRepository { @Override public void deleteNode(ZoneId zone, String hostname) { require(zone, hostname); - nodeRepository.get(zone).remove(HostName.from(hostname)); + nodeRepository.get(zone).remove(HostName.of(hostname)); } @Override @@ -246,8 +246,8 @@ public class NodeRepositoryMock implements NodeRepository { /** Add a fixed set of nodes to given zone */ public void addFixedNodes(ZoneId zone) { var nodeA = Node.builder() - .hostname(HostName.from("hostA")) - .parentHostname(HostName.from("parentHostA")) + .hostname(HostName.of("hostA")) + .parentHostname(HostName.of("parentHostA")) .state(Node.State.active) .type(NodeType.tenant) .owner(ApplicationId.from("tenant1", "app1", "default")) @@ -262,8 +262,8 @@ public class NodeRepositoryMock implements NodeRepository { .exclusiveTo(ApplicationId.from("t1", "a1", "i1")) .build(); var nodeB = Node.builder() - .hostname(HostName.from("hostB")) - .parentHostname(HostName.from("parentHostB")) + .hostname(HostName.of("hostB")) + .parentHostname(HostName.of("parentHostB")) .state(Node.State.active) .type(NodeType.tenant) .owner(ApplicationId.from("tenant2", "app2", "default")) @@ -319,7 +319,7 @@ public class NodeRepositoryMock implements NodeRepository { } private Node require(ZoneId zone, String hostname) { - return require(zone, HostName.from(hostname)); + return require(zone, HostName.of(hostname)); } private Node require(ZoneId zone, HostName hostname) { @@ -329,7 +329,7 @@ public class NodeRepositoryMock implements NodeRepository { } private void patchNodes(ZoneId zone, String hostname, UnaryOperator<Node> patcher) { - patchNodes(zone, Optional.of(HostName.from(hostname)), patcher); + patchNodes(zone, Optional.of(HostName.of(hostname)), patcher); } private void patchNodes(DeploymentId deployment, Optional<HostName> hostname, UnaryOperator<Node> patcher) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventTrackerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventTrackerTest.java index 8daedc05e96..6ccd307f0d9 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventTrackerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventTrackerTest.java @@ -122,7 +122,7 @@ public class CloudEventTrackerTest { private Node createNode(String hostname, NodeType nodeType) { return Node.builder() - .hostname(HostName.from(hostname)) + .hostname(HostName.of(hostname)) .type(nodeType) .build(); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/HostInfoUpdaterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/HostInfoUpdaterTest.java index a06e15de3c7..890f0b41098 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/HostInfoUpdaterTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/HostInfoUpdaterTest.java @@ -84,10 +84,10 @@ public class HostInfoUpdaterTest { // Updates node registered under a different hostname ZoneId zone = tester.zoneRegistry().zones().controllerUpgraded().all().ids().get(0); String hostnameSuffix = ".prod." + zone.value(); - Node configNode = Node.builder().hostname(HostName.from("cfg3" + hostnameSuffix)) + Node configNode = Node.builder().hostname(HostName.of("cfg3" + hostnameSuffix)) .type(NodeType.config) .build(); - Node configHost = Node.builder().hostname(HostName.from("cfghost3" + hostnameSuffix)) + Node configHost = Node.builder().hostname(HostName.of("cfghost3" + hostnameSuffix)) .type(NodeType.confighost) .build(); tester.serviceRegistry().configServer().nodeRepository().putNodes(zone, List.of(configNode, configHost)); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java index 6109890bae3..4d3f94eaa3d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java @@ -135,8 +135,8 @@ public class ResourceMeterMaintainerTest { Node.State.parked, Node.State.active) .map(state -> Node.builder() - .hostname(HostName.from("host" + state)) - .parentHostname(HostName.from("parenthost" + state)) + .hostname(HostName.of("host" + state)) + .parentHostname(HostName.of("parenthost" + state)) .state(state) .type(NodeType.tenant) .owner(ApplicationId.from("tenant1", "app1", "default")) diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java index f58911a6114..1a6976034c5 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java @@ -36,8 +36,8 @@ public class ResourceTagMaintainerTest { resourceTagMaintainer.maintain(); assertEquals(2, mockResourceTagger.getValues().size()); Map<HostName, ApplicationId> applicationForHost = mockResourceTagger.getValues().get(ZoneId.from("prod.region-2")); - assertEquals(ApplicationId.from("t1", "a1", "i1"), applicationForHost.get(HostName.from("parentHostA.prod.region-2"))); - assertEquals(SHARED_HOST_APPLICATION, applicationForHost.get(HostName.from("parentHostB.prod.region-2"))); + assertEquals(ApplicationId.from("t1", "a1", "i1"), applicationForHost.get(HostName.of("parentHostA.prod.region-2"))); + assertEquals(SHARED_HOST_APPLICATION, applicationForHost.get(HostName.of("parentHostB.prod.region-2"))); } private void setUpZones() { @@ -51,19 +51,19 @@ public class ResourceTagMaintainerTest { public void setNodes(ZoneId zone) { var hostA = Node.builder() - .hostname(HostName.from("parentHostA." + zone.value())) + .hostname(HostName.of("parentHostA." + zone.value())) .type(NodeType.host) .owner(ApplicationId.from(SystemApplication.TENANT.value(), "tenant-host", "default")) .exclusiveTo(ApplicationId.from("t1", "a1", "i1")) .build(); var nodeA = Node.builder() - .hostname(HostName.from("hostA." + zone.value())) + .hostname(HostName.of("hostA." + zone.value())) .type(NodeType.tenant) - .parentHostname(HostName.from("parentHostA." + zone.value())) + .parentHostname(HostName.of("parentHostA." + zone.value())) .owner(ApplicationId.from("tenant1", "app1", "default")) .build(); var hostB = Node.builder() - .hostname(HostName.from("parentHostB." + zone.value())) + .hostname(HostName.of("parentHostB." + zone.value())) .type(NodeType.host) .owner(ApplicationId.from(SystemApplication.TENANT.value(), "tenant-host", "default")) .build(); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainerTest.java index 0dbe31d921b..8b2bfe8ee95 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainerTest.java @@ -35,7 +35,7 @@ public class SystemRoutingPolicyMaintainerTest { tester.configServer().putLoadBalancers(zone, List.of(new LoadBalancer("lb1", SystemApplication.configServer.id(), ClusterSpec.Id.from("config"), - Optional.of(HostName.from("lb1.example.com")), + Optional.of(HostName.of("lb1.example.com")), LoadBalancer.State.active, Optional.of("dns-zone-1")))); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java index 7f369d21d3a..e7a6c3ea3c3 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java @@ -37,9 +37,9 @@ public class VcmrMaintainerTest { private NodeRepositoryMock nodeRepo; private final ZoneId zoneId = ZoneId.from("prod.us-east-3"); private final ZoneId zone2 = ZoneId.from("prod.us-west-1"); - private final HostName host1 = HostName.from("host1"); - private final HostName host2 = HostName.from("host2"); - private final HostName host3 = HostName.from("host3"); + private final HostName host1 = HostName.of("host1"); + private final HostName host2 = HostName.of("host2"); + private final HostName host3 = HostName.of("host3"); private final String changeRequestId = "id123"; @Before diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/NameServiceQueueSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/NameServiceQueueSerializerTest.java index 4ef09bbfce0..5ecc22ffc5e 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/NameServiceQueueSerializerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/NameServiceQueueSerializerTest.java @@ -32,11 +32,11 @@ public class NameServiceQueueSerializerTest { new CreateRecord(record1), new CreateRecords(List.of(record2)), new CreateRecords(List.of(new Record(Record.Type.ALIAS, RecordName.from("alias.example.com"), - new LatencyAliasTarget(HostName.from("alias1"), + new LatencyAliasTarget(HostName.of("alias1"), "dns-zone-01", ZoneId.from("prod", "us-north-1")).pack()), new Record(Record.Type.ALIAS, RecordName.from("alias.example.com"), - new LatencyAliasTarget(HostName.from("alias2"), + new LatencyAliasTarget(HostName.of("alias2"), "dns-zone-02", ZoneId.from("prod", "us-north-2")).pack())) ), diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionStatusSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionStatusSerializerTest.java index 482303a0e49..d50c071d98e 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionStatusSerializerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionStatusSerializerTest.java @@ -30,12 +30,12 @@ public class OsVersionStatusSerializerTest { Map<OsVersion, List<NodeVersion>> versions = new LinkedHashMap<>(); versions.put(new OsVersion(version1, CloudName.defaultName()), List.of( - new NodeVersion(HostName.from("node1"), ZoneId.from("prod", "us-west"), version1, version2, Optional.of(Instant.ofEpochMilli(11))), - new NodeVersion(HostName.from("node2"), ZoneId.from("prod", "us-east"), version1, version2, Optional.of(Instant.ofEpochMilli(22))) + new NodeVersion(HostName.of("node1"), ZoneId.from("prod", "us-west"), version1, version2, Optional.of(Instant.ofEpochMilli(11))), + new NodeVersion(HostName.of("node2"), ZoneId.from("prod", "us-east"), version1, version2, Optional.of(Instant.ofEpochMilli(22))) )); versions.put(new OsVersion(version2, CloudName.defaultName()), List.of( - new NodeVersion(HostName.from("node3"), ZoneId.from("prod", "us-west"), version2, version2, Optional.of(Instant.ofEpochMilli(33))), - new NodeVersion(HostName.from("node4"), ZoneId.from("prod", "us-east"), version2, version2, Optional.of(Instant.ofEpochMilli(44))) + new NodeVersion(HostName.of("node3"), ZoneId.from("prod", "us-west"), version2, version2, Optional.of(Instant.ofEpochMilli(33))), + new NodeVersion(HostName.of("node4"), ZoneId.from("prod", "us-east"), version2, version2, Optional.of(Instant.ofEpochMilli(44))) )); OsVersionStatusSerializer serializer = new OsVersionStatusSerializer(new OsVersionSerializer(), new NodeVersionSerializer()); 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 422188420bd..2e8ba84d4ff 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 @@ -38,13 +38,13 @@ public class RoutingPolicySerializerTest { ClusterSpec.Id.from("my-cluster2"), ZoneId.from("prod", "us-north-2")); var policies = List.of(new RoutingPolicy(id1, - HostName.from("long-and-ugly-name"), + HostName.of("long-and-ugly-name"), Optional.of("zone1"), instanceEndpoints, applicationEndpoints, new RoutingPolicy.Status(true, RoutingStatus.DEFAULT)), new RoutingPolicy(id2, - HostName.from("long-and-ugly-name-2"), + HostName.of("long-and-ugly-name-2"), Optional.empty(), instanceEndpoints, Set.of(), diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java index e202d4a687d..73cfc6ad2f3 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java @@ -55,7 +55,7 @@ public class VersionStatusSerializerTest { private static List<NodeVersion> nodeVersions(Version version, Version wantedVersion, String... hostnames) { var nodeVersions = new ArrayList<NodeVersion>(); for (var hostname : hostnames) { - nodeVersions.add(new NodeVersion(HostName.from(hostname), ZoneId.from("prod", "us-north-1"), version, wantedVersion, Optional.empty())); + nodeVersions.add(new NodeVersion(HostName.of(hostname), ZoneId.from("prod", "us-north-1"), version, wantedVersion, Optional.empty())); } return nodeVersions; } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequestTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequestTest.java index 5827ef676d7..6b07fea0187 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequestTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequestTest.java @@ -19,9 +19,9 @@ public class ProxyRequestTest { @Test public void testBadUri() { - assertThrows("Request path '/path' does not end with proxy path '/zone/v2/'", - IllegalArgumentException.class, - () -> testRequest("http://domain.tld/path", "/zone/v2/")); + assertEquals("Request path '/path' does not end with proxy path '/zone/v2/'", + assertThrows(IllegalArgumentException.class, + () -> testRequest("http://domain.tld/path", "/zone/v2/")).getMessage()); } @Test 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 67b201bdc9d..52da2fadf0c 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 @@ -634,13 +634,13 @@ public class ApplicationApiTest extends ControllerContainerTest { "{\"enabled\":true,\"clusters\":[{\"name\":\"cluster\",\"pending\":[{\"type\":\"type\",\"requiredGeneration\":100}],\"ready\":[{\"type\":\"type\",\"readyAtMillis\":345,\"startedAtMillis\":456,\"endedAtMillis\":567,\"state\":\"failed\",\"message\":\"(＃｀д´)ﾉ\",\"progress\":0.1,\"speed\":1.0}]}]}"); // POST to request a service dump - tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-central-1/node/host-tenant1:application1:instance1-prod.us-central-1/service-dump", POST) + tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-central-1/node/host-tenant1.application1.instance1-prod.us-central-1/service-dump", POST) .userIdentity(HOSTED_VESPA_OPERATOR) .data("{\"configId\":\"default/container.1\",\"artifacts\":[\"jvm-dump\"],\"dumpOptions\":{\"duration\":30}}"), "{\"message\":\"Request created\"}"); // GET to get status of service dump - tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-central-1/node/host-tenant1:application1:instance1-prod.us-central-1/service-dump", GET) + tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-central-1/node/host-tenant1.application1.instance1-prod.us-central-1/service-dump", GET) .userIdentity(HOSTED_VESPA_OPERATOR), "{\"createdMillis\":" + tester.controller().clock().millis() + ",\"configId\":\"default/container.1\"" + ",\"artifacts\":[\"jvm-dump\"],\"dumpOptions\":{\"duration\":30}}"); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-nodes.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-nodes.json index 422c8c122fa..88a92bf7810 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-nodes.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-nodes.json @@ -1,7 +1,7 @@ { "nodes": [ { - "hostname": "host-tenant1:application1:instance1-prod.us-central-1", + "hostname": "host-tenant1.application1.instance1-prod.us-central-1", "state": "active", "orchestration": "unorchestrated", "version": "6.1", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json index 3ef993c6589..bfaa4d5c813 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json @@ -28,7 +28,7 @@ { "at": 0, "type": "info", - "message": "host-tenant:application:default-dev.us-east-1: unorchestrated" + "message": "host-tenant.application.default-dev.us-east-1: unorchestrated" }, { "at": 0, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json index 6b1d48f4a08..7c1f7223e9e 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json @@ -18,7 +18,7 @@ { "at": 14503000, "type": "info", - "message": "host-tenant:application:default-t-staging.us-east-3: unorchestrated" + "message": "host-tenant.application.default-t-staging.us-east-3: unorchestrated" }, { "at": 14503000, @@ -33,7 +33,7 @@ { "at": 14503000, "type": "info", - "message": "host-tenant:application:default-t-staging.us-east-3: unorchestrated" + "message": "host-tenant.application.default-t-staging.us-east-3: unorchestrated" }, { "at": 14503000, @@ -48,7 +48,7 @@ { "at": 14503000, "type": "info", - "message": "host-tenant:application:default-t-staging.us-east-3: unorchestrated" + "message": "host-tenant.application.default-t-staging.us-east-3: unorchestrated" }, { "at": 14503000, @@ -63,7 +63,7 @@ { "at": 14503000, "type": "info", - "message": "host-tenant:application:default-t-staging.us-east-3: unorchestrated" + "message": "host-tenant.application.default-t-staging.us-east-3: unorchestrated" }, { "at": 14503000, @@ -102,7 +102,7 @@ { "at": 14503000, "type": "info", - "message": "host-tenant:application:default-staging.us-east-3: unorchestrated" + "message": "host-tenant.application.default-staging.us-east-3: unorchestrated" }, { "at": 14503000, @@ -127,7 +127,7 @@ { "at": 14503000, "type": "debug", - "message": "host-tenant:application:default-staging.us-east-3: unorchestrated" + "message": "host-tenant.application.default-staging.us-east-3: unorchestrated" }, { "at": 14503000, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json index 377b8c6ed69..e830f96bbba 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json @@ -23,7 +23,7 @@ { "at": "(ignore)", "type": "info", - "message": "host-tenant1:application1:instance1-t-test.us-east-1: unorchestrated" + "message": "host-tenant1.application1.instance1-t-test.us-east-1: unorchestrated" }, { "at": "(ignore)", @@ -38,7 +38,7 @@ { "at": "(ignore)", "type": "info", - "message": "host-tenant1:application1:instance1-t-test.us-east-1: unorchestrated" + "message": "host-tenant1.application1.instance1-t-test.us-east-1: unorchestrated" }, { "at": "(ignore)", @@ -53,7 +53,7 @@ { "at": "(ignore)", "type": "info", - "message": "host-tenant1:application1:instance1-t-test.us-east-1: unorchestrated" + "message": "host-tenant1.application1.instance1-t-test.us-east-1: unorchestrated" }, { "at": "(ignore)", @@ -68,7 +68,7 @@ { "at": "(ignore)", "type": "info", - "message": "host-tenant1:application1:instance1-t-test.us-east-1: unorchestrated" + "message": "host-tenant1.application1.instance1-t-test.us-east-1: unorchestrated" }, { "at": "(ignore)", @@ -83,7 +83,7 @@ { "at": "(ignore)", "type": "info", - "message": "host-tenant1:application1:instance1-t-test.us-east-1: unorchestrated" + "message": "host-tenant1.application1.instance1-t-test.us-east-1: unorchestrated" }, { "at": "(ignore)", @@ -122,7 +122,7 @@ { "at": "(ignore)", "type": "info", - "message": "host-tenant1:application1:instance1-test.us-east-1: unorchestrated" + "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated" }, { "at": "(ignore)", @@ -147,7 +147,7 @@ { "at": "(ignore)", "type": "debug", - "message": "host-tenant1:application1:instance1-test.us-east-1: unorchestrated" + "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated" }, { "at": "(ignore)", @@ -172,7 +172,7 @@ { "at": "(ignore)", "type": "debug", - "message": "host-tenant1:application1:instance1-test.us-east-1: unorchestrated" + "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated" }, { "at": "(ignore)", @@ -197,7 +197,7 @@ { "at": "(ignore)", "type": "debug", - "message": "host-tenant1:application1:instance1-test.us-east-1: unorchestrated" + "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated" }, { "at": "(ignore)", @@ -222,7 +222,7 @@ { "at": "(ignore)", "type": "debug", - "message": "host-tenant1:application1:instance1-test.us-east-1: unorchestrated" + "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated" }, { "at": "(ignore)", @@ -247,7 +247,7 @@ { "at": "(ignore)", "type": "debug", - "message": "host-tenant1:application1:instance1-test.us-east-1: unorchestrated" + "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated" }, { "at": "(ignore)", @@ -272,7 +272,7 @@ { "at": "(ignore)", "type": "debug", - "message": "host-tenant1:application1:instance1-test.us-east-1: unorchestrated" + "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated" }, { "at": "(ignore)", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json index f675825c3b6..bfb5d8e6cbc 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json @@ -18,7 +18,7 @@ { "at": 0, "type": "info", - "message": "host-tenant:application:default-t-test.us-east-1: unorchestrated" + "message": "host-tenant.application.default-t-test.us-east-1: unorchestrated" }, { "at": 0, @@ -33,7 +33,7 @@ { "at": 0, "type": "info", - "message": "host-tenant:application:default-t-test.us-east-1: unorchestrated" + "message": "host-tenant.application.default-t-test.us-east-1: unorchestrated" }, { "at": 0, @@ -48,7 +48,7 @@ { "at": 0, "type": "info", - "message": "host-tenant:application:default-t-test.us-east-1: unorchestrated" + "message": "host-tenant.application.default-t-test.us-east-1: unorchestrated" }, { "at": 0, @@ -63,7 +63,7 @@ { "at": 0, "type": "info", - "message": "host-tenant:application:default-t-test.us-east-1: unorchestrated" + "message": "host-tenant.application.default-t-test.us-east-1: unorchestrated" }, { "at": 0, @@ -78,7 +78,7 @@ { "at": 0, "type": "info", - "message": "host-tenant:application:default-t-test.us-east-1: unorchestrated" + "message": "host-tenant.application.default-t-test.us-east-1: unorchestrated" }, { "at": 0, @@ -117,7 +117,7 @@ { "at": 0, "type": "info", - "message": "host-tenant:application:default-test.us-east-1: unorchestrated" + "message": "host-tenant.application.default-test.us-east-1: unorchestrated" }, { "at": 0, @@ -142,7 +142,7 @@ { "at": 0, "type": "debug", - "message": "host-tenant:application:default-test.us-east-1: unorchestrated" + "message": "host-tenant.application.default-test.us-east-1: unorchestrated" }, { "at": 0, @@ -167,7 +167,7 @@ { "at": 0, "type": "debug", - "message": "host-tenant:application:default-test.us-east-1: unorchestrated" + "message": "host-tenant.application.default-test.us-east-1: unorchestrated" }, { "at": 0, @@ -192,7 +192,7 @@ { "at": 0, "type": "debug", - "message": "host-tenant:application:default-test.us-east-1: unorchestrated" + "message": "host-tenant.application.default-test.us-east-1: unorchestrated" }, { "at": 0, @@ -217,7 +217,7 @@ { "at": 0, "type": "debug", - "message": "host-tenant:application:default-test.us-east-1: unorchestrated" + "message": "host-tenant.application.default-test.us-east-1: unorchestrated" }, { "at": 0, @@ -242,7 +242,7 @@ { "at": 0, "type": "debug", - "message": "host-tenant:application:default-test.us-east-1: unorchestrated" + "message": "host-tenant.application.default-test.us-east-1: unorchestrated" }, { "at": 0, @@ -267,7 +267,7 @@ { "at": 0, "type": "debug", - "message": "host-tenant:application:default-test.us-east-1: unorchestrated" + "message": "host-tenant.application.default-test.us-east-1: unorchestrated" }, { "at": 0, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java index ca0db13b3d1..53da8c515a7 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java @@ -97,8 +97,8 @@ public class DeploymentApiTest extends ControllerContainerTest { version.isControllerVersion(), version.isSystemVersion(), version.isReleased(), - List.of(new NodeVersion(HostName.from("config1.test"), ZoneId.defaultId(), version.versionNumber(), version.versionNumber(), Optional.empty()), - new NodeVersion(HostName.from("config2.test"), ZoneId.defaultId(), version.versionNumber(), version.versionNumber(), Optional.empty())), + List.of(new NodeVersion(HostName.of("config1.test"), ZoneId.defaultId(), version.versionNumber(), version.versionNumber(), Optional.empty()), + new NodeVersion(HostName.of("config2.test"), ZoneId.defaultId(), version.versionNumber(), version.versionNumber(), Optional.empty())), version.confidence() ); } 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 1919de33e8b..83b6f05c0b0 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 @@ -453,7 +453,7 @@ public class RoutingPoliciesTest { tester.controllerTester().configServer().removeLoadBalancers(context.instanceId(), zone1); // Load balancer for the same application is provisioned again, but with a different hostname - var newHostname = HostName.from("new-hostname"); + var newHostname = HostName.of("new-hostname"); var loadBalancer = new LoadBalancer("LB-0-Z-" + zone1.value(), context.instanceId(), ClusterSpec.Id.from("c0"), @@ -708,7 +708,7 @@ public class RoutingPoliciesTest { List<Record> records = tester.controllerTester().nameService().findRecords(Record.Type.CNAME, name); assertEquals(1, records.size()); - assertEquals(RecordData.from("lb-0--hosted-vespa:zone-config-servers:default--prod.us-west-1."), + assertEquals(RecordData.from("lb-0--hosted-vespa.zone-config-servers.default--prod.us-west-1."), records.get(0).data()); } @@ -859,10 +859,10 @@ public class RoutingPoliciesTest { for (int i = 0; i < count; i++) { HostName lbHostname; if (shared) { - lbHostname = HostName.from("shared-lb--" + zone.value()); + lbHostname = HostName.of("shared-lb--" + zone.value()); } else { - lbHostname = HostName.from("lb-" + i + "--" + application.serializedForm() + - "--" + zone.value()); + lbHostname = HostName.of("lb-" + i + "--" + application.toFullString() + + "--" + zone.value()); } loadBalancers.add( new LoadBalancer("LB-" + i + "-Z-" + zone.value(), @@ -985,7 +985,7 @@ public class RoutingPoliciesTest { deploymentsByDnsName.forEach((dnsName, deployments) -> { Set<String> weightedTargets = deployments.stream() .map(d -> "weighted/lb-" + loadBalancerId + "--" + - d.applicationId().serializedForm() + "--" + d.zoneId().value() + + d.applicationId().toFullString() + "--" + d.zoneId().value() + "/dns-zone-1/" + d.zoneId().value() + "/" + deploymentWeights.get(d)) .collect(Collectors.toSet()); assertEquals(dnsName + " has expected targets", weightedTargets, aliasDataOf(dnsName)); @@ -1009,7 +1009,7 @@ public class RoutingPoliciesTest { zonesByRegionEndpoint.forEach((regionEndpoint, zonesInRegion) -> { Set<String> weightedTargets = zonesInRegion.stream() .map(z -> "weighted/lb-" + loadBalancerId + "--" + - instance.serializedForm() + "--" + z.value() + + instance.toFullString() + "--" + z.value() + "/dns-zone-1/" + z.value() + "/" + zoneWeights.get(z)) .collect(Collectors.toSet()); assertEquals("Region endpoint " + regionEndpoint + " points to load balancer", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java index ec8d5c35049..7ba69438816 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java @@ -82,9 +82,9 @@ public class VersionStatusTest { @Test public void testControllerVersionIsVersionOfOldestController() { - HostName controller1 = HostName.from("controller-1"); - HostName controller2 = HostName.from("controller-2"); - HostName controller3 = HostName.from("controller-3"); + HostName controller1 = HostName.of("controller-1"); + HostName controller2 = HostName.of("controller-2"); + HostName controller3 = HostName.of("controller-3"); MockCuratorDb db = new MockCuratorDb(Stream.of(controller1, controller2, controller3) .map(hostName -> hostName.value() + ":2222") .collect(Collectors.joining(","))); @@ -491,9 +491,9 @@ public class VersionStatusTest { @Test public void testCommitDetailsPreservation() { - HostName controller1 = HostName.from("controller-1"); - HostName controller2 = HostName.from("controller-2"); - HostName controller3 = HostName.from("controller-3"); + HostName controller1 = HostName.of("controller-1"); + HostName controller2 = HostName.of("controller-2"); + HostName controller3 = HostName.of("controller-3"); MockCuratorDb db = new MockCuratorDb(Stream.of(controller1, controller2, controller3) .map(hostName -> hostName.value() + ":2222") .collect(Collectors.joining(","))); |