schema: fix some problems in network/interface schemas

<portgroup> allows a <bandwidth> element, but the schema didn't have
this. Since this makes for multiple elements in portgroup, they must
be interleaved.

<interface type='bridge'> needs to allow <virtualport> elements
for openvswitch, but the schema didn't allow this.

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 1b94155acfac29a5e8e49a793afaf5755f385519..767fccda0898b2761b820324221cac4fc6d71c0c 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1410,6 +1410,9 @@
                 <empty/>
               </element>
             </optional>
+            <optional>
+              <ref name="virtualPortProfile"/>
+            </optional>
             <ref name="interface-options"/>
           </interleave>
         </group>

diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
index 25df26686a76604ddb12535518809c2d251dceb2..124c9f982ae7af2e0716f302dee4da1d468107a8 100644 (file)
--- a/docs/schemas/network.rng
+++ b/docs/schemas/network.rng
@@ -133,9 +133,14 @@
                 </choice>
               </attribute>
             </optional>
-            <optional>
-              <ref name="virtualPortProfile"/>
-            </optional>
+            <interleave>
+              <optional>
+                <ref name="virtualPortProfile"/>
+              </optional>
+              <optional>
+                <ref name="bandwidth"/>
+              </optional>
+            </interleave>
           </element>
         </zeroOrMore>