From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Wed, 20 Jul 2016 12:11:46 +0000 (+0300)
Subject: schema: fix resolved interfaces of network type
X-Git-Tag: v2.1.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03c1e0f38f4f7da0ff09bff2560e0230772bdd9d;p=thirdparty%2Flibvirt.git

schema: fix resolved interfaces of network type

  This patch reflects cases when <interface> element and its <source>
subelement for network type are formated based on actual type resolved
from referenced network instead of original one. networkAllocateActualDevice
and virDomainActualNetDefContentsFormat are taken as reference.
---

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index eb781871e5..ac9fd21816 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2107,6 +2107,28 @@
     </element>
   </define>
 
+  <define name="interface-network-attributes">
+    <attribute name="network">
+      <text/>
+    </attribute>
+    <optional>
+      <attribute name="portgroup">
+        <ref name="deviceName"/>
+      </attribute>
+    </optional>
+  </define>
+
+  <define name="interface-bridge-attributes">
+    <attribute name="bridge">
+      <ref name="deviceName"/>
+    </attribute>
+    <optional>
+      <attribute name="macTableManager">
+        <ref name="macTableManager"/>
+      </attribute>
+    </optional>
+  </define>
+
   <!--
       An interface description can either be of type bridge in which case
       it will use a bridging source, or of type ethernet which uses a device
@@ -2123,9 +2145,10 @@
           <interleave>
             <optional>
               <element name="source">
-                <attribute name="bridge">
-                  <ref name="deviceName"/>
-                </attribute>
+                <ref name="interface-bridge-attributes"/>
+                <optional>
+                  <ref name="interface-network-attributes"/>
+                </optional>
                 <empty/>
               </element>
             </optional>
@@ -2179,13 +2202,9 @@
           </attribute>
           <interleave>
             <element name="source">
-              <attribute name="network">
-                <text/>
-              </attribute>
+              <ref name='interface-network-attributes'/>
               <optional>
-                <attribute name="portgroup">
-                  <ref name="deviceName"/>
-                </attribute>
+                <ref name="interface-bridge-attributes"/>
               </optional>
               <empty/>
             </element>
@@ -2209,6 +2228,9 @@
                   <ref name="bridgeMode"/>
                 </attribute>
               </optional>
+              <optional>
+                <ref name='interface-network-attributes'/>
+              </optional>
               <empty/>
             </element>
             <optional>
diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
index b67a5eae88..c2c51aea4d 100644
--- a/docs/schemas/network.rng
+++ b/docs/schemas/network.rng
@@ -72,10 +72,7 @@
 
             <optional>
               <attribute name="macTableManager">
-                <choice>
-                  <value>kernel</value>
-                  <value>libvirt</value>
-                </choice>
+                <ref name="macTableManager"/>
               </attribute>
             </optional>
 
diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng
index fb69f7c712..a334b83e3b 100644
--- a/docs/schemas/networkcommon.rng
+++ b/docs/schemas/networkcommon.rng
@@ -260,4 +260,10 @@
       </optional>
     </element>
   </define>
+  <define name="macTableManager">
+    <choice>
+      <value>kernel</value>
+      <value>libvirt</value>
+    </choice>
+  </define>
 </grammar>