[libvirt] [PATCH] interface.rng: Make miimon and arpmon optional for bond interfaces
This has been optional in netcf for awhile, but the change hadn't been
propogated to the libvirt copy of the RNG.
---
I noticed this was out of date while updating the netcf RNG with the
new regex for ipv4-address.
Note that, although the diff is long, it's just adding
<optional>...</optional> around the section, and re-indenting.
Everything in the middle is only whitespace changes.
docs/schemas/interface.rng | 77 +++++++++++++++++++++++---------------------
1 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/docs/schemas/interface.rng b/docs/schemas/interface.rng
index 75893b5..4dd1bb4 100644
--- a/docs/schemas/interface.rng
+++ b/docs/schemas/interface.rng
@@ -177,43 +177,46 @@
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>
+ <optional>
+ <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>
+ </optional>
+
<oneOrMore>
<!-- The slave interfaces -->
<ref name="bare-ethernet-interface"/>
--
1.7.2.3