6:32 p.m.
These patches add basic IPv6 support to netcf. They are not terribly
well-tested, but seem to work AFAICT (I'd appreciate any help testing this).
The interface.rng schema (patch 1/3) now allows an IPv6 block
<protocol family="ipv6">
<autoconf/>
<dhcp/>
<ip address="3ffe:ffff:0:5::1" prefix="128"/>
.. more <ip/> addresses ..
<route gateway="3ffe:ffff:1234:5678::1"/>
</protocol>
where anything inside the <protocol/> tag is optional.
Detailed examples can be found in patch 3/3
Given the Fedora release schedule, I am probably going to cut another netcf
release containing these patches tomorrow. Therefore, feedback by tomorrow
would be most valuable ;)
David
6:32 p.m.
New subject: [PATCH 1/3] Extend the schema for IPv6 addressing
---
data/xml/interface.rng | 53 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/data/xml/interface.rng b/data/xml/interface.rng
index 6b8f79d..bb8500f 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="2">
+ <start v:serial="3">
<choice>
<ref name="ethernet-interface"/>
<ref name="bridge-interface"/>
@@ -276,6 +276,11 @@
<ref name="protocol-ipv4"/>
</element>
</optional>
+ <optional v:since="3">
+ <element name="protocol">
+ <ref name="protocol-ipv6"/>
+ </element>
+ </optional>
</define>
<define name="protocol-ipv4">
@@ -305,6 +310,38 @@
</group>
</choice>
</define>
+
+ <define name="protocol-ipv6">
+ <attribute name="family">
+ <value>ipv6</value>
+ </attribute>
+ <optional>
+ <element name="autoconf"><empty/></element>
+ </optional>
+ <optional>
+ <element name="dhcp">
+ <optional>
+ <attribute name="peerdns">
+ <ref name="yes-or-no"/>
+ </attribute>
+ </optional>
+ </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>
+ </define>
+
<!-- Jim Fehlig (<jfehlig(a)novell.com>) suggest the
following additions to DHCP:
@@ -402,6 +439,20 @@
</data>
</define>
+ <!-- Based on http://blog.mes-stats.fr/2008/10/09/regex-ipv4-et-ipv6 -->
+ <define name='ipv6-addr'>
+ <data type='string'>
+ <!-- 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>
+ </define>
+
<define name='vlan-id'>
<data type="unsignedInt">
<param name="maxInclusive">4096</param>
--
1.6.2.5
10:48 a.m.
New subject: [PATCH 1/3] Extend the schema for IPv6 addressing
On Thu, Sep 24, 2009 at 04:32:21PM -0700, David Lutterkort wrote:
---
data/xml/interface.rng | 53 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 deletions(-)
ACK this looks good to me.
diff --git a/data/xml/interface.rng b/data/xml/interface.rng
index 6b8f79d..bb8500f 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="2">
+ <start v:serial="3">
<choice>
<ref name="ethernet-interface"/>
<ref name="bridge-interface"/>
@@ -276,6 +276,11 @@
<ref name="protocol-ipv4"/>
</element>
</optional>
+ <optional v:since="3">
+ <element name="protocol">
+ <ref name="protocol-ipv6"/>
+ </element>
+ </optional>
</define>
<define name="protocol-ipv4">
@@ -305,6 +310,38 @@
</group>
</choice>
</define>
+
+ <define name="protocol-ipv6">
+ <attribute name="family">
+ <value>ipv6</value>
+ </attribute>
+ <optional>
+ <element name="autoconf"><empty/></element>
+ </optional>
+ <optional>
+ <element name="dhcp">
+ <optional>
+ <attribute name="peerdns">
+ <ref name="yes-or-no"/>
+ </attribute>
+ </optional>
+ </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>
+ </define>
+
<!-- Jim Fehlig (<jfehlig(a)novell.com>) suggest the
following additions to DHCP:
@@ -402,6 +439,20 @@
</data>
</define>
+ <!-- Based on http://blog.mes-stats.fr/2008/10/09/regex-ipv4-et-ipv6 -->
+ <define name='ipv6-addr'>
+ <data type='string'>
+ <!-- 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>
+ </define>
+
<define name='vlan-id'>
<data type="unsignedInt">
<param name="maxInclusive">4096</param>
Nice regex !!!
Daniel
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
10:48 a.m.
New subject: [PATCH 1/3] Extend the schema for IPv6 addressing
On Thu, Sep 24, 2009 at 04:32:21PM -0700, David Lutterkort wrote:
---
data/xml/interface.rng | 53 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/data/xml/interface.rng b/data/xml/interface.rng
index 6b8f79d..bb8500f 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="2">
+ <start v:serial="3">
<choice>
<ref name="ethernet-interface"/>
<ref name="bridge-interface"/>
@@ -276,6 +276,11 @@
<ref name="protocol-ipv4"/>
</element>
</optional>
+ <optional v:since="3">
+ <element name="protocol">
+ <ref name="protocol-ipv6"/>
+ </element>
+ </optional>
</define>
Hum, this forces ipv4 protocol info before ipv6 ones, but I guess it's
fine, makes things easier to lookup manually though I guess the parsing
code doesn't care :-)
<define name="protocol-ipv4">
@@ -305,6 +310,38 @@
</group>
</choice>
</define>
+
+ <define name="protocol-ipv6">
+ <attribute name="family">
+ <value>ipv6</value>
+ </attribute>
+ <optional>
+ <element name="autoconf"><empty/></element>
+ </optional>
+ <optional>
----------
+ <element name="dhcp">
+ <optional>
+ <attribute name="peerdns">
+ <ref name="yes-or-no"/>
+ </attribute>
+ </optional>
+ </element>
----------
identical to ipv4, so I would factor this out as a define.
+ </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>
+ </define>
+
ACK
following additions to DHCP:
@@ -402,6 +439,20 @@
</data>
</define>
+ <!-- Based on http://blog.mes-stats.fr/2008/10/09/regex-ipv4-et-ipv6 -->
+ <define name='ipv6-addr'>
+ <data type='string'>
+ <!-- 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>
OMG !!!
Well as long as it doesn't break libxml2 regexps :-)
+ </data>
+ </define>
+
+ <define name='ipv6-prefix'>
+ <data type='unsignedInt'>
+ <param name="maxInclusive">128</param>
+ </data>
+ </define>
+
<define name='vlan-id'>
<data type="unsignedInt">
<param name="maxInclusive">4096</param>
I think the only novelty is the zeroOrMore for <ip> which sounds fine
from an Ipv6 standpoint !
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library http://libvirt.org/
10:53 a.m.
New subject: [PATCH 1/3] Extend the schema for IPv6 addressing
On Fri, Sep 25, 2009 at 05:48:52PM +0200, Daniel Veillard wrote:
On Thu, Sep 24, 2009 at 04:32:21PM -0700, David Lutterkort wrote:
> ---
> data/xml/interface.rng | 53 +++++++++++++++++++++++++++++++++++++++++++++++-
> 1 files changed, 52 insertions(+), 1 deletions(-)
>
> diff --git a/data/xml/interface.rng b/data/xml/interface.rng
> index 6b8f79d..bb8500f 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="2">
> + <start v:serial="3">
> <choice>
> <ref name="ethernet-interface"/>
> <ref name="bridge-interface"/>
> @@ -276,6 +276,11 @@
> <ref name="protocol-ipv4"/>
> </element>
> </optional>
> + <optional v:since="3">
> + <element name="protocol">
> + <ref name="protocol-ipv6"/>
> + </element>
> + </optional>
> </define>
Hum, this forces ipv4 protocol info before ipv6 ones, but I guess it's
fine, makes things easier to lookup manually though I guess the parsing
code doesn't care :-)
> <define name="protocol-ipv4">
> @@ -305,6 +310,38 @@
> </group>
> </choice>
> </define>
> +
> + <define name="protocol-ipv6">
> + <attribute name="family">
> + <value>ipv6</value>
> + </attribute>
> + <optional>
> + <element name="autoconf"><empty/></element>
> + </optional>
> + <optional>
----------
> + <element name="dhcp">
> + <optional>
> + <attribute name="peerdns">
> + <ref name="yes-or-no"/>
> + </attribute>
> + </optional>
> + </element>
----------
identical to ipv4, so I would factor this out as a define.
> + </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>
> + </define>
> +
ACK
> following additions to DHCP:
>
> @@ -402,6 +439,20 @@
> </data>
> </define>
>
> + <!-- Based on http://blog.mes-stats.fr/2008/10/09/regex-ipv4-et-ipv6 -->
> + <define name='ipv6-addr'>
> + <data type='string'>
> + <!-- 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>
OMG !!!
Well as long as it doesn't break libxml2 regexps :-)
> + </data>
> + </define>
> +
> + <define name='ipv6-prefix'>
> + <data type='unsignedInt'>
> + <param name="maxInclusive">128</param>
> + </data>
> + </define>
> +
> <define name='vlan-id'>
> <data type="unsignedInt">
> <param name="maxInclusive">4096</param>
I think the only novelty is the zeroOrMore for <ip> which sounds fine
from an Ipv6 standpoint !
It is not really a novelty - the IPv4 definition should be allowing
zeroOrMore too - it is a bug that it doesn't !
Regards,
Daniel
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
12:40 p.m.
New subject: [PATCH 1/3] Extend the schema for IPv6 addressing
On Fri, 2009-09-25 at 17:48 +0200, Daniel Veillard wrote:
On Thu, Sep 24, 2009 at 04:32:21PM -0700, David Lutterkort wrote:
Hum, this forces ipv4 protocol info before ipv6 ones, but I guess it's
fine, makes things easier to lookup manually though I guess the parsing
code doesn't care :-)
It doesn't really matter from a processing POV, so I could relax that
and allow ipv4/ipv6 in any order. How good's the implementation of the
interleave validation ;) ? Actually, interleave isn't allowed here since
you'd be interleaving two <protocol/> elements, and interleave doesn't
seem to be able to discriminate based on the family attribute. Ugh.
----------
> + <element name="dhcp">
> + <optional>
> + <attribute name="peerdns">
> + <ref name="yes-or-no"/>
> + </attribute>
> + </optional>
> + </element>
----------
identical to ipv4, so I would factor this out as a define.
Done.
David
6:32 p.m.
New subject: [PATCH 2/3] Transforms for ipv6-addressing
* data/xml/initscripts-get.xsl: produce IPv6 entries in ifcfg- files
* data/xml/initscripts-put.xsl: read IPv6 entries in ifcfg files and
generate XML for them. Uses libexslt.
* src/drv_initscripts.c: register the strings module from libexslt
* configure.ac: use libexslt
---
configure.ac | 3 +-
data/xml/initscripts-get.xsl | 44 ++++++++++++++++++++++++++++++++++++++++++
data/xml/initscripts-put.xsl | 44 +++++++++++++++++++++++++++++++++++++++++-
src/drv_initscripts.c | 3 ++
4 files changed, 92 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8775940..acfacbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,10 +30,11 @@ PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES([LIBAUGEAS], [augeas >= 0.5.0])
PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
PKG_CHECK_MODULES([LIBXSLT], [libxslt])
+PKG_CHECK_MODULES([LIBEXSLT], [libexslt])
NETCF_CHECK_READLINE
-NETCF_LIBDEPS=$(echo $LIBAUGEAS_LIBS $LIBXSLT_LIBS $LIBXML_LIBS)
+NETCF_LIBDEPS=$(echo $LIBAUGEAS_LIBS $LIBEXSLT_LIBS $LIBXSLT_LIBS $LIBXML_LIBS)
AC_SUBST([NETCF_LIBDEPS])
AC_OUTPUT(Makefile \
diff --git a/data/xml/initscripts-get.xsl b/data/xml/initscripts-get.xsl
index f144092..fab8ecb 100644
--- a/data/xml/initscripts-get.xsl
+++ b/data/xml/initscripts-get.xsl
@@ -176,6 +176,9 @@
<xsl:for-each select="protocol[@family='ipv4']">
<xsl:call-template name="protocol-ipv4"/>
</xsl:for-each>
+ <xsl:for-each select="protocol[@family='ipv6']">
+ <xsl:call-template name="protocol-ipv6"/>
+ </xsl:for-each>
</xsl:template>
<xsl:template name="protocol-ipv4">
@@ -198,4 +201,45 @@
</xsl:when>
</xsl:choose>
</xsl:template>
+
+ <xsl:template name="protocol-ipv6">
+ <node label="IPV6INIT" value="yes"/>
+ <xsl:if test="count(autoconf) > 0">
+ <node label="IPV6_AUTOCONF" value="yes"/>
+ </xsl:if>
+ <xsl:if test="count(autoconf) = 0">
+ <node label="IPV6_AUTOCONF" value="no"/>
+ </xsl:if>
+ <xsl:if test="count(dhcp) > 0">
+ <node label="DHCPV6" value="yes"/>
+ </xsl:if>
+ <xsl:if test="count(dhcp) = 0">
+ <node label="DHCPV6" value="no"/>
+ </xsl:if>
+ <xsl:if test="count(ip) > 0">
+ <node label="IPV6ADDR">
+ <xsl:attribute name="value">
+ <xsl:value-of select="ip[1]/@address"/><xsl:if
test="ip[1]/@prefix">/<xsl:value-of
select="ip[1]/@prefix"/></xsl:if>
+ </xsl:attribute>
+ </node>
+ </xsl:if>
+ <xsl:if test="count(ip) > 1">
+ <node label="IPV6ADDR_SECONDARIES">
+ <xsl:attribute name="value">
+ <xsl:text>'</xsl:text>
+ <xsl:for-each
select="ip[1]/following-sibling::ip[following-sibling::ip]">
+ <xsl:value-of select="@address"/><xsl:if
test="@prefix">/<xsl:value-of
select="@prefix"/></xsl:if><xsl:value-of select="string('
')"/>
+ </xsl:for-each>
+ <xsl:for-each select="ip[last()]">
+ <xsl:value-of select="@address"/><xsl:if
test="@prefix">/<xsl:value-of
select="@prefix"/></xsl:if>
+ </xsl:for-each>
+ <xsl:text>'</xsl:text>
+ </xsl:attribute>
+ </node>
+ </xsl:if>
+ <xsl:if test="route">
+ <node label="IPV6_DEFAULTGW" value="{route/@gateway}"/>
+ </xsl:if>
+ </xsl:template>
+
</xsl:stylesheet>
diff --git a/data/xml/initscripts-put.xsl b/data/xml/initscripts-put.xsl
index 0bd5dbc..ff741d4 100644
--- a/data/xml/initscripts-put.xsl
+++ b/data/xml/initscripts-put.xsl
@@ -2,7 +2,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:ipcalc = "http://redhat.com/xslt/netcf/ipcalc/1.0"
xmlns:bond = "http://redhat.com/xslt/netcf/bond/1.0"
- extension-element-prefixes="bond ipcalc"
+ xmlns:str="http://exslt.org/strings"
+ extension-element-prefixes="bond ipcalc str"
version="1.0">
<xsl:import href="util-put.xsl"/>
@@ -165,6 +166,7 @@
<xsl:template name="interface-addressing">
<xsl:call-template name="protocol-ipv4"/>
+ <xsl:call-template name="protocol-ipv6"/>
</xsl:template>
<xsl:template name="protocol-ipv4">
@@ -203,6 +205,46 @@
</xsl:if>
</xsl:template>
+ <xsl:template name="protocol-ipv6">
+ <xsl:if test="node[@label = 'IPV6INIT'][@value =
'yes']">
+ <protocol family="ipv6">
+ <xsl:if test="node[@label = 'IPV6_AUTOCONF'][@value =
'yes']">
+ <autoconf/>
+ </xsl:if>
+ <xsl:if test="node[@label = 'DHCPV6'][@value =
'yes']">
+ <dhcp/>
+ </xsl:if>
+ <xsl:if test="node[@label = 'IPV6ADDR']">
+ <xsl:call-template name="ipv6-address">
+ <xsl:with-param name="value"
+ select="node[@label =
'IPV6ADDR']/@value"/>
+ </xsl:call-template>
+ </xsl:if>
+ <xsl:if test="node[@label = 'IPV6ADDR_SECONDARIES']">
+ <xsl:for-each select="str:split(node[@label =
'IPV6ADDR_SECONDARIES']/@value)">
+ <xsl:call-template name="ipv6-address">
+ <xsl:with-param name="value" select="."/>
+ </xsl:call-template>
+ </xsl:for-each>
+ </xsl:if>
+ </protocol>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template name="ipv6-address">
+ <xsl:param name="value"/>
+ <xsl:variable name="address" select="substring-before($value,
'/')"/>
+ <xsl:variable name="prefix" select="substring-after($value,
'/')"/>
+ <ip address="{$address}">
+ <xsl:if test="$prefix != ''">
+ <xsl:attribute name="prefix"><xsl:value-of
select="$prefix"/></xsl:attribute>
+ </xsl:if>
+ </ip>
+ <xsl:if test="node[@label = 'IPV6_DEFAULTGW']">
+ <route gateway="{node[@label =
'IPV6_DEFAULTGW']/@value}"/>
+ </xsl:if>
+ </xsl:template>
+
<xsl:template name="bare-ethernet-interface">
<interface type="ethernet">
<xsl:call-template name="name-attr"/>
diff --git a/src/drv_initscripts.c b/src/drv_initscripts.c
index 02b7e6e..1c0463d 100644
--- a/src/drv_initscripts.c
+++ b/src/drv_initscripts.c
@@ -45,6 +45,8 @@
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
+#include <libexslt/exslt.h>
+
static const char *const network_scripts_path =
"/files/etc/sysconfig/network-scripts";
@@ -479,6 +481,7 @@ int drv_init(struct netcf *ncf) {
// FIXME: Check for errors
xsltInit();
+ exsltStrRegister();
ncf->driver->get = parse_stylesheet(ncf, "initscripts-get.xsl");
ncf->driver->put = parse_stylesheet(ncf, "initscripts-put.xsl");
ncf->driver->rng = rng_parse(ncf, "interface.rng");
--
1.6.2.5
10:56 a.m.
New subject: [PATCH 2/3] Transforms for ipv6-addressing
On Thu, Sep 24, 2009 at 04:32:22PM -0700, David Lutterkort wrote:
* data/xml/initscripts-get.xsl: produce IPv6 entries in ifcfg-
files
* data/xml/initscripts-put.xsl: read IPv6 entries in ifcfg files and
generate XML for them. Uses libexslt.
* src/drv_initscripts.c: register the strings module from libexslt
* configure.ac: use libexslt
---
configure.ac | 3 +-
data/xml/initscripts-get.xsl | 44 ++++++++++++++++++++++++++++++++++++++++++
data/xml/initscripts-put.xsl | 44 +++++++++++++++++++++++++++++++++++++++++-
src/drv_initscripts.c | 3 ++
4 files changed, 92 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8775940..acfacbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,10 +30,11 @@ PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES([LIBAUGEAS], [augeas >= 0.5.0])
PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
PKG_CHECK_MODULES([LIBXSLT], [libxslt])
+PKG_CHECK_MODULES([LIBEXSLT], [libexslt])
NETCF_CHECK_READLINE
-NETCF_LIBDEPS=$(echo $LIBAUGEAS_LIBS $LIBXSLT_LIBS $LIBXML_LIBS)
+NETCF_LIBDEPS=$(echo $LIBAUGEAS_LIBS $LIBEXSLT_LIBS $LIBXSLT_LIBS $LIBXML_LIBS)
Hum libexslt is not the most correct part of the stack ...
[...]
- extension-element-prefixes="bond ipcalc"
+ xmlns:str="http://exslt.org/strings"
+ extension-element-prefixes="bond ipcalc str"
[...]
+ <xsl:if test="node[@label =
'IPV6ADDR_SECONDARIES']">
+ <xsl:for-each select="str:split(node[@label =
'IPV6ADDR_SECONDARIES']/@value)">
okay str:split should be safe :-)
I didn't noticed anything nasty !
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library http://libvirt.org/
11:45 a.m.
New subject: [PATCH 2/3] Transforms for ipv6-addressing
On Fri, 2009-09-25 at 17:56 +0200, Daniel Veillard wrote:
Hum libexslt is not the most correct part of the stack ...
Ugh .. I hope the call to exsltStrRegister in drv_init won't cause any
headaches.
[...]
> - extension-element-prefixes="bond ipcalc"
> + xmlns:str="http://exslt.org/strings"
> + extension-element-prefixes="bond ipcalc str"
[...]
> + <xsl:if test="node[@label =
'IPV6ADDR_SECONDARIES']">
> + <xsl:for-each select="str:split(node[@label =
'IPV6ADDR_SECONDARIES']/@value)">
okay str:split should be safe :-)
I didn't noticed anything nasty !
Yeah, that's all I use it for; eventually, I want to do the splitting in
the Augeas lens and remove the dependency on libexslt.
David
6:32 p.m.
New subject: [PATCH 3/3] Test cases for ipv6-addressing
Exercise the various variations on how an interface can be set up for IPv6
---
tests/initscripts/ipv6-autoconf-dhcp.xml | 10 ++++++++++
tests/initscripts/ipv6-autoconf.xml | 10 ++++++++++
tests/initscripts/ipv6-dhcp.xml | 10 ++++++++++
tests/initscripts/ipv6-local.xml | 10 ++++++++++
tests/initscripts/ipv6-static-multi.xml | 12 ++++++++++++
tests/initscripts/ipv6-static.xml | 12 ++++++++++++
tests/interface/ipv6-autoconf-dhcp.xml | 7 +++++++
tests/interface/ipv6-autoconf.xml | 6 ++++++
tests/interface/ipv6-dhcp.xml | 6 ++++++
tests/interface/ipv6-local.xml | 4 ++++
tests/interface/ipv6-static-multi.xml | 8 ++++++++
tests/interface/ipv6-static.xml | 7 +++++++
tests/test-initscripts.c | 7 +++++++
13 files changed, 109 insertions(+), 0 deletions(-)
create mode 100644 tests/initscripts/ipv6-autoconf-dhcp.xml
create mode 100644 tests/initscripts/ipv6-autoconf.xml
create mode 100644 tests/initscripts/ipv6-dhcp.xml
create mode 100644 tests/initscripts/ipv6-local.xml
create mode 100644 tests/initscripts/ipv6-static-multi.xml
create mode 100644 tests/initscripts/ipv6-static.xml
create mode 100644 tests/interface/ipv6-autoconf-dhcp.xml
create mode 100644 tests/interface/ipv6-autoconf.xml
create mode 100644 tests/interface/ipv6-dhcp.xml
create mode 100644 tests/interface/ipv6-local.xml
create mode 100644 tests/interface/ipv6-static-multi.xml
create mode 100644 tests/interface/ipv6-static.xml
diff --git a/tests/initscripts/ipv6-autoconf-dhcp.xml
b/tests/initscripts/ipv6-autoconf-dhcp.xml
new file mode 100644
index 0000000..f755fa4
--- /dev/null
+++ b/tests/initscripts/ipv6-autoconf-dhcp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<forest>
+ <tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth0">
+ <node label="DEVICE" value="eth0"/>
+ <node label="ONBOOT" value="yes"/>
+ <node label="IPV6INIT" value="yes"/>
+ <node label="IPV6_AUTOCONF" value="yes"/>
+ <node label="DHCPV6" value="yes"/>
+ </tree>
+</forest>
diff --git a/tests/initscripts/ipv6-autoconf.xml b/tests/initscripts/ipv6-autoconf.xml
new file mode 100644
index 0000000..637864c
--- /dev/null
+++ b/tests/initscripts/ipv6-autoconf.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<forest>
+ <tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth0">
+ <node label="DEVICE" value="eth0"/>
+ <node label="ONBOOT" value="yes"/>
+ <node label="IPV6INIT" value="yes"/>
+ <node label="IPV6_AUTOCONF" value="yes"/>
+ <node label="DHCPV6" value="no"/>
+ </tree>
+</forest>
diff --git a/tests/initscripts/ipv6-dhcp.xml b/tests/initscripts/ipv6-dhcp.xml
new file mode 100644
index 0000000..c87f0ce
--- /dev/null
+++ b/tests/initscripts/ipv6-dhcp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<forest>
+ <tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth0">
+ <node label="DEVICE" value="eth0"/>
+ <node label="ONBOOT" value="yes"/>
+ <node label="IPV6INIT" value="yes"/>
+ <node label="IPV6_AUTOCONF" value="no"/>
+ <node label="DHCPV6" value="yes"/>
+ </tree>
+</forest>
diff --git a/tests/initscripts/ipv6-local.xml b/tests/initscripts/ipv6-local.xml
new file mode 100644
index 0000000..96294f8
--- /dev/null
+++ b/tests/initscripts/ipv6-local.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<forest>
+ <tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth0">
+ <node label="DEVICE" value="eth0"/>
+ <node label="ONBOOT" value="yes"/>
+ <node label="IPV6INIT" value="yes"/>
+ <node label="IPV6_AUTOCONF" value="no"/>
+ <node label="DHCPV6" value="no"/>
+ </tree>
+</forest>
diff --git a/tests/initscripts/ipv6-static-multi.xml
b/tests/initscripts/ipv6-static-multi.xml
new file mode 100644
index 0000000..afbbfb1
--- /dev/null
+++ b/tests/initscripts/ipv6-static-multi.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<forest>
+ <tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth0">
+ <node label="DEVICE" value="eth0"/>
+ <node label="ONBOOT" value="yes"/>
+ <node label="IPV6INIT" value="yes"/>
+ <node label="IPV6_AUTOCONF" value="no"/>
+ <node label="DHCPV6" value="no"/>
+ <node label="IPV6ADDR" value="3ffe:ffff:0:5::1/128"/>
+ <node label="IPV6ADDR_SECONDARIES" value="3ffe:ffff:0:5::3/128
3ffe:ffff:0:5::5/128"/>
+ </tree>
+</forest>
diff --git a/tests/initscripts/ipv6-static.xml b/tests/initscripts/ipv6-static.xml
new file mode 100644
index 0000000..187b1dc
--- /dev/null
+++ b/tests/initscripts/ipv6-static.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<forest>
+ <tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth0">
+ <node label="DEVICE" value="eth0"/>
+ <node label="ONBOOT" value="yes"/>
+ <node label="IPV6INIT" value="yes"/>
+ <node label="IPV6_AUTOCONF" value="no"/>
+ <node label="DHCPV6" value="no"/>
+ <node label="IPV6ADDR" value="3ffe:ffff:0:5::1/128"/>
+ <node label="IPV6_DEFAULTGW"
value="3ffe:ffff:1234:5678::1"/>
+ </tree>
+</forest>
diff --git a/tests/interface/ipv6-autoconf-dhcp.xml
b/tests/interface/ipv6-autoconf-dhcp.xml
new file mode 100644
index 0000000..3799b81
--- /dev/null
+++ b/tests/interface/ipv6-autoconf-dhcp.xml
@@ -0,0 +1,7 @@
+<interface type="ethernet" name="eth0">
+ <start mode="onboot"/>
+ <protocol family="ipv6">
+ <autoconf/>
+ <dhcp/>
+ </protocol>
+</interface>
diff --git a/tests/interface/ipv6-autoconf.xml b/tests/interface/ipv6-autoconf.xml
new file mode 100644
index 0000000..7c7dbb4
--- /dev/null
+++ b/tests/interface/ipv6-autoconf.xml
@@ -0,0 +1,6 @@
+<interface type="ethernet" name="eth0">
+ <start mode="onboot"/>
+ <protocol family="ipv6">
+ <autoconf/>
+ </protocol>
+</interface>
diff --git a/tests/interface/ipv6-dhcp.xml b/tests/interface/ipv6-dhcp.xml
new file mode 100644
index 0000000..ca7d792
--- /dev/null
+++ b/tests/interface/ipv6-dhcp.xml
@@ -0,0 +1,6 @@
+<interface type="ethernet" name="eth0">
+ <start mode="onboot"/>
+ <protocol family="ipv6">
+ <dhcp/>
+ </protocol>
+</interface>
diff --git a/tests/interface/ipv6-local.xml b/tests/interface/ipv6-local.xml
new file mode 100644
index 0000000..db96c9a
--- /dev/null
+++ b/tests/interface/ipv6-local.xml
@@ -0,0 +1,4 @@
+<interface type="ethernet" name="eth0">
+ <start mode="onboot"/>
+ <protocol family="ipv6"/>
+</interface>
diff --git a/tests/interface/ipv6-static-multi.xml
b/tests/interface/ipv6-static-multi.xml
new file mode 100644
index 0000000..753e904
--- /dev/null
+++ b/tests/interface/ipv6-static-multi.xml
@@ -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>
diff --git a/tests/interface/ipv6-static.xml b/tests/interface/ipv6-static.xml
new file mode 100644
index 0000000..31a452b
--- /dev/null
+++ b/tests/interface/ipv6-static.xml
@@ -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>
diff --git a/tests/test-initscripts.c b/tests/test-initscripts.c
index 56d430e..0f2a887 100644
--- a/tests/test-initscripts.c
+++ b/tests/test-initscripts.c
@@ -183,6 +183,13 @@ static void testTransforms(CuTest *tc) {
assert_transforms(tc, "ethernet-static-no-prefix");
assert_transforms(tc, "ethernet-dhcp");
assert_transforms(tc, "vlan");
+
+ assert_transforms(tc, "ipv6-local");
+ assert_transforms(tc, "ipv6-static");
+ assert_transforms(tc, "ipv6-dhcp");
+ assert_transforms(tc, "ipv6-autoconf");
+ assert_transforms(tc, "ipv6-autoconf-dhcp");
+ assert_transforms(tc, "ipv6-static-multi");
}
int main(void) {
--
1.6.2.5
10:52 a.m.
New subject: [PATCH 3/3] Test cases for ipv6-addressing
On Thu, Sep 24, 2009 at 04:32:23PM -0700, David Lutterkort wrote:
Exercise the various variations on how an interface can be set up for
IPv6
---
tests/initscripts/ipv6-autoconf-dhcp.xml | 10 ++++++++++
tests/initscripts/ipv6-autoconf.xml | 10 ++++++++++
tests/initscripts/ipv6-dhcp.xml | 10 ++++++++++
tests/initscripts/ipv6-local.xml | 10 ++++++++++
tests/initscripts/ipv6-static-multi.xml | 12 ++++++++++++
tests/initscripts/ipv6-static.xml | 12 ++++++++++++
tests/interface/ipv6-autoconf-dhcp.xml | 7 +++++++
tests/interface/ipv6-autoconf.xml | 6 ++++++
tests/interface/ipv6-dhcp.xml | 6 ++++++
tests/interface/ipv6-local.xml | 4 ++++
tests/interface/ipv6-static-multi.xml | 8 ++++++++
tests/interface/ipv6-static.xml | 7 +++++++
tests/test-initscripts.c | 7 +++++++
13 files changed, 109 insertions(+), 0 deletions(-)
create mode 100644 tests/initscripts/ipv6-autoconf-dhcp.xml
create mode 100644 tests/initscripts/ipv6-autoconf.xml
create mode 100644 tests/initscripts/ipv6-dhcp.xml
create mode 100644 tests/initscripts/ipv6-local.xml
create mode 100644 tests/initscripts/ipv6-static-multi.xml
create mode 100644 tests/initscripts/ipv6-static.xml
create mode 100644 tests/interface/ipv6-autoconf-dhcp.xml
create mode 100644 tests/interface/ipv6-autoconf.xml
create mode 100644 tests/interface/ipv6-dhcp.xml
create mode 100644 tests/interface/ipv6-local.xml
create mode 100644 tests/interface/ipv6-static-multi.xml
create mode 100644 tests/interface/ipv6-static.xml
diff --git a/tests/initscripts/ipv6-autoconf-dhcp.xml
b/tests/initscripts/ipv6-autoconf-dhcp.xml
new file mode 100644
index 0000000..f755fa4
--- /dev/null
+++ b/tests/initscripts/ipv6-autoconf-dhcp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<forest>
+ <tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth0">
+ <node label="DEVICE" value="eth0"/>
+ <node label="ONBOOT" value="yes"/>
+ <node label="IPV6INIT" value="yes"/>
+ <node label="IPV6_AUTOCONF" value="yes"/>
+ <node label="DHCPV6" value="yes"/>
+ </tree>
+</forest>
diff --git a/tests/initscripts/ipv6-autoconf.xml b/tests/initscripts/ipv6-autoconf.xml
new file mode 100644
index 0000000..637864c
--- /dev/null
+++ b/tests/initscripts/ipv6-autoconf.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<forest>
+ <tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth0">
+ <node label="DEVICE" value="eth0"/>
+ <node label="ONBOOT" value="yes"/>
+ <node label="IPV6INIT" value="yes"/>
+ <node label="IPV6_AUTOCONF" value="yes"/>
+ <node label="DHCPV6" value="no"/>
+ </tree>
+</forest>
diff --git a/tests/initscripts/ipv6-dhcp.xml b/tests/initscripts/ipv6-dhcp.xml
new file mode 100644
index 0000000..c87f0ce
--- /dev/null
+++ b/tests/initscripts/ipv6-dhcp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<forest>
+ <tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth0">
+ <node label="DEVICE" value="eth0"/>
+ <node label="ONBOOT" value="yes"/>
+ <node label="IPV6INIT" value="yes"/>
+ <node label="IPV6_AUTOCONF" value="no"/>
+ <node label="DHCPV6" value="yes"/>
+ </tree>
+</forest>
diff --git a/tests/initscripts/ipv6-local.xml b/tests/initscripts/ipv6-local.xml
new file mode 100644
index 0000000..96294f8
--- /dev/null
+++ b/tests/initscripts/ipv6-local.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<forest>
+ <tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth0">
+ <node label="DEVICE" value="eth0"/>
+ <node label="ONBOOT" value="yes"/>
+ <node label="IPV6INIT" value="yes"/>
+ <node label="IPV6_AUTOCONF" value="no"/>
+ <node label="DHCPV6" value="no"/>
+ </tree>
+</forest>
diff --git a/tests/initscripts/ipv6-static-multi.xml
b/tests/initscripts/ipv6-static-multi.xml
new file mode 100644
index 0000000..afbbfb1
--- /dev/null
+++ b/tests/initscripts/ipv6-static-multi.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<forest>
+ <tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth0">
+ <node label="DEVICE" value="eth0"/>
+ <node label="ONBOOT" value="yes"/>
+ <node label="IPV6INIT" value="yes"/>
+ <node label="IPV6_AUTOCONF" value="no"/>
+ <node label="DHCPV6" value="no"/>
+ <node label="IPV6ADDR" value="3ffe:ffff:0:5::1/128"/>
+ <node label="IPV6ADDR_SECONDARIES" value="3ffe:ffff:0:5::3/128
3ffe:ffff:0:5::5/128"/>
+ </tree>
+</forest>
diff --git a/tests/initscripts/ipv6-static.xml b/tests/initscripts/ipv6-static.xml
new file mode 100644
index 0000000..187b1dc
--- /dev/null
+++ b/tests/initscripts/ipv6-static.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<forest>
+ <tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth0">
+ <node label="DEVICE" value="eth0"/>
+ <node label="ONBOOT" value="yes"/>
+ <node label="IPV6INIT" value="yes"/>
+ <node label="IPV6_AUTOCONF" value="no"/>
+ <node label="DHCPV6" value="no"/>
+ <node label="IPV6ADDR" value="3ffe:ffff:0:5::1/128"/>
+ <node label="IPV6_DEFAULTGW"
value="3ffe:ffff:1234:5678::1"/>
+ </tree>
+</forest>
diff --git a/tests/interface/ipv6-autoconf-dhcp.xml
b/tests/interface/ipv6-autoconf-dhcp.xml
new file mode 100644
index 0000000..3799b81
--- /dev/null
+++ b/tests/interface/ipv6-autoconf-dhcp.xml
@@ -0,0 +1,7 @@
+<interface type="ethernet" name="eth0">
+ <start mode="onboot"/>
+ <protocol family="ipv6">
+ <autoconf/>
+ <dhcp/>
+ </protocol>
+</interface>
diff --git a/tests/interface/ipv6-autoconf.xml b/tests/interface/ipv6-autoconf.xml
new file mode 100644
index 0000000..7c7dbb4
--- /dev/null
+++ b/tests/interface/ipv6-autoconf.xml
@@ -0,0 +1,6 @@
+<interface type="ethernet" name="eth0">
+ <start mode="onboot"/>
+ <protocol family="ipv6">
+ <autoconf/>
+ </protocol>
+</interface>
diff --git a/tests/interface/ipv6-dhcp.xml b/tests/interface/ipv6-dhcp.xml
new file mode 100644
index 0000000..ca7d792
--- /dev/null
+++ b/tests/interface/ipv6-dhcp.xml
@@ -0,0 +1,6 @@
+<interface type="ethernet" name="eth0">
+ <start mode="onboot"/>
+ <protocol family="ipv6">
+ <dhcp/>
+ </protocol>
+</interface>
diff --git a/tests/interface/ipv6-local.xml b/tests/interface/ipv6-local.xml
new file mode 100644
index 0000000..db96c9a
--- /dev/null
+++ b/tests/interface/ipv6-local.xml
@@ -0,0 +1,4 @@
+<interface type="ethernet" name="eth0">
+ <start mode="onboot"/>
+ <protocol family="ipv6"/>
+</interface>
diff --git a/tests/interface/ipv6-static-multi.xml
b/tests/interface/ipv6-static-multi.xml
new file mode 100644
index 0000000..753e904
--- /dev/null
+++ b/tests/interface/ipv6-static-multi.xml
@@ -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>
diff --git a/tests/interface/ipv6-static.xml b/tests/interface/ipv6-static.xml
new file mode 100644
index 0000000..31a452b
--- /dev/null
+++ b/tests/interface/ipv6-static.xml
@@ -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>
diff --git a/tests/test-initscripts.c b/tests/test-initscripts.c
index 56d430e..0f2a887 100644
--- a/tests/test-initscripts.c
+++ b/tests/test-initscripts.c
@@ -183,6 +183,13 @@ static void testTransforms(CuTest *tc) {
assert_transforms(tc, "ethernet-static-no-prefix");
assert_transforms(tc, "ethernet-dhcp");
assert_transforms(tc, "vlan");
+
+ assert_transforms(tc, "ipv6-local");
+ assert_transforms(tc, "ipv6-static");
+ assert_transforms(tc, "ipv6-dhcp");
+ assert_transforms(tc, "ipv6-autoconf");
+ assert_transforms(tc, "ipv6-autoconf-dhcp");
+ assert_transforms(tc, "ipv6-static-multi");
}
int main(void) {
ACK, these cover the scenarios I'd outlined earlier
The only possible extra thing is that I have a feeling it is possible to
enable IPv6 by default on all interfaces using NETWORKING_IPV6=yes in
/etc/sysconfig/network, even without needing IPV6INIT=yes in the per-if
config files. Would need to refer to the code / docs for initscripts to
be sure of that though, and its easily added in later if required
Daniel
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
12:44 p.m.
New subject: [PATCH 3/3] Test cases for ipv6-addressing
On Fri, 2009-09-25 at 16:52 +0100, Daniel P. Berrange wrote:
The only possible extra thing is that I have a feeling it is possible
to
enable IPv6 by default on all interfaces using NETWORKING_IPV6=yes in
/etc/sysconfig/network, even without needing IPV6INIT=yes in the per-if
config files. Would need to refer to the code / docs for initscripts to
be sure of that though, and its easily added in later if required
According to sysconfig.txt, NETWORKING_IPV6 was used to cause setup of
global IPv6 things (I assume loadingthe ipv6 module), but is deprecated
now.
IPV6INIT controls interface-specific ipv6 initialization - it can be set
in /etc/sysconfig/network, but I don't see why you'd do that, and
setting it in each ifcfg-* is definitely safer.
David
5335
days inactive
5336
days old
netcf-devel@lists.fedorahosted.org
12 comments
3 participants
participants (3)
-
Daniel P. Berrange -
Daniel Veillard -
David Lutterkort