summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2022-04-09 14:51:56 +0200
committerjonmv <venstad@gmail.com>2022-04-09 14:51:56 +0200
commitcb1eb57fa9707b1186f0aa10a0853780d7674742 (patch)
tree1c1ca993fdf96007ce4e2c98b2058809601d6fe5 /node-admin
parent87e5b33c003d07ca585d73e0166857fe22b4c16f (diff)
Revert "Merge pull request #22072 from vespa-engine/jonmv/unify-hostname-classes"
This reverts commit 87e5b33c003d07ca585d73e0166857fe22b4c16f, reversing changes made to 80b96d32550ae0df59572a58cd62f507e8068c2c.
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/ContainerTester.java2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java
index 2713ff45ae8..d884c608ead 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java
@@ -27,7 +27,7 @@ public interface NodeAgentContext extends TaskContext {
/** @return hostname of the linux container this context applies to */
default HostName hostname() {
- return HostName.from(node().hostname());
+ return HostName.of(node().hostname());
}
default NodeType nodeType() {
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 fd93252f3b5..415a8b6f438 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
@@ -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.from("host.test.yahoo.com");
+ static final HostName HOST_HOSTNAME = HostName.of("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 5436f84f467..995712c6dda 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
@@ -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.from("basehost1.test.yahoo.com");
+ private final HostName hostHostname = HostName.of("basehost1.test.yahoo.com");
private final NodeAdminStateUpdater updater = spy(new NodeAdminStateUpdater(
nodeAgentContextFactory, nodeRepository, orchestrator, nodeAdmin, hostHostname));