ProvisionInfo -> AllocatedHosts

21 files changed, 98 insertions, 104 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
index b2bcba94662..0071ad6ca51 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
@@ -6,7 +6,7 @@ import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.application.api.ApplicationFile;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.UnparsedConfigDefinition;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.Version;
 import com.yahoo.io.reader.NamedReader;
 import com.yahoo.log.LogLevel;
@@ -355,7 +355,7 @@ public class ZooKeeperClient {
         }
     }
 
-    public void feedProvisionInfo(ProvisionInfo info) throws IOException {
+    public void feedProvisionInfo(AllocatedHosts info) throws IOException {
         configCurator.putData(rootPath.append(ZKApplicationPackage.allocatedHostsNode).getAbsolute(), info.toJson());
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployer.java
index 9c0d7f69d19..1b212e4fd5c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployer.java
@@ -3,7 +3,7 @@ package com.yahoo.vespa.config.server.deploy;
 
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.FileRegistry;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.Version;
 
 import java.io.IOException;
@@ -28,15 +28,15 @@ public class ZooKeeperDeployer {
      *
      * @param applicationPackage The application package to persist.
      * @param fileRegistryMap the file registries to persist.
-     * @param provisionInfo the provisioning info to persist.
+     * @param allocatedHosts the provisioning info to persist.
      * @throws IOException if deploying fails
      */
     public void deploy(ApplicationPackage applicationPackage, Map<Version, FileRegistry> fileRegistryMap, 
-                       ProvisionInfo provisionInfo) throws IOException {
+                       AllocatedHosts allocatedHosts) throws IOException {
         zooKeeperClient.setupZooKeeper();
         zooKeeperClient.feedZooKeeper(applicationPackage);
         zooKeeperClient.feedZKFileRegistries(fileRegistryMap);
-        zooKeeperClient.feedProvisionInfo(provisionInfo);
+        zooKeeperClient.feedProvisionInfo(allocatedHosts);
     }
 
     public void cleanup() {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
index 3c26ce1b76b..6ef11ff7490 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
@@ -5,13 +5,11 @@ import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.api.ConfigDefinitionRepo;
-import com.yahoo.config.model.api.HostProvisioner;
-import com.yahoo.config.model.api.Model;
 import com.yahoo.config.model.api.ModelContext;
 import com.yahoo.config.model.api.ModelFactory;
 import com.yahoo.config.model.application.provider.MockFileRegistry;
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.Version;
 import com.yahoo.config.provision.Zone;
@@ -25,7 +23,6 @@ import com.yahoo.vespa.config.server.application.PermanentApplicationPackage;
 import com.yahoo.vespa.config.server.deploy.ModelContextImpl;
 import com.yahoo.vespa.config.server.monitoring.MetricUpdater;
 import com.yahoo.vespa.config.server.monitoring.Metrics;
-import com.yahoo.vespa.config.server.provision.StaticProvisioner;
 import com.yahoo.vespa.config.server.session.SessionZooKeeperClient;
 import com.yahoo.vespa.config.server.session.SilentDeployLogger;
 import com.yahoo.vespa.curator.Curator;
@@ -71,11 +68,11 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
     }
 
     @Override
-    protected Application buildModelVersion(ModelFactory modelFactory, 
+    protected Application buildModelVersion(ModelFactory modelFactory,
                                             ApplicationPackage applicationPackage,
-                                            ApplicationId applicationId, 
+                                            ApplicationId applicationId,
                                             com.yahoo.component.Version wantedNodeVespaVersion,
-                                            SettableOptional<ProvisionInfo> ignored, // Ignored since we have this in the app package for activated models
+                                            SettableOptional<AllocatedHosts> ignored, // Ignored since we have this in the app package for activated models
                                             Instant now) {
         log.log(LogLevel.DEBUG, String.format("Loading model version %s for session %s application %s",
                                               modelFactory.getVersion(), appGeneration, applicationId));
@@ -87,7 +84,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
                 logger,
                 configDefinitionRepo,
                 getForVersionOrLatest(applicationPackage.getFileRegistryMap(), modelFactory.getVersion()).orElse(new MockFileRegistry()),
-                createHostProvisioner(applicationPackage.getProvisionInfo()),
+                createHostProvisioner(applicationPackage.getAllocatedHosts()),
                 createModelContextProperties(applicationId),
                 Optional.empty(),
                 new com.yahoo.component.Version(modelFactory.getVersion().toString()),
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
index 84316d0688a..305f817f399 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
@@ -8,8 +8,7 @@ import com.yahoo.config.model.api.ModelContext;
 import com.yahoo.config.model.api.ModelFactory;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.OutOfCapacityException;
-import com.yahoo.config.provision.ProvisionInfo;
-import com.yahoo.config.provision.Provisioner;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.Rotation;
 import com.yahoo.config.provision.Version;
 import com.yahoo.config.provision.Zone;
@@ -71,7 +70,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
                                               .collect(Collectors.toList());
 
         // The newest version (major and minor) (which is loaded first) decides the allocated hosts
-        SettableOptional<ProvisionInfo> allocatedHosts = new SettableOptional();
+        SettableOptional<AllocatedHosts> allocatedHosts = new SettableOptional();
         List<MODELRESULT> allApplicationModels = new ArrayList<>();
         for (int i = 0; i < majorVersions.size(); i++) {
             try {
@@ -103,7 +102,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
     private List<MODELRESULT> buildModelVersion(Set<Version> versions, ApplicationId applicationId,
                                                 com.yahoo.component.Version wantedNodeVespaVersion, 
                                                 ApplicationPackage applicationPackage,
-                                                SettableOptional<ProvisionInfo> allocatedHosts,
+                                                SettableOptional<AllocatedHosts> allocatedHosts,
                                                 Instant now) {
         Version latest = findLatest(versions);
         // load latest application version
@@ -114,7 +113,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
                                                                  allocatedHosts,
                                                                  now);
         if ( ! allocatedHosts.isPresent())
-            allocatedHosts.set(latestApplicationVersion.getModel().provisionInfo());
+            allocatedHosts.set(latestApplicationVersion.getModel().allocatedHosts());
         
         if (latestApplicationVersion.getModel().skipOldConfigModels(now))
             return Collections.singletonList(latestApplicationVersion);
@@ -156,7 +155,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
     protected abstract MODELRESULT buildModelVersion(ModelFactory modelFactory, ApplicationPackage applicationPackage,
                                                      ApplicationId applicationId, 
                                                      com.yahoo.component.Version wantedNodeVespaVersion,
-                                                     SettableOptional<ProvisionInfo> allocatedHosts,
+                                                     SettableOptional<AllocatedHosts> allocatedHosts,
                                                      Instant now);
 
     protected ModelContext.Properties createModelContextProperties(ApplicationId applicationId,
@@ -175,9 +174,9 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
      * Returns a host provisioner returning the previously allocated hosts if available and when on hosted Vespa,
      * returns empty otherwise.
      */
-    protected Optional<HostProvisioner> createHostProvisioner(Optional<ProvisionInfo> provisionInfo) {
-        if (hosted && provisionInfo.isPresent())
-            return Optional.of(new StaticProvisioner(provisionInfo.get()));
+    protected Optional<HostProvisioner> createHostProvisioner(Optional<AllocatedHosts> allocatedHosts) {
+        if (hosted && allocatedHosts.isPresent())
+            return Optional.of(new StaticProvisioner(allocatedHosts.get()));
         return Optional.empty();
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
index 27de7f2b2e1..d7610a7d817 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.modelfactory;
 
-import com.yahoo.component.Vtag;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.api.ConfigChangeAction;
@@ -13,7 +12,7 @@ import com.yahoo.config.model.api.ModelCreateResult;
 import com.yahoo.config.model.api.ModelFactory;
 import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.Version;
 import com.yahoo.log.LogLevel;
 import com.yahoo.vespa.config.server.application.ApplicationSet;
@@ -82,7 +81,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
                                                     ApplicationPackage applicationPackage,
                                                     ApplicationId applicationId, 
                                                     com.yahoo.component.Version wantedNodeVespaVersion,
-                                                    SettableOptional<ProvisionInfo> activatedHosts,
+                                                    SettableOptional<AllocatedHosts> activatedHosts,
                                                     Instant now) {
         Version modelVersion = modelFactory.getVersion();
         log.log(LogLevel.DEBUG, "Start building model for Vespa version " + modelVersion);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java
index 1cad735879a..c5e8d4b87ea 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java
@@ -8,16 +8,16 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * Host provisioning from an existing {@link ProvisionInfo} instance.
+ * Host provisioning from an existing {@link AllocatedHosts} instance.
  *
  * @author bratseth
  */
 public class StaticProvisioner implements HostProvisioner {
 
-    private final ProvisionInfo provisionInfo;
+    private final AllocatedHosts allocatedHosts;
 
-    public StaticProvisioner(ProvisionInfo provisionInfo) {
-        this.provisionInfo = provisionInfo;
+    public StaticProvisioner(AllocatedHosts allocatedHosts) {
+        this.allocatedHosts = allocatedHosts;
     }
 
     @Override
@@ -27,7 +27,7 @@ public class StaticProvisioner implements HostProvisioner {
 
     @Override
     public List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger) {
-        return provisionInfo.getHosts().stream()
+        return allocatedHosts.getHosts().stream()
                 .filter(host -> host.membership().isPresent() && matches(host.membership().get().cluster(), cluster))
                 .collect(Collectors.toList());
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
index 0b8f1f67e79..673dc7ae568 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
@@ -6,7 +6,7 @@ import com.yahoo.config.application.api.ApplicationFile;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.ApplicationMetaData;
 import com.yahoo.config.application.api.DeployLogger;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.transaction.AbstractTransaction;
 import com.yahoo.transaction.NestedTransaction;
 import com.yahoo.transaction.Transaction;
@@ -171,7 +171,7 @@ public class LocalSession extends Session implements Comparable<LocalSession> {
 
     public Version getVespaVersion() { return zooKeeperClient.readVespaVersion(); }
 
-    public ProvisionInfo getProvisionInfo() {
+    public AllocatedHosts getProvisionInfo() {
         return zooKeeperClient.getProvisionInfo();
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 3dc0eb4f1b5..ac9c43a6082 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -235,10 +235,10 @@ public class SessionPreparer {
                                        com.yahoo.component.Version vespaVersion,
                                        DeployLogger deployLogger,
                                        Map<Version, FileRegistry> fileRegistryMap,
-                                       ProvisionInfo provisionInfo) {
+                                       AllocatedHosts allocatedHosts) {
         ZooKeeperDeployer zkDeployer = zooKeeperClient.createDeployer(deployLogger);
         try {
-            zkDeployer.deploy(applicationPackage, fileRegistryMap, provisionInfo);
+            zkDeployer.deploy(applicationPackage, fileRegistryMap, allocatedHosts);
             zooKeeperClient.writeApplicationId(applicationId);
             zooKeeperClient.writeVespaVersion(vespaVersion);
         } catch (RuntimeException | IOException e) {
@@ -260,8 +260,8 @@ public class SessionPreparer {
         public List<PreparedModelsBuilder.PreparedModelResult> asList() { return results; }
 
         /** Returns the host allocations resulting from this preparation. */
-        public ProvisionInfo getProvisionInfo() {
-            return results.asList().get(0).getModel().provisionInfo(); // All have the same provision info
+        public AllocatedHosts getProvisionInfo() {
+            return results.asList().get(0).getModel().allocatedHosts(); // All have the same hosts allocated
         }
 
         public Map<Version, FileRegistry> getFileRegistries() {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
index 3bd60d3d96c..83727de1726 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
@@ -6,8 +6,7 @@ import com.yahoo.component.Vtag;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.provision.NodeFlavors;
-import com.yahoo.config.provision.ProvisionInfo;
-import com.yahoo.config.provision.TenantName;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.transaction.Transaction;
 import com.yahoo.log.LogLevel;
 import com.yahoo.path.Path;
@@ -189,9 +188,9 @@ public class SessionZooKeeperClient {
         return rootPath.append(CREATE_TIME_PATH).getAbsolute();
     }
 
-    ProvisionInfo getProvisionInfo() {
-        return loadApplicationPackage().getProvisionInfo()
-                                       .orElseThrow(() -> new IllegalStateException("Provision info does not exists"));
+    AllocatedHosts getProvisionInfo() {
+        return loadApplicationPackage().getAllocatedHosts()
+                                       .orElseThrow(() -> new IllegalStateException("Allocated hosts does not exists"));
     }
 
     public ZooKeeperDeployer createDeployer(DeployLogger logger) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
index 7e82b6bf649..0e7eee71b65 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
@@ -14,7 +14,7 @@ import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.application.provider.*;
 import com.yahoo.config.provision.HostSpec;
 import com.yahoo.config.provision.NodeFlavors;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.io.IOUtils;
 import com.yahoo.path.Path;
 import com.yahoo.io.reader.NamedReader;
@@ -44,7 +44,7 @@ public class ZKApplicationPackage implements ApplicationPackage {
     private ZKLiveApp liveApp;
 
     private final Map<com.yahoo.config.provision.Version, PreGeneratedFileRegistry> fileRegistryMap = new HashMap<>();
-    private final Optional<ProvisionInfo> provisionInfo;
+    private final Optional<AllocatedHosts> allocatedHosts;
     private static final com.yahoo.config.provision.Version legacyVersion = com.yahoo.config.provision.Version.fromIntValues(0, 0, 0);
 
     public static final String fileRegistryNode = "fileregistry";
@@ -56,55 +56,55 @@ public class ZKApplicationPackage implements ApplicationPackage {
         liveApp = new ZKLiveApp(zk, appPath);
         metaData = readMetaDataFromLiveApp(liveApp);
         importFileRegistries(fileRegistryNode);
-        provisionInfo = importProvisionInfos(allocatedHostsNode, nodeFlavors);
+        allocatedHosts = importAllocatedHosts(allocatedHostsNode, nodeFlavors);
     }
 
-    private Optional<ProvisionInfo> importProvisionInfos(String allocatedHostsPath, Optional<NodeFlavors> nodeFlavors) {
+    private Optional<AllocatedHosts> importAllocatedHosts(String allocatedHostsPath, Optional<NodeFlavors> nodeFlavors) {
         if ( ! liveApp.exists(allocatedHostsPath)) return Optional.empty();
-        Optional<ProvisionInfo> provisionInfo = readProvisionInfo(allocatedHostsPath, nodeFlavors);
-        if ( ! provisionInfo.isPresent()) { // Read from legacy location. TODO: Remove when 6.142 is in production everywhere
+        Optional<AllocatedHosts> allocatedHosts = readAllocatedHosts(allocatedHostsPath, nodeFlavors);
+        if ( ! allocatedHosts.isPresent()) { // Read from legacy location. TODO: Remove when 6.143 is in production everywhere
             List<String> provisionInfoByVersionNodes = liveApp.getChildren(allocatedHostsPath);
-            provisionInfo = merge(readProvisionInfosByVersion(provisionInfoByVersionNodes, nodeFlavors));
+            allocatedHosts = merge(readAllocatedHostsByVersion(provisionInfoByVersionNodes, nodeFlavors));
         }
-        return provisionInfo;
+        return allocatedHosts;
     }
     
-    private Map<Version, ProvisionInfo> readProvisionInfosByVersion(List<String> provisionInfoByVersionNodes, Optional<NodeFlavors> nodeFlavors) {
-        Map<Version, ProvisionInfo> provisionInfoMap = new HashMap<>();
+    private Map<Version, AllocatedHosts> readAllocatedHostsByVersion(List<String> provisionInfoByVersionNodes, Optional<NodeFlavors> nodeFlavors) {
+        Map<Version, AllocatedHosts> allocatedHostsByVersion = new HashMap<>();
         provisionInfoByVersionNodes.stream()
                 .forEach(versionStr -> {
                     Version version = Version.fromString(versionStr);
-                    Optional<ProvisionInfo> provisionInfo = readProvisionInfo(Joiner.on("/").join(allocatedHostsNode, versionStr),
-                                                                              nodeFlavors);
-                    provisionInfo.ifPresent(info -> provisionInfoMap.put(version, info));
+                    Optional<AllocatedHosts> allocatedHosts = readAllocatedHosts(Joiner.on("/").join(allocatedHostsNode, versionStr),
+                                                                                nodeFlavors);
+                    allocatedHosts.ifPresent(info -> allocatedHostsByVersion.put(version, info));
                 });
-        return provisionInfoMap;
+        return allocatedHostsByVersion;
     }
 
-    private Optional<ProvisionInfo> merge(Map<Version, ProvisionInfo> provisionInfoMap) {
+    private Optional<AllocatedHosts> merge(Map<Version, AllocatedHosts> provisionInfoMap) {
         // Merge the provision infos in any order. This is wrong but preserves current behavior (modulo order differences)
         if (provisionInfoMap.isEmpty()) return Optional.empty();
         
         Map<String, HostSpec> merged = new HashMap<>();
-        for (Map.Entry<Version, ProvisionInfo> entry : provisionInfoMap.entrySet()) {
+        for (Map.Entry<Version, AllocatedHosts> entry : provisionInfoMap.entrySet()) {
             for (HostSpec host : entry.getValue().getHosts())
                 merged.put(host.hostname(), host);
         }
-        return Optional.of(ProvisionInfo.withHosts(ImmutableSet.copyOf(merged.values())));
+        return Optional.of(AllocatedHosts.withHosts(ImmutableSet.copyOf(merged.values())));
     }
 
     /** 
-     * Reads provision info at the given node.
+     * Reads allocated hosts at the given node.
      * 
-     * @return the provision info at this node or empty if there is no data at this path
+     * @return the allocated hosts at this node or empty if there is no data at this path
      */
-    private Optional<ProvisionInfo> readProvisionInfo(String provisionInfoPath, Optional<NodeFlavors> nodeFlavors) {
+    private Optional<AllocatedHosts> readAllocatedHosts(String allocatedHostsPath, Optional<NodeFlavors> nodeFlavors) {
         try {
-            byte[] data = liveApp.getBytes(provisionInfoPath);
-            if (data.length == 0) return Optional.empty(); // TODO: Remove this line (and make return non-optional) when 6.142 is in production everywhere
-            return Optional.of(ProvisionInfo.fromJson(data, nodeFlavors));
+            byte[] data = liveApp.getBytes(allocatedHostsPath);
+            if (data.length == 0) return Optional.empty(); // TODO: Remove this line (and make return non-optional) when 6.143 is in production everywhere
+            return Optional.of(AllocatedHosts.fromJson(data, nodeFlavors));
         } catch (Exception e) {
-            throw new RuntimeException("Unable to read provision info", e);
+            throw new RuntimeException("Unable to read allocated hosts", e);
         }
     }
 
@@ -176,8 +176,9 @@ public class ZKApplicationPackage implements ApplicationPackage {
         return ret;
     }
 
-    public Optional<ProvisionInfo> getProvisionInfo() {
-        return provisionInfo;
+    @Override
+    public Optional<AllocatedHosts> getAllocatedHosts() {
+        return allocatedHosts;
     }
 
     @Override
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java
index b892abc67af..ae65a3f01fe 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.config.server;
 import com.yahoo.config.model.api.FileDistribution;
 import com.yahoo.config.model.api.HostInfo;
 import com.yahoo.config.model.api.Model;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.vespa.config.ConfigKey;
 import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.buildergen.ConfigDefinition;
@@ -44,7 +44,7 @@ public class ModelStub implements Model {
     }
 
     @Override
-    public Optional<ProvisionInfo> getProvisionInfo() {
+    public Optional<AllocatedHosts> getProvisionInfo() {
         return null;
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java
index 5806c7991fc..ac2ca55313b 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java
@@ -7,7 +7,7 @@ import com.yahoo.config.model.api.Model;
 import com.yahoo.config.model.api.PortInfo;
 import com.yahoo.config.model.api.ServiceInfo;
 import com.yahoo.config.provision.ClusterSpec;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.vespa.config.ConfigKey;
 import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.buildergen.ConfigDefinition;
@@ -93,7 +93,7 @@ class MockModel implements Model {
     }
 
     @Override
-    public Optional<ProvisionInfo> getProvisionInfo() {
+    public Optional<AllocatedHosts> getProvisionInfo() {
         throw new UnsupportedOperationException();
     }
 }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
index c9556425dda..2ca120cb96b 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
@@ -20,7 +20,7 @@ import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostFilter;
 import com.yahoo.config.provision.HostSpec;
 import com.yahoo.config.provision.InstanceName;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.ProvisionLogger;
 import com.yahoo.config.provision.Provisioner;
 import com.yahoo.config.provision.Version;
@@ -134,7 +134,7 @@ public class DeployTester {
         return id;
     }
 
-    public ProvisionInfo getProvisionInfoFromDeployedApp(ApplicationId applicationId) {
+    public AllocatedHosts getProvisionInfoFromDeployedApp(ApplicationId applicationId) {
         Tenant tenant = tenant();
         LocalSession session = tenant.getLocalSessionRepo().getSession(tenant.getApplicationRepo()
                                                                              .getSessionIdForApplication(applicationId));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
index 933c1e1d64d..bd0d4287631 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
@@ -178,11 +178,11 @@ public class ZooKeeperClientTest extends TestWithCurator {
         HostSpec host1 = new HostSpec("host1.yahoo.com", Collections.emptyList());
         HostSpec host2 = new HostSpec("host2.yahoo.com", Collections.emptyList());
         ImmutableSet<HostSpec> hosts = ImmutableSet.of(host1, host2);
-        zooKeeperClient.feedProvisionInfo(ProvisionInfo.withHosts(hosts));
+        zooKeeperClient.feedProvisionInfo(AllocatedHosts.withHosts(hosts));
         Path hostsPath = app.append(ZKApplicationPackage.allocatedHostsNode);
         assertTrue(zk.exists(hostsPath.getAbsolute()));
         
-        ProvisionInfo deserialized = ProvisionInfo.fromJson(zk.getBytes(hostsPath.getAbsolute()), Optional.empty());
+        AllocatedHosts deserialized = AllocatedHosts.fromJson(zk.getBytes(hostsPath.getAbsolute()), Optional.empty());
         assertEquals(hosts, deserialized.getHosts());
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployerTest.java
index b7bd7918e02..b256079d259 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployerTest.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.config.server.deploy;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.application.provider.*;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.Version;
 import com.yahoo.io.IOUtils;
 import com.yahoo.path.Path;
@@ -53,7 +53,7 @@ public class ZooKeeperDeployerTest {
         ZooKeeperClient client = new ZooKeeperClient(configCurator, logger, true, appPath);
         ZooKeeperDeployer deployer = new ZooKeeperDeployer(client);
 
-        deployer.deploy(applicationPackage, Collections.singletonMap(Version.fromIntValues(1, 0, 0), new MockFileRegistry()), ProvisionInfo.withHosts(Collections.emptySet()));
+        deployer.deploy(applicationPackage, Collections.singletonMap(Version.fromIntValues(1, 0, 0), new MockFileRegistry()), AllocatedHosts.withHosts(Collections.emptySet()));
         assertTrue(configCurator.exists(appPath.getAbsolute()));
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
index 1719b71b071..dfa2b687587 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
@@ -13,7 +13,7 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.HostSpec;
 import com.yahoo.config.provision.InstanceName;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.container.jdisc.HttpResponse;
@@ -218,7 +218,7 @@ public class SessionActiveHandlerTest extends SessionHandlerTest {
         ZooKeeperClient zkC = new ZooKeeperClient(configCurator, new BaseDeployLogger(), false, pathProvider.getSessionDirs().append(String.valueOf(sessionId)));
         VespaModelFactory modelFactory = new VespaModelFactory(new NullConfigModelRegistry());
         zkC.feedZKFileRegistries(Collections.singletonMap(modelFactory.getVersion(), new MockFileRegistry()));
-        zkC.feedProvisionInfo(ProvisionInfo.withHosts(Collections.emptySet()));
+        zkC.feedProvisionInfo(AllocatedHosts.withHosts(Collections.emptySet()));
         TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder()
                 .curator(curator)
                 .configCurator(configCurator)
@@ -318,7 +318,7 @@ public class SessionActiveHandlerTest extends SessionHandlerTest {
 
         ActivateRequest invoke(boolean createLocalSession) throws Exception {
             SessionZooKeeperClient zkClient = new MockSessionZKClient(curator, pathProvider.getSessionDirs().append(String.valueOf(sessionId)),
-                                                                      Optional.of(ProvisionInfo.withHosts(Collections.singleton(new HostSpec("bar", Collections.emptyList())))));
+                                                                      Optional.of(AllocatedHosts.withHosts(Collections.singleton(new HostSpec("bar", Collections.emptyList())))));
             session = createRemoteSession(sessionId, initialStatus, zkClient, clock);
             if (createLocalSession) {
                 LocalSessionRepo repo = addLocalSession(sessionId, deployData, zkClient);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/provision/StaticProvisionerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/provision/StaticProvisionerTest.java
index 2b936a42574..badcdf53b77 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/provision/StaticProvisionerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/provision/StaticProvisionerTest.java
@@ -30,7 +30,7 @@ public class StaticProvisionerTest {
         InMemoryProvisioner inMemoryHostProvisioner = new InMemoryProvisioner(false, "host1.yahoo.com", "host2.yahoo.com", "host3.yahoo.com", "host4.yahoo.com");
         VespaModel firstModel = createModel(app, inMemoryHostProvisioner);
 
-        StaticProvisioner staticProvisioner = new StaticProvisioner(firstModel.provisionInfo());
+        StaticProvisioner staticProvisioner = new StaticProvisioner(firstModel.allocatedHosts());
         VespaModel secondModel = createModel(app, staticProvisioner);
 
         assertModelConfig(firstModel, secondModel);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
index f4be4d31943..adb4defe1b7 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
@@ -125,14 +125,14 @@ public class LocalSessionTest {
 
     @Test
     public void require_that_provision_info_can_be_read() throws Exception {
-        ProvisionInfo input = ProvisionInfo.withHosts(Collections.singleton(new HostSpec("myhost", Collections.<String>emptyList())));
+        AllocatedHosts input = AllocatedHosts.withHosts(Collections.singleton(new HostSpec("myhost", Collections.<String>emptyList())));
 
         LocalSession session = createSession(TenantName.defaultName(), 3, new SessionTest.MockSessionPreparer(), Optional.of(input));
         ApplicationId origId = new ApplicationId.Builder()
                                .tenant("tenant")
                                .applicationName("foo").instanceName("quux").build();
         doPrepare(session, new PrepareParams.Builder().applicationId(origId).build(), Instant.now());
-        ProvisionInfo info = session.getProvisionInfo();
+        AllocatedHosts info = session.getProvisionInfo();
         assertNotNull(info);
         assertThat(info.getHosts().size(), is(1));
         assertTrue(info.getHosts().contains(new HostSpec("myhost", Collections.emptyList())));
@@ -151,16 +151,16 @@ public class LocalSessionTest {
     }
 
     private LocalSession createSession(TenantName tenant, long sessionId, SessionTest.MockSessionPreparer preparer) throws Exception {
-        return createSession(tenant, sessionId, preparer, Optional.<ProvisionInfo>empty());
+        return createSession(tenant, sessionId, preparer, Optional.<AllocatedHosts>empty());
     }
 
-    private LocalSession createSession(TenantName tenant, long sessionId, SessionTest.MockSessionPreparer preparer, Optional<ProvisionInfo> provisionInfo) throws Exception {
+    private LocalSession createSession(TenantName tenant, long sessionId, SessionTest.MockSessionPreparer preparer, Optional<AllocatedHosts> allocatedHosts) throws Exception {
         Path appPath = Path.fromString("/" + sessionId);
-        SessionZooKeeperClient zkc = new MockSessionZKClient(curator, appPath, provisionInfo);
+        SessionZooKeeperClient zkc = new MockSessionZKClient(curator, appPath, allocatedHosts);
         zkc.createWriteStatusTransaction(Session.Status.NEW).commit();
         ZooKeeperClient zkClient = new ZooKeeperClient(configCurator, new BaseDeployLogger(), false, appPath);
-        if (provisionInfo.isPresent()) {
-            zkClient.feedProvisionInfo(provisionInfo.get());
+        if (allocatedHosts.isPresent()) {
+            zkClient.feedProvisionInfo(allocatedHosts.get());
         }
         zkClient.feedZKFileRegistries(Collections.singletonMap(Version.fromIntValues(0, 0, 0), new MockFileRegistry()));
         File sessionDir = new File(tenantFileSystemDirs.path(), String.valueOf(sessionId));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/MockSessionZKClient.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/MockSessionZKClient.java
index 9b658a807b9..ddeb2e5dc75 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/MockSessionZKClient.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/MockSessionZKClient.java
@@ -3,7 +3,7 @@ package com.yahoo.vespa.config.server.session;
 
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.test.MockApplicationPackage;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.transaction.Transaction;
 import com.yahoo.path.Path;
 import com.yahoo.vespa.curator.Curator;
@@ -14,22 +14,21 @@ import java.util.Optional;
 /**
  * Overrides application package fetching, because this part is hard to do without feeding a full app.
  *
- * @author lulf
- * @since 5.1
+ * @author Ulf Lilleengen
  */
 public class MockSessionZKClient extends SessionZooKeeperClient {
 
     private ApplicationPackage app = null;
-    private Optional<ProvisionInfo> info = null;
+    private Optional<AllocatedHosts> info = null;
     private Session.Status sessionStatus;
 
     public MockSessionZKClient(Curator curator, Path rootPath) {
         this(curator, rootPath, (ApplicationPackage)null);
     }
 
-    public MockSessionZKClient(Curator curator, Path rootPath, Optional<ProvisionInfo> provisionInfo) {
+    public MockSessionZKClient(Curator curator, Path rootPath, Optional<AllocatedHosts> allocatedHosts) {
         this(curator, rootPath);
-        this.info = provisionInfo;
+        this.info = allocatedHosts;
     }
 
     public MockSessionZKClient(Curator curator, Path rootPath, ApplicationPackage application) {
@@ -49,8 +48,8 @@ public class MockSessionZKClient extends SessionZooKeeperClient {
     }
 
     @Override
-    ProvisionInfo getProvisionInfo() {
-        return info.orElseThrow(() -> new IllegalStateException("Trying to read provision info, but no provision info exists"));
+    AllocatedHosts getProvisionInfo() {
+        return info.orElseThrow(() -> new IllegalStateException("Could not find allocated hosts"));
     }
 
     @Override
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
index 3dccee1572c..3b67597c43c 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
@@ -8,7 +8,7 @@ import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.config.model.application.provider.MockFileRegistry;
 import com.yahoo.config.provision.ApplicationName;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.Version;
 import com.yahoo.io.IOUtils;
 import com.yahoo.path.Path;
@@ -95,7 +95,7 @@ public class TenantRequestHandlerTest extends TestWithCurator {
         File app = tempFolder.newFolder();
         IOUtils.copyDirectory(appDir, app);
         ZooKeeperDeployer deployer = zkc.createDeployer(new BaseDeployLogger());
-        deployer.deploy(FilesApplicationPackage.fromFile(appDir), Collections.singletonMap(vespaVersion, new MockFileRegistry()), ProvisionInfo.withHosts(Collections.emptySet()));
+        deployer.deploy(FilesApplicationPackage.fromFile(appDir), Collections.singletonMap(vespaVersion, new MockFileRegistry()), AllocatedHosts.withHosts(Collections.emptySet()));
     }
 
     private ApplicationSet reloadConfig(long id, Clock clock) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java
index 9e91b97806d..adf26dbfa32 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java
@@ -16,7 +16,7 @@ import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.HostSpec;
 import com.yahoo.config.provision.NodeFlavors;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.Version;
 import com.yahoo.config.provisioning.FlavorsConfig;
 import com.yahoo.path.Path;
@@ -33,7 +33,7 @@ public class ZKApplicationPackageTest extends TestWithCurator {
     private static final String APP = "src/test/apps/zkapp";
     private static final String TEST_FLAVOR_NAME = "test-flavor";
     private static final Optional<Flavor> TEST_FLAVOR = new MockNodeFlavors().getFlavor(TEST_FLAVOR_NAME);
-    private static final ProvisionInfo provisionInfo = ProvisionInfo.withHosts(
+    private static final AllocatedHosts ALLOCATED_HOSTS = AllocatedHosts.withHosts(
             Collections.singleton(new HostSpec("foo.yahoo.com", Collections.emptyList(), TEST_FLAVOR, Optional.empty())));
 
     @Rule
@@ -64,8 +64,8 @@ public class ZKApplicationPackageTest extends TestWithCurator {
         assertTrue(zkApp.getFileRegistryMap().containsKey(goodVersion));
         assertFalse(zkApp.getFileRegistryMap().containsKey(Version.fromIntValues(0, 0, 0)));
         assertThat(zkApp.getFileRegistryMap().get(goodVersion).fileSourceHost(), is("dummyfiles"));
-        ProvisionInfo readInfo = zkApp.getProvisionInfo().get();
-        assertThat(Utf8.toString(readInfo.toJson()), is(Utf8.toString(provisionInfo.toJson())));
+        AllocatedHosts readInfo = zkApp.getAllocatedHosts().get();
+        assertThat(Utf8.toString(readInfo.toJson()), is(Utf8.toString(ALLOCATED_HOSTS.toJson())));
         assertThat(readInfo.getHosts().iterator().next().flavor(), is(TEST_FLAVOR));
         assertTrue(zkApp.getDeployment().isPresent());
         assertThat(DeploymentSpec.fromXml(zkApp.getDeployment().get()).globalServiceId().get(), is("mydisc"));
@@ -77,7 +77,7 @@ public class ZKApplicationPackageTest extends TestWithCurator {
         String metaData = "{\"deploy\":{\"user\":\"foo\",\"from\":\"bar\",\"timestamp\":1},\"application\":{\"name\":\"foo\",\"checksum\":\"abc\",\"generation\":4,\"previousActiveGeneration\":3}}";
         zk.putData("/0", ConfigCurator.META_ZK_PATH, metaData);
         zk.putData("/0/" + ZKApplicationPackage.fileRegistryNode + "/3.0.0", "dummyfiles");
-        zk.putData("/0/" + ZKApplicationPackage.allocatedHostsNode + "/3.0.0", provisionInfo.toJson());
+        zk.putData("/0/" + ZKApplicationPackage.allocatedHostsNode + "/3.0.0", ALLOCATED_HOSTS.toJson());
     }
 
     private static class MockNodeFlavors extends NodeFlavors{