schema: Be more flexible for diskSourceNetworkProtocolPropsCommon

Add <interleave> to allow the subproperties to be specified in any
order.

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index e2246e6b633abd72774b49984aa20a3b5cbc6041..da2fb0d5cb9c61be5b287e07df780bf1db8a94b7 100644 (file)
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -1967,22 +1967,24 @@
   </define>
 
   <define name="diskSourceNetworkProtocolPropsCommon">
-    <optional>
-      <element name="readahead">
-        <attribute name="size">
-          <ref name="positiveInteger"/>
-        </attribute>
-        <empty/>
-      </element>
-    </optional>
-    <optional>
-      <element name="timeout">
-        <attribute name="seconds">
-          <ref name="positiveInteger"/>
-        </attribute>
-        <empty/>
-      </element>
-    </optional>
+    <interleave>
+      <optional>
+        <element name="readahead">
+          <attribute name="size">
+            <ref name="positiveInteger"/>
+          </attribute>
+          <empty/>
+        </element>
+      </optional>
+      <optional>
+        <element name="timeout">
+          <attribute name="seconds">
+            <ref name="positiveInteger"/>
+          </attribute>
+          <empty/>
+        </element>
+      </optional>
+    </interleave>
   </define>
 
   <define name="diskSourceNetworkProtocolSSLVerify">