Revert "Revert "Revert "Revert "Bratseth/select 1 host by index""""

2 files changed, 7 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java
index 33cc581c3a8..a78eb1f74f9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java
@@ -33,14 +33,14 @@ public class FileDistributionConfigProvider {
         fileDistributionOptions.getConfig(builder);
         builder.torrentport(FileDistributorService.BASEPORT + 1);
         builder.stateport(FileDistributorService.BASEPORT + 2);
-        builder.hostname(host.getHostName());
+        builder.hostname(host.getHostname());
         builder.filedbpath(FileDistribution.getDefaultFileDBPath().toString());
     }
 
     public void getConfig(FiledistributorrpcConfig.Builder builder) {
         // If disabled config proxy should act as file distributor, so use config proxy port
         int port = (fileDistributionOptions.disableFiledistributor()) ? ConfigProxy.BASEPORT : FileDistributorService.BASEPORT;
-        builder.connectionspec("tcp/" + host.getHostName() + ":" + port);
+        builder.connectionspec("tcp/" + host.getHostname() + ":" + port);
     }
 
     public void getConfig(FilereferencesConfig.Builder builder) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java
index 8fcece3aa80..f3aad88a446 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java
@@ -78,7 +78,7 @@ public class FileDistributor {
     }
 
     public Set<String> getTargetHostnames() {
-        return getTargetHosts().stream().map(Host::getHostName).collect(Collectors.toSet());
+        return getTargetHosts().stream().map(Host::getHostname).collect(Collectors.toSet());
     }
 
     /** Returns the host which is the source of the files */
@@ -94,9 +94,9 @@ public class FileDistributor {
     public void sendDeployedFiles(FileDistribution dbHandler) {
         String fileSourceHost = fileSourceHost();
         for (Host host : getTargetHosts()) {
-            if ( ! host.getHostName().equals(fileSourceHost)) {
-                dbHandler.sendDeployedFiles(host.getHostName(), filesToSendToHost(host));
-                dbHandler.startDownload(host.getHostName(), filesToSendToHost(host));
+            if ( ! host.getHostname().equals(fileSourceHost)) {
+                dbHandler.sendDeployedFiles(host.getHostname(), filesToSendToHost(host));
+                dbHandler.startDownload(host.getHostname(), filesToSendToHost(host));
             }
         }
         dbHandler.sendDeployedFiles(fileSourceHost, allFilesToSend());
@@ -108,5 +108,5 @@ public class FileDistributor {
     public void reloadDeployFileDistributor(FileDistribution dbHandler) {
         dbHandler.reloadDeployFileDistributor();
     }
-    
+
 }