aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@gmail.com>2022-04-08 12:26:45 +0200
committerJon Marius Venstad <jonmv@gmail.com>2022-04-08 12:26:45 +0200
commitc94ec50b539ff6d0d3273029f1278e8c90274a57 (patch)
tree7a16a90f3feb9138e1f1bf3f1d676455d5cb9a92 /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
parent06db1231f64976bd5b7b3bf9d851f179ddfaeeaa (diff)
Use one HostName class (that is not for JSON)
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java14
1 files changed, 7 insertions, 7 deletions
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..7bc5ad16620 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
@@ -2,7 +2,7 @@
package com.yahoo.vespa.hosted.controller.maintenance;
import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.HostName;
+import com.yahoo.net.HostName;
import com.yahoo.config.provision.NodeType;
import com.yahoo.config.provision.zone.ZoneId;
import com.yahoo.vespa.hosted.controller.ControllerTester;
@@ -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();