1 files changed, 15 insertions, 16 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java b/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java
index 0c038077fe4..f8f749ef070 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java
@@ -1,12 +1,11 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.api;
 
-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;
 
-import java.time.Clock;
 import java.time.Instant;
 import java.util.Optional;
 import java.util.Set;
@@ -16,8 +15,7 @@ import java.util.Collection;
  * A {@link Model} represents the interface towards the model of an entire tenant, and defines methods
  * for querying this model.
  *
- * @author lulf
- * @since 5.1
+ * @author Ulf Lilleengen
  */
 public interface Model {
 
@@ -60,9 +58,20 @@ public interface Model {
 
     /**
      * Get the provisioning info for this model.
-     * @return {@link ProvisionInfo} instance, if available.
+     * 
+     * @return {@link AllocatedHosts} instance, if available.
+     * @deprecated use allocatedHosts
      */
-    Optional<ProvisionInfo> getProvisionInfo();
+    @Deprecated
+    // TODO: Remove this (and the implementation below) when no version older than 6.143 is deployed anywhere
+    default Optional<AllocatedHosts> getProvisionInfo() {
+        return Optional.of(allocatedHosts());
+    }
+
+    @SuppressWarnings("deprecation")
+    default AllocatedHosts allocatedHosts() {
+        return getProvisionInfo().get();
+    }
 
     /**
      * Returns whether this application allows serving config request for a different version.
@@ -71,11 +80,6 @@ public interface Model {
      */
     default boolean allowModelVersionMismatch(Instant now) { return false; }
 
-    /** @deprecated pass now. */
-    // TODO: Remove this when no version older than 6.115 is deployed anywhere
-    @Deprecated
-    default boolean allowModelVersionMismatch() { return allowModelVersionMismatch(Clock.systemUTC().instant()); }
-
     /**
      * Returns whether old config models should be loaded (default) or not.
      * Skipping old config models is a validation override which is useful when the old model
@@ -88,9 +92,4 @@ public interface Model {
      */
     default boolean skipOldConfigModels(Instant now) { return false; }
     
-    /** @deprecated pass now. */
-    // TODO: Remove this when no version older than 6.115 is deployed anywhere
-    @Deprecated 
-    default boolean skipOldConfigModels() { return skipOldConfigModels(Clock.systemUTC().instant()); }
-
 }