Improve file distribution error message

25 files changed, 94 insertions, 111 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
index aede68a1dd1..1cc5c93c28a 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
@@ -223,7 +223,7 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra
     @Override
     public void getConfig(ModelConfig.Builder builder) {
         builder.vespaVersion(vespaVersion.toFullString());
-        for (HostResource modelHost : getHostSystem().getHosts()) {
+        for (HostResource modelHost : hostSystem().getHosts()) {
             builder.hosts(new Hosts.Builder()
                     .name(modelHost.getHostname())
                     .services(getServices(modelHost))
@@ -278,7 +278,7 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra
     }
 
     @Override
-    public HostSystem getHostSystem() {
+    public HostSystem hostSystem() {
         return hostSystem;
     }
 
diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
index c2834847423..48c21f370f4 100644
--- a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
+++ b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
@@ -265,13 +265,8 @@ public abstract class AbstractConfigProducer<CHILD extends AbstractConfigProduce
         }
     }
 
-    /**
-     * Returns the one and only HostSystem of the root node
-     * Must be overridden by root node.
-     */
-    public HostSystem getHostSystem() {
-        return getRoot().getHostSystem();
-    }
+    /** Returns the one and only HostSystem of the root node. Must be overridden by root node. */
+    public HostSystem hostSystem() { return getRoot().hostSystem(); }
 
     public AbstractConfigProducerRoot getRoot() {
         return parent == null ? null : parent.getRoot();
diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java b/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java
index 74ab4504136..13f271ebe9d 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java
@@ -123,7 +123,7 @@ public class MockRoot extends AbstractConfigProducerRoot {
         return fileDistributor;
     }
 
-    public HostSystem getHostSystem() {
+    public HostSystem hostSystem() {
         return hostSystem;
     }
 
diff --git a/config-model/src/main/java/com/yahoo/config/model/test/TestRoot.java b/config-model/src/main/java/com/yahoo/config/model/test/TestRoot.java
index 25c97cba04b..81f5d303d56 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/TestRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/TestRoot.java
@@ -61,6 +61,6 @@ public class TestRoot {
      * @return A list of hosts.
      */
     public List<HostResource> getHosts() {
-        return model.getHostSystem().getHosts();
+        return model.hostSystem().getHosts();
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ConfigProducer.java b/config-model/src/main/java/com/yahoo/vespa/model/ConfigProducer.java
index dc1fb0506f0..bf86bc4a453 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/ConfigProducer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/ConfigProducer.java
@@ -23,7 +23,7 @@ public interface ConfigProducer extends com.yahoo.config.ConfigInstance.Producer
     String getConfigId();
 
     /** Returns the one and only HostSystem of the root node */
-    HostSystem getHostSystem();
+    HostSystem hostSystem();
 
     /** Returns the user configs of this */
     UserConfigRepo getUserConfigs();
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 3ac5f794426..eda562bea5a 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
@@ -63,8 +63,8 @@ public class HostSystem extends AbstractConfigProducer<Host> {
     /**
      * Returns the host with the given hostname.
      *
-     * @param name the hostname of the host.
-     * @return the host with the given hostname.
+     * @param name the hostname of the host
+     * @return the host with the given hostname, or null if no such host
      */
     public HostResource getHostByHostname(String name) {
         // TODO: please eliminate the following ugly hack
@@ -106,12 +106,10 @@ public class HostSystem extends AbstractConfigProducer<Host> {
 
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder();
-        for (HostResource host : hostname2host.values()) {
-            sb.append(host).append(",");
-        }
-        if (sb.length() > 0) sb.deleteCharAt(sb.length() - 1);
-        return sb.toString();
+        return "hosts [" + hostname2host.values().stream()
+                                                 .map(host -> host.getHostname())
+                                                 .collect(Collectors.joining(", ")) +
+               "]";
     }
 
     public HostResource getHost(String hostAlias) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
index 08956b272f6..ad61e0f48a3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
@@ -176,7 +176,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
 
 
 
-        HostSystem hostSystem = root.getHostSystem();
+        HostSystem hostSystem = root.hostSystem();
         if (complete) { // create a a completed, frozen model
             configModelRepo.readConfigModels(deployState, this, builder, root, configModelRegistry);
             addServiceClusters(deployState, builder);
@@ -261,16 +261,16 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
     }
 
     /** Returns the one and only HostSystem of this VespaModel */
-    public HostSystem getHostSystem() {
-        return root.getHostSystem();
+    public HostSystem hostSystem() {
+        return root.hostSystem();
     }
 
     /** Return a collection of all hostnames used in this application */
     @Override
     public Set<HostInfo> getHosts() {
-        return getHostSystem().getHosts().stream()
-                .map(HostResource::getHostInfo)
-                .collect(Collectors.toCollection(LinkedHashSet::new));
+        return hostSystem().getHosts().stream()
+                           .map(HostResource::getHostInfo)
+                           .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     public FileDistributor getFileDistributor() {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
index d31c411a39e..7484e0cd9a0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
@@ -262,27 +262,21 @@ public class Admin extends AbstractConfigProducer implements Serializable {
 
     private void addFileDistribution(HostResource host) {
         FileDistributor fileDistributor = fileDistribution.getFileDistributor();
-        HostResource deployHost = getHostSystem().getHostByHostname(fileDistributor.fileSourceHost());
-        if (deployHostIsMissing(deployHost)) {
-            throw new RuntimeException("Could not find host in the application's host system: '" +
-                                       fileDistributor.fileSourceHost() + "'. Hostsystem=" + getHostSystem());
-        }
+        HostResource hostResource = hostSystem().getHostByHostname(fileDistributor.fileSourceHost());
+        if (hostResource == null && ! multitenant)
+            throw new IllegalArgumentException("Could not find " + host + " in the application's " + hostSystem());
 
         FileDistributionConfigProvider configProvider =
                 new FileDistributionConfigProvider(fileDistribution,
                                                    fileDistributor,
-                                                   host == deployHost,
+                                                   host == hostResource,
                                                    host.getHost());
         fileDistribution.addFileDistributionConfigProducer(host.getHost(), configProvider);
     }
 
-    private boolean deployHostIsMissing(HostResource deployHost) {
-        return !multitenant && deployHost == null;
-    }
-
     // If not configured by user: Use default setup: max 3 slobroks, 1 on the default configserver host
     private List<Slobrok> createDefaultSlobrokSetup(DeployLogger deployLogger) {
-        List<HostResource> hosts = getHostSystem().getHosts();
+        List<HostResource> hosts = hostSystem().getHosts();
         List<Slobrok> slobs = new ArrayList<>();
         if (logserver != null) {
             Slobrok slobrok = new Slobrok(this, 0);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
index 9de777a96ef..a115b25cbd9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
@@ -55,7 +55,7 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu
     List<Configserver> getConfigServersFromSpec(DeployLogger deployLogger, AbstractConfigProducer parent) {
         List<Configserver> configservers = new ArrayList<>();
         for (ConfigServerSpec spec : configServerSpecs) {
-            HostSystem hostSystem = parent.getHostSystem();
+            HostSystem hostSystem = parent.hostSystem();
             HostResource host = new HostResource(Host.createConfigServerHost(hostSystem, spec.getHostName()));
             hostSystem.addBoundHost(host);
             Configserver configserver = new Configserver(parent, spec.getHostName(), spec.getConfigServerPort());
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
index fbd3f353d95..61d0cd7cd1e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
@@ -62,7 +62,7 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
 
     private void assignSlobroks(DeployLogger deployLogger, NodesSpecification nodesSpecification, Admin admin) {
         if (nodesSpecification.isDedicated()) {
-            createSlobroks(deployLogger, admin, allocateHosts(admin.getHostSystem(), "slobroks", nodesSpecification));
+            createSlobroks(deployLogger, admin, allocateHosts(admin.hostSystem(), "slobroks", nodesSpecification));
         }
         else {
             createSlobroks(deployLogger, admin, pickContainerHostsForSlobrok(nodesSpecification.count(), 2));
@@ -73,7 +73,7 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
         if (nodesSpecification.count() > 1) throw new IllegalArgumentException("You can only request a single log server");
         if (deployState.getProperties().applicationId().instance().isTester()) return; // No logserver is needed on tester applications
         if (nodesSpecification.isDedicated()) {
-            Collection<HostResource> hosts = allocateHosts(admin.getHostSystem(), "logserver", nodesSpecification);
+            Collection<HostResource> hosts = allocateHosts(admin.hostSystem(), "logserver", nodesSpecification);
             if (hosts.isEmpty()) return; // No log server can be created (and none is needed)
 
             Logserver logserver = createLogserver(deployState.getDeployLogger(), admin, hosts);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
index 2718db46be9..97b78e1b9b1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
@@ -122,7 +122,7 @@ public class VespaDomBuilder extends VespaModelBuilder {
             T t = doBuild(deployState, ancestor, producerSpec);
 
             if (t instanceof AbstractService) {
-                initializeService((AbstractService)t, deployState, ancestor.getHostSystem(), producerSpec);
+                initializeService((AbstractService)t, deployState, ancestor.hostSystem(), producerSpec);
             } else {
                 initializeProducer(t, deployState, producerSpec);
             }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 16ecf5f761c..3e9ebaeccd4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -607,7 +607,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
     /** Creates a single host when there is no nodes tag */
     private HostResource allocateSingleNodeHost(ApplicationContainerCluster cluster, DeployLogger logger, Element containerElement, ConfigModelContext context) {
         DeployState deployState = context.getDeployState();
-        HostSystem hostSystem = cluster.getHostSystem();
+        HostSystem hostSystem = cluster.hostSystem();
         if (deployState.isHosted()) {
             Optional<HostResource> singleContentHost = getHostResourceFromContentClusters(cluster, containerElement, context);
             if (singleContentHost.isPresent()) { // there is a content cluster; put the container on its first node 
@@ -631,7 +631,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
     private List<ApplicationContainer> createNodesFromNodeCount(ApplicationContainerCluster cluster, Element nodesElement, ConfigModelContext context) {
         NodesSpecification nodesSpecification = NodesSpecification.from(new ModelElement(nodesElement), context);
-        Map<HostResource, ClusterMembership> hosts = nodesSpecification.provision(cluster.getRoot().getHostSystem(),
+        Map<HostResource, ClusterMembership> hosts = nodesSpecification.provision(cluster.getRoot().hostSystem(),
                                                                                   ClusterSpec.Type.container,
                                                                                   ClusterSpec.Id.from(cluster.getName()), 
                                                                                   log);
@@ -645,8 +645,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
                                                       context.getDeployState().getWantedNodeVespaVersion(),
                                                       false);
         Map<HostResource, ClusterMembership> hosts = 
-                cluster.getRoot().getHostSystem().allocateHosts(clusterSpec, 
-                                                                Capacity.fromRequiredNodeType(type), 1, log);
+                cluster.getRoot().hostSystem().allocateHosts(clusterSpec,
+                                                             Capacity.fromRequiredNodeType(type), 1, log);
         return createNodesFromHosts(context.getDeployLogger(), hosts, cluster);
     }
     
@@ -663,7 +663,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         Map<HostResource, ClusterMembership> hosts = 
                 StorageGroup.provisionHosts(nodeSpecification,
                                             referenceId, 
-                                            cluster.getRoot().getHostSystem(),
+                                            cluster.getRoot().hostSystem(),
                                             context.getDeployLogger());
         return createNodesFromHosts(context.getDeployLogger(), hosts, cluster);
     }
@@ -690,7 +690,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         Map<HostResource, ClusterMembership> hosts =
                 StorageGroup.provisionHosts(nodesSpec,
                                             contentServices.get(0).getAttribute("id"),
-                                            cluster.getRoot().getHostSystem(),
+                                            cluster.getRoot().hostSystem(),
                                             context.getDeployLogger());
         return Optional.of(hosts.keySet().iterator().next());
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java
index 6b000835a22..adfc703f747 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java
@@ -284,7 +284,7 @@ public class StorageGroup {
             private StorageNode buildSingleNode(DeployState deployState, ContentCluster parent) {
                 int distributionKey = 0;
                 StorageNode sNode = new StorageNode(parent.getStorageNodes(), 1.0, distributionKey , false);
-                sNode.setHostResource(parent.getHostSystem().getHost(Container.SINGLENODE_CONTAINER_SERVICESPEC));
+                sNode.setHostResource(parent.hostSystem().getHost(Container.SINGLENODE_CONTAINER_SERVICESPEC));
                 PersistenceEngine provider = parent.getPersistence().create(deployState, sNode, storageGroup, null);
                 new Distributor(parent.getDistributorNodes(), distributionKey, null, provider);
                 return sNode;
@@ -302,7 +302,7 @@ public class StorageGroup {
                     throw new IllegalArgumentException("Specifying individual groups is not supported on hosted applications");
                 Map<HostResource, ClusterMembership> hostMapping =
                         nodeRequirement.isPresent() ?
-                        provisionHosts(nodeRequirement.get(), owner.getStorageNodes().getClusterName(), owner.getRoot().getHostSystem(), deployLogger) :
+                        provisionHosts(nodeRequirement.get(), owner.getStorageNodes().getClusterName(), owner.getRoot().hostSystem(), deployLogger) :
                         Collections.emptyMap();
 
                 Map<Optional<ClusterSpec.Group>, Map<HostResource, ClusterMembership>> hostGroups = collectAllocatedSubgroups(hostMapping);
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 4925a13c4d2..1a0c3a875fb 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
@@ -345,7 +345,7 @@ public class ContentCluster extends AbstractConfigProducer implements
         }
 
         private Collection<HostResource> getControllerHosts(NodesSpecification nodesSpecification, Admin admin, String clusterName, ConfigModelContext context) {
-            return nodesSpecification.provision(admin.getHostSystem(), ClusterSpec.Type.admin, ClusterSpec.Id.from(clusterName), context.getDeployLogger()).keySet();
+            return nodesSpecification.provision(admin.hostSystem(), ClusterSpec.Type.admin, ClusterSpec.Id.from(clusterName), context.getDeployLogger()).keySet();
         }
 
         private List<HostResource> drawControllerHosts(int count, StorageGroup rootGroup, Collection<ContainerModel> containers) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/generic/service/ServiceCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/generic/service/ServiceCluster.java
index 76f3415a666..7d304968bc7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/generic/service/ServiceCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/generic/service/ServiceCluster.java
@@ -42,9 +42,9 @@ public class ServiceCluster extends AbstractConfigProducer {
     }
 
     @Override
-    public HostSystem getHostSystem() {
+    public HostSystem hostSystem() {
         if (hostSystem!=null) return hostSystem;
-        return super.getHostSystem();
+        return super.hostSystem();
     }
 
     /**
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 074ff610e9a..0b10b2b13ba 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
@@ -105,7 +105,7 @@ public class SystemModelTestCase {
     @Test
     public void testHostSystem() {
         VespaModel vespaModel = getVespaModelDoNotValidateXml(TESTDIR + "simpleconfig/");
-        HostSystem hostSystem = vespaModel.getHostSystem();
+        HostSystem hostSystem = vespaModel.hostSystem();
 
         HostResource host1 = hostSystem.getHost("host1");
         HostResource host2 = hostSystem.getHost("host2");
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 6011b138a61..d9b4693921c 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
@@ -139,7 +139,7 @@ public class ModelProvisioningTest {
         QrStartConfig qrsStartConfig = new QrStartConfig(qrStartBuilder);
         assertEquals(45, qrsStartConfig.jvm().heapSizeAsPercentageOfPhysicalMemory());
         
-        HostSystem hostSystem = model.getHostSystem();
+        HostSystem hostSystem = model.hostSystem();
         assertNotNull(hostSystem.getHostByHostname("myhost0"));
         assertNotNull(hostSystem.getHostByHostname("myhost1"));
         assertNotNull(hostSystem.getHostByHostname("myhost2"));
@@ -169,7 +169,7 @@ public class ModelProvisioningTest {
         tester.addHosts(numberOfHosts);
         int numberOfContentNodes = 2;
         VespaModel model = tester.createModel(xmlWithNodes, true);
-        assertEquals(numberOfHosts, model.getRoot().getHostSystem().getHosts().size());
+        assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size());
         Map<String, ContentCluster> contentClusters = model.getContentClusters();
         ContentCluster cluster = contentClusters.get("bar");
         assertEquals(numberOfContentNodes, cluster.getRootGroup().getNodes().size());
@@ -217,8 +217,8 @@ public class ModelProvisioningTest {
         tester.addHosts(1);
         VespaModel model = tester.createModel(xmlWithNodes, true);
 
-        assertEquals(1, model.getHostSystem().getHosts().size());
-        HostResource host = model.getHostSystem().getHosts().iterator().next();
+        assertEquals(1, model.hostSystem().getHosts().size());
+        HostResource host = model.hostSystem().getHosts().iterator().next();
 
         assertTrue(host.spec().membership().isPresent());
         assertEquals("container", host.spec().membership().get().cluster().type().name());
@@ -250,7 +250,7 @@ public class ModelProvisioningTest {
         assertEquals("Nodes in container1", 2, model.getContainerClusters().get("container1").getContainers().size());
         assertEquals("Heap size is lowered with combined clusters", 
                      17, physicalMemoryPercentage(model.getContainerClusters().get("container1")));
-        assertEquals(2, model.getHostSystem().getHosts().stream()
+        assertEquals(2, model.hostSystem().getHosts().stream()
                              .filter(hostResource -> hostResource.spec().membership().get().cluster().type() == ClusterSpec.Type.combined)
                              .count());
 
@@ -391,7 +391,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true);
-        assertEquals(numberOfHosts, model.getRoot().getHostSystem().getHosts().size());
+        assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size());
 
         // Check container cluster
         assertEquals(1, model.getContainerClusters().size());
@@ -497,7 +497,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true);
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         // Check content cluster
         ContentCluster cluster = model.getContentClusters().get("bar");
@@ -553,7 +553,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true);
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         // Check content clusters
         ContentCluster cluster = model.getContentClusters().get("bar");
@@ -594,7 +594,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true);
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         // Check content clusters
         ContentCluster cluster = model.getContentClusters().get("bar");
@@ -632,7 +632,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true);
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         ContentCluster cluster = model.getContentClusters().get("bar");
         ContainerCluster clusterControllers = cluster.getClusterControllers();
@@ -661,7 +661,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true, "node-1-3-9-09", "node-1-3-9-06", "node-1-3-9-03");
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         // Check content clusters
         ContentCluster cluster = model.getContentClusters().get("bar");
@@ -691,7 +691,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true, "node-1-3-9-09");
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         // Check slobroks clusters
         assertEquals("Includes retired node", 1+3, model.getAdmin().getSlobroks().size());
@@ -716,7 +716,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true, "node-1-3-9-01", "node-1-3-9-02");
-        assertEquals(numberOfHosts, model.getRoot().getHostSystem().getHosts().size());
+        assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size());
 
         // Check slobroks clusters
         assertEquals("Includes retired node", 3+2, model.getAdmin().getSlobroks().size());
@@ -745,7 +745,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true, "node-1-3-9-12", "node-1-3-9-03", "node-1-3-9-02");
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         // Check slobroks clusters
         // ... from cluster default
@@ -777,7 +777,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true);
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         ContentCluster cluster = model.getContentClusters().get("bar");
         ContainerCluster clusterControllers = cluster.getClusterControllers();
@@ -886,7 +886,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true);
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         // Check content clusters
         ContentCluster cluster = model.getContentClusters().get("bar");
@@ -952,7 +952,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, false);
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         ContentCluster cluster = model.getContentClusters().get("bar");
         assertEquals(2*3, cluster.redundancy().effectiveInitialRedundancy()); // Reduced from 3*3
@@ -1008,7 +1008,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, false);
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         ContentCluster cluster = model.getContentClusters().get("bar");
         assertEquals(4, cluster.redundancy().effectiveInitialRedundancy());
@@ -1052,7 +1052,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, false);
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         ContentCluster cluster = model.getContentClusters().get("bar");
         ClusterControllerContainerCluster clusterControllers = cluster.getClusterControllers();
@@ -1113,7 +1113,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, false);
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         ContentCluster cluster = model.getContentClusters().get("bar");
         assertEquals(1, cluster.redundancy().effectiveInitialRedundancy());
@@ -1189,7 +1189,7 @@ public class ModelProvisioningTest {
         tester.addHosts(new NodeResources(0.7, 2, 2.5, 0.3), 3); // Controller-bar
         tester.addHosts(new NodeResources(10, 64, 200, 0.3), 6); // Content-bar
         VespaModel model = tester.createModel(services, true, 0);
-        assertEquals(totalHosts, model.getRoot().getHostSystem().getHosts().size());
+        assertEquals(totalHosts, model.getRoot().hostSystem().getHosts().size());
     }
 
     @Test
@@ -1204,7 +1204,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true);
-        assertEquals(numberOfHosts, model.getRoot().getHostSystem().getHosts().size());
+        assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size());
         assertEquals(3, model.getContainerClusters().get("container").getContainers().size());
         assertNotNull(model.getAdmin().getLogserver());
         assertEquals(3, model.getAdmin().getSlobroks().size());
@@ -1222,7 +1222,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true);
-        assertEquals(numberOfHosts, model.getRoot().getHostSystem().getHosts().size());
+        assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size());
         assertEquals("xyz", model.getContainerClusters().get("container").getContainers().get(0).getAssignedJvmOptions());
     }
 
@@ -1238,7 +1238,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true);
-        assertEquals(numberOfHosts, model.getRoot().getHostSystem().getHosts().size());
+        assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size());
         assertEquals("xyz", model.getContainerClusters().get("container").getContainers().get(0).getAssignedJvmOptions());
     }
 
@@ -1282,7 +1282,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(1);
         VespaModel model = tester.createModel(services, true);
-        assertEquals(1, model.getRoot().getHostSystem().getHosts().size());
+        assertEquals(1, model.getRoot().hostSystem().getHosts().size());
         assertEquals(1, model.getAdmin().getSlobroks().size());
     }
     @Test
@@ -1356,7 +1356,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(1);
         VespaModel model = tester.createModel(services, true);
-        assertEquals(1, model.getRoot().getHostSystem().getHosts().size());
+        assertEquals(1, model.getRoot().hostSystem().getHosts().size());
         assertEquals(1, model.getAdmin().getSlobroks().size());
         assertEquals(1, model.getContainerClusters().get("foo").getContainers().size());
         assertEquals(1, model.getContentClusters().get("bar").getRootGroup().countNodes());
@@ -1375,7 +1375,7 @@ public class ModelProvisioningTest {
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(1);
         VespaModel model = tester.createModel(services, true);
-        assertEquals(1, model.getRoot().getHostSystem().getHosts().size());
+        assertEquals(1, model.getRoot().hostSystem().getHosts().size());
         assertEquals(1, model.getAdmin().getSlobroks().size());
         assertEquals(1, model.getContainerClusters().get("foo").getContainers().size());
     }
@@ -1399,7 +1399,7 @@ public class ModelProvisioningTest {
         tester.setHosted(false);
         tester.addHosts(1);
         VespaModel model = tester.createModel(services, true);
-        assertEquals(1, model.getRoot().getHostSystem().getHosts().size());
+        assertEquals(1, model.getRoot().hostSystem().getHosts().size());
         assertEquals(1, model.getAdmin().getSlobroks().size());
         assertEquals(1, model.getContainerClusters().get("foo").getContainers().size());
         assertEquals(1, model.getContentClusters().get("bar").getRootGroup().recursiveGetNodes().size());
@@ -1426,7 +1426,7 @@ public class ModelProvisioningTest {
         tester.setHosted(false);
         tester.addHosts(1);
         VespaModel model = tester.createModel(services, true);
-        assertEquals(1, model.getRoot().getHostSystem().getHosts().size());
+        assertEquals(1, model.getRoot().hostSystem().getHosts().size());
         assertEquals(1, model.getAdmin().getSlobroks().size());
         assertEquals(1, model.getContainerClusters().get("foo").getContainers().size());
         assertEquals(1, model.getContentClusters().get("bar").getRootGroup().countNodes());
@@ -1468,7 +1468,7 @@ public class ModelProvisioningTest {
         " </services>";
 
         VespaModel model = createNonProvisionedMultitenantModel(services);
-        assertEquals(1, model.getRoot().getHostSystem().getHosts().size());
+        assertEquals(1, model.getRoot().hostSystem().getHosts().size());
         ContentCluster content = model.getContentClusters().get("storage");
         assertEquals(2, content.getRootGroup().getNodes().size());
         ContainerCluster controller = content.getClusterControllers();
@@ -1514,7 +1514,7 @@ public class ModelProvisioningTest {
                 "</services>";
 
         VespaModel model = createNonProvisionedMultitenantModel(services);
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(1));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(1));
         ContentCluster content = model.getContentClusters().get("storage");
         assertEquals(1, content.getRootGroup().getNodes().size());
         ContainerCluster controller = content.getClusterControllers();
@@ -1577,7 +1577,7 @@ public class ModelProvisioningTest {
                 "</services>";
 
         VespaModel model = createNonProvisionedModel(false, hosts, services);
-        assertEquals(3, model.getRoot().getHostSystem().getHosts().size());
+        assertEquals(3, model.getRoot().hostSystem().getHosts().size());
         ContentCluster content = model.getContentClusters().get("storage");
         assertEquals(3, content.getRootGroup().getNodes().size());
     }
@@ -1626,7 +1626,7 @@ public class ModelProvisioningTest {
                 " </services>";
 
         VespaModel model = createNonProvisionedMultitenantModel(services);
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(1));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(1));
         ContentCluster content = model.getContentClusters().get("storage");
         assertEquals(2, content.getRootGroup().getNodes().size());
         ContainerCluster controller = content.getClusterControllers();
@@ -1747,7 +1747,7 @@ public class ModelProvisioningTest {
         tester.addHosts(numberOfHosts);
 
         VespaModel model = tester.createModel(Zone.defaultZone(), services, true);
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         Admin admin = model.getAdmin();
         Logserver logserver = admin.getLogserver();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java
index e0d2e165772..cd67e432b8f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java
@@ -274,7 +274,7 @@ public class ClusterControllerTestCase extends DomBuilderTest {
 
     private boolean existsHostsWithClusterControllerConfigId(VespaModel model) {
         boolean found = false;
-        for (HostResource h : model.getHostSystem().getHosts()) {
+        for (HostResource h : model.hostSystem().getHosts()) {
             for (Service s : h.getServices()) {
                 if (s.getConfigId().equals("admin/cluster-controllers/0")) {
                     found = true;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
index 854b708797e..89248d2469d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
@@ -15,12 +15,10 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.C
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.TestMode.hosted;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.TestMode.self_hosted;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getModel;
-import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.configId;
 
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getNodeDimensionsConfig;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getRpcConnectorConfig;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getVespaServicesConfig;
-import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.assertEquals;
@@ -39,9 +37,9 @@ public class MetricsProxyContainerTest {
         tester.addHosts(numberOfHosts);
 
         VespaModel model = tester.createModel(servicesWithManyNodes(), true);
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
+        assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
-        for (var host : model.getHostSystem().getHosts()) {
+        for (var host : model.hostSystem().getHosts()) {
             assertThat(host.getService(METRICS_PROXY_CONTAINER.serviceName), notNullValue());
 
             long metricsProxies =  host.getServices().stream()
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
index a7ab9e02a79..31a2a6496d7 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
@@ -168,8 +168,8 @@ public class ContentBuilderTest extends DomBuilderTest {
         assertEquals("clu", c.getConfigId());
         //assertEquals("content/a/0", a.getRootGroup().getNodes().get(0).getConfigId()); // This is how it should look like in an ideal world.
         assertEquals("clu/storage/0", c.getRootGroup().getNodes().get(0).getConfigId()); // Due to reuse.
-        assertEquals(1, c.getRoot().getHostSystem().getHosts().size());
-        HostResource h = c.getRoot().getHostSystem().getHost("mockhost");
+        assertEquals(1, c.getRoot().hostSystem().getHosts().size());
+        HostResource h = c.getRoot().hostSystem().getHost("mockhost");
         String [] expectedServices = {"configserver", "logserver", "logd", "container-clustercontroller", "metricsproxy-container", "slobrok", "configproxy","config-sentinel", "qrserver", "storagenode", "searchnode", "distributor", "transactionlogserver"};
         assertServices(h, expectedServices);
         assertEquals("clu/storage/0", h.getService("storagenode").getConfigId());
@@ -216,8 +216,8 @@ public class ContentBuilderTest extends DomBuilderTest {
         assertEquals(musicClusterId, cluster.getConfigId());
         //assertEquals("content/a/0", a.getRootGroup().getNodes().get(0).getConfigId());
         assertEquals(musicClusterId + "/storage/0", cluster.getRootGroup().getNodes().get(0).getConfigId()); // Due to reuse.
-        assertEquals(1, cluster.getRoot().getHostSystem().getHosts().size());
-        HostResource h = cluster.getRoot().getHostSystem().getHost("mockhost");
+        assertEquals(1, cluster.getRoot().hostSystem().getHosts().size());
+        HostResource h = cluster.getRoot().hostSystem().getHost("mockhost");
         String [] expectedServices = {
                 "logd", "configproxy", "config-sentinel", "configserver", "logserver",
                 "slobrok", "storagenode", "distributor","searchnode","transactionlogserver",
@@ -301,8 +301,8 @@ public class ContentBuilderTest extends DomBuilderTest {
         assertEquals("b", b.getConfigId());
         //assertEquals("content/a/0", a.getRootGroup().getNodes().get(0).getConfigId());
         assertEquals("b/storage/0", b.getRootGroup().getNodes().get(0).getConfigId()); // Due to reuse.
-        assertEquals(1, b.getRoot().getHostSystem().getHosts().size());
-        HostResource h = b.getRoot().getHostSystem().getHost("mockhost");
+        assertEquals(1, b.getRoot().hostSystem().getHosts().size());
+        HostResource h = b.getRoot().hostSystem().getHost("mockhost");
         assertEquals("b/storage/0", h.getService("storagenode").getConfigId());
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java
index 964f8ed4818..18063bff16b 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java
@@ -123,7 +123,7 @@ public class DomAdminV2BuilderTest extends DomBuilderTest {
         assertThat(admin.getConfigservers().size(), is(3));
         assertThat(admin.getSlobroks().size(), is(1));
         assertThat(admin.getClusterControllerHosts().size(), is(1));
-        assertNotNull(admin.getHostSystem().getHostByHostname("test1"));
+        assertNotNull(admin.hostSystem().getHostByHostname("test1"));
         for (Configserver configserver : admin.getConfigservers()) {
             assertThat(configserver.getHostName(), is(not(admin.getClusterControllerHosts().get(0).getHost().getHostname())));
             for (Slobrok slobrok : admin.getSlobroks()) {
@@ -214,7 +214,7 @@ public class DomAdminV2BuilderTest extends DomBuilderTest {
                                       deployState.getFileRegistry(), multitenant,
                                       configServerSpecs);
         Admin admin = domAdminBuilder.build(deployState, root, xml);
-        admin.addPerHostServices(root.getHostSystem().getHosts(), deployState);
+        admin.addPerHostServices(root.hostSystem().getHosts(), deployState);
         return admin;
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
index b8d9ad59ae0..d3d5ba90488 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
@@ -15,10 +15,8 @@ import org.w3c.dom.Element;
 
 import java.io.StringReader;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 
 /**
  * @author gjoranv
@@ -94,12 +92,12 @@ public class VespaDomBuilderTest {
     @Test
     public void testHostSystem() {
         VespaModel model = createModel(hosts, services);
-        HostSystem hostSystem = model.getHostSystem();
-        assertThat(hostSystem.getHosts().size(), is(1));
+        HostSystem hostSystem = model.hostSystem();
+        assertEquals(1, hostSystem.getHosts().size());
         HostResource host = hostSystem.getHosts().get(0);
-        assertThat(host, is(hostSystem.getHostByHostname(host.getHostname())));
+        assertEquals(hostSystem.getHostByHostname(host.getHostname()), host);
         assertNotNull(hostSystem.getHost("node1"));
-        assertThat(hostSystem.toString(), is("host '" + host.getHostname() + "'"));
+        assertEquals("hosts [" + host.getHostname() + "]", hostSystem.toString());
     }
 
     private VespaModel createModel(String hosts, String services) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 37612f86d9e..5a1befd3eb0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -472,7 +472,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
                 .withServices(servicesXml)
                 .build();
         VespaModel model = new VespaModel(applicationPackage);
-        assertThat(model.getHostSystem().getHosts().size(), is(1));
+        assertThat(model.hostSystem().getHosts().size(), is(1));
     }
 
     @Test
@@ -575,7 +575,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
                         .setMultitenant(true)
                         .setHostedVespa(true))
                 .build());
-        assertEquals(1, model.getHostSystem().getHosts().size());
+        assertEquals(1, model.hostSystem().getHosts().size());
     }
 
     @Test(expected = IllegalArgumentException.class)
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java
index 7ef89ded733..8c4552ba117 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java
@@ -77,7 +77,7 @@ public class ModelAmendingTestCase {
         VespaModel model = tester.createModel(services);
 
         // Check that all hosts are amended
-        for (HostResource host : model.getAdmin().getHostSystem().getHosts()) {
+        for (HostResource host : model.getAdmin().hostSystem().getHosts()) {
             assertFalse(host + " is amended", host.getHost().getChildrenByTypeRecursive(AmendedService.class).isEmpty());
         }
         
@@ -108,7 +108,7 @@ public class ModelAmendingTestCase {
         }
 
         private void amend(DeployLogger deployLogger, AdminModel adminModel) {
-            for (HostResource host : adminModel.getAdmin().getHostSystem().getHosts()) {
+            for (HostResource host : adminModel.getAdmin().hostSystem().getHosts()) {
                 if ( ! host.getHost().getChildrenByTypeRecursive(AmendedService.class).isEmpty()) continue; // already amended
                 adminModel.getAdmin().addAndInitializeService(deployLogger, host, new AmendedService(host.getHost()));
             }
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 ac81c1a7b7e..c985ebabbf9 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
@@ -291,7 +291,7 @@ public class VespaModelTestCase {
         VespaModel model = new VespaModel(new MockApplicationPackage.Builder()
                                                   .withServices("<services version='1.0'><container version='1.0'><search /></container></services>")
                                                   .build());
-        assertThat(model.getHostSystem().getHosts().size(), is(1));
+        assertThat(model.hostSystem().getHosts().size(), is(1));
         assertThat(model.getContainerClusters().size(), is(1));
     }