Merge branch 'master' into gjoranv/exclude-scala-xml

21 files changed, 123 insertions, 55 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java
index 85f05116e5b..f909f3864da 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java
@@ -14,7 +14,6 @@ import java.util.List;
  * application if one exists. Pre-condition: A valid hosts file.
  *
  * @author hmusum
- * @since 5.11
  */
 public class HostsXmlProvisioner implements HostProvisioner {
 
diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
index 133d94c745b..8b97eb2503e 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
@@ -25,6 +25,7 @@ import java.util.*;
  * @author tonytv
  */
 public class MockApplicationPackage implements ApplicationPackage {
+
     public static final String MUSIC_SEARCHDEFINITION = createSearchDefinition("music", "foo");
     public static final String BOOK_SEARCHDEFINITION = createSearchDefinition("book", "bar");
 
diff --git a/config-model/src/main/java/com/yahoo/config/model/test/TestDriver.java b/config-model/src/main/java/com/yahoo/config/model/test/TestDriver.java
index 55c522025fb..b538468d0bc 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/TestDriver.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/TestDriver.java
@@ -5,7 +5,8 @@ import com.google.common.annotations.Beta;
 import com.yahoo.component.Version;
 import com.yahoo.config.model.MapConfigModelRegistry;
 import com.yahoo.config.application.api.ApplicationPackage;
-import com.yahoo.config.model.application.provider.SchemaValidator;
+import com.yahoo.config.model.application.provider.BaseDeployLogger;
+import com.yahoo.config.model.application.provider.SchemaValidators;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.builder.xml.ConfigModelBuilder;
 import com.yahoo.vespa.model.VespaModel;
@@ -102,11 +103,10 @@ public class TestDriver {
         if (!validate) {
             return;
         }
-        SchemaValidator validator = SchemaValidator.createTestValidatorHosts(new Version(6));
+        SchemaValidators schemaValidators = new SchemaValidators(new Version(6), new BaseDeployLogger());
         if (appPkg.getHosts() != null) {
-            validator.validate(appPkg.getHosts());
+            schemaValidators.hostsXmlValidator().validate(appPkg.getHosts());
         }
-        validator = SchemaValidator.createTestValidatorServices(new Version(6));
-        validator.validate(appPkg.getServices());
+        schemaValidators.servicesXmlValidator().validate(appPkg.getServices());
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
index 6d4945f23ad..38e417aca9e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
@@ -45,7 +45,7 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
 
     /** The optional PRELOAD libraries for this Service. */
     // Please keep non-null, as passed to command line in service startup
-    private String preload = Defaults.getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so");
+    private String preload = Defaults.getDefaults().underVespaHome("lib64/vespa/malloc/libvespamallocd.so");
 
     // If larger or equal to 0 it mean that explicit mmaps shall not be included in coredump.
     private long mmapNoCoreLimit = -1l;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
index bc890755ca9..5e74a2ebc8a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
  * TODO: Merge with {@link Host}
  * Host resources are ordered by their host order.
  *
- * @author Ulf Lillengen
+ * @author Ulf Lilleengen
  */
 public class HostResource implements Comparable<HostResource> {
 
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 139fec80983..eda8b564ffd 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
@@ -21,7 +21,7 @@ import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.config.model.producer.AbstractConfigProducerRoot;
 import com.yahoo.config.model.producer.UserConfigRepo;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.log.LogLevel;
 import com.yahoo.vespa.config.ConfigDefinitionKey;
 import com.yahoo.vespa.config.ConfigKey;
@@ -83,7 +83,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
 
     public static final Logger log = Logger.getLogger(VespaModel.class.getPackage().toString());
     private ConfigModelRepo configModelRepo = new ConfigModelRepo();
-    private final Optional<ProvisionInfo> info;
+    private final AllocatedHosts allocatedHosts;
 
     /**
      * The config id for the root config producer
@@ -146,7 +146,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
         if (complete) { // create a a completed, frozen model
             configModelRepo.readConfigModels(deployState, builder, root, configModelRegistry);
             addServiceClusters(deployState.getApplicationPackage(), builder);
-            this.info = Optional.of(createProvisionInfo()); // must happen after the two lines above
+            this.allocatedHosts = AllocatedHosts.withHosts(root.getHostSystem().getHostSpecs()); // must happen after the two lines above
             setupRouting();
             this.fileDistributor = root.getFileDistributionConfigProducer().getFileDistributor();
             getAdmin().addPerHostServices(getHostSystem().getHosts(), deployState.getProperties());
@@ -157,7 +157,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
             this.deployState = null;
         }
         else { // create a model with no services instantiated and the given file distributor
-            this.info = Optional.of(createProvisionInfo());
+            this.allocatedHosts = AllocatedHosts.withHosts(root.getHostSystem().getHostSpecs());
             this.fileDistributor = fileDistributor;
         }
     }
@@ -167,10 +167,6 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
         return new VespaModel(new NullConfigModelRegistry(), deployState, false, new FileDistributor(deployState.getFileRegistry()));
     }
 
-    private ProvisionInfo createProvisionInfo() {
-        return ProvisionInfo.withHosts(root.getHostSystem().getHostSpecs());
-    }
-
     private void validateWrapExceptions() {
         try {
             validate();
@@ -421,8 +417,8 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
     }
 
     @Override
-    public Optional<ProvisionInfo> getProvisionInfo() {
-        return info;
+    public AllocatedHosts allocatedHosts() {
+        return allocatedHosts;
     }
 
     private static Set<ConfigKey<?>> configsProduced(ConfigProducer cp) {
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 215aa6c2f7f..fc27f9e8dc7 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
@@ -34,7 +34,7 @@ import java.util.logging.Logger;
 /**
  * Factory for creating {@link VespaModel} instances.
  *
- * @author lulf
+ * @author Ulf Lilleengen
  */
 public class VespaModelFactory implements ModelFactory {
 
@@ -42,9 +42,17 @@ public class VespaModelFactory implements ModelFactory {
     private final ConfigModelRegistry configModelRegistry;
     private final Zone zone;
     private final Clock clock;
+    private final Version version;
 
+    /** Creates a factory for vespa models for this version of the source */
     @Inject
     public VespaModelFactory(ComponentRegistry<ConfigModelPlugin> pluginRegistry, Zone zone) {
+        this(Version.fromIntValues(VespaVersion.major, VespaVersion.minor, VespaVersion.micro), pluginRegistry, zone);
+    }
+
+    /** Creates a factory for vespa models of a particular version */
+    public VespaModelFactory(Version version, ComponentRegistry<ConfigModelPlugin> pluginRegistry, Zone zone) {
+        this.version = version;
         List<ConfigModelBuilder> modelBuilders = new ArrayList<>();
         for (ConfigModelPlugin plugin : pluginRegistry.allComponents()) {
             if (plugin instanceof ConfigModelBuilder) {
@@ -55,11 +63,15 @@ public class VespaModelFactory implements ModelFactory {
         this.zone = zone;
         this.clock = Clock.systemUTC();
     }
-
+    
     public VespaModelFactory(ConfigModelRegistry configModelRegistry) {
         this(configModelRegistry, Clock.systemUTC());
     }
     public VespaModelFactory(ConfigModelRegistry configModelRegistry, Clock clock) {
+        this(Version.fromIntValues(VespaVersion.major, VespaVersion.minor, VespaVersion.micro), configModelRegistry, clock);
+    }
+    public VespaModelFactory(Version version, ConfigModelRegistry configModelRegistry, Clock clock) {
+        this.version = version;
         if (configModelRegistry == null) {
             this.configModelRegistry = new NullConfigModelRegistry();
             log.info("Will not load config models from plugins, as no registry is available");
@@ -72,9 +84,7 @@ public class VespaModelFactory implements ModelFactory {
 
     /** Returns the version this model is build for */
     @Override
-    public Version getVersion() {
-        return Version.fromIntValues(VespaVersion.major, VespaVersion.minor, VespaVersion.micro);
-    }
+    public Version getVersion() { return version; }
 
     @Override
     public Model createModel(ModelContext modelContext) {
@@ -82,8 +92,7 @@ public class VespaModelFactory implements ModelFactory {
     }
 
     @Override
-    public ModelCreateResult createAndValidateModel(ModelContext modelContext, 
-                                                    boolean ignoreValidationErrors) {
+    public ModelCreateResult createAndValidateModel(ModelContext modelContext, boolean ignoreValidationErrors) {
         validateXml(modelContext, ignoreValidationErrors);
         DeployState deployState = createDeployState(modelContext);
         VespaModel model = buildModel(deployState);
@@ -94,18 +103,16 @@ public class VespaModelFactory implements ModelFactory {
     private void validateXml(ModelContext modelContext, boolean ignoreValidationErrors) {
         if (modelContext.appDir().isPresent()) {
             ApplicationPackageXmlFilesValidator validator =
-                    ApplicationPackageXmlFilesValidator.createDefaultXMLValidator(modelContext.appDir().get(),
-                                                                                  modelContext.modelVespaVersion());
+                    ApplicationPackageXmlFilesValidator.create(modelContext.appDir().get(),
+                                                               modelContext.modelVespaVersion());
             try {
                 validator.checkApplication();
-                ApplicationPackageXmlFilesValidator.checkIncludedDirs(modelContext.applicationPackage(), 
-                                                                      modelContext.modelVespaVersion());
+                validator.checkIncludedDirs(modelContext.applicationPackage());
             } catch (IllegalArgumentException e) {
                 rethrowUnlessIgnoreErrors(e, ignoreValidationErrors);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-
         } else {
             validateXML(modelContext.applicationPackage(), ignoreValidationErrors);
         }
@@ -164,7 +171,6 @@ public class VespaModelFactory implements ModelFactory {
 
     private List<ConfigChangeAction> validateModel(VespaModel model, DeployState deployState, boolean ignoreValidationErrors) {
         try {
-            deployState.getApplicationPackage().validateXML();
             return Validation.validate(model, ignoreValidationErrors, deployState);
         } catch (IllegalArgumentException e) {
             rethrowUnlessIgnoreErrors(e, ignoreValidationErrors);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
index 0867fc2a299..cefc08981a4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
@@ -41,7 +41,7 @@ public class Slobrok extends AbstractService {
     }
 
     public String getStartupCommand() {
-        return "exec $ROOT/bin/vespa-slobrok -p " + getPort() +
+        return "exec $ROOT/sbin/vespa-slobrok -p " + getPort() +
                 " -s " + getStatePort() +
                 " -c " + getConfigId();
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java
index 414cc56b1e3..c9cc51af867 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java
@@ -19,8 +19,7 @@ import java.util.List;
 /**
  * Builds the config model for the standalone config server.
  *
- * @author lulf
- * @since 5.16
+ * @author Ulf Lilleengen
  */
 public class ConfigServerContainerModelBuilder extends ContainerModelBuilder {
 
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc
index 3ce5e002e53..36897643964 100644
--- a/config-model/src/main/resources/schema/deployment.rnc
+++ b/config-model/src/main/resources/schema/deployment.rnc
@@ -25,7 +25,8 @@ Staging = element staging {
 Prod = element prod {
    attribute global-service-id { text }? &
    Region* &
-   Delay*
+   Delay* &
+   Parallel*
 }
 
 Region = element region {
@@ -38,3 +39,7 @@ Delay = element delay {
    attribute minutes { xsd:long }? &
    attribute seconds { xsd:long }?
 }
+
+Parallel = element parallel {
+    Region*
+}
diff --git a/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml
new file mode 100644
index 00000000000..0d3b74b8119
--- /dev/null
+++ b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml
@@ -0,0 +1,11 @@
+<deployment version="1.0">
+  <test/>
+  <staging/>
+  <prod global-service-id="query">
+    <parallel>
+      <region active="true">us-east-3</region>
+      <delay hours="1"/>
+      <region active="true">us-west-1</region>
+    </parallel>
+  </prod>
+</deployment>
diff --git a/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/hosts.xml b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/hosts.xml
new file mode 100644
index 00000000000..115efd488d0
--- /dev/null
+++ b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/hosts.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<hosts>
+  <host name="localhost">
+    <alias>node1</alias>
+  </host>
+    <host name="schmocalhost">
+    <alias>node2</alias>
+  </host>
+</hosts>
diff --git a/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/services.xml b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/services.xml
new file mode 100644
index 00000000000..03d8fc012ac
--- /dev/null
+++ b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/services.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<services version="1.0">
+
+  <admin version="2.0">
+    <adminserver hostalias="node1"/>
+  </admin>
+
+  <container version="1.0">
+    <nodes>
+      <node hostalias="node1" />
+    </nodes>
+    <search/>
+  </container>
+
+</services>
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
index ee2e6ffcc74..3d5c9b1c187 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
@@ -196,7 +196,7 @@ public class ApplicationDeployTest {
 
     @Test
     public void testThatModelIsRebuiltWhenSearchDefinitionIsAdded() throws IOException {
-        File tmpDir = Files.createTempDir();
+        File tmpDir = tmpFolder.getRoot();
         IOUtils.copyDirectory(new File(TESTDIR, "app1"), tmpDir);
         FilesApplicationPackage app = createAppPkg(tmpDir.getAbsolutePath());
         assertThat(getSearchDefinitions(app).size(), is(5));
@@ -208,25 +208,37 @@ public class ApplicationDeployTest {
 
     @Test
     public void testThatAppWithDeploymentXmlIsValid() throws IOException {
-        File tmpDir = Files.createTempDir();
+        File tmpDir = tmpFolder.getRoot();
         IOUtils.copyDirectory(new File(TESTDIR, "app1"), tmpDir);
         createAppPkg(tmpDir.getAbsolutePath());
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testThatAppWithIllegalDeploymentXmlIsNotValid() throws IOException {
-        File tmpDir = Files.createTempDir();
+        File tmpDir = tmpFolder.getRoot();
         IOUtils.copyDirectory(new File(TESTDIR, "app_invalid_deployment_xml"), tmpDir);
         createAppPkg(tmpDir.getAbsolutePath());
     }
 
     @Test
     public void testThatAppWithIllegalEmptyProdRegion() throws IOException {
-        File tmpDir = Files.createTempDir();
+        File tmpDir = tmpFolder.getRoot();
         IOUtils.copyDirectory(new File(TESTDIR, "empty_prod_region_in_deployment_xml"), tmpDir);
         createAppPkg(tmpDir.getAbsolutePath());
     }
 
+    @Test
+    public void testThatAppWithInvalidParallelDeploymentFails() throws IOException {
+        File tmpDir = tmpFolder.getRoot();
+        IOUtils.copyDirectory(new File(TESTDIR, "invalid_parallel_deployment_xml"), tmpDir);
+        try {
+            createAppPkg(tmpDir.getAbsolutePath());
+            fail("Expected exception");
+        } catch (IllegalArgumentException e) {
+            assertThat(e.getMessage(), containsString("element \"delay\" not allowed here"));
+        }
+    }
+
     private List<SearchDefinition> getSearchDefinitions(FilesApplicationPackage app) {
         return new DeployState.Builder().applicationPackage(app).build().getSearchDefinitions();
     }
@@ -242,9 +254,10 @@ public class ApplicationDeployTest {
     public FilesApplicationPackage createAppPkg(String appPkg, boolean validateXml) throws IOException {
         final FilesApplicationPackage filesApplicationPackage = FilesApplicationPackage.fromFile(new File(appPkg));
         if (validateXml) {
-            ApplicationPackageXmlFilesValidator validator = ApplicationPackageXmlFilesValidator.createTestXmlValidator(new File(appPkg), new Version(6));
+            ApplicationPackageXmlFilesValidator validator =
+                    ApplicationPackageXmlFilesValidator.create(new File(appPkg), new Version(6));
             validator.checkApplication();
-            ApplicationPackageXmlFilesValidator.checkIncludedDirs(filesApplicationPackage, new Version(6));
+            validator.checkIncludedDirs(filesApplicationPackage);
         }
         return filesApplicationPackage;
     }
diff --git a/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java b/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java
index 42659755186..fda230e22ab 100644
--- a/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java
@@ -65,6 +65,6 @@ public class SchemaValidatorTest {
     }
 
     private SchemaValidator createValidator() throws IOException {
-        return SchemaValidator.createTestValidatorServices(new Version(6));
+        return new SchemaValidators(new Version(6)).servicesXmlValidator();
     }
 }
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java
index 6a17f314d26..51b039a7532 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java
@@ -11,10 +11,10 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 /**
- * @author lulf
- * @since 5.11
+ * @author Ulf Lilleengen
  */
 public class HostSpecTest {
+
     @Test
     public void testEquals() {
         HostSpec h1 = new HostSpec("foo", Collections.<String>emptyList());
@@ -42,4 +42,5 @@ public class HostSpecTest {
         assertFalse(h4.equals(h3));
         assertTrue(h4.equals(h4));
     }
+
 }
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 63d5d37598b..98f599769c0 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
@@ -110,9 +110,9 @@ public class ModelProvisioningTest {
         assertThat(model.getContainerClusters().get("mydisc").getContainers().get(0).getJvmArgs(), is(""));
         assertThat(model.getContainerClusters().get("mydisc").getContainers().get(1).getJvmArgs(), is(""));
         assertThat(model.getContainerClusters().get("mydisc").getContainers().get(2).getJvmArgs(), is(""));
-        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(0).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so")));
-        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(1).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so")));
-        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(2).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so")));
+        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(0).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamallocd.so")));
+        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(1).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamallocd.so")));
+        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(2).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamallocd.so")));
         assertThat(model.getContainerClusters().get("mydisc").getMemoryPercentage(), is(Optional.empty()));
 
         assertThat(model.getContainerClusters().get("mydisc2").getContainers().get(0).getJvmArgs(), is("-verbosegc"));
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 8102f358830..cc3f4a22966 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
@@ -18,7 +18,7 @@ import com.yahoo.config.model.provision.InMemoryProvisioner;
 import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.config.model.test.TestDriver;
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.document.config.DocumentmanagerConfig;
 import com.yahoo.messagebus.MessagebusConfig;
 import com.yahoo.net.HostName;
@@ -286,7 +286,7 @@ public class VespaModelTestCase {
                         .build())
                 .build();
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
-        ProvisionInfo info = model.getProvisionInfo().get();
+        AllocatedHosts info = model.allocatedHosts();
         assertEquals("Admin version 3 is ignored, and there are no other hosts to borrow for admin services", 0, info.getHosts().size());
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithFilePkg.java b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithFilePkg.java
index 7802b6f51cd..c89d3098c4d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithFilePkg.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithFilePkg.java
@@ -45,8 +45,10 @@ public class VespaModelCreatorWithFilePkg {
     }
 
     public void validate() throws IOException {
-        ApplicationPackageXmlFilesValidator.createTestXmlValidator(applicationPkg.getAppDir(), new Version(6)).checkApplication();
-        ApplicationPackageXmlFilesValidator.checkIncludedDirs(applicationPkg, new Version(6));
+        ApplicationPackageXmlFilesValidator validator =
+                ApplicationPackageXmlFilesValidator.create(applicationPkg.getAppDir(), new Version(6));
+        validator.checkApplication();
+        validator.checkIncludedDirs(applicationPkg);
     }
 
     public VespaModel create(boolean validateApplicationWithSchema) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithMockPkg.java b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithMockPkg.java
index 98e9fd7b166..8bb500906f3 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithMockPkg.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithMockPkg.java
@@ -6,8 +6,8 @@ import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.ConfigModelRegistry;
 import com.yahoo.config.model.NullConfigModelRegistry;
 import com.yahoo.config.model.api.ConfigChangeAction;
+import com.yahoo.config.model.application.provider.SchemaValidators;
 import com.yahoo.config.model.deploy.DeployState;
-import com.yahoo.config.model.application.provider.SchemaValidator;
 import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.application.validation.Validation;
@@ -56,14 +56,15 @@ public class VespaModelCreatorWithMockPkg {
             VespaModel model = new VespaModel(configModelRegistry, deployState);
             Version vespaVersion = new Version(6);
             if (validate) {
+                SchemaValidators validators = new SchemaValidators(vespaVersion);
                 try {
                     if (appPkg.getHosts() != null) {
-                        SchemaValidator.createTestValidatorHosts(vespaVersion).validate(appPkg.getHosts());
+                        validators.hostsXmlValidator().validate(appPkg.getHosts());
                     }
                     if (appPkg.getDeployment().isPresent()) {
-                        SchemaValidator.createTestValidatorDeployment(vespaVersion).validate(appPkg.getDeployment().get());
+                        validators.deploymentXmlValidator().validate(appPkg.getDeployment().get());
                     }
-                    SchemaValidator.createTestValidatorServices(vespaVersion).validate(appPkg.getServices());
+                    validators.servicesXmlValidator().validate(appPkg.getServices());
                 } catch (Exception e) {
                     System.err.println(e.getClass());
                     throw e instanceof RuntimeException ? (RuntimeException) e : new RuntimeException(e);
diff --git a/config-model/src/test/schema-test-files/deployment.xml b/config-model/src/test/schema-test-files/deployment.xml
index 89b52bc44ca..99b1dc1be69 100644
--- a/config-model/src/test/schema-test-files/deployment.xml
+++ b/config-model/src/test/schema-test-files/deployment.xml
@@ -9,5 +9,13 @@
         <region active='true'>us-central-1</region>
         <delay hours='3' minutes='7' seconds='13'/>
         <region active='true'>us-east-3</region>
+        <parallel>
+            <region active='true'>us-north-1</region>
+            <region active='true'>us-south-1</region>
+        </parallel>
+        <parallel>
+            <region active='true'>us-north-2</region>
+            <region active='true'>us-south-2</region>
+        </parallel>
     </prod>
 </deployment>