* docs/network.rng docs/Makefile.am libvirt.spec.in: added Relax-NG

  grammar for network descriptions that David Lutterkort posted in
  April, it needs an update though
Daniel

diff --git a/ChangeLog b/ChangeLog
index 26bb1d3c1f410ca097ef0c52eee1f97d147331e3..76e94e4fd2da2cc21870694a0135a8aeb1a5da0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul 24 11:18:11 CEST 2007 Daniel Veillard <veillard@redhat.com>
+
+       * docs/network.rng docs/Makefile.am libvirt.spec.in: added Relax-NG
+         grammar for network descriptions that David Lutterkort posted in
+         April, it needs an update though
+
 Tue Jul 24 10:15:33 CEST 2007 Daniel Veillard <veillard@redhat.com>
 
        * po/*: update translations and regenerate .pot

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 4a884852af91c65f60566c128f109d2b5c8edf50..3eb8bfd64374cc70d718e9c45ad86d5f12807b08 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -10,7 +10,7 @@ APIPAGES=APIconstructors.html APIfiles.html APIfunctions.html \
 EXTRA_DIST=                                                    \
           libvirt-api.xml libvirt-refs.xml apibuild.py         \
           *.xsl *.html *.gif html/*.html html/*.png \
-          test*.xml libvirt.rng
+          test*.xml libvirt.rng network.rng
 
 
 man_MANS=

diff --git a/docs/network.rng b/docs/network.rng
new file mode 100644 (file)
index 0000000..a3a4b88
--- /dev/null
+++ b/docs/network.rng
@@ -0,0 +1,61 @@
+<!-- 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">
+  <!-- The name of the network, used to refer to it through the API
+       and in virsh -->
+  <element name="name"><text/></element>
+  <optional>
+    <element name="uuid"><text/></element>
+  </optional>
+  <optional>
+    <!-- The name of the network to be set up; this will back
+         the network on the host -->
+    <element name="bridge">
+      <optional>
+        <attribute name="name"><text/></attribute>
+      </optional>
+      <optional>
+        <attribute name="stp">
+          <choice>
+            <value>on</value>
+            <value>off</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="delay"><data type="integer"/></attribute>
+      </optional>
+    </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
+         are IP addresses, and should be validated as such in the scheme -->
+    <element name="ip">
+      <optional>
+        <attribute name="address"><text/></attribute>
+      </optional>
+      <optional>
+        <attribute name="netmask"><text/></attribute>
+      </optional>
+      <!-- Define the range(s) of IP addresses that the DHCP
+           server should hand out -->
+      <element name="dhcp">
+        <zeroOrMore>
+          <element name="range">
+            <attribute name="start"><text/></attribute>
+            <attribute name="end"><text/></attribute>
+          </element>
+        </zeroOrMore>
+      </element>
+    </element>
+  </optional>
+  <optional>
+    <!-- The device through which the bridge is connected to the
+         rest of the network -->
+    <element name="forward">
+      <optional><attribute name="dev"><text/></attribute></optional>
+    </element>
+  </optional>
+</element>

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 4928f20c319b433af59ce74cb5564352e04f774e..6cd7c969104725f5b429adea334f37336b0d7372 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -3,7 +3,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: @VERSION@
-Release: 1%{?dist}%{?extra_release}
+Release: 1%{?dist}%{?extra_release}migr5
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -135,6 +135,7 @@ fi
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %doc docs/libvirt.rng
+%doc docs/network.rng
 
 %files devel
 %defattr(-, root, root)