[libvirt] [Patch] Network schema fixes and updates

This is a patch to make network schema (network.rng) to support some neat features (/netowrk/domain, //dhcp/host/*). --- docs/schemas/network.rng | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 34c0163..a4281a5 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -1,6 +1,7 @@ <!-- A Relax NG schema for the libvirt network XML format --> <element name="network" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> + <interleave> <!-- The name of the network, used to refer to it through the API and in virsh --> <element name="name"><text/></element> @@ -43,6 +44,11 @@ </element> </optional> <optional> + <element name="domain"> + <attribute name="name"><text/></attribute> + </element> + </optional> + <optional> <!-- The IP element sets up NAT'ing and an optional DHCP server local to the host. --> <!-- FIXME: address, netmask and the start and end of the ranges @@ -63,7 +69,15 @@ <attribute name="end"><text/></attribute> </element> </zeroOrMore> + <zeroOrMore> + <element name="host"> + <attribute name="mac"><text/></attribute> + <attribute name="name"><text/></attribute> + <attribute name="ip"><text/></attribute> + </element> + </zeroOrMore> </element> </element> </optional> + </interleave> </element> -- 1.6.3.2

On Mon, Jun 29, 2009 at 02:19:57AM +0900, Satoru SATOH wrote:
This is a patch to make network schema (network.rng) to support some neat features (/netowrk/domain, //dhcp/host/*).
--- docs/schemas/network.rng | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 34c0163..a4281a5 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -1,6 +1,7 @@ <!-- A Relax NG schema for the libvirt network XML format --> <element name="network" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> + <interleave> <!-- The name of the network, used to refer to it through the API and in virsh --> <element name="name"><text/></element> @@ -43,6 +44,11 @@ </element> </optional> <optional> + <element name="domain"> + <attribute name="name"><text/></attribute> + </element> + </optional> + <optional> <!-- The IP element sets up NAT'ing and an optional DHCP server local to the host. --> <!-- FIXME: address, netmask and the start and end of the ranges @@ -63,7 +69,15 @@ <attribute name="end"><text/></attribute> </element> </zeroOrMore> + <zeroOrMore> + <element name="host"> + <attribute name="mac"><text/></attribute> + <attribute name="name"><text/></attribute> + <attribute name="ip"><text/></attribute> + </element> + </zeroOrMore> </element> </element> </optional> + </interleave> </element> --
ACK Danmiel -- |: 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 :|

On Mon, Jun 29, 2009 at 02:19:57AM +0900, Satoru SATOH wrote:
This is a patch to make network schema (network.rng) to support some neat features (/netowrk/domain, //dhcp/host/*).
Right, makes sense, applied and commited, thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
participants (3)
-
Daniel P. Berrange
-
Daniel Veillard
-
Satoru SATOH