Enable dedicated-nodes-when-unspecified by default

1 files changed, 9 insertions, 33 deletions

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 ebafe9dd45b..7208d8c5fc1 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
@@ -1364,10 +1364,11 @@ public class ModelProvisioningTest {
                 "  </http>" +
                 "</container>";
         VespaModelTester tester = new VespaModelTester();
-        tester.addHosts(1);
+        tester.addHosts(2);
         VespaModel model = tester.createModel(services, true);
-        assertEquals(1, model.getHosts().size());
+        assertEquals(2, model.getHosts().size());
         assertEquals(1, model.getContainerClusters().size());
+        assertEquals(2, model.getContainerClusters().get("foo").getContainers().size());
     }
 
     @Test
@@ -1430,7 +1431,7 @@ public class ModelProvisioningTest {
     }
 
     @Test
-    public void testNoNodeTagMeans1Node() {
+    public void testNoNodeTagMeansTwoNodes() {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
                 "<services>" +
@@ -1445,31 +1446,6 @@ public class ModelProvisioningTest {
                 "  </content>" +
                 "</services>";
         VespaModelTester tester = new VespaModelTester();
-        tester.addHosts(1);
-        VespaModel model = tester.createModel(services, true);
-        assertEquals(1, model.getRoot().hostSystem().getHosts().size());
-        assertEquals(1, model.getAdmin().getSlobroks().size());
-        assertEquals(1, model.getContainerClusters().get("foo").getContainers().size());
-        assertEquals(1, model.getContentClusters().get("bar").getRootGroup().countNodes());
-    }
-
-    @Test
-    public void testNoNodeTagMeansTwoNodesInContainerClusterWithFeatureFlag() {
-        String services =
-                "<?xml version='1.0' encoding='utf-8' ?>\n" +
-                "<services>" +
-                "  <container id='foo' version='1.0'>" +
-                "    <search/>" +
-                "    <document-api/>" +
-                "  </container>" +
-                "  <content version='1.0' id='bar'>" +
-                "     <documents>" +
-                "       <document type='type1' mode='index'/>" +
-                "     </documents>" +
-                "  </content>" +
-                "</services>";
-        VespaModelTester tester = new VespaModelTester();
-        tester.setUseDedicatedNodesWhenUnspecified(true);
         tester.addHosts(3);
         VespaModel model = tester.createModel(services, true);
         assertEquals(3, model.getRoot().hostSystem().getHosts().size());
@@ -1479,7 +1455,7 @@ public class ModelProvisioningTest {
     }
 
     @Test
-    public void testNoNodeTagMeans1NodeNoContent() {
+    public void testNoNodeTagMeansTwoNodesNoContent() {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
                 "<services>" +
@@ -1489,11 +1465,11 @@ public class ModelProvisioningTest {
                 "  </container>" +
                 "</services>";
         VespaModelTester tester = new VespaModelTester();
-        tester.addHosts(1);
+        tester.addHosts(2);
         VespaModel model = tester.createModel(services, true);
-        assertEquals(1, model.getRoot().hostSystem().getHosts().size());
-        assertEquals(1, model.getAdmin().getSlobroks().size());
-        assertEquals(1, model.getContainerClusters().get("foo").getContainers().size());
+        assertEquals(2, model.getRoot().hostSystem().getHosts().size());
+        assertEquals(2, model.getAdmin().getSlobroks().size());
+        assertEquals(2, model.getContainerClusters().get("foo").getContainers().size());
     }
 
     @Test