Do hostname check when adding a new host

2 files changed, 6 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/Host.java b/config-model/src/main/java/com/yahoo/vespa/model/Host.java
index 7dbab87fac0..047a6ef9bd5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/Host.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/Host.java
@@ -34,8 +34,6 @@ public final class Host extends TreeConfigProducer<AnyConfigProducer> implements
         Objects.requireNonNull(hostname, "The host name of a host cannot be null");
         this.runsConfigServer = runsConfigServer;
         this.hostname = hostname;
-        if (parent instanceof HostSystem)
-            ((HostSystem)parent).checkName(hostname);
     }
 
     public static Host createConfigServerHost(HostSystem hostSystem, String hostname) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
index b204aeaacf6..00a1078b294 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
@@ -54,8 +54,8 @@ public class HostSystem extends TreeConfigProducer<Host> {
         this.isHosted = isHosted;
     }
 
-    void checkName(String hostname) {
-        if (isHosted) return; // Done in node-repo instead
+    String checkHostname(String hostname) {
+        if (isHosted) return hostname; // Done in node-repo instead
 
         if (doCheckIp) {
             BiConsumer<Level, String> logFunction = deployLogger::logApplicationPackage;
@@ -71,6 +71,7 @@ public class HostSystem extends TreeConfigProducer<Host> {
                 logFunction.accept(Level.WARNING, "Unable to lookup IP address of host: " + hostname);
             }
         }
+        return hostname;
     }
 
     @Override
@@ -88,10 +89,10 @@ public class HostSystem extends TreeConfigProducer<Host> {
     }
 
     private HostResource addNewHost(HostSpec hostSpec) {
-        Host host = Host.createHost(this, hostSpec.hostname());
-        HostResource hostResource = new HostResource(host, hostSpec);
+        String hostname = checkHostname(hostSpec.hostname());
+        HostResource hostResource = new HostResource(Host.createHost(this, hostname), hostSpec);
         hostSpec.networkPorts().ifPresent(np -> hostResource.ports().addNetworkPorts(np));
-        hostname2host.put(host.getHostname(), hostResource);
+        hostname2host.put(hostname, hostResource);
         return hostResource;
     }