From 58117f97200ef2d4365da22246b493819bbea2fb Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 13 Oct 2022 18:40:15 +0200
Subject: [PATCH] schema: nwfilter: Allow interleaving subelements of the top
 level 'filter' element
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@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>