Move HostName -> Hostnames, and DomainName and Hostname to com.yahoo.net

3 files changed, 7 insertions, 6 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
index 67d89835c0d..32f2c985880 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
@@ -8,6 +8,7 @@ import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.config.provision.SystemName;
+import com.yahoo.net.Hostnames;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeList;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
@@ -346,7 +347,7 @@ class NodeAllocation {
         // - cfg1 is starting and redeploys its infrastructure application during bootstrap. A deficit is detected
         //   (itself, because cfg1 is only added to the repository *after* it is up)
         // - cfg1 tries to provision a new host for itself
-        Integer myIndex = parseIndex(com.yahoo.net.HostName.getLocalhost());
+        Integer myIndex = parseIndex(Hostnames.getLocalhost());
         indices.remove(myIndex);
         return indices;
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java
index 8a66a9394b2..166b65e08ca 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java
@@ -2,7 +2,7 @@
 package com.yahoo.vespa.hosted.provision.restapi;
 
 import com.yahoo.container.jdisc.HttpResponse;
-import com.yahoo.net.HostName;
+import com.yahoo.net.Hostnames;
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.JsonFormat;
 import com.yahoo.slime.Slime;
@@ -33,7 +33,7 @@ public class LocksResponse extends HttpResponse {
     private final Slime slime = new Slime();
 
     public LocksResponse() {
-        this(HostName.getLocalhost(),
+        this(Hostnames.getLocalhost(),
              new TreeMap<>(LockStats.getGlobal().getLockMetricsByPath()),
              LockStats.getGlobal().getThreadLockStats(),
              LockStats.getGlobal().getLockAttemptSamples());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java
index 68d75db8a4c..326d4999bbe 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java
@@ -15,7 +15,7 @@ import com.yahoo.config.provision.NodeType;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.Zone;
-import com.yahoo.net.HostName;
+import com.yahoo.net.Hostnames;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.flags.custom.ClusterCapacity;
@@ -503,12 +503,12 @@ public class DynamicProvisioningMaintainerTest {
         assertEquals(2, allNodes.nodeType(hostType.childNodeType()).size());
 
         // Deployment by the removed host has no effect
-        HostName.setHostNameForTestingOnly("cfg2.example.com");
+        Hostnames.setHostNameForTestingOnly("cfg2.example.com");
         tester.prepareAndActivateInfraApplication(configSrvApp, hostType.childNodeType());
         assertEquals(List.of(), dynamicProvisioningTester.hostProvisioner.provisionedHosts());
 
         // Deployment on another config server starts provisioning a new host and child
-        HostName.setHostNameForTestingOnly("cfg3.example.com");
+        Hostnames.setHostNameForTestingOnly("cfg3.example.com");
         assertEquals(0, tester.nodeRepository().nodes().list(Node.State.reserved).nodeType(hostType.childNodeType()).size());
         assertEquals(2, tester.prepareAndActivateInfraApplication(configSrvApp, hostType.childNodeType()).size());
         assertEquals(1, tester.nodeRepository().nodes().list(Node.State.reserved).nodeType(hostType.childNodeType()).size());