You need to sign in or sign up before continuing.
提交 03c1e0f3 编写于 作者: N Nikolay Shirokovskiy 提交者: Ján Tomko

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.
上级 0e8083da
...@@ -2107,6 +2107,28 @@ ...@@ -2107,6 +2107,28 @@
</element> </element>
</define> </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 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 it will use a bridging source, or of type ethernet which uses a device
...@@ -2123,9 +2145,10 @@ ...@@ -2123,9 +2145,10 @@
<interleave> <interleave>
<optional> <optional>
<element name="source"> <element name="source">
<attribute name="bridge"> <ref name="interface-bridge-attributes"/>
<ref name="deviceName"/> <optional>
</attribute> <ref name="interface-network-attributes"/>
</optional>
<empty/> <empty/>
</element> </element>
</optional> </optional>
...@@ -2179,13 +2202,9 @@ ...@@ -2179,13 +2202,9 @@
</attribute> </attribute>
<interleave> <interleave>
<element name="source"> <element name="source">
<attribute name="network"> <ref name='interface-network-attributes'/>
<text/>
</attribute>
<optional> <optional>
<attribute name="portgroup"> <ref name="interface-bridge-attributes"/>
<ref name="deviceName"/>
</attribute>
</optional> </optional>
<empty/> <empty/>
</element> </element>
...@@ -2209,6 +2228,9 @@ ...@@ -2209,6 +2228,9 @@
<ref name="bridgeMode"/> <ref name="bridgeMode"/>
</attribute> </attribute>
</optional> </optional>
<optional>
<ref name='interface-network-attributes'/>
</optional>
<empty/> <empty/>
</element> </element>
<optional> <optional>
......
...@@ -72,10 +72,7 @@ ...@@ -72,10 +72,7 @@
<optional> <optional>
<attribute name="macTableManager"> <attribute name="macTableManager">
<choice> <ref name="macTableManager"/>
<value>kernel</value>
<value>libvirt</value>
</choice>
</attribute> </attribute>
</optional> </optional>
......
...@@ -260,4 +260,10 @@ ...@@ -260,4 +260,10 @@
</optional> </optional>
</element> </element>
</define> </define>
<define name="macTableManager">
<choice>
<value>kernel</value>
<value>libvirt</value>
</choice>
</define>
</grammar> </grammar>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册