Merge branch 'master' into hmusum/throw-exception-when-specifyin-resource-limits

18 files changed, 288 insertions, 268 deletions

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 75cb41be13f..8f751631fb5 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
@@ -46,7 +46,7 @@ import static org.junit.Assert.fail;
 public class ApplicationDeployTest {
 
     private static final String TESTDIR = "src/test/cfg/application/";
-    private static final String TESTSDDIR = TESTDIR + "app1/searchdefinitions/";
+    private static final String TEST_SCHEMAS_DIR = TESTDIR + "app1/schemas/";
 
     @Rule
     public TemporaryFolder tmpFolder = new TemporaryFolder();
@@ -54,7 +54,7 @@ public class ApplicationDeployTest {
     @Test
     public void testVespaModel() throws SAXException, IOException {
         ApplicationPackageTester tester = ApplicationPackageTester.create(TESTDIR + "app1");
-        VespaModel model = new VespaModel(tester.app());
+        new VespaModel(tester.app());
         List<NamedSchema> schemas = tester.getSchemas();
         assertEquals(schemas.size(), 5);
         for (NamedSchema searchDefinition : schemas) {
@@ -73,11 +73,11 @@ public class ApplicationDeployTest {
                     fail();
             }
         }
-        assertEquals(Set.of(new File(TESTSDDIR + "laptop.sd"),
-                            new File(TESTSDDIR + "music.sd"),
-                            new File(TESTSDDIR + "pc.sd"),
-                            new File(TESTSDDIR + "product.sd"),
-                            new File(TESTSDDIR + "sock.sd")),
+        assertEquals(Set.of(new File(TEST_SCHEMAS_DIR + "laptop.sd"),
+                            new File(TEST_SCHEMAS_DIR + "music.sd"),
+                            new File(TEST_SCHEMAS_DIR + "pc.sd"),
+                            new File(TEST_SCHEMAS_DIR + "product.sd"),
+                            new File(TEST_SCHEMAS_DIR + "sock.sd")),
                      new HashSet<>(tester.app().getSearchDefinitionFiles()));
 
         List<FilesApplicationPackage.Component> components = tester.app().getComponents();
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 2b72420614d..b0ddadf11bd 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
@@ -38,7 +38,6 @@ import com.yahoo.yolean.Exceptions;
 import org.junit.Test;
 
 import java.io.StringReader;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -50,6 +49,7 @@ import static com.yahoo.config.model.test.TestUtil.joinLines;
 import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import static com.yahoo.vespa.model.search.NodeResourcesTuning.GB;
 import static com.yahoo.vespa.model.search.NodeResourcesTuning.reservedMemoryGb;
+import static com.yahoo.vespa.model.test.utils.ApplicationPackageUtils.generateSchemas;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -502,7 +502,6 @@ public class ModelProvisioningTest {
 
         // Check content clusters
         ContentCluster cluster = model.getContentClusters().get("bar");
-        assertNull("No own cluster controllers when hosted", cluster.getClusterControllers());
         assertEquals(0, cluster.getRootGroup().getNodes().size());
         assertEquals(9, cluster.getRootGroup().getSubgroups().size());
         assertEquals("0", cluster.getRootGroup().getSubgroups().get(0).getIndex());
@@ -536,7 +535,6 @@ public class ModelProvisioningTest {
         assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().get(2).getConfigId(), is("bar/storage/26"));
 
         cluster = model.getContentClusters().get("baz");
-        assertNull("No own cluster controllers when hosted", cluster.getClusterControllers());
         assertEquals(0, cluster.getRootGroup().getNodes().size());
         assertEquals(27, cluster.getRootGroup().getSubgroups().size());
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getIndex(), is("0"));
@@ -730,7 +728,6 @@ public class ModelProvisioningTest {
 
         // Check content cluster
         ContentCluster cluster = model.getContentClusters().get("bar");
-        assertNull(cluster.getClusterControllers());
         assertEquals(0, cluster.getRootGroup().getNodes().size());
         assertEquals(8, cluster.getRootGroup().getSubgroups().size());
         assertEquals(8, cluster.distributionBits());
@@ -865,8 +862,6 @@ public class ModelProvisioningTest {
         assertEquals(7, model.getRoot().hostSystem().getHosts().size());
 
         // Check cluster controllers
-        assertNull(model.getContentClusters().get("foo").getClusterControllers());
-        assertNull(model.getContentClusters().get("bar").getClusterControllers());
         ClusterControllerContainerCluster clusterControllers = model.getAdmin().getClusterControllers();
         assertEquals(3, clusterControllers.getContainers().size());
         assertEquals("cluster-controllers", clusterControllers.getName());
@@ -2021,7 +2016,7 @@ public class ModelProvisioningTest {
     }
 
     private VespaModel createNonProvisionedModel(boolean multitenant, String hosts, String services) {
-        VespaModelCreatorWithMockPkg modelCreatorWithMockPkg = new VespaModelCreatorWithMockPkg(hosts, services, ApplicationPackageUtils.generateSearchDefinition("type1"));
+        VespaModelCreatorWithMockPkg modelCreatorWithMockPkg = new VespaModelCreatorWithMockPkg(hosts, services, generateSchemas("type1"));
         ApplicationPackage appPkg = modelCreatorWithMockPkg.appPkg;
         DeployState deployState = new DeployState.Builder().applicationPackage(appPkg).
                 properties((new TestProperties()).setMultitenant(multitenant)).
@@ -2029,7 +2024,7 @@ public class ModelProvisioningTest {
         return modelCreatorWithMockPkg.create(false, deployState);
     }
 
-    private int physicalMemoryPercentage(ContainerCluster cluster) {
+    private int physicalMemoryPercentage(ContainerCluster<?> cluster) {
         QrStartConfig.Builder b = new QrStartConfig.Builder();
         cluster.getConfig(b);
         return b.build().jvm().heapSizeAsPercentageOfPhysicalMemory();
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
index 125e25470df..370315ad08b 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
@@ -105,7 +105,7 @@ public class ExportingTestCase extends AbstractExportingTestCase {
     @Test
     public void testRankExpression() throws IOException, ParseException {
         assertCorrectDeriving("rankexpression", null,
-                new TestProperties().useExternalRankExpression(false), new TestableDeployLogger());
+                new TestProperties().useExternalRankExpression(true), new TestableDeployLogger());
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java
index ff17a211e17..85ef70132b5 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java
@@ -52,22 +52,22 @@ public class RankingExpressionsTestCase extends SchemaTestCase {
         RawRankProfile rawRankProfile = new RawRankProfile(functionsRankProfile, new QueryProfileRegistry(),
                 new ImportedMlModels(), new AttributeFields(search), deployProperties);
         List<Pair<String, String>> rankProperties = rawRankProfile.configProperties();
-        assertEquals(5, rankProperties.size());
+        assertEquals(6, rankProperties.size());
 
-        assertEquals("rankingExpression(titlematch$@126063073eb2deb.ab95cd69909927c).rankingScript", rankProperties.get(0).getFirst());
-        assertEquals("4 * 5 + 890", rankProperties.get(0).getSecond());
+        assertEquals("rankingExpression(titlematch$).rankingScript", rankProperties.get(2).getFirst());
+        assertEquals("var1 * var2 + 890", rankProperties.get(2).getSecond());
 
-        assertEquals("rankingExpression(titlematch$@c7e4c2d0e6d9f2a1.1d4ed08e56cce2e6).rankingScript", rankProperties.get(1).getFirst());
-        assertEquals("7 * 8 + 890", rankProperties.get(1).getSecond());
+        assertEquals("rankingExpression(artistmatch).rankingScript", rankProperties.get(3).getFirst());
+        assertEquals("78 + closeness(distance)", rankProperties.get(3).getSecond());
 
-        assertEquals("rankingExpression(artistmatch).rankingScript", rankProperties.get(2).getFirst());
-        assertEquals("78 + closeness(distance)", rankProperties.get(2).getSecond());
+        assertEquals("rankingExpression(firstphase).rankingScript", rankProperties.get(5).getFirst());
+        assertEquals("0.8 + 0.2 * rankingExpression(titlematch$@126063073eb2deb.ab95cd69909927c) + 0.8 * rankingExpression(titlematch$@c7e4c2d0e6d9f2a1.1d4ed08e56cce2e6) * closeness(distance)", rankProperties.get(5).getSecond());
 
-        assertEquals("vespa.rank.firstphase", rankProperties.get(3).getFirst());
-        assertEquals("rankingExpression(firstphase)", rankProperties.get(3).getSecond());
+        assertEquals("rankingExpression(titlematch$@c7e4c2d0e6d9f2a1.1d4ed08e56cce2e6).rankingScript", rankProperties.get(1).getFirst());
+        assertEquals("7 * 8 + 890", rankProperties.get(1).getSecond());
 
-        assertEquals("rankingExpression(firstphase).rankingScript", rankProperties.get(4).getFirst());
-        assertEquals("0.8 + 0.2 * rankingExpression(titlematch$@126063073eb2deb.ab95cd69909927c) + 0.8 * rankingExpression(titlematch$@c7e4c2d0e6d9f2a1.1d4ed08e56cce2e6) * closeness(distance)", rankProperties.get(4).getSecond());
+        assertEquals("rankingExpression(titlematch$@126063073eb2deb.ab95cd69909927c).rankingScript", rankProperties.get(0).getFirst());
+        assertEquals("4 * 5 + 890", rankProperties.get(0).getSecond());
     }
 
     @Test(expected = IllegalArgumentException.class)
diff --git a/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderTestCase.java b/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderTestCase.java
index 91152648b10..8f9aa33ea52 100644
--- a/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderTestCase.java
@@ -49,9 +49,9 @@ public class DocumentModelBuilderTestCase extends SchemaTestCase {
     @Test
     public void testMultipleInheritanceArray() throws IOException, ParseException {
         SearchBuilder search = new SearchBuilder();
-        search.importFile("src/test/cfg/search/data/travel/searchdefinitions/TTData.sd");
-        search.importFile("src/test/cfg/search/data/travel/searchdefinitions/TTEdge.sd");
-        search.importFile("src/test/cfg/search/data/travel/searchdefinitions/TTPOI.sd");
+        search.importFile("src/test/cfg/search/data/travel/schemas/TTData.sd");
+        search.importFile("src/test/cfg/search/data/travel/schemas/TTEdge.sd");
+        search.importFile("src/test/cfg/search/data/travel/schemas/TTPOI.sd");
         search.build();
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidatorTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidatorTestCase.java
index 76f34cf4a81..341a90c6618 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidatorTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidatorTestCase.java
@@ -15,6 +15,7 @@ import org.junit.rules.ExpectedException;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
+import java.util.List;
 
 import static com.yahoo.config.model.test.TestUtil.joinLines;
 
@@ -99,17 +100,17 @@ public class ComplexAttributeFieldsValidatorTestCase {
                 "}"));
     }
 
-    private static void createModelAndValidate(String searchDefinition) throws IOException, SAXException {
-        DeployState deployState = createDeployState(servicesXml(), searchDefinition);
+    private static void createModelAndValidate(String schema) throws IOException, SAXException {
+        DeployState deployState = createDeployState(servicesXml(), schema);
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
         ValidationParameters validationParameters = new ValidationParameters(CheckRouting.FALSE);
         Validation.validate(model, validationParameters, deployState);
     }
 
-    private static DeployState createDeployState(String servicesXml, String searchDefinition) {
+    private static DeployState createDeployState(String servicesXml, String schema) {
         ApplicationPackage app = new MockApplicationPackage.Builder()
                 .withServices(servicesXml)
-                .withSearchDefinition(searchDefinition)
+                .withSchemas(List.of(schema))
                 .build();
         return new DeployState.Builder().applicationPackage(app).build();
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
index ad4603e5c6b..7bff4890b7e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
@@ -824,24 +824,6 @@ public class ContentBuilderTest extends DomBuilderTest {
         verifyThatFeatureFlagControlsVisibilityDelayDefault(0.6, 0.6);
     }
 
-    private void verifyThatFeatureFlagControlsUseBucketExecutorForPruneRemoved(boolean flag) {
-        DeployState.Builder deployStateBuilder = new DeployState.Builder().properties(new TestProperties().useBucketExecutorForPruneRemoved(flag));
-        VespaModel model = new VespaModelCreatorWithMockPkg(new MockApplicationPackage.Builder()
-                .withServices(singleNodeContentXml())
-                .withSearchDefinition(MockApplicationPackage.MUSIC_SEARCHDEFINITION)
-                .build())
-                .create(deployStateBuilder);
-        ProtonConfig config = getProtonConfig(model.getContentClusters().values().iterator().next());
-        assertEquals(flag, config.pruneremoveddocuments().usebucketexecutor());
-    }
-
-
-    @Test
-    public void verifyUseBucketExecutorForPruneRemoved() {
-        verifyThatFeatureFlagControlsUseBucketExecutorForPruneRemoved(true);
-        verifyThatFeatureFlagControlsUseBucketExecutorForPruneRemoved(false);
-    }
-
     @Test
     public void failWhenNoDocumentsElementSpecified() {
         expectedException.expect(IllegalArgumentException.class);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
index f3199f6a46f..80aafdd4ec7 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
@@ -69,7 +69,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
                 "  <accesslog type='vespa' ",
                 "             fileNamePattern='pattern' rotationInterval='interval' />",
                 "  <accesslog type='json' ",
-                "             fileNamePattern='pattern' rotationInterval='interval' />",
+                "             fileNamePattern='pattern' rotationInterval='interval' queueSize='17' bufferSize='65536'/>",
                 nodesXml,
                 "</container>" );
 
@@ -85,8 +85,8 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
             AccessLogConfig.FileHandler fileHandlerConfig = config.fileHandler();
             assertEquals("pattern", fileHandlerConfig.pattern());
             assertEquals("interval", fileHandlerConfig.rotation());
-            assertEquals(10000, fileHandlerConfig.queueSize());
-            assertEquals(4*1024*1024, fileHandlerConfig.bufferSize());
+            assertEquals(256, fileHandlerConfig.queueSize());
+            assertEquals(256*1024, fileHandlerConfig.bufferSize());
         }
 
         { // json
@@ -97,8 +97,8 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
             AccessLogConfig.FileHandler fileHandlerConfig = config.fileHandler();
             assertEquals("pattern", fileHandlerConfig.pattern());
             assertEquals("interval", fileHandlerConfig.rotation());
-            assertEquals(10000, fileHandlerConfig.queueSize());
-            assertEquals(4*1024*1024, fileHandlerConfig.bufferSize());
+            assertEquals(17, fileHandlerConfig.queueSize());
+            assertEquals(65536, fileHandlerConfig.bufferSize());
         }
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 7f862afa1b0..543318f9224 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -40,6 +40,11 @@ import com.yahoo.net.HostName;
 import com.yahoo.path.Path;
 import com.yahoo.prelude.cluster.QrMonitorConfig;
 import com.yahoo.search.config.QrStartConfig;
+import com.yahoo.security.KeyAlgorithm;
+import com.yahoo.security.KeyUtils;
+import com.yahoo.security.SignatureAlgorithm;
+import com.yahoo.security.X509CertificateBuilder;
+import com.yahoo.security.X509CertificateUtils;
 import com.yahoo.security.tls.TlsContext;
 import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.model.AbstractService;
@@ -53,6 +58,7 @@ import com.yahoo.vespa.model.container.http.ConnectorFactory;
 import com.yahoo.vespa.model.content.utils.ContentClusterUtils;
 import com.yahoo.vespa.model.test.VespaModelTester;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithFilePkg;
+import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matchers;
 import org.hamcrest.core.IsEqual;
 import org.junit.Rule;
@@ -61,8 +67,15 @@ import org.junit.rules.TemporaryFolder;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
+import javax.security.auth.x500.X500Principal;
 import java.io.IOException;
 import java.io.StringReader;
+import java.math.BigInteger;
+import java.security.KeyPair;
+import java.security.cert.X509Certificate;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -82,6 +95,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
@@ -818,6 +832,48 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
+    public void operator_certificates_are_joined_with_clients_pem() {
+        var applicationPackage = new MockApplicationPackage.Builder()
+                .withRoot(applicationFolder.getRoot())
+                .build();
+
+        var applicationTrustCert = X509CertificateUtils.toPem(
+                X509CertificateUtils.createSelfSigned("CN=application", Duration.ofDays(1)).certificate());
+        var operatorCert = X509CertificateUtils.createSelfSigned("CN=operator", Duration.ofDays(1)).certificate();
+
+        applicationPackage.getFile(Path.fromString("security")).createDirectory();
+        applicationPackage.getFile(Path.fromString("security/clients.pem")).writeFile(new StringReader(applicationTrustCert));
+
+        var deployState = new DeployState.Builder().properties(
+                new TestProperties()
+                        .setOperatorCertificates(List.of(operatorCert))
+                        .setHostedVespa(true)
+                        .setEndpointCertificateSecrets(Optional.of(new EndpointCertificateSecrets("CERT", "KEY"))))
+                .zone(new Zone(SystemName.PublicCd, Environment.dev, RegionName.defaultName()))
+                .applicationPackage(applicationPackage)
+                .build();
+
+        Element clusterElem = DomBuilderTest.parse("<container version='1.0' />");
+
+        createModel(root, deployState, null, clusterElem);
+
+        ApplicationContainer container = (ApplicationContainer)root.getProducer("container/container.0");
+        List<ConnectorFactory> connectorFactories = container.getHttp().getHttpServer().get().getConnectorFactories();
+        ConnectorFactory tlsPort = connectorFactories.stream().filter(connectorFactory -> connectorFactory.getListenPort() == 4443).findFirst().orElseThrow();
+
+        ConnectorConfig.Builder builder = new ConnectorConfig.Builder();
+        tlsPort.getConfig(builder);
+
+        ConnectorConfig connectorConfig = new ConnectorConfig(builder);
+        var caCerts = X509CertificateUtils.certificateListFromPem(connectorConfig.ssl().caCertificate());
+        assertEquals(2, caCerts.size());
+        List<String> certnames = caCerts.stream()
+                .map(cert -> cert.getSubjectX500Principal().getName())
+                .collect(Collectors.toList());
+        assertThat(certnames, containsInAnyOrder("CN=operator", "CN=application"));
+    }
+
+    @Test
     public void environment_vars_are_honoured() {
         Element clusterElem = DomBuilderTest.parse(
                 "<container version='1.0'>",
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
index 953c42243a6..13d02fc1fb8 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
@@ -26,7 +26,6 @@ import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerContainer;
 import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerContainerCluster;
 import com.yahoo.vespa.model.container.ContainerCluster;
-import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 import com.yahoo.vespa.model.content.engines.ProtonEngine;
 import com.yahoo.vespa.model.content.utils.ContentClusterBuilder;
@@ -46,7 +45,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import static java.util.stream.Collectors.toList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -533,6 +531,7 @@ public class ContentClusterTest extends ContentBaseTest {
         ContentCluster stagingNot16Bits = createWithZone(xml, new Zone(Environment.staging, RegionName.from("us-east-3")));
         assertDistributionBitsInConfig(stagingNot16Bits, 8);
     }
+
     @Test
     public void testGenerateSearchNodes()
     {
@@ -1076,7 +1075,6 @@ public class ContentClusterTest extends ContentBaseTest {
                                                           "    </documents>" +
                                                           "  </content>" +
                                                           " </services>");
-        assertNull("No own cluster controller for content", oneContentModel.getContentClusters().get("storage").getClusterControllers());
         assertNotNull("Shared cluster controller with content", oneContentModel.getAdmin().getClusterControllers());
 
         String twoContentServices = "<?xml version='1.0' encoding='UTF-8' ?>" +
@@ -1108,8 +1106,6 @@ public class ContentClusterTest extends ContentBaseTest {
         VespaModel twoContentModel = createEnd2EndOneNode(new TestProperties().setHostedVespa(true)
                                                                               .setMultitenant(true),
                                                           twoContentServices);
-        assertNull("No own cluster controller for content", twoContentModel.getContentClusters().get("storage").getClusterControllers());
-        assertNull("No own cluster controller for content", twoContentModel.getContentClusters().get("dev-null").getClusterControllers());
         assertNotNull("Shared cluster controller with content", twoContentModel.getAdmin().getClusterControllers());
 
         ClusterControllerContainerCluster clusterControllers = twoContentModel.getAdmin().getClusterControllers();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
index 5cf57430f91..9a681003293 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
@@ -17,6 +17,7 @@ import com.yahoo.vespa.config.content.PersistenceConfig;
 import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.documentmodel.NewDocumentType;
 import static com.yahoo.vespa.defaults.Defaults.getDefaults;
+import static com.yahoo.config.model.test.TestUtil.joinLines;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 import com.yahoo.vespa.model.content.storagecluster.StorageCluster;
 import com.yahoo.vespa.model.content.utils.ContentClusterUtils;
@@ -44,10 +45,17 @@ public class StorageClusterTest {
         return parse(xml, root);
     }
 
-    StorageCluster parse(String xml) {
-        MockRoot root = new MockRoot();
+    StorageCluster parse(String xml, ModelContext.Properties properties) {
+        MockRoot root = new MockRoot("",
+                new DeployState.Builder()
+                        .properties(properties)
+                        .applicationPackage(new MockApplicationPackage.Builder().build())
+                        .build());
         return parse(xml, root);
     }
+    StorageCluster parse(String xml) {
+        return parse(xml, new TestProperties());
+    }
     StorageCluster parse(String xml, MockRoot root) {
         root.getDeployState().getDocumentModel().getDocumentManager().add(
                 new NewDocumentType(new NewDocumentType.Name("music"))
@@ -61,13 +69,23 @@ public class StorageClusterTest {
         return cluster.getStorageNodes();
     }
 
+    private static String group() {
+        return joinLines(
+                "<group>",
+                "   <node distribution-key=\"0\" hostalias=\"mockhost\"/>",
+                "</group>");
+    }
+    private static String cluster(String clusterName, String insert) {
+        return joinLines(
+                "<content id=\"" + clusterName + "\">",
+                "<documents/>",
+                insert,
+                group(),
+                "</content>");
+    }
     @Test
     public void testBasics() {
-        StorageCluster storage = parse("<content id=\"foofighters\"><documents/>\n" +
-              "  <group>" +
-              "     <node distribution-key=\"0\" hostalias=\"mockhost\"/>" +
-              "  </group>" +
-              "</content>\n");
+        StorageCluster storage = parse(cluster("foofighters", ""));
 
         assertEquals(1, storage.getChildren().size());
         StorServerConfig.Builder builder = new StorServerConfig.Builder();
@@ -79,11 +97,7 @@ public class StorageClusterTest {
     }
     @Test
     public void testCommunicationManagerDefaults() {
-        StorageCluster storage = parse("<content id=\"foofighters\"><documents/>\n" +
-                "  <group>" +
-                "     <node distribution-key=\"0\" hostalias=\"mockhost\"/>" +
-                "  </group>" +
-                "</content>\n");
+        StorageCluster storage = parse(cluster("foofighters", ""));
         StorCommunicationmanagerConfig.Builder builder = new StorCommunicationmanagerConfig.Builder();
         storage.getChildren().get("0").getConfig(builder);
         StorCommunicationmanagerConfig config = new StorCommunicationmanagerConfig(builder);
@@ -97,40 +111,49 @@ public class StorageClusterTest {
     }
 
     @Test
+    public void testMergeDefaults() {
+        StorServerConfig.Builder builder = new StorServerConfig.Builder();
+        parse(cluster("foofighters", "")).getConfig(builder);
+
+        StorServerConfig config = new StorServerConfig(builder);
+        assertEquals(16, config.max_merges_per_node());
+        assertEquals(1024, config.max_merge_queue_size());
+    }
+
+    @Test
     public void testMerges() {
         StorServerConfig.Builder builder = new StorServerConfig.Builder();
-        parse("" +
-                "<content id=\"foofighters\">\n" +
-                "  <documents/>" +
-                "  <tuning>" +
-                "    <merges max-per-node=\"1K\" max-queue-size=\"10K\"/>\n" +
-                "  </tuning>" +
-                "  <group>" +
-                "     <node distribution-key=\"0\" hostalias=\"mockhost\"/>" +
-                "  </group>" +
-                "</content>"
+        parse(cluster("foofighters", joinLines(
+                "<tuning>",
+                "  <merges max-per-node=\"1K\" max-queue-size=\"10K\"/>",
+                "</tuning>")),
+                new TestProperties().setMaxMergeQueueSize(1919).setMaxConcurrentMergesPerNode(37)
         ).getConfig(builder);
 
         StorServerConfig config = new StorServerConfig(builder);
         assertEquals(1024, config.max_merges_per_node());
         assertEquals(1024*10, config.max_merge_queue_size());
     }
+    @Test
+    public void testMergeFeatureFlags() {
+        StorServerConfig.Builder builder = new StorServerConfig.Builder();
+        parse(cluster("foofighters", ""), new TestProperties().setMaxMergeQueueSize(1919).setMaxConcurrentMergesPerNode(37)).getConfig(builder);
+
+        StorServerConfig config = new StorServerConfig(builder);
+        assertEquals(37, config.max_merges_per_node());
+        assertEquals(1919, config.max_merge_queue_size());
+    }
 
     @Test
     public void testVisitors() {
         StorVisitorConfig.Builder builder = new StorVisitorConfig.Builder();
-        parse(
-                "<cluster id=\"bees\">\n" +
-                "  <documents/>" +
-                "  <tuning>\n" +
-                "    <visitors thread-count=\"7\" max-queue-size=\"1000\">\n" +
-                "      <max-concurrent fixed=\"42\" variable=\"100\"/>\n" +
-                "    </visitors>\n" +
-                "  </tuning>\n" +
-                "  <group>" +
-                "     <node distribution-key=\"0\" hostalias=\"mockhost\"/>" +
-                "  </group>" +
-                "</cluster>"
+        parse(cluster("bees",
+                joinLines(
+                "<tuning>",
+                "  <visitors thread-count=\"7\" max-queue-size=\"1000\">",
+                "    <max-concurrent fixed=\"42\" variable=\"100\"/>",
+                "  </visitors>",
+                "</tuning>"))
         ).getConfig(builder);
 
         StorVisitorConfig config = new StorVisitorConfig(builder);
@@ -143,16 +166,10 @@ public class StorageClusterTest {
     @Test
     public void testPersistenceThreads() {
 
-        StorageCluster stc = parse(
-                "<cluster id=\"bees\">\n" +
-                "    <documents/>" +
-                "    <tuning>\n" +
-                "        <persistence-threads count=\"7\"/>\n" +
-                "    </tuning>\n" +
-                "  <group>" +
-                "     <node distribution-key=\"0\" hostalias=\"mockhost\"/>" +
-                "  </group>" +
-                "</cluster>",
+        StorageCluster stc = parse(cluster("bees",joinLines(
+                "<tuning>",
+                "  <persistence-threads count=\"7\"/>",
+                "</tuning>")),
                 new Flavor(new FlavorsConfig.Flavor.Builder().name("test-flavor").minCpuCores(9).build())
         );
 
@@ -178,16 +195,10 @@ public class StorageClusterTest {
     @Test
     public void testResponseThreads() {
 
-        StorageCluster stc = parse(
-                "<cluster id=\"bees\">\n" +
-                        "    <documents/>" +
-                        "    <tuning>\n" +
-                        "        <persistence-threads count=\"7\"/>\n" +
-                        "    </tuning>\n" +
-                        "  <group>" +
-                        "     <node distribution-key=\"0\" hostalias=\"mockhost\"/>" +
-                        "  </group>" +
-                        "</cluster>",
+        StorageCluster stc = parse(cluster("bees",joinLines(
+                "<tuning>",
+                "  <persistence-threads count=\"7\"/>",
+                "</tuning>")),
                 new Flavor(new FlavorsConfig.Flavor.Builder().name("test-flavor").minCpuCores(9).build())
         );
         StorFilestorConfig.Builder builder = new StorFilestorConfig.Builder();
@@ -201,20 +212,14 @@ public class StorageClusterTest {
     @Test
     public void testPersistenceThreadsOld() {
 
-        StorageCluster stc = parse(
-                "<cluster id=\"bees\">\n" +
-                        "    <documents/>" +
-                        "    <tuning>\n" +
-                        "        <persistence-threads>\n" +
-                        "            <thread lowest-priority=\"VERY_LOW\" count=\"2\"/>\n" +
-                        "            <thread lowest-priority=\"VERY_HIGH\" count=\"1\"/>\n" +
-                        "            <thread count=\"1\"/>\n" +
-                        "        </persistence-threads>\n" +
-                        "    </tuning>\n" +
-                        "  <group>" +
-                        "     <node distribution-key=\"0\" hostalias=\"mockhost\"/>" +
-                        "  </group>" +
-                        "</cluster>",
+        StorageCluster stc = parse(cluster("bees", joinLines(
+                "<tuning>",
+                "  <persistence-threads>",
+                "    <thread lowest-priority=\"VERY_LOW\" count=\"2\"/>",
+                "    <thread lowest-priority=\"VERY_HIGH\" count=\"1\"/>",
+                "    <thread count=\"1\"/>",
+                "  </persistence-threads>",
+                "</tuning>")),
                 new Flavor(new FlavorsConfig.Flavor.Builder().name("test-flavor").minCpuCores(9).build())
         );
 
@@ -238,15 +243,7 @@ public class StorageClusterTest {
 
     @Test
     public void testNoPersistenceThreads() {
-        StorageCluster stc = parse(
-                "<cluster id=\"bees\">\n" +
-                        "    <documents/>" +
-                        "    <tuning>\n" +
-                        "    </tuning>\n" +
-                        "  <group>" +
-                        "     <node distribution-key=\"0\" hostalias=\"mockhost\"/>" +
-                        "  </group>" +
-                        "</cluster>",
+        StorageCluster stc = parse(cluster("bees", ""),
                 new Flavor(new FlavorsConfig.Flavor.Builder().name("test-flavor").minCpuCores(9).build())
         );
 
@@ -267,13 +264,7 @@ public class StorageClusterTest {
     }
 
     private StorageCluster simpleCluster(ModelContext.Properties properties) {
-        return parse(
-                "<cluster id=\"bees\">\n" +
-                        "    <documents/>" +
-                        "  <group>" +
-                        "     <node distribution-key=\"0\" hostalias=\"mockhost\"/>" +
-                        "  </group>" +
-                        "</cluster>",
+        return parse(cluster("bees", ""),
                 new Flavor(new FlavorsConfig.Flavor.Builder().name("test-flavor").minCpuCores(9).build()),
                 properties);
     }
@@ -302,14 +293,7 @@ public class StorageClusterTest {
     @Test
     public void integrity_checker_explicitly_disabled_when_not_running_with_vds_provider() {
         StorIntegritycheckerConfig.Builder builder = new StorIntegritycheckerConfig.Builder();
-        parse(
-                "<cluster id=\"bees\">\n" +
-                "  <documents/>" +
-                "  <group>" +
-                "     <node distribution-key=\"0\" hostalias=\"mockhost\"/>" +
-                "  </group>" +
-                "</cluster>"
-        ).getConfig(builder);
+        parse(cluster("bees", "")).getConfig(builder);
         StorIntegritycheckerConfig config = new StorIntegritycheckerConfig(builder);
         // '-' --> don't run on the given week day
         assertEquals("-------", config.weeklycycle());
@@ -317,15 +301,15 @@ public class StorageClusterTest {
 
     @Test
     public void testCapacity() {
-        String xml =
-                "<cluster id=\"storage\">\n" +
-                        "  <documents/>" +
-                        "  <group>\n" +
-                        "    <node distribution-key=\"0\" hostalias=\"mockhost\"/>\n" +
-                        "    <node distribution-key=\"1\" hostalias=\"mockhost\" capacity=\"1.5\"/>\n" +
-                        "    <node distribution-key=\"2\" hostalias=\"mockhost\" capacity=\"2.0\"/>\n" +
-                        "  </group>\n" +
-                        "</cluster>";
+        String xml = joinLines(
+                "<cluster id=\"storage\">",
+                "  <documents/>",
+                "  <group>",
+                "    <node distribution-key=\"0\" hostalias=\"mockhost\"/>",
+                "    <node distribution-key=\"1\" hostalias=\"mockhost\" capacity=\"1.5\"/>",
+                "    <node distribution-key=\"2\" hostalias=\"mockhost\" capacity=\"2.0\"/>",
+                "  </group>",
+                "</cluster>");
 
         ContentCluster cluster = ContentClusterUtils.createCluster(xml, new MockRoot());
 
@@ -341,15 +325,7 @@ public class StorageClusterTest {
 
     @Test
     public void testRootFolder() {
-        String xml =
-                "<cluster id=\"storage\">\n" +
-                        "  <documents/>" +
-                        "  <group>\n" +
-                        "    <node distribution-key=\"0\" hostalias=\"mockhost\"/>\n" +
-                        "  </group>\n" +
-                        "</cluster>";
-
-        ContentCluster cluster = ContentClusterUtils.createCluster(xml, new MockRoot());
+        ContentCluster cluster = ContentClusterUtils.createCluster(cluster("storage", ""), new MockRoot());
 
         StorageNode node = cluster.getStorageNodes().getChildren().get("0");
 
@@ -372,18 +348,18 @@ public class StorageClusterTest {
 
     @Test
     public void testGenericPersistenceTuning() {
-        String xml =
-                "<cluster id=\"storage\">\n" +
-                        "<documents/>" +
-                        "<engine>\n" +
-                        "    <fail-partition-on-error>true</fail-partition-on-error>\n" +
-                        "    <revert-time>34m</revert-time>\n" +
-                        "    <recovery-time>5d</recovery-time>\n" +
-                        "</engine>" +
-                        "  <group>\n" +
-                        "    <node distribution-key=\"0\" hostalias=\"mockhost\"/>\n" +
-                        "  </group>\n" +
-                        "</cluster>";
+        String xml = joinLines(
+                "<cluster id=\"storage\">",
+                "  <documents/>",
+                "  <engine>",
+                "    <fail-partition-on-error>true</fail-partition-on-error>",
+                "    <revert-time>34m</revert-time>",
+                "    <recovery-time>5d</recovery-time>",
+                "  </engine>",
+                "  <group>",
+                "    node distribution-key=\"0\" hostalias=\"mockhost\"/>",
+                "  </group>",
+                "</cluster>");
 
         ContentCluster cluster = ContentClusterUtils.createCluster(xml, new MockRoot());
 
@@ -398,21 +374,21 @@ public class StorageClusterTest {
 
     @Test
     public void requireThatUserDoesNotSpecifyBothGroupAndNodes() {
-        String xml =
-                "<cluster id=\"storage\">\n" +
-                        "<documents/>\n" +
-                        "<engine>\n" +
-                        "    <fail-partition-on-error>true</fail-partition-on-error>\n" +
-                        "    <revert-time>34m</revert-time>\n" +
-                        "    <recovery-time>5d</recovery-time>\n" +
-                        "</engine>" +
-                        "  <group>\n" +
-                        "    <node distribution-key=\"0\" hostalias=\"mockhost\"/>\n" +
-                        "  </group>\n" +
-                        "  <nodes>\n" +
-                        "    <node distribution-key=\"1\" hostalias=\"mockhost\"/>\n" +
-                        "  </nodes>\n" +
-                        "</cluster>";
+        String xml = joinLines(
+                "<cluster id=\"storage\">",
+                "  <documents/>",
+                "  <engine>",
+                "    <fail-partition-on-error>true</fail-partition-on-error>",
+                "    <revert-time>34m</revert-time>",
+                "    <recovery-time>5d</recovery-time>",
+                "  </engine>",
+                "  <group>",
+                "    <node distribution-key=\"0\" hostalias=\"mockhost\"/>",
+                "  </group>",
+                "  <nodes>",
+                "    <node distribution-key=\"1\" hostalias=\"mockhost\"/>",
+                "  </nodes>",
+                "</cluster>");
 
         try {
             final MockRoot root = new MockRoot();
@@ -429,20 +405,20 @@ public class StorageClusterTest {
 
     @Test
     public void requireThatGroupNamesMustBeUniqueAmongstSiblings() {
-        String xml =
-                "<cluster id=\"storage\">\n" +
-                 "  <redundancy>2</redundancy>" +
-                "  <documents/>\n" +
-                "  <group>\n" +
-                "    <distribution partitions=\"*\"/>\n" +
-                "    <group distribution-key=\"0\" name=\"bar\">\n" +
-                "      <node distribution-key=\"0\" hostalias=\"mockhost\"/>\n" +
-                "    </group>\n" +
-                "    <group distribution-key=\"0\" name=\"bar\">\n" +
-                "      <node distribution-key=\"1\" hostalias=\"mockhost\"/>\n" +
-                "    </group>\n" +
-                "  </group>\n" +
-                "</cluster>";
+        String xml = joinLines(
+                "<cluster id=\"storage\">",
+                "  <redundancy>2</redundancy>",
+                "  <documents/>",
+                "  <group>",
+                "    <distribution partitions=\"*\"/>",
+                "    <group distribution-key=\"0\" name=\"bar\">",
+                "      <node distribution-key=\"0\" hostalias=\"mockhost\"/>",
+                "    </group>",
+                "    <group distribution-key=\"0\" name=\"bar\">",
+                "      <node distribution-key=\"1\" hostalias=\"mockhost\"/>",
+                "    </group>",
+                "  </group>",
+                "</cluster>");
 
         try {
             ContentClusterUtils.createCluster(xml, new MockRoot());
@@ -455,24 +431,24 @@ public class StorageClusterTest {
 
     @Test
     public void requireThatGroupNamesCanBeDuplicatedAcrossLevels() {
-        String xml =
-                "<cluster id=\"storage\">\n" +
-                "  <redundancy>2</redundancy>" +
-                "<documents/>\n" +
-                "  <group>\n" +
-                "    <distribution partitions=\"*\"/>\n" +
-                "    <group distribution-key=\"0\" name=\"bar\">\n" +
-                "      <group distribution-key=\"0\" name=\"foo\">\n" +
-                "        <node distribution-key=\"0\" hostalias=\"mockhost\"/>\n" +
-                "      </group>\n" +
-                "    </group>\n" +
-                "    <group distribution-key=\"0\" name=\"foo\">\n" +
-                "      <group distribution-key=\"0\" name=\"bar\">\n" +
-                "        <node distribution-key=\"1\" hostalias=\"mockhost\"/>\n" +
-                "      </group>\n" +
-                "    </group>\n" +
-                "  </group>\n" +
-                "</cluster>";
+        String xml = joinLines(
+                "<cluster id=\"storage\">",
+                "  <redundancy>2</redundancy>",
+                "  <documents/>",
+                "  <group>",
+                "    <distribution partitions=\"*\"/>",
+                "    <group distribution-key=\"0\" name=\"bar\">",
+                "      <group distribution-key=\"0\" name=\"foo\">",
+                "        <node distribution-key=\"0\" hostalias=\"mockhost\"/>",
+                "      </group>",
+                "    </group>",
+                "    <group distribution-key=\"0\" name=\"foo\">",
+                "      <group distribution-key=\"0\" name=\"bar\">",
+                "        <node distribution-key=\"1\" hostalias=\"mockhost\"/>",
+                "      </group>",
+                "    </group>",
+                "  </group>",
+                "</cluster>");
 
         // Should not throw.
         ContentClusterUtils.createCluster(xml, new MockRoot());
@@ -480,18 +456,18 @@ public class StorageClusterTest {
 
     @Test
     public void requireThatNestedGroupsRequireDistribution() {
-        String xml =
-                "<cluster id=\"storage\">\n" +
-                        "<documents/>\n" +
-                        "  <group>\n" +
-                        "    <group distribution-key=\"0\" name=\"bar\">\n" +
-                        "      <node distribution-key=\"0\" hostalias=\"mockhost\"/>\n" +
-                        "    </group>\n" +
-                        "    <group distribution-key=\"0\" name=\"baz\">\n" +
-                        "      <node distribution-key=\"1\" hostalias=\"mockhost\"/>\n" +
-                        "    </group>\n" +
-                        "  </group>\n" +
-                        "</cluster>";
+        String xml = joinLines(
+                "<cluster id=\"storage\">",
+                "  <documents/>",
+                "  <group>",
+                "    <group distribution-key=\"0\" name=\"bar\">",
+                "      <node distribution-key=\"0\" hostalias=\"mockhost\"/>",
+                "    </group>",
+                "    <group distribution-key=\"0\" name=\"baz\">",
+                "      <node distribution-key=\"1\" hostalias=\"mockhost\"/>",
+                "    </group>",
+                "  </group>",
+                "</cluster>");
 
         try {
             ContentClusterUtils.createCluster(xml, new MockRoot());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
index 7c93b4ef02b..afeffbbc875 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
@@ -15,9 +15,7 @@ import java.util.List;
 
 import static com.yahoo.config.model.test.TestUtil.joinLines;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Simon Thoresen Hult
@@ -179,7 +177,7 @@ public class ClusterTest {
                         "    </tuning>",
                         "  </content>",
                         "</services>"))
-                .withSchemas(ApplicationPackageUtils.generateSearchDefinition("my_document"))
+                .withSchemas(ApplicationPackageUtils.generateSchemas("my_document"))
                 .build();
         List<Content> contents = new TestDriver().buildModel(app).getConfigModels(Content.class);
         assertEquals(1, contents.size());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/ml/MlModelsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/ml/MlModelsTest.java
index 854c4d32a64..9e87b5509bc 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/ml/MlModelsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/ml/MlModelsTest.java
@@ -32,8 +32,8 @@ public class MlModelsTest {
             IOUtils.copy(appDir.append("services.xml").toString(), storedAppDir.append("services.xml").toString());
             IOUtils.copyDirectory(appDir.append(ApplicationPackage.MODELS_GENERATED_DIR).toFile(),
                                   storedAppDir.append(ApplicationPackage.MODELS_GENERATED_DIR).toFile());
-            IOUtils.copyDirectory(appDir.append(ApplicationPackage.SEARCH_DEFINITIONS_DIR).toFile(),
-                                  storedAppDir.append(ApplicationPackage.SEARCH_DEFINITIONS_DIR).toFile());
+            IOUtils.copyDirectory(appDir.append(ApplicationPackage.SCHEMAS_DIR).toFile(),
+                                  storedAppDir.append(ApplicationPackage.SCHEMAS_DIR).toFile());
             ImportedModelTester storedTester = new ImportedModelTester("ml_models", storedAppDir);
             verify(storedTester.createVespaModel());
         }
@@ -61,7 +61,7 @@ public class MlModelsTest {
         assertEquals(testProfile, b.toString());
     }
 
-    private final String testProfile =
+    private static final String testProfile =
             "rankingExpression(Placeholder).rankingScript: attribute(argument)\n" +
             "rankingExpression(Placeholder).type: tensor<float>(d0[1],d1[784])\n" +
             "rankingExpression(mnist_softmax_onnx).rankingScript: join(reduce(join(rename(rankingExpression(Placeholder), (d0, d1), (d0, d2)), constant(mnist_softmax_Variable), f(a,b)(a * b)), sum, d2), constant(mnist_softmax_Variable_1), f(a,b)(a + b))\n" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/ml/StatelessOnnxEvaluationTest.java b/config-model/src/test/java/com/yahoo/vespa/model/ml/StatelessOnnxEvaluationTest.java
index 5dea4a04229..5c64dd9f8cd 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/ml/StatelessOnnxEvaluationTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/ml/StatelessOnnxEvaluationTest.java
@@ -4,17 +4,13 @@ package com.yahoo.vespa.model.ml;
 import ai.vespa.models.evaluation.FunctionEvaluator;
 import ai.vespa.models.evaluation.Model;
 import ai.vespa.models.evaluation.ModelsEvaluator;
-import ai.vespa.models.evaluation.RankProfilesConfigImporter;
-import ai.vespa.models.handler.ModelsEvaluationHandler;
 import com.yahoo.component.ComponentId;
-import com.yahoo.config.FileReference;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.filedistribution.fileacquirer.FileAcquirer;
 import com.yahoo.filedistribution.fileacquirer.MockFileAcquirer;
 import com.yahoo.io.IOUtils;
 import com.yahoo.path.Path;
 import com.yahoo.tensor.Tensor;
-import com.yahoo.tensor.TensorType;
 import com.yahoo.vespa.config.search.RankProfilesConfig;
 import com.yahoo.vespa.config.search.core.OnnxModelsConfig;
 import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
@@ -31,7 +27,6 @@ import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -55,8 +50,8 @@ public class StatelessOnnxEvaluationTest {
             IOUtils.copy(appDir.append("services.xml").toString(), storedAppDir.append("services.xml").toString());
             IOUtils.copyDirectory(appDir.append(ApplicationPackage.MODELS_GENERATED_DIR).toFile(),
                     storedAppDir.append(ApplicationPackage.MODELS_GENERATED_DIR).toFile());
-            IOUtils.copyDirectory(appDir.append(ApplicationPackage.SEARCH_DEFINITIONS_DIR).toFile(),
-                    storedAppDir.append(ApplicationPackage.SEARCH_DEFINITIONS_DIR).toFile());
+            IOUtils.copyDirectory(appDir.append(ApplicationPackage.SCHEMAS_DIR).toFile(),
+                    storedAppDir.append(ApplicationPackage.SCHEMAS_DIR).toFile());
             ImportedModelTester storedTester = new ImportedModelTester("onnx_rt", storedAppDir);
             assertModelEvaluation(storedTester.createVespaModel(), appDir);
 
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 f5250343afe..2b36bfc47b2 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
@@ -192,7 +192,7 @@ public class VespaModelTestCase {
                         "   </documents>" +
                         "</content>" +
                         "</services>",
-                ApplicationPackageUtils.generateSearchDefinition("music"))
+                ApplicationPackageUtils.generateSchemas("music"))
                 .create();
         MessagebusConfig.Builder mBusB = new MessagebusConfig.Builder();
         model.getConfig(mBusB, "client");
@@ -216,7 +216,7 @@ public class VespaModelTestCase {
                         "</hosts>");
     }
 
-    class MyLogger implements DeployLogger {
+    static class MyLogger implements DeployLogger {
         List<Pair<Level, String>> msgs = new ArrayList<>();
         @Override
         public void log(Level level, String message) {
@@ -305,4 +305,29 @@ public class VespaModelTestCase {
         assertThat(model.getContainerClusters().size(), is(1));
     }
 
+    @Test
+    public void testThatDeployLogContainsWarningWhenUsingSearchdefinitionsDir() throws IOException, SAXException {
+        ApplicationPackage app = FilesApplicationPackage.fromFile(
+                new File("src/test/cfg/application/deprecated_features_app/"));
+        MyLogger logger = new MyLogger();
+        DeployState deployState = new DeployState.Builder()
+                .applicationPackage(app)
+                .deployLogger(logger)
+                .build();
+        VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
+        Validation.validate(model, new ValidationParameters(), deployState);
+        assertContainsWarning(logger.msgs, "Directory searchdefinitions/ should not be used for schemas, use schemas/ instead");
+    }
+
+    private void assertContainsWarning(List<Pair<Level,String>> msgs, String text) {
+        boolean foundCorrectWarning = false;
+        for (var msg : msgs)
+            if (msg.getFirst().getName().equals("WARNING") && msg.getSecond().equals(text)) {
+                foundCorrectWarning = true;
+            }
+        if (! foundCorrectWarning) for (var msg : msgs) System.err.println("MSG: "+msg);
+        assertTrue(msgs.size() > 0);
+        assertTrue(foundCorrectWarning);
+    }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
index ba975e52d1a..7e34e9efbbf 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
@@ -21,7 +21,6 @@ import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.ProvisionLogger;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.model.VespaModel;
-import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
 
 import java.util.ArrayList;
@@ -31,6 +30,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import static com.yahoo.vespa.model.test.utils.ApplicationPackageUtils.generateSchemas;
+
 /**
  * Helper class which sets up a system with multiple hosts.
  * Usage:
@@ -168,7 +169,7 @@ public class VespaModelTester {
                                   boolean alwaysReturnOneNode,
                                   int startIndexForClusters, Optional<VespaModel> previousModel,
                                   DeployState.Builder deployStatebuilder, String ... retiredHostNames) {
-        VespaModelCreatorWithMockPkg modelCreatorWithMockPkg = new VespaModelCreatorWithMockPkg(null, services, ApplicationPackageUtils.generateSearchDefinition("type1"));
+        VespaModelCreatorWithMockPkg modelCreatorWithMockPkg = new VespaModelCreatorWithMockPkg(null, services, generateSchemas("type1"));
         ApplicationPackage appPkg = modelCreatorWithMockPkg.appPkg;
 
         provisioner = hosted ?        new ProvisionerAdapter(new InMemoryProvisioner(hostsByResources,
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java
index df62a3bff07..1f7deaf1991 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.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.test.utils;
 
 import java.util.ArrayList;
@@ -43,10 +43,6 @@ public class ApplicationPackageUtils {
                 "}";
     }
 
-    public static List<String> generateSearchDefinition(String name) {
-        return generateSchemas(name);
-    }
-
     public static List<String> generateSchemas(String ... sdNames) {
         return generateSchemas(Arrays.asList(sdNames));
     }
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 8147d2e00ca..eea3da0e096 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
@@ -24,9 +24,8 @@ import java.io.IOException;
  */
 public class VespaModelCreatorWithFilePkg {
 
-    private FilesApplicationPackage applicationPkg;
-
-    private ConfigModelRegistry configModelRegistry;
+    private final FilesApplicationPackage applicationPkg;
+    private final ConfigModelRegistry configModelRegistry;
 
     public VespaModelCreatorWithFilePkg(String directoryName) {
         this(new File(directoryName));