diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-04-08 16:24:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-08 16:24:09 +0200 |
commit | 05606dfe1bba4bcadc1ae4fae95b626f6441cd52 (patch) | |
tree | f35c24e158a5cd86af535f51f1a6093d8c80322c /node-admin/src/test | |
parent | db9e570a36decb24e6cb13f44bd0ff444ab762e3 (diff) |
Revert "Jonmv/unify hostname classes"
Diffstat (limited to 'node-admin/src/test')
2 files changed, 4 insertions, 4 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/ContainerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/ContainerTester.java index de9f1999953..fd93252f3b5 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/ContainerTester.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/ContainerTester.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.hosted.node.admin.integration; import com.yahoo.config.provision.DockerImage; -import com.yahoo.net.HostName; +import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.NodeType; import com.yahoo.vespa.flags.InMemoryFlagSource; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec; @@ -51,7 +51,7 @@ import static org.mockito.Mockito.when; public class ContainerTester implements AutoCloseable { private static final Logger log = Logger.getLogger(ContainerTester.class.getName()); - static final HostName HOST_HOSTNAME = HostName.of("host.test.yahoo.com"); + static final HostName HOST_HOSTNAME = HostName.from("host.test.yahoo.com"); private final Thread loopThread; private final Phaser phaser = new Phaser(1); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java index e0f86916acf..5436f84f467 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java @@ -1,7 +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.node.admin.nodeadmin; -import com.yahoo.net.HostName; +import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.NodeType; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.Acl; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec; @@ -47,7 +47,7 @@ public class NodeAdminStateUpdaterTest { private final NodeRepoMock nodeRepository = spy(new NodeRepoMock()); private final Orchestrator orchestrator = mock(Orchestrator.class); private final NodeAdmin nodeAdmin = mock(NodeAdmin.class); - private final HostName hostHostname = HostName.of("basehost1.test.yahoo.com"); + private final HostName hostHostname = HostName.from("basehost1.test.yahoo.com"); private final NodeAdminStateUpdater updater = spy(new NodeAdminStateUpdater( nodeAgentContextFactory, nodeRepository, orchestrator, nodeAdmin, hostHostname)); |