NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-20 11:48:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update interface.rng and xml test files to match netcf 0.1.5

Browse Source 
The RNG now supports IPv6 and bonds attached to bridges, along with
some other minor tweaks. All test files from netcf have been copied to
the test directory and added to the xml2xml and schema tests (and they
all pass, of course ;-)
This commit is contained in:
Laine Stump 2010-01-01 20:40:26 -05:00 committed by Matthias Bolte
parent 0022995555
commit 77dd67087b
16 changed files with 291 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

322
docs/schemas/interface.rng
View File

@ -1,7 +1,13 @@
<!-- A Relax NG schema for network interfaces --> <!-- A Relax NG schema for network interfaces -->
<grammar xmlns="http://relaxng.org/ns/structure/1.0" <grammar xmlns="http://relaxng.org/ns/structure/1.0"
xmlns:v="http://netcf.org/xml/version/1.0"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<start> <!-- Versions for this schema are simple integers that are incremented
everytime a changed (but backwards compatible) version
is released. The current version is indicated with the v:serial
attribute on the start element.
-->
<start v:serial="4">
<choice> <choice>
<ref name="ethernet-interface"/> <ref name="ethernet-interface"/>
<ref name="bridge-interface"/> <ref name="bridge-interface"/>
@ -109,12 +115,17 @@
<ref name="on-or-off"/> <ref name="on-or-off"/>
</attribute> </attribute>
</optional> </optional>
<oneOrMore> <!-- Bridge forward delay (see 'brctl setfd') -->
<optional v:since="2">
<attribute name="delay"><ref name="timeval"/></attribute>
</optional>
<zeroOrMore>
<choice> <choice>
<ref name="bare-ethernet-interface"/> <ref name="bare-ethernet-interface"/>
<ref name="bare-vlan-interface"/> <ref name="bare-vlan-interface"/>
<ref v:since="2" name="bare-bond-interface"/>
</choice> </choice>
</oneOrMore> </zeroOrMore>
</element> </element>
</element> </element>
</define> </define>
@ -125,90 +136,105 @@
<!-- <!--
Bonds Bonds
--> -->
<define name="bond-interface-common">
<attribute name="type">
<value>bond</value>
</attribute>
<ref name="name-attr"/>
</define>
<define name="bond-element">
<element name="bond">
<optional>
<attribute name="mode">
<choice>
<value>balance-rr</value>
<!-- The primary interface is the first interface child
of the bond element -->
<value>active-backup</value>
<value>balance-xor</value>
<value>broadcast</value>
<value>802.3ad</value>
<value>balance-tlb</value>
<value>balance-alb</value>
</choice>
</attribute>
</optional>
<!-- FIXME: add more attributes
mode == 802.3ad
ad_select
lacp_rate
xmit_hash_policy
mode == active-backup
fail_over_mac
num_grat_arp when mode == active-backup (since 3.3.0)
num_unsol_na when mode == active-backup (ipv6, since 3.4.0)
mode == balance-xor
xmit_hash_policy (since 2.6.3/3.2.2)
-->
<choice>
<element name="miimon">
<!-- miimon frequency in ms -->
<attribute name="freq"><ref name="uint"/></attribute>
<optional>
<attribute name="downdelay"><ref name="uint"/></attribute>
</optional>
<optional>
<attribute name="updelay"><ref name="uint"/></attribute>
</optional>
<optional>
<!-- use_carrier -->
<attribute name="carrier">
<choice>
<!-- use MII/ETHTOOL ioctl -->
<value>ioctl</value>
<!-- use netif_carrier_ok() -->
<value>netif</value>
</choice>
</attribute>
</optional>
</element>
<element name="arpmon">
<attribute name="interval"><ref name="uint"/></attribute>
<attribute name="target"><ref name="ipv4-addr"/></attribute>
<optional>
<attribute name="validate">
<choice>
<value>none</value>
<value>active</value>
<value>backup</value>
<value>all</value>
</choice>
</attribute>
</optional>
</element>
</choice>
<oneOrMore>
<!-- The slave interfaces -->
<ref name="bare-ethernet-interface"/>
</oneOrMore>
</element>
</define>
<define name="bare-bond-interface">
<element name="interface">
<ref name="bond-interface-common"/>
<ref name="bond-element"/>
</element>
</define>
<define name="bond-interface"> <define name="bond-interface">
<element name="interface"> <element name="interface">
<attribute name="type"> <ref name="bond-interface-common"/>
<value>bond</value>
</attribute>
<ref name="name-attr"/>
<ref name="startmode"/> <ref name="startmode"/>
<ref name="mtu"/> <ref name="mtu"/>
<ref name="interface-addressing"/> <ref name="interface-addressing"/>
<element name="bond"> <ref name="bond-element"/>
<optional>
<attribute name="mode">
<choice>
<value>balance-rr</value>
<!-- The primary interface is the first interface child
of the bond element -->
<value>active-backup</value>
<value>balance-xor</value>
<value>broadcast</value>
<value>802.3ad</value>
<value>balance-tlb</value>
<value>balance-alb</value>
</choice>
</attribute>
</optional>
<!-- FIXME: add more attributes
mode == 802.3ad
ad_select
lacp_rate
xmit_hash_policy
mode == active-backup
fail_over_mac
num_grat_arp when mode == active-backup (since 3.3.0)
num_unsol_na when mode == active-backup (ipv6, since 3.4.0)
mode == balance-xor
xmit_hash_policy (since 2.6.3/3.2.2)
-->
<choice>
<element name="miimon">
<!-- miimon frequency in ms -->
<attribute name="freq"><ref name="uint"/></attribute>
<optional>
<attribute name="downdelay"><ref name="uint"/></attribute>
</optional>
<optional>
<attribute name="updelay"><ref name="uint"/></attribute>
</optional>
<optional>
<!-- use_carrier -->
<attribute name="carrier">
<choice>
<!-- use MII/ETHTOOL ioctl -->
<value>ioctl</value>
<!-- use netif_carrier_ok() -->
<value>netif</value>
</choice>
</attribute>
</optional>
</element>
<element name="arpmon">
<attribute name="interval"><ref name="uint"/></attribute>
<attribute name="target"><ref name="ipv4-addr"/></attribute>
<optional>
<attribute name="validate">
<choice>
<value>none</value>
<value>active</value>
<value>backup</value>
<value>all</value>
</choice>
</attribute>
</optional>
</element>
</choice>
<oneOrMore>
<!-- The slave interfaces -->
<ref name="bare-ethernet-interface"/>
</oneOrMore>
</element>
</element> </element>
</define> </define>
@ -245,47 +271,87 @@
different protocols different protocols
--> -->
<define name="interface-addressing"> <define name="interface-addressing">
<optional>
<element name="protocol">
<ref name="protocol-ipv4"/>
</element>
</optional>
</define>
<define name="protocol-ipv4">
<attribute name="family">
<value>ipv4</value>
</attribute>
<choice> <choice>
<element name="dhcp">
<optional>
<attribute name="peerdns">
<ref name="yes-or-no"/>
</attribute>
</optional>
</element>
<!-- FIXME: This format should be good enough for IPv4 and IPv6, i.e.
ipaddr="192.168.0.5/24"
ipaddr="2001:DB8:ABCD::1/64"
but will cause some backend pain
-->
<group> <group>
<element name="ip">
<attribute name="address"><ref name="ipv4-addr"/></attribute>
<optional>
<attribute name="prefix"><ref name="ipv4-prefix"/></attribute>
</optional>
</element>
<optional> <optional>
<element name="route"> <ref name="protocol-ipv4"/>
<attribute name="gateway"><ref name="ipv4-addr"/></attribute> </optional>
</element> <optional v:since="3">
<ref name="protocol-ipv6"/>
</optional>
</group>
<group>
<optional v:since="3">
<ref name="protocol-ipv6"/>
</optional>
<optional>
<ref name="protocol-ipv4"/>
</optional> </optional>
</group> </group>
</choice> </choice>
</define> </define>
<define name="protocol-ipv4">
<element name="protocol">
<attribute name="family">
<value>ipv4</value>
</attribute>
<choice>
<ref name="dhcp-element"/>
<group>
<element name="ip">
<attribute name="address"><ref name="ipv4-addr"/></attribute>
<optional>
<attribute name="prefix"><ref name="ipv4-prefix"/></attribute>
</optional>
</element>
<optional>
<element name="route">
<attribute name="gateway"><ref name="ipv4-addr"/></attribute>
</element>
</optional>
</group>
</choice>
</element>
</define>
<define name="protocol-ipv6">
<element name="protocol">
<attribute name="family">
<value>ipv6</value>
</attribute>
<optional>
<element name="autoconf"><empty/></element>
</optional>
<optional>
<ref name="dhcp-element"/>
</optional>
<zeroOrMore>
<element name="ip">
<attribute name="address"><ref name="ipv6-addr"/></attribute>
<optional>
<attribute name="prefix"><ref name="ipv6-prefix"/></attribute>
</optional>
</element>
</zeroOrMore>
<optional>
<element name="route">
<attribute name="gateway"><ref name="ipv6-addr"/></attribute>
</element>
</optional>
</element>
</define>
<define name="dhcp-element">
<element name="dhcp">
<optional>
<attribute name="peerdns">
<ref name="yes-or-no"/>
</attribute>
</optional>
</element>
</define>
<!-- Jim Fehlig (<jfehlig@novell.com>) suggest the <!-- Jim Fehlig (<jfehlig@novell.com>) suggest the
following additions to DHCP: following additions to DHCP:
@ -342,6 +408,12 @@
</data> </data>
</define> </define>
<define name="timeval">
<data type="double">
<param name="minInclusive">0</param>
</data>
</define>
<define name='device-name'> <define name='device-name'>
<data type='string'> <data type='string'>
<param name="pattern">[a-zA-Z0-9_\.\-:/]+</param> <param name="pattern">[a-zA-Z0-9_\.\-:/]+</param>
@ -367,13 +439,27 @@
<define name='ipv4-addr'> <define name='ipv4-addr'>
<data type='string'> <data type='string'>
<param name="pattern">([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9]</param> <param name="pattern">(((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2}))\.){3}((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2}))</param>
</data> </data>
</define> </define>
<define name='ipv4-prefix'> <define name='ipv4-prefix'>
<data type='unsignedInt'>
<param name="maxInclusive">32</param>
</data>
</define>
<!-- Based on http://blog.mes-stats.fr/2008/10/09/regex-ipv4-et-ipv6 -->
<define name='ipv6-addr'>
<data type='string'> <data type='string'>
<param name="pattern">[1-9]|[12][0-9]|3[0-2]</param> <!-- To understand this better, take apart the toplevel '|'s -->
<param name="pattern">(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2})))\.){3}(((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2}))))|(([0-9A-Fa-f]{1,4}:){0,5}:((((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2})))\.){3}(((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2}))))|(::([0-9A-Fa-f]{1,4}:){0,5}((((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2})))\.){3}(((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2}))))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)</param>
</data>
</define>
<define name='ipv6-prefix'>
<data type='unsignedInt'>
<param name="maxInclusive">128</param>
</data> </data>
</define> </define>

6
tests/interfaceschemadata/bond-arp.xml
View File

@ -6,7 +6,9 @@
</protocol> </protocol>
<bond mode='active-backup'> <bond mode='active-backup'>
<arpmon interval='100' target='192.168.50.1' validate='active'/> <arpmon interval='100' target='192.168.50.1' validate='active'/>
<interface type='ethernet' name='eth1'/> <interface type='ethernet' name='eth1'>
<interface type='ethernet' name='eth0'/> </interface>
<interface type='ethernet' name='eth0'>
</interface>
</bond> </bond>
</interface> </interface>

6
tests/interfaceschemadata/bond.xml
View File

@ -6,7 +6,9 @@
</protocol> </protocol>
<bond mode='active-backup'> <bond mode='active-backup'>
<miimon freq='100' updelay='10' carrier='ioctl'/> <miimon freq='100' updelay='10' carrier='ioctl'/>
<interface type='ethernet' name='eth1'/> <interface type='ethernet' name='eth1'>
<interface type='ethernet' name='eth0'/> </interface>
<interface type='ethernet' name='eth0'>
</interface>
</bond> </bond>
</interface> </interface>

17
tests/interfaceschemadata/bridge-bond.xml Normal file
View File

@ -0,0 +1,17 @@
<interface type='bridge' name='br0'>
<start mode='onboot'/>
<mtu size='1500'/>
<bridge stp='off'>
<interface type='ethernet' name='eth2'>
</interface>
<interface type='bond' name='bond0'>
<bond mode='active-backup'>
<miimon freq='100' updelay='10' carrier='ioctl'/>
<interface type='ethernet' name='eth1'>
</interface>
<interface type='ethernet' name='eth0'>
</interface>
</bond>
</interface>
</bridge>
</interface>

6
tests/interfaceschemadata/bridge-empty.xml Normal file
View File

@ -0,0 +1,6 @@
<interface type='bridge' name='br0'>
<start mode='onboot'/>
<mtu size='1500'/>
<bridge stp='off'>
</bridge>
</interface>

3
tests/interfaceschemadata/bridge-no-address.xml
View File

@ -5,6 +5,7 @@
<interface type='ethernet' name='eth0'> <interface type='ethernet' name='eth0'>
<mac address='ab:bb:cc:dd:ee:ff'/> <mac address='ab:bb:cc:dd:ee:ff'/>
</interface> </interface>
<interface type='ethernet' name='eth1'/> <interface type='ethernet' name='eth1'>
</interface>
</bridge> </bridge>
</interface> </interface>

2
tests/interfaceschemadata/bridge-vlan.xml
View File

@ -6,7 +6,7 @@
<bridge stp='off'> <bridge stp='off'>
<interface type='vlan' name='eth0.42'> <interface type='vlan' name='eth0.42'>
<vlan tag='42'> <vlan tag='42'>
<interface name='eth0'/> <interface name='eth0'/>
</vlan> </vlan>
</interface> </interface>
</bridge> </bridge>

5
tests/interfaceschemadata/bridge.xml
View File

@ -4,10 +4,11 @@
<protocol family='ipv4'> <protocol family='ipv4'>
<dhcp/> <dhcp/>
</protocol> </protocol>
<bridge stp='off'> <bridge stp='off' delay='0.01'>
<interface type='ethernet' name='eth0'> <interface type='ethernet' name='eth0'>
<mac address='ab:bb:cc:dd:ee:ff'/> <mac address='ab:bb:cc:dd:ee:ff'/>
</interface> </interface>
<interface type='ethernet' name='eth1'/> <interface type='ethernet' name='eth1'>
</interface>
</bridge> </bridge>
</interface> </interface>

3
tests/interfaceschemadata/bridge42.xml
View File

@ -2,6 +2,7 @@
<start mode='onboot'/> <start mode='onboot'/>
<mtu size='1500'/> <mtu size='1500'/>
<bridge stp='off'> <bridge stp='off'>
<interface type='ethernet' name='eth42'/> <interface type='ethernet' name='eth42'>
</interface>
</bridge> </bridge>
</interface> </interface>

7
tests/interfaceschemadata/ipv6-autoconf-dhcp.xml Normal file
View File

@ -0,0 +1,7 @@
<interface type='ethernet' name='eth0'>
<start mode='onboot'/>
<protocol family='ipv6'>
<autoconf/>
<dhcp/>
</protocol>
</interface>

6
tests/interfaceschemadata/ipv6-autoconf.xml Normal file
View File

@ -0,0 +1,6 @@
<interface type='ethernet' name='eth0'>
<start mode='onboot'/>
<protocol family='ipv6'>
<autoconf/>
</protocol>
</interface>

6
tests/interfaceschemadata/ipv6-dhcp.xml Normal file
View File

@ -0,0 +1,6 @@
<interface type='ethernet' name='eth0'>
<start mode='onboot'/>
<protocol family='ipv6'>
<dhcp/>
</protocol>
</interface>

5
tests/interfaceschemadata/ipv6-local.xml Normal file
View File

@ -0,0 +1,5 @@
<interface type='ethernet' name='eth0'>
<start mode='onboot'/>
<protocol family='ipv6'>
</protocol>
</interface>

8
tests/interfaceschemadata/ipv6-static-multi.xml Normal file
View File

@ -0,0 +1,8 @@
<interface type='ethernet' name='eth0'>
<start mode='onboot'/>
<protocol family='ipv6'>
<ip address='3ffe:ffff:0:5::1' prefix='128'/>
<ip address='3ffe:ffff:0:5::3' prefix='128'/>
<ip address='3ffe:ffff:0:5::5' prefix='128'/>
</protocol>
</interface>

7
tests/interfaceschemadata/ipv6-static.xml Normal file
View File

@ -0,0 +1,7 @@
<interface type='ethernet' name='eth0'>
<start mode='onboot'/>
<protocol family='ipv6'>
<ip address='3ffe:ffff:0:5::1' prefix='128'/>
<route gateway='3ffe:ffff:1234:5678::1'/>
</protocol>
</interface>

9
tests/interfacexml2xmltest.c
View File

@ -83,11 +83,20 @@ mymain(int argc, char **argv)
DO_TEST("ethernet-static-no-prefix"); DO_TEST("ethernet-static-no-prefix");
DO_TEST("bridge"); DO_TEST("bridge");
DO_TEST("bridge42"); DO_TEST("bridge42");
DO_TEST("bridge-bond");
DO_TEST("bridge-empty");
DO_TEST("bridge-no-address");
DO_TEST("bridge-vlan"); DO_TEST("bridge-vlan");
DO_TEST("bridge-no-address"); DO_TEST("bridge-no-address");
DO_TEST("vlan"); DO_TEST("vlan");
DO_TEST("bond"); DO_TEST("bond");
DO_TEST("bond-arp"); DO_TEST("bond-arp");
DO_TEST("ipv6-autoconf-dhcp");
DO_TEST("ipv6-autoconf");
DO_TEST("ipv6-dhcp");
DO_TEST("ipv6-local");
DO_TEST("ipv6-static-multi");
DO_TEST("ipv6-static");
return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
} }