diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2021-02-19 17:38:26 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2021-02-19 17:41:20 +0100 |
| commit | a219da1a7379606860c874a64f94aafb8973d205 (patch) | |
| tree | 9d3bfe7b78fbc8ed14451150a3d4adc8d9103199 /config-model/src/main/java/com/yahoo | |
| parent | 19bc1b558b233a924de13f2a02796d450f1469be (diff) | |
Test models with dedicated cluster controllers
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java index 4c5ec1cbbc8..498461fa3f8 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java @@ -20,6 +20,7 @@ import org.w3c.dom.Node; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; @@ -195,7 +196,9 @@ public class NodesSpecification { List<NodesSpecification> allContent = findParentByTag("services", element.getXml()).map(services -> XML.getChildren(services, "content")) .orElse(List.of()) .stream() - .map(content -> from(new ModelElement(content), context)) + .map(content -> new ModelElement(content).child("nodes")) + .filter(nodes -> nodes != null && nodes.integerAttribute("count") != null) + .map(nodes -> from(nodes, context)) .collect(toList()); return new NodesSpecification(new ClusterResources(count, 1, resources), new ClusterResources(count, 1, resources), |