Run Application with VespaModel instead of MockRoot

12 files changed, 65 insertions, 25 deletions

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 d3e922c69dc..041c1fc5386 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
@@ -5,12 +5,21 @@ import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.api.HostProvisioner;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.config.model.test.MockRoot;
-import com.yahoo.config.provision.*;
+import com.yahoo.config.provision.Capacity;
+import com.yahoo.config.provision.ClusterMembership;
+import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.config.provision.HostSpec;
+import com.yahoo.config.provision.ProvisionLogger;
 import com.yahoo.net.HostName;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.*;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
@@ -73,7 +82,7 @@ public class HostSystem extends AbstractConfigProducer<Host> {
      * @return The canonical hostname, or null if unable to resolve.
      * @throws UnknownHostException if the hostname cannot be resolved
      */
-    public static String lookupCanonicalHostname(String hostname) throws UnknownHostException {
+    private String lookupCanonicalHostname(String hostname) throws UnknownHostException {
         return java.net.InetAddress.getByName(hostname).getCanonicalHostName();
     }
 
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 9a23be1f5c5..4d736e848bd 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
@@ -100,6 +100,8 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
 
     /** The validation overrides of this. This is never null. */
     private final ValidationOverrides validationOverrides;
+    
+    private final FileDistributor fileDistributor;
 
     /** Creates a Vespa Model from internal model types only */
     public VespaModel(ApplicationPackage app) throws IOException, SAXException {
@@ -130,23 +132,41 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
      * @param deployState the global deploy state to use for this model.
      */
     public VespaModel(ConfigModelRegistry configModelRegistry, DeployState deployState) throws IOException, SAXException {
+        this(configModelRegistry, deployState, true, null);
+    }
+
+    private VespaModel(ConfigModelRegistry configModelRegistry, DeployState deployState, boolean freeze, FileDistributor fileDistributor) throws IOException, SAXException {
         super("vespamodel");
         this.deployState = deployState;
         this.validationOverrides = deployState.validationOverrides();
         configModelRegistry = new VespaConfigModelRegistry(configModelRegistry);
         VespaModelBuilder builder = new VespaDomBuilder();
         root = builder.getRoot(VespaModel.ROOT_CONFIGID, deployState, this);
-        configModelRepo.readConfigModels(deployState, builder, root, configModelRegistry);
-        addServiceClusters(deployState.getApplicationPackage(), builder);
-        setupRouting();
+        if (freeze) {
+            configModelRepo.readConfigModels(deployState, builder, root, configModelRegistry);
+            addServiceClusters(deployState.getApplicationPackage(), builder);
+            setupRouting();
+            this.fileDistributor = root.getFileDistributionConfigProducer().getFileDistributor();
+        }
+        else {
+            this.fileDistributor = fileDistributor;
+        }
         log.log(LogLevel.DEBUG, "hostsystem=" + getHostSystem());
         this.info = Optional.of(createProvisionInfo());
-        getAdmin().addPerHostServices(getHostSystem().getHosts(), deployState.getProperties());
-        freezeModelTopology();
-        root.prepare(configModelRepo);
-        configModelRepo.prepareConfigModels();
-        validateWrapExceptions();
-        this.deployState = null;
+        if (freeze)
+            getAdmin().addPerHostServices(getHostSystem().getHosts(), deployState.getProperties());
+        if (freeze) { // TODO: A little more than freezing ...
+            freezeModelTopology();
+            root.prepare(configModelRepo);
+            configModelRepo.prepareConfigModels();
+            validateWrapExceptions();
+            this.deployState = null;
+        }
+    }
+    
+    /** Creates a mutable model which must be completed, then frozen, before use */
+    public static VespaModel createMutable(DeployState deployState)  throws IOException, SAXException {
+        return new VespaModel(new NullConfigModelRegistry(), deployState, false, new FileDistributor(deployState.getFileRegistry()));
     }
 
     private ProvisionInfo createProvisionInfo() {
@@ -192,7 +212,8 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
     }
 
     public FileDistributor getFileDistributor() {
-        return root.getFileDistributionConfigProducer().getFileDistributor();
+        // return root.getFileDistributionConfigProducer().getFileDistributor();
+        return fileDistributor;
     }
 
     /** Returns this models Vespa instance */
@@ -437,9 +458,8 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
 
     @Override
     public DeployState getDeployState() {
-        if (deployState == null) {
+        if (deployState == null)
             throw new IllegalStateException("Cannot call getDeployState() once model has been built");
-        }
         return deployState;
     }
 
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 38a1e59433f..6949c5adf25 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
@@ -200,7 +200,7 @@ public class Admin extends AbstractConfigProducer implements Serializable {
         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());
+                                       fileDistributor.fileSourceHost() + "'. Hostsystem=" + getHostSystem());
         }
 
         FileDistributorService fds = new FileDistributorService(fileDistribution, host.getHost().getHostName(),
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java
index 11508ba91ed..47332b064da 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java
@@ -96,10 +96,12 @@ public class Configserver extends AbstractService {
 
     // TODO: Remove this implementation when we are on Hosted Vespa.
     public static class Spec implements ConfigServerSpec {
+
         private final String hostName;
         private final int configServerPort;
         private final int httpPort;
         private final int zooKeeperPort;
+
         public String getHostName() {
             return hostName;
         }
@@ -142,4 +144,5 @@ public class Configserver extends AbstractService {
             this.zooKeeperPort = zooKeeperPort;
         }
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java b/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java
index 55cfc8b2fba..c1ad6eead47 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java
@@ -26,7 +26,7 @@ import java.util.Set;
 import java.util.TreeSet;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  * @since 5.1.11
  */
 public class ContainerDocumentApi implements FeederConfig.Producer {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 485e206f9a3..743875b1ea5 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -328,6 +328,7 @@ public final class ContainerCluster
     private void addAndSendApplicationBundles() {
         for (ComponentInfo component : getRoot().getDeployState().getApplicationPackage().getComponentsInfo(getRoot().getDeployState().getProperties().vespaVersion())) {
             FileReference reference = FileSender.sendFileToServices(component.getPathRelativeToAppDir(), containers);
+            System.out.println("Adding app bundle " + component + ", reference " + reference);
             applicationBundles.add(reference);
         }
     }
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 e92bffe2542..1351933fbc8 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
@@ -16,6 +16,7 @@ import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.ClusterMembership;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.container.jdisc.config.MetricDefaultsConfig;
+import com.yahoo.path.Path;
 import com.yahoo.search.rendering.RendererRegistry;
 import com.yahoo.text.XML;
 import com.yahoo.vespa.defaults.Defaults;
@@ -104,7 +105,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         checkVersion(spec);
 
         this.log = modelContext.getDeployLogger();
-
         ContainerCluster cluster = createContainerCluster(spec, modelContext);
         addClusterContent(cluster, spec, modelContext);
         addBundlesForPlatformComponents(cluster);
@@ -587,9 +587,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
     private ContainerDocumentApi buildDocumentApi(ContainerCluster cluster, Element spec) {
         Element documentApiElement = XML.getChild(spec, "document-api");
-        if (documentApiElement == null) {
-            return null;
-        }
+        if (documentApiElement == null) return null;
 
         ContainerDocumentApi.Options documentApiOptions = DocumentApiOptionsBuilder.build(documentApiElement);
         return new ContainerDocumentApi(cluster, documentApiOptions);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
index df2090db166..b1ffd55b0f0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
@@ -12,10 +12,11 @@ import java.util.List;
 import java.util.logging.Logger;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  * @since 5.1.11
  */
 public class DocumentApiOptionsBuilder {
+
     private static final Logger log = Logger.getLogger(DocumentApiOptionsBuilder.class.getName());
     private static final String[] DEFAULT_BINDINGS = {"http://*/", "https://*/"};
 
@@ -116,4 +117,5 @@ public class DocumentApiOptionsBuilder {
         String value = getCleanValue(spec, "abortondocumenterror");
         return value == null ? null : Boolean.parseBoolean(value);
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProducer.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProducer.java
index 630118cc60c..095a5e29450 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProducer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProducer.java
@@ -13,6 +13,7 @@ import java.util.Map;
  * @author tonytv
  */
 public class FileDistributionConfigProducer extends AbstractConfigProducer {
+
     private final Map<Host, FileDistributorService> fileDistributorServices = new IdentityHashMap<>();
     private final FileDistributor fileDistributor;
     private final FileDistributionOptions options;
@@ -56,4 +57,5 @@ public class FileDistributionConfigProducer extends AbstractConfigProducer {
             return new FileDistributionConfigProducer(ancestor, fileDistributor, options);
         }
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java
index 4dc24618a61..df7b4f58ab5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java
@@ -117,4 +117,5 @@ public class FileDistributor {
         result.addAll(asList(additionalHosts));
         return result;
     }
+    
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
index 4ab9ed3af85..147e5f1bfa5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
@@ -142,8 +142,10 @@ public class FileSender implements Serializable {
         FileReference reference = sentFiles.get(path);
         if (reference == null) {
             reference = sendFileToServices(path, services);
-            sentFiles.put(path, reference);
+            if (reference != null) // null when standalone TODO: Create admin in StandaloneContainerApplication instead
+                sentFiles.put(path, reference);
         }
-        builder.setValue(reference.value());
+        if (reference != null) // null when standalone TODO: Create admin in StandaloneContainerApplication instead
+            builder.setValue(reference.value());
     }
 }
\ No newline at end of file
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/utils/FreezableMap.java b/config-model/src/main/java/com/yahoo/vespa/model/utils/FreezableMap.java
index a05008cc9a0..211413f9bff 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/utils/FreezableMap.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/utils/FreezableMap.java
@@ -4,8 +4,9 @@ package com.yahoo.vespa.model.utils;
 import java.util.*;
 
 /**
- * Delegates to a map that can be froozen.
+ * Delegates to a map that can be frozen.
  * Not thread safe.
+ *
  * @author tonytv
  */
 public class FreezableMap<K, V> implements Map<K, V> {
@@ -88,4 +89,5 @@ public class FreezableMap<K, V> implements Map<K, V> {
     public boolean isFrozen() {
         return frozen;
     }
+
 }