Prepare to select host by index (no change)

3 files changed, 93 insertions, 68 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
index c7755d3de5a..8c2178bd581 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
@@ -415,10 +415,25 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri
                     .filter(node -> ! node.isRetired()) // Avoid retired controllers to avoid surprises on expiry
                     .map(StorageNode::getHostResource).collect(Collectors.toList()));
             }
-            List<HostResource> sortedHosts = new ArrayList<>(hosts);
-            Collections.sort(sortedHosts);
-            sortedHosts = sortedHosts.subList(0, Math.min(count, hosts.size()));
-            return sortedHosts;
+
+            int targetHostsSortedByIndex = 0;
+
+            targetHostsSortedByIndex = Math.min(Math.min(targetHostsSortedByIndex, count), hosts.size());
+
+            List<HostResource> hostsSortedByName = new ArrayList<>(hosts);
+            Collections.sort(hostsSortedByName);
+
+            List<HostResource> hostsSortedByIndex = new ArrayList<>(hosts);
+            hostsSortedByIndex.sort(Comparator.comparingInt(host -> host.primaryClusterMembership().get().index()));
+
+            hostsSortedByName = hostsSortedByName.subList(0, Math.min(count - targetHostsSortedByIndex, hostsSortedByName.size()));
+            hostsSortedByIndex.removeAll(hostsSortedByName);
+            hostsSortedByIndex = hostsSortedByIndex.subList(0, Math.min(targetHostsSortedByIndex, hostsSortedByIndex.size()));
+
+            List<HostResource> finalHosts = new ArrayList<>();
+            finalHosts.addAll(hostsSortedByName);
+            finalHosts.addAll(hostsSortedByIndex);
+            return finalHosts;
         }
 
         private ContainerCluster createClusterControllers(AbstractConfigProducer parent, Collection<HostResource> hosts, String name, boolean multitenant) {
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 63d5d37598b..e18677640d8 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -391,16 +391,16 @@ public class ModelProvisioningTest {
         ContainerCluster clusterControllers = cluster.getClusterControllers();
         assertEquals(3, clusterControllers.getContainers().size());
         assertEquals("bar-controllers", clusterControllers.getName());
-        assertEquals("default10", clusterControllers.getContainers().get(0).getHostName());
-        assertEquals("default13", clusterControllers.getContainers().get(1).getHostName());
-        assertEquals("default16", clusterControllers.getContainers().get(2).getHostName());
+        assertEquals("default28", clusterControllers.getContainers().get(0).getHostName());
+        assertEquals("default31", clusterControllers.getContainers().get(1).getHostName());
+        assertEquals("default34", clusterControllers.getContainers().get(2).getHostName());
         assertEquals(0, cluster.getRootGroup().getNodes().size());
         assertEquals(9, cluster.getRootGroup().getSubgroups().size());
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getIndex(), is("0"));
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().size(), is(3));
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getDistributionKey(), is(0));
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getConfigId(), is("bar/storage/0"));
-        assertEquals("default10", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getHostName());
+        assertEquals("default54", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getHostName());
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(1).getDistributionKey(), is(1));
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(1).getConfigId(), is("bar/storage/1"));
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(2).getDistributionKey(), is(2));
@@ -409,13 +409,13 @@ public class ModelProvisioningTest {
         assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().size(), is(3));
         assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getDistributionKey(), is(3));
         assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getConfigId(), is("bar/storage/3"));
-        assertEquals("default13", cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getHostName());
+        assertEquals("default51", cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getHostName());
         assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(1).getDistributionKey(), is(4));
         assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(1).getConfigId(), is("bar/storage/4"));
         assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(2).getDistributionKey(), is(5));
         assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(2).getConfigId(), is("bar/storage/5"));
         // ...
-        assertEquals("default16", cluster.getRootGroup().getSubgroups().get(2).getNodes().get(0).getHostName());
+        assertEquals("default48", cluster.getRootGroup().getSubgroups().get(2).getNodes().get(0).getHostName());
         // ...
         assertThat(cluster.getRootGroup().getSubgroups().get(8).getIndex(), is("8"));
         assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().size(), is(3));
@@ -430,23 +430,23 @@ public class ModelProvisioningTest {
         clusterControllers = cluster.getClusterControllers();
         assertEquals(3, clusterControllers.getContainers().size());
         assertEquals("baz-controllers", clusterControllers.getName());
-        assertEquals("default37", clusterControllers.getContainers().get(0).getHostName());
-        assertEquals("default38", clusterControllers.getContainers().get(1).getHostName());
-        assertEquals("default39", clusterControllers.getContainers().get(2).getHostName());
+        assertEquals("default01", clusterControllers.getContainers().get(0).getHostName());
+        assertEquals("default02", clusterControllers.getContainers().get(1).getHostName());
+        assertEquals("default03", clusterControllers.getContainers().get(2).getHostName());
         assertEquals(0, cluster.getRootGroup().getNodes().size());
         assertEquals(27, cluster.getRootGroup().getSubgroups().size());
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getIndex(), is("0"));
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().size(), is(1));
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getDistributionKey(), is(0));
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getConfigId(), is("baz/storage/0"));
-        assertEquals("default37", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getHostName());
+        assertEquals("default27", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getHostName());
         assertThat(cluster.getRootGroup().getSubgroups().get(1).getIndex(), is("1"));
         assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().size(), is(1));
         assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getDistributionKey(), is(1));
         assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getConfigId(), is("baz/storage/1"));
-        assertEquals("default38", cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getHostName());
+        assertEquals("default26", cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getHostName());
         // ...
-        assertEquals("default39", cluster.getRootGroup().getSubgroups().get(2).getNodes().get(0).getHostName());
+        assertEquals("default25", cluster.getRootGroup().getSubgroups().get(2).getNodes().get(0).getHostName());
         // ...
         assertThat(cluster.getRootGroup().getSubgroups().get(26).getIndex(), is("26"));
         assertThat(cluster.getRootGroup().getSubgroups().get(26).getNodes().size(), is(1));
@@ -483,9 +483,9 @@ public class ModelProvisioningTest {
         ContainerCluster clusterControllers = cluster.getClusterControllers();
         assertEquals(3, clusterControllers.getContainers().size());
         assertEquals("bar-controllers", clusterControllers.getName());
-        assertEquals("default10", clusterControllers.getContainers().get(0).getHostName());
-        assertEquals("default11", clusterControllers.getContainers().get(1).getHostName());
-        assertEquals("default12", clusterControllers.getContainers().get(2).getHostName());
+        assertEquals("default01", clusterControllers.getContainers().get(0).getHostName());
+        assertEquals("default02", clusterControllers.getContainers().get(1).getHostName());
+        assertEquals("default03", clusterControllers.getContainers().get(2).getHostName());
         assertEquals(0, cluster.getRootGroup().getNodes().size());
         assertEquals(8, cluster.getRootGroup().getSubgroups().size());
         assertEquals(8, cluster.distributionBits());
@@ -494,19 +494,19 @@ public class ModelProvisioningTest {
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().size(), is(1));
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getDistributionKey(), is(0));
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getConfigId(), is("bar/storage/0"));
-        assertEquals("default10", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getHostName());
+        assertEquals("default08", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getHostName());
         // second group
         assertThat(cluster.getRootGroup().getSubgroups().get(1).getIndex(), is("1"));
         assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().size(), is(1));
         assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getDistributionKey(), is(1));
         assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getConfigId(), is("bar/storage/1"));
-        assertEquals("default11", cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getHostName());
+        assertEquals("default07", cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getHostName());
         // ... last group
         assertThat(cluster.getRootGroup().getSubgroups().get(7).getIndex(), is("7"));
         assertThat(cluster.getRootGroup().getSubgroups().get(7).getNodes().size(), is(1));
         assertThat(cluster.getRootGroup().getSubgroups().get(7).getNodes().get(0).getDistributionKey(), is(7));
         assertThat(cluster.getRootGroup().getSubgroups().get(7).getNodes().get(0).getConfigId(), is("bar/storage/7"));
-        assertEquals("default17", cluster.getRootGroup().getSubgroups().get(7).getNodes().get(0).getHostName());
+        assertEquals("default01", cluster.getRootGroup().getSubgroups().get(7).getNodes().get(0).getHostName());
     }
 
     @Test
@@ -540,14 +540,14 @@ public class ModelProvisioningTest {
         assertEquals( 8, cluster.distributionBits());
         assertEquals("We get the closest odd numer", 5, clusterControllers.getContainers().size());
         assertEquals("bar-controllers", clusterControllers.getName());
-        assertEquals("default10", clusterControllers.getContainers().get(0).getHostName());
-        assertEquals("default11", clusterControllers.getContainers().get(1).getHostName());
-        assertEquals("default13", clusterControllers.getContainers().get(2).getHostName());
-        assertEquals("default14", clusterControllers.getContainers().get(3).getHostName()); // Should be 16 for perfect distribution ...
-        assertEquals("default10", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getHostName());
-        assertEquals("default11", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(1).getHostName());
-        assertEquals("default13", cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getHostName());
-        assertEquals("default16", cluster.getRootGroup().getSubgroups().get(2).getNodes().get(0).getHostName());
+        assertEquals("default01", clusterControllers.getContainers().get(0).getHostName());
+        assertEquals("default02", clusterControllers.getContainers().get(1).getHostName());
+        assertEquals("default04", clusterControllers.getContainers().get(2).getHostName());
+        assertEquals("default05", clusterControllers.getContainers().get(3).getHostName()); // Should be 16 for perfect distribution ...
+        assertEquals("default09", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getHostName());
+        assertEquals("default08", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(1).getHostName());
+        assertEquals("default06", cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getHostName());
+        assertEquals("default03", cluster.getRootGroup().getSubgroups().get(2).getNodes().get(0).getHostName());
     }
 
     @Test
@@ -604,7 +604,7 @@ public class ModelProvisioningTest {
         int numberOfHosts = 19;
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
-        VespaModel model = tester.createModel(services, true, "default10", "default13", "default16");
+        VespaModel model = tester.createModel(services, true, "default09", "default06", "default03");
         assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
 
         // Check content clusters
@@ -612,9 +612,9 @@ public class ModelProvisioningTest {
         ContainerCluster clusterControllers = cluster.getClusterControllers();
         assertEquals(3, clusterControllers.getContainers().size());
         assertEquals("bar-controllers", clusterControllers.getName());
-        assertEquals("Skipping retired default10", "default11", clusterControllers.getContainers().get(0).getHostName());
-        assertEquals("Skipping retired default13", "default14", clusterControllers.getContainers().get(1).getHostName());
-        assertEquals("Skipping retired default16", "default17", clusterControllers.getContainers().get(2).getHostName());
+        assertEquals("Skipping retired default09", "default01", clusterControllers.getContainers().get(0).getHostName());
+        assertEquals("Skipping retired default03", "default04", clusterControllers.getContainers().get(1).getHostName());
+        assertEquals("Skipping retired default06", "default07", clusterControllers.getContainers().get(2).getHostName());
     }
 
     @Test
@@ -631,15 +631,15 @@ public class ModelProvisioningTest {
         int numberOfHosts = 10;
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
-        VespaModel model = tester.createModel(services, true, "default0");
+        VespaModel model = tester.createModel(services, true, "default09");
         assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
 
         // Check slobroks clusters
         assertEquals("Includes retired node", 1+3, model.getAdmin().getSlobroks().size());
-        assertEquals("default1", model.getAdmin().getSlobroks().get(0).getHostName());
-        assertEquals("default2", model.getAdmin().getSlobroks().get(1).getHostName());
-        assertEquals("default3", model.getAdmin().getSlobroks().get(2).getHostName());
-        assertEquals("Included in addition because it is retired", "default0", model.getAdmin().getSlobroks().get(3).getHostName());
+        assertEquals("default01", model.getAdmin().getSlobroks().get(0).getHostName());
+        assertEquals("default02", model.getAdmin().getSlobroks().get(1).getHostName());
+        assertEquals("default03", model.getAdmin().getSlobroks().get(2).getHostName());
+        assertEquals("Included in addition because it is retired", "default09", model.getAdmin().getSlobroks().get(3).getHostName());
     }
 
     @Test
@@ -656,16 +656,16 @@ public class ModelProvisioningTest {
         int numberOfHosts = 10;
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
-        VespaModel model = tester.createModel(services, true, "default3", "default4");
+        VespaModel model = tester.createModel(services, true, "default09", "default08");
         assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
 
         // Check slobroks clusters
         assertEquals("Includes retired node", 3+2, model.getAdmin().getSlobroks().size());
-        assertEquals("default0", model.getAdmin().getSlobroks().get(0).getHostName());
-        assertEquals("default1", model.getAdmin().getSlobroks().get(1).getHostName());
-        assertEquals("default2", model.getAdmin().getSlobroks().get(2).getHostName());
-        assertEquals("Included in addition because it is retired", "default3", model.getAdmin().getSlobroks().get(3).getHostName());
-        assertEquals("Included in addition because it is retired", "default4", model.getAdmin().getSlobroks().get(4).getHostName());
+        assertEquals("default01", model.getAdmin().getSlobroks().get(0).getHostName());
+        assertEquals("default02", model.getAdmin().getSlobroks().get(1).getHostName());
+        assertEquals("default03", model.getAdmin().getSlobroks().get(2).getHostName());
+        assertEquals("Included in addition because it is retired", "default08", model.getAdmin().getSlobroks().get(3).getHostName());
+        assertEquals("Included in addition because it is retired", "default09", model.getAdmin().getSlobroks().get(4).getHostName());
     }
 
     @Test
@@ -685,19 +685,19 @@ public class ModelProvisioningTest {
         int numberOfHosts = 13;
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
-        VespaModel model = tester.createModel(services, true, "default0", "default10", "default11");
+        VespaModel model = tester.createModel(services, true, "default12", "default03", "default02");
         assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
 
         // Check slobroks clusters
         // ... from cluster default
         assertEquals("Includes retired node", 3+3, model.getAdmin().getSlobroks().size());
-        assertEquals("default1", model.getAdmin().getSlobroks().get(0).getHostName());
-        assertEquals("default2", model.getAdmin().getSlobroks().get(1).getHostName());
-        assertEquals("Included in addition because it is retired", "default0", model.getAdmin().getSlobroks().get(2).getHostName());
+        assertEquals("default04", model.getAdmin().getSlobroks().get(0).getHostName());
+        assertEquals("default05", model.getAdmin().getSlobroks().get(1).getHostName());
+        assertEquals("Included in addition because it is retired", "default12", model.getAdmin().getSlobroks().get(2).getHostName());
         // ... from cluster bar
-        assertEquals("default12", model.getAdmin().getSlobroks().get(3).getHostName());
-        assertEquals("Included in addition because it is retired", "default10", model.getAdmin().getSlobroks().get(4).getHostName());
-        assertEquals("Included in addition because it is retired", "default11", model.getAdmin().getSlobroks().get(5).getHostName());
+        assertEquals("default01", model.getAdmin().getSlobroks().get(3).getHostName());
+        assertEquals("Included in addition because it is retired", "default02", model.getAdmin().getSlobroks().get(4).getHostName());
+        assertEquals("Included in addition because it is retired", "default03", model.getAdmin().getSlobroks().get(5).getHostName());
     }
 
     @Test
@@ -828,10 +828,10 @@ public class ModelProvisioningTest {
         ContainerCluster clusterControllers = cluster.getClusterControllers();
         assertEquals(4, clusterControllers.getContainers().size());
         assertEquals("bar-controllers", clusterControllers.getName());
-        assertEquals("default19", clusterControllers.getContainers().get(0).getHostName());
-        assertEquals("default20", clusterControllers.getContainers().get(1).getHostName());
-        assertEquals("default21", clusterControllers.getContainers().get(2).getHostName());
-        assertEquals("default22", clusterControllers.getContainers().get(3).getHostName());
+        assertEquals("default04", clusterControllers.getContainers().get(0).getHostName());
+        assertEquals("default03", clusterControllers.getContainers().get(1).getHostName());
+        assertEquals("default02", clusterControllers.getContainers().get(2).getHostName());
+        assertEquals("default01", clusterControllers.getContainers().get(3).getHostName());
     }
 
     @Test
@@ -957,7 +957,7 @@ public class ModelProvisioningTest {
         ContainerCluster clusterControllers = cluster.getClusterControllers();
         assertEquals(1, clusterControllers.getContainers().size());
         assertEquals("bar-controllers", clusterControllers.getName());
-        assertEquals("default0", clusterControllers.getContainers().get(0).getHostName());
+        assertEquals("default01", clusterControllers.getContainers().get(0).getHostName());
         assertEquals(1, cluster.redundancy().effectiveInitialRedundancy()); // Reduced from 3*3
         assertEquals(1, cluster.redundancy().effectiveFinalRedundancy()); // Reduced from 3*4
         assertEquals(1, cluster.redundancy().effectiveReadyCopies()); // Reduced from 3*3
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 901bd7f55b5..b88ba0276c4 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
@@ -18,7 +18,6 @@ import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -29,7 +28,7 @@ import java.util.Optional;
  * Helper class which sets up a system with multiple hosts.
  * Usage:
  * <code>
- *     VespaModelteser teser = new VespaModelTester();
+ *     VespaModelteser tester = new VespaModelTester();
  *     tester.addHosts(count, flavor);
  *     ... add more nodes
  *     VesoaModel model = tester.createModel(servicesString);
@@ -43,7 +42,7 @@ public class VespaModelTester {
     private final ConfigModelRegistry configModelRegistry;
 
     private boolean hosted = true;
-    private Map<String, Collection<Host>> hosts = new HashMap<>();
+    private Map<String, Collection<Host>> hostsByFlavor = new HashMap<>();
 
     public VespaModelTester() {
         this(new NullConfigModelRegistry());
@@ -55,20 +54,31 @@ public class VespaModelTester {
     
     /** Adds some hosts of the 'default' flavor to this system */
     public Hosts addHosts(int count) { return addHosts("default", count); }
+
     /** Adds some hosts to this system */
     public Hosts addHosts(String flavor, int count) { 
-        List<Host> hosts = new ArrayList<>();
-        for (int i = 0; i < count; i++)
-            hosts.add(new com.yahoo.config.model.provision.Host(flavor + i));
-        this.hosts.put(flavor.isEmpty() ? "default" : flavor, hosts);
-        return new Hosts(hosts);
+        return addHosts(Optional.empty(), flavor, count);
     }
+
     public void addHosts(Flavor flavor, int count) {
+        addHosts(Optional.of(flavor), flavor.name(), count);
+    }
+
+    private Hosts addHosts(Optional<Flavor> flavor, String flavorName, int count) {
         List<Host> hosts = new ArrayList<>();
+        
         for (int i = 0; i < count; ++i) {
-            hosts.add(new Host(flavor.name() + i, ImmutableList.of(), Optional.of(flavor)));
+            // Let host names sort in the opposite order of the order the hosts are added
+            // This allows us to test index vs. name order selection when subsets of hosts are selected from a cluster
+            // (for e.g cluster controllers and slobrok nodes)
+            String hostname = String.format("%s%02d", flavorName, count - i);
+            hosts.add(new Host(hostname, ImmutableList.of(), flavor));
         }
-        this.hosts.put(flavor.name(), hosts);
+        this.hostsByFlavor.put(flavorName, hosts);
+
+        if (hosts.size() > 100)
+            throw new IllegalStateException("The host naming scheme is nameNN. To test more than 100 hosts, change to nameNNN");
+        return new Hosts(hosts);
     }
 
     /** Sets whether this sets up a model for a hosted system. Default: true */
@@ -95,7 +105,7 @@ public class VespaModelTester {
         ApplicationPackage appPkg = modelCreatorWithMockPkg.appPkg;
 
         HostProvisioner provisioner = hosted ? 
-                                      new InMemoryProvisioner(hosts, failOnOutOfCapacity, startIndexForClusters, retiredHostNames) :
+                                      new InMemoryProvisioner(hostsByFlavor, failOnOutOfCapacity, startIndexForClusters, retiredHostNames) :
                                       new SingleNodeProvisioner();
 
         DeployState deployState = new DeployState.Builder()