Cleanup creation of host provisioner

3 files changed, 11 insertions, 10 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
index 5de03f17958..d6673cd49e9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model;
 
 import ai.vespa.rankingexpression.importer.configmodelview.MlModelImporter;
@@ -11,7 +11,6 @@ import com.yahoo.config.model.MapConfigModelRegistry;
 import com.yahoo.config.model.NullConfigModelRegistry;
 import com.yahoo.config.model.api.ConfigChangeAction;
 import com.yahoo.config.model.api.ConfigModelPlugin;
-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.ModelCreateResult;
@@ -22,10 +21,8 @@ import com.yahoo.config.model.builder.xml.ConfigModelBuilder;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.provision.TransientException;
 import com.yahoo.config.provision.Zone;
-import com.yahoo.container.QrConfig;
 import com.yahoo.vespa.config.VespaVersion;
 import com.yahoo.vespa.model.application.validation.Validation;
-import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
@@ -147,7 +144,7 @@ public class VespaModelFactory implements ModelFactory {
             .permanentApplicationPackage(modelContext.permanentApplicationPackage())
             .properties(modelContext.properties())
             .vespaVersion(version())
-            .modelHostProvisioner(createHostProvisioner(modelContext))
+            .modelHostProvisioner(modelContext.getHostProvisioner())
             .provisioned(modelContext.provisioned())
             .endpoints(modelContext.properties().endpoints())
             .modelImporters(modelImporters)
@@ -160,11 +157,6 @@ public class VespaModelFactory implements ModelFactory {
         return builder.build(validationParameters);
     }
 
-    private static HostProvisioner createHostProvisioner(ModelContext modelContext) {
-        return modelContext.hostProvisioner().orElse(
-                DeployState.getDefaultModelHostProvisioner(modelContext.applicationPackage()));
-    }
-
     private void validateXML(ApplicationPackage applicationPackage, boolean ignoreValidationErrors) {
         try {
             applicationPackage.validateXML();
diff --git a/config-model/src/test/java/com/yahoo/config/model/MockModelContext.java b/config-model/src/test/java/com/yahoo/config/model/MockModelContext.java
index f8ab3cc54c8..98cbd363bca 100644
--- a/config-model/src/test/java/com/yahoo/config/model/MockModelContext.java
+++ b/config-model/src/test/java/com/yahoo/config/model/MockModelContext.java
@@ -13,6 +13,7 @@ import com.yahoo.config.model.api.Provisioned;
 import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.model.application.provider.MockFileRegistry;
 import com.yahoo.config.model.application.provider.StaticConfigDefinitionRepo;
+import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.deploy.TestProperties;
 import com.yahoo.config.model.test.MockApplicationPackage;
 
@@ -54,6 +55,11 @@ public class MockModelContext implements ModelContext {
     }
 
     @Override
+    public HostProvisioner getHostProvisioner() {
+        return DeployState.getDefaultModelHostProvisioner(applicationPackage);
+    }
+
+    @Override
     public Provisioned provisioned() { return new Provisioned(); }
 
     @Override
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java b/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java
index a9bf8bdcc49..33f9d715801 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java
@@ -146,6 +146,9 @@ public class VespaModelFactoryTest {
             }
 
             @Override
+            public HostProvisioner getHostProvisioner() { return provisionerToOverride; }
+
+            @Override
             public Properties properties() {
                 return new TestProperties();
             }