Add option to ignore undefined fields

2 files changed, 23 insertions, 4 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
index b4242336c5c..ca0b4681e51 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
@@ -5,7 +5,9 @@ import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
 import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.container.handler.threadpool.ContainerThreadpoolConfig;
+import com.yahoo.document.config.DocumentmanagerConfig;
 import com.yahoo.vespa.model.container.ContainerCluster;
+import com.yahoo.vespa.model.container.ContainerModel;
 import com.yahoo.vespa.model.container.component.Handler;
 import com.yahoo.vespa.model.container.component.SystemBindingPattern;
 import com.yahoo.vespa.model.container.component.UserBindingPattern;
@@ -63,7 +65,7 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa
     }
 
     @Test
-    public void requireThatHandlersAreSetup() {
+    public void test_handler_setup() {
         Element elem = DomBuilderTest.parse(
                 "<container id='cluster1' version='1.0'>",
                 "  <document-api />",
@@ -86,6 +88,20 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa
     }
 
     @Test
+    public void nonexisting_fields_can_be_ignored() {
+        Element elem = DomBuilderTest.parse(
+                "<container id='cluster1' version='1.0'>",
+                "  <document-api ignore-undefined-fields='true' />",
+                nodesXml,
+                "</container>");
+        ContainerModel model = createModel(root, elem).get(0);
+
+        var documentManager = new DocumentmanagerConfig.Builder();
+        model.getCluster().getConfig(documentManager);
+        assertTrue(documentManager.build().ignoreundefinedfields());
+    }
+
+    @Test
     public void feeding_api_have_separate_threadpools() {
         Element elem = DomBuilderTest.parse(
                 "<container id='cluster1' version='1.0'>",
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
index cfe4b72f37d..7e8852ce85a 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
@@ -56,18 +56,21 @@ public abstract class ContainerModelBuilderTestBase {
         createModel(root, clusterElem);
     }
 
-    public static void createModel(MockRoot root, DeployState deployState, VespaModel vespaModel, Element... containerElems) {
+    public static List<ContainerModel> createModel(MockRoot root, DeployState deployState, VespaModel vespaModel, Element... containerElems) {
+        List<ContainerModel> containerModels = new ArrayList<>();
         for (Element containerElem : containerElems) {
             ContainerModel model = new ContainerModelBuilder(false, ContainerModelBuilder.Networking.enable)
                                            .build(deployState, vespaModel, null, root, containerElem);
             ContainerCluster<?> cluster = model.getCluster();
             generateDefaultSearchChains(cluster);
+            containerModels.add(model);
         }
         root.freezeModelTopology();
+        return containerModels;
     }
 
-    public static void createModel(MockRoot root, Element... containerElems) {
-        createModel(root, DeployState.createTestState(), null, containerElems);
+    public static List<ContainerModel> createModel(MockRoot root, Element... containerElems) {
+        return createModel(root, DeployState.createTestState(), null, containerElems);
     }
 
     public static void createModel(MockRoot root, DeployLogger testLogger, Element... containerElems) {