Add a jdisc container clsuter to actually get some dispatch nodes.

2 files changed, 30 insertions, 25 deletions

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 0e442ad7993..e1dc29bb321 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,6 @@ 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.BaseDeployLogger;
 import com.yahoo.config.model.application.provider.SchemaValidators;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.builder.xml.ConfigModelBuilder;
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 80cf3365f71..1a2eb93face 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
@@ -101,30 +101,36 @@ public class ClusterTest {
 
     private static ContentCluster newContentCluster(String contentSearchXml, String searchNodeTuningXml, boolean globalDocType) throws ParseException {
         ApplicationPackage app = new MockApplicationPackage.Builder()
-                .withHosts(joinLines("<hosts>",
-                                "  <host name='localhost'><alias>my_host</alias></host>",
-                                "</hosts>"))
-                .withServices(joinLines("<services version='1.0'>",
-                                "  <admin version='2.0'>",
-                                "    <adminserver hostalias='my_host' />",
-                                "  </admin>",
-                                "  <content version='1.0'>",
-                                "    <redundancy>3</redundancy>",
-                                "    <documents>",
-                                "    " + getDocumentXml(globalDocType),
-                                "    </documents>",
-                                "    <engine>",
-                                "      <proton>",
-                                "        <searchable-copies>2</searchable-copies>",
-                                searchNodeTuningXml,
-                                "      </proton>",
-                                "    </engine>",
-                                "    <group>",
-                                "      <node hostalias='my_host' distribution-key='0' />",
-                                "    </group>",
-                                contentSearchXml,
-                                "  </content>",
-                                "</services>"))
+                .withHosts(joinLines(
+                        "<hosts>",
+                        "  <host name='localhost'><alias>my_host</alias></host>",
+                        "</hosts>"))
+                .withServices(joinLines(
+                        "<services version='1.0'>",
+                        "  <admin version='2.0'>",
+                        "    <adminserver hostalias='my_host' />",
+                        "  </admin>",
+                        "<jdisc id='foo' version='1.0'>",
+                        "  <search />",
+                        "  <nodes><node hostalias='my_host' /></nodes>",
+                        "</jdisc>",
+                        "  <content version='1.0'>",
+                        "    <redundancy>3</redundancy>",
+                        "    <documents>",
+                        "    " + getDocumentXml(globalDocType),
+                        "    </documents>",
+                        "    <engine>",
+                        "      <proton>",
+                        "        <searchable-copies>2</searchable-copies>",
+                        searchNodeTuningXml,
+                        "      </proton>",
+                        "    </engine>",
+                        "    <group>",
+                        "      <node hostalias='my_host' distribution-key='0' />",
+                        "    </group>",
+                        contentSearchXml,
+                        "  </content>",
+                        "</services>"))
                 .withSearchDefinitions(ApplicationPackageUtils.generateSearchDefinition("my_document"))
                 .build();
         List<Content> contents = new TestDriver().buildModel(app).getConfigModels(Content.class);