Revert "Revert "Use HostName for message bus, but fix HostName to work with dev machines""

8 files changed, 17 insertions, 23 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java b/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java
index 6a5abee7cb3..fbd5e712d3d 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java
@@ -2,7 +2,6 @@
 package com.yahoo.config.model.provision;
 
 import com.google.common.collect.ImmutableMap;
-import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.model.builder.xml.XmlHelper;
 import com.yahoo.net.HostName;
 import com.yahoo.text.XML;
@@ -76,7 +75,7 @@ public class Hosts {
                 throw new RuntimeException("Missing 'name' attribute for host.");
             }
             if ("localhost".equals(name)) {
-                name = HostName.getLocalhost();
+                name = HostName.getHostName();
             }
             final List<String> hostAliases = VespaDomBuilder.getHostAliases(hostE.getChildNodes());
             if (hostAliases.isEmpty()) {
diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java
index fe8b3935fcf..fb706e7201f 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java
@@ -26,7 +26,7 @@ public class SingleNodeProvisioner implements HostProvisioner {
 
     public SingleNodeProvisioner() {
         try {
-            host = new Host(HostSystem.lookupCanonicalHostname(HostName.getLocalhost()));
+            host = new Host(HostSystem.lookupCanonicalHostname(HostName.getHostName()));
             this.hostSpec = new HostSpec(host.hostname(), host.aliases());
         }
         catch (UnknownHostException e) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
index ef0f4882f1c..96c80c57ab2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
@@ -52,7 +52,7 @@ public class ConfigserverCluster extends AbstractConfigProducer
 
     @Override
     public void getConfig(ZookeeperServerConfig.Builder builder) {
-        String myhostname = HostName.getLocalhost();
+        String myhostname = HostName.getHostName();
         int myid = 0;
         int i = 0;
         for (ConfigServer server : getConfigServers()) {
@@ -115,7 +115,7 @@ public class ConfigserverCluster extends AbstractConfigProducer
             builder.defaultContentFlavor(options.defaultContentFlavor().get());
         }
 
-        builder.serverId(HostName.getLocalhost());
+        builder.serverId(HostName.getHostName());
         if (!containerCluster.getHttp().getHttpServer().getConnectorFactories().isEmpty()) {
             builder.httpport(containerCluster.getHttp().getHttpServer().getConnectorFactories().get(0).getListenPort());
         }
@@ -144,7 +144,7 @@ public class ConfigserverCluster extends AbstractConfigProducer
         if (options.allConfigServers().length > 0) {
             return options.allConfigServers();
         } else {
-            return new ConfigServer[]{new ConfigServer(HostName.getLocalhost(), Optional.<Integer>empty()) };
+            return new ConfigServer[]{new ConfigServer(HostName.getHostName(), Optional.<Integer>empty()) };
         }
     }
 
diff --git a/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java b/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java
index 6be85fb19e4..dc0ace32c1b 100644
--- a/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java
@@ -78,7 +78,7 @@ public class SystemModelTestCase {
 
         // Verify configIds from vespaModel
         assertTrue(12 <= vespaModel.getConfigIds().size());
-        String localhost = HostName.getLocalhost();
+        String localhost = HostName.getHostName();
         String localhostConfigId = "hosts/" + localhost;
         Set<String> configIds = vespaModel.getConfigIds();
         assertTrue(configIds.contains("client"));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
index a8554c54867..f203fbce328 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
@@ -8,7 +8,6 @@ import com.yahoo.cloud.config.SentinelConfig;
 import com.yahoo.config.model.ApplicationConfigProducerRoot;
 import com.yahoo.config.model.deploy.DeployProperties;
 import com.yahoo.config.model.deploy.DeployState;
-import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.config.model.test.TestDriver;
 import com.yahoo.config.model.test.TestRoot;
 import com.yahoo.config.provision.ApplicationId;
@@ -24,10 +23,7 @@ import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.StatisticsComponent;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithFilePkg;
 import org.junit.Test;
-import org.xml.sax.SAXException;
 
-import java.io.IOException;
-import java.util.List;
 import java.util.Set;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -65,7 +61,7 @@ public class AdminTestCase {
 
         // Verify configIds
         Set<String> configIds = vespaModel.getConfigIds();
-        String localhost = HostName.getLocalhost();
+        String localhost = HostName.getHostName();
         String localhostConfigId = "hosts/" + localhost;
         assertTrue(configIds.contains(localhostConfigId));
         assertTrue(configIds.contains("admin/logserver"));
@@ -119,7 +115,7 @@ public class AdminTestCase {
 
         // Verify configIds
         Set<String> configIds = vespaModel.getConfigIds();
-        String localhost = HostName.getLocalhost();
+        String localhost = HostName.getHostName();
         String localhostConfigId = "hosts/" + localhost;
         assertTrue(configIds.contains(localhostConfigId));
         assertTrue(configIds.contains("admin/logserver"));
@@ -156,7 +152,7 @@ public class AdminTestCase {
                         tenant("quux").
                         applicationName("foo").instanceName("bim").build()).build()).build();
         TestRoot root = new TestDriver().buildModel(state);
-        String localhost = HostName.getLocalhost();
+        String localhost = HostName.getHostName();
         SentinelConfig config = root.getConfig(SentinelConfig.class, "hosts/" + localhost);
         assertThat(config.application().tenant(), is("quux"));
         assertThat(config.application().name(), is("foo"));
@@ -179,7 +175,7 @@ public class AdminTestCase {
 
         // Verify configIds
         Set<String> configIds = vespaModel.getConfigIds();
-        String localhost = HostName.getLocalhost();
+        String localhost = HostName.getHostName();
         String localhostConfigId = "hosts/" + localhost;
         assertTrue(configIds.contains(localhostConfigId));
         assertTrue(configIds.contains("admin/logserver"));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/clients/test/Gateway20TestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/clients/test/Gateway20TestCase.java
index 5987ab8410a..579abf6d2c6 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/clients/test/Gateway20TestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/clients/test/Gateway20TestCase.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.*;
  * @author <a href="mailto:gunnarga@yahoo-inc.com">Gunnar Gauslaa Bergem</a>
  */
 public class Gateway20TestCase {
-    private static String hostname = HostName.getLocalhost();  // Using the same way of getting hostname as filedistribution model
+    private static String hostname = HostName.getHostName();  // Using the same way of getting hostname as filedistribution model
 
     @Test
     public void testSimpleDocprocV3() throws Exception {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
index 170586bef85..d9fc3cd9007 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
@@ -71,7 +71,7 @@ public class ConfigserverClusterTest {
         assertThat(config.configModelPluginDir().get(0), is(Defaults.getDefaults().vespaHome() + "lib/jars/config-models"));
         assertThat(config.rpcport(), is(12345));
         assertThat(config.httpport(), is(1337));
-        assertThat(config.serverId(), is(HostName.getLocalhost()));
+        assertThat(config.serverId(), is(HostName.getHostName()));
         assertTrue(config.useVespaVersionInRequest());
         assertThat(config.numParallelTenantLoaders(), is(4));
         assertFalse(config.multitenant());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
index 87fb5e567a5..5bb01c87d0f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
@@ -23,7 +23,6 @@ import com.yahoo.container.core.ContainerHttpConfig;
 import com.yahoo.document.config.DocumentmanagerConfig;
 import com.yahoo.messagebus.MessagebusConfig;
 import com.yahoo.net.HostName;
-import com.yahoo.net.LinuxInetAddress;
 import com.yahoo.vespa.config.ConfigKey;
 import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.ConfigPayloadBuilder;
@@ -102,7 +101,7 @@ public class VespaModelTestCase {
         LogdConfig.Builder b = new LogdConfig.Builder();
         b = (LogdConfig.Builder) model.getConfig(b, "");
         LogdConfig c = new LogdConfig(b);
-        assertEquals(HostSystem.lookupCanonicalHostname(HostName.getLocalhost()), c.logserver().host());
+        assertEquals(HostSystem.lookupCanonicalHostname(HostName.getHostName()), c.logserver().host());
 
         SlobroksConfig.Builder sb = new SlobroksConfig.Builder();
         sb = (com.yahoo.cloud.config.SlobroksConfig.Builder) model.getConfig(sb, "");
@@ -113,7 +112,7 @@ public class VespaModelTestCase {
         zb = (ZookeepersConfig.Builder) model.getConfig(zb, "");
         ZookeepersConfig zc = new ZookeepersConfig(zb);
         assertEquals(zc.zookeeperserverlist().split(",").length, 2);
-        assertTrue(zc.zookeeperserverlist().startsWith(HostSystem.lookupCanonicalHostname(HostName.getLocalhost())));
+        assertTrue(zc.zookeeperserverlist().startsWith(HostSystem.lookupCanonicalHostname(HostName.getHostName())));
 
         ApplicationIdConfig.Builder appIdBuilder = new ApplicationIdConfig.Builder();
         appIdBuilder = (ApplicationIdConfig.Builder) model.getConfig(appIdBuilder, "");
@@ -127,11 +126,11 @@ public class VespaModelTestCase {
     public void testHostsConfig() {
         VespaModel model = getVespaModel(TESTDIR + "app_qrserverandgw");
         LogdConfig config = getLogdConfig(model, "");
-        assertEquals(config.logserver().host(), HostName.getLocalhost());
+        assertEquals(config.logserver().host(), HostName.getHostName());
         assertNotNull(config);
         config = getLogdConfig(model, "hosts");
         assertNotNull(config);
-        assertEquals(config.logserver().host(), HostName.getLocalhost());
+        assertEquals(config.logserver().host(), HostName.getHostName());
     }
 
     private static LogdConfig getLogdConfig(VespaModel model, String configId) {
@@ -158,7 +157,7 @@ public class VespaModelTestCase {
         LogdConfig config = getLogdConfig(model, "");
         assertNotNull(config);
         assertEquals(config.logserver().host(), "foo");
-        config = getLogdConfig(model, "hosts/" + HostName.getLocalhost() + "/logd");
+        config = getLogdConfig(model, "hosts/" + HostName.getHostName() + "/logd");
         assertNotNull(config);
         assertEquals(config.logserver().host(), "foo");
     }