External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-21 10:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

schema: fix resolved interfaces of network type

Browse Source 
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.
This commit is contained in:
Nikolay Shirokovskiy 2016-07-20 15:11:46 +03:00 committed by Ján Tomko
parent 0e8083da3b
commit 03c1e0f38f
3 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
docs/schemas/domaincommon.rng
View File

@ -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>

5
docs/schemas/network.rng
View File

@ -72,10 +72,7 @@
<optional>
<attribute name="macTableManager">
<choice>
<value>kernel</value>
<value>libvirt</value>
</choice>
<ref name="macTableManager"/>
</attribute>
</optional>

6
docs/schemas/networkcommon.rng
View File

@ -260,4 +260,10 @@
</optional>
</element>
</define>
<define name="macTableManager">
<choice>
<value>kernel</value>
<value>libvirt</value>
</choice>
</define>
</grammar>