Allow all application hosts to talk to ZooKeeper

2 files changed, 7 insertions, 5 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
index b4e366c1609..05f5145cfa7 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
@@ -47,7 +47,7 @@ public class DedicatedAdminV4Test {
                 + " </host>"
                 + "</hosts>";
         ApplicationPackage app = new MockApplicationPackage.Builder().withHosts(hosts).withServices(services).build();
-        VespaModel model = new VespaModel(new NullConfigModelRegistry(), new DeployState.Builder().applicationPackage(app).modelHostProvisioner(new InMemoryProvisioner(Hosts.getHosts(app.getHosts()), true)).build());
+        VespaModel model = new VespaModel(new NullConfigModelRegistry(), new DeployState.Builder().applicationPackage(app).modelHostProvisioner(new InMemoryProvisioner(Hosts.readFrom(app.getHosts()), true)).build());
         assertEquals(3, model.getHosts().size());
 
         Set<String> serviceNames0 = serviceNames(model.getConfig(SentinelConfig.class, "hosts/myhost0"));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
index 6eb38dd6f66..0c57d036998 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
@@ -13,9 +13,11 @@ import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -48,11 +50,11 @@ public class VespaModelTester {
     public Hosts addHosts(int count) { return addHosts("default", count); }
     /** Adds some hosts to this system */
     public Hosts addHosts(String flavor, int count) { 
-        Hosts hosts = new Hosts();
+        List<Host> hosts = new ArrayList<>();
         for (int i = 0; i < count; i++)
-            hosts.addHost(new com.yahoo.config.model.provision.Host(flavor + i), Collections.emptyList());
-        this.hosts.put(flavor.isEmpty() ? "default" : flavor, hosts.getHosts());
-        return hosts;
+            hosts.add(new com.yahoo.config.model.provision.Host(flavor + i));
+        this.hosts.put(flavor.isEmpty() ? "default" : flavor, hosts);
+        return new Hosts(hosts);
     }
 
     /** Creates a model which uses 0 as start index and fails on out of capacity */