From: Laine Stump <laine@laine.org>
Date: Sun, 12 Aug 2012 16:01:32 +0000 (-0400)
Subject: schema: fix some problems in network/interface schemas
X-Git-Tag: v0.10.0-rc1~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4a199a1af85e075a62e2574ceca656356990a9a;p=thirdparty%2Flibvirt.git

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 1b94155acf..767fccda08 100644
--- 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 25df26686a..124c9f982a 100644
--- 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>