schema: nodedev: Allow interleaving sub-elements of 'css' address type

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

diff --git a/src/conf/schemas/nodedev.rng b/src/conf/schemas/nodedev.rng
index a9b32bb80f6a01c7c4984336565eab8b6b09b753..fba4021754022c9b336b7f3d40c8832e774ab7b2 100644 (file)
--- a/src/conf/schemas/nodedev.rng
+++ b/src/conf/schemas/nodedev.rng
@@ -656,15 +656,17 @@
   </define>
 
   <define name="capccwaddress">
-    <element name="cssid">
-      <ref name="ccwCssidRange"/>
-    </element>
-    <element name="ssid">
-      <ref name="ccwSsidRange"/>
-    </element>
-    <element name="devno">
-      <ref name="ccwDevnoRange"/>
-    </element>
+    <interleave>
+      <element name="cssid">
+        <ref name="ccwCssidRange"/>
+      </element>
+      <element name="ssid">
+        <ref name="ccwSsidRange"/>
+      </element>
+      <element name="devno">
+        <ref name="ccwDevnoRange"/>
+      </element>
+    </interleave>
   </define>
 
   <define name="capccwdev">
@@ -678,15 +680,17 @@
     <attribute name="type">
       <value>css</value>
     </attribute>
-    <ref name="capccwaddress"/>
-    <optional>
-      <element name="channel_dev_addr">
-        <ref name="capccwaddress"/>
-      </element>
-    </optional>
-    <optional>
-      <ref name="mdev_types"/>
-    </optional>
+    <interleave>
+      <ref name="capccwaddress"/>
+      <optional>
+        <element name="channel_dev_addr">
+          <ref name="capccwaddress"/>
+        </element>
+      </optional>
+      <optional>
+        <ref name="mdev_types"/>
+      </optional>
+    </interleave>
   </define>
 
   <define name="capvdpa">