[PATCH 12/15] schema: nwfilter: Allow interleaving subelements of the top level 'filter' element
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/conf/schemas/nwfilter.rng | 36 ++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/conf/schemas/nwfilter.rng b/src/conf/schemas/nwfilter.rng
index a75de7ed3e..262bd551e3 100644
--- a/src/conf/schemas/nwfilter.rng
+++ b/src/conf/schemas/nwfilter.rng
@@ -7,20 +7,21 @@
</start>
<define name="filter">
<element name="filter">
- <ref name="filter-node-attributes"/>
- <optional>
- <element name="uuid">
- <ref name="UUID"/>
- </element>
- </optional>
- <zeroOrMore>
- <choice>
- <element name="filterref">
- <ref name="filterref-node-attributes"/>
+ <interleave>
+ <ref name="filter-node-attributes"/>
+ <optional>
+ <element name="uuid">
+ <ref name="UUID"/>
</element>
- <element name="rule">
- <ref name="rule-node-attributes"/>
- <choice>
+ </optional>
+ <zeroOrMore>
+ <choice>
+ <element name="filterref">
+ <ref name="filterref-node-attributes"/>
+ </element>
+ <element name="rule">
+ <ref name="rule-node-attributes"/>
+ <choice>
<empty/>
<element name="mac">
<ref name="match-attribute"/>
@@ -199,10 +200,11 @@
<ref name="common-ipv6-attributes-p2"/>
<ref name="comment-attribute"/>
</element>
- </choice>
- </element>
- </choice>
- </zeroOrMore>
+ </choice>
+ </element>
+ </choice>
+ </zeroOrMore>
+ </interleave>
</element>
</define>
--
2.37.3