[netcf-devel] [PATCH 1/1] schema: add delay attribute to bridge element
Dan Kenigsberg
danken at redhat.com
Thu Jul 16 19:57:09 UTC 2009
On Thu, Jul 16, 2009 at 11:01:00AM -0700, David Lutterkort wrote:
> This makes it possible to set the forward delay for a bridge
> ---
> data/xml/initscripts-get.xsl | 3 +++
> data/xml/initscripts-put.xsl | 3 +++
> data/xml/interface.rng | 6 +++++-
> tests/initscripts/bridge.xml | 1 +
> tests/interface/bridge.xml | 2 +-
> 5 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/data/xml/initscripts-get.xsl b/data/xml/initscripts-get.xsl
> index 8f7aca7..b2a9020 100644
> --- a/data/xml/initscripts-get.xsl
> +++ b/data/xml/initscripts-get.xsl
> @@ -70,6 +70,9 @@
> <xsl:if test="bridge/@stp">
> <node label="STP" value="{bridge/@stp}"/>
> </xsl:if>
> + <xsl:if test="bridge/@delay">
> + <node label="DELAY" value="{bridge/@delay}"/>
> + </xsl:if>
> </tree>
> <xsl:for-each select='bridge/interface'>
> <tree>
> diff --git a/data/xml/initscripts-put.xsl b/data/xml/initscripts-put.xsl
> index aac047a..8df15c7 100644
> --- a/data/xml/initscripts-put.xsl
> +++ b/data/xml/initscripts-put.xsl
> @@ -76,6 +76,9 @@
> <xsl:if test="node[@label = 'STP']">
> <xsl:attribute name="stp"><xsl:value-of select="node[@label = 'STP']/@value"/></xsl:attribute>
> </xsl:if>
> + <xsl:if test="node[@label = 'DELAY']">
> + <xsl:attribute name="delay"><xsl:value-of select="node[@label = 'DELAY']/@value"/></xsl:attribute>
> + </xsl:if>
> <xsl:for-each select="/descendant-or-self::*[node[@label = 'BRIDGE' and @value = $iface]]">
> <xsl:if test="count(node[@label = 'VLAN']) = 0">
> <xsl:call-template name="bare-ethernet-interface"/>
> diff --git a/data/xml/interface.rng b/data/xml/interface.rng
> index 93ec9f8..6388d44 100644
> --- a/data/xml/interface.rng
> +++ b/data/xml/interface.rng
> @@ -7,7 +7,7 @@
> is released. The current version is indicated with the v:serial
> attribute on the start element.
> -->
> - <start v:serial="1">
> + <start v:serial="2">
> <choice>
> <ref name="ethernet-interface"/>
> <ref name="bridge-interface"/>
> @@ -115,6 +115,10 @@
> <ref name="on-or-off"/>
> </attribute>
> </optional>
> + <!-- Bridge forward delay (see 'brctl setfd') -->
> + <optional v:since="2">
> + <attribute name="delay"><ref name="uint"/></attribute>
> + </optional>
brctl setfd supports microsecond-precision timeval; uint sounds wrong
for that.
> <oneOrMore>
> <choice>
> <ref name="bare-ethernet-interface"/>
> diff --git a/tests/initscripts/bridge.xml b/tests/initscripts/bridge.xml
> index 3bfd573..5734315 100644
> --- a/tests/initscripts/bridge.xml
> +++ b/tests/initscripts/bridge.xml
> @@ -10,6 +10,7 @@
> <node label="TYPE" value="Bridge"/>
> <node label="BOOTPROTO" value="dhcp"/>
> <node label="STP" value="off"/>
> + <node label="DELAY" value="0"/>
> </tree>
> <tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth0">
> <node label="DEVICE" value="eth0"/>
> diff --git a/tests/interface/bridge.xml b/tests/interface/bridge.xml
> index fb0c35b..c04e24a 100644
> --- a/tests/interface/bridge.xml
> +++ b/tests/interface/bridge.xml
> @@ -4,7 +4,7 @@
> <protocol family="ipv4">
> <dhcp/>
> </protocol>
> - <bridge stp="off">
> + <bridge stp="off" delay="0">
> <interface type="ethernet" name="eth0">
> <mac address="ab:bb:cc:dd:ee:ff"/>
> </interface>
> --
> 1.6.0.6
>
> _______________________________________________
> netcf-devel mailing list
> netcf-devel at lists.fedorahosted.org
> https://fedorahosted.org/mailman/listinfo/netcf-devel
More information about the netcf-devel
mailing list