Re: [libvirt] [PATCH 06/10] network: RNG changes for virtual switch

2011-07-08 Thread Daniel P. Berrange
On Tue, Jul 05, 2011 at 03:45:54AM -0400, Laine Stump wrote:
> This adds  and  (which itself can
> contain a ) to , adds several new options to
> forward mode, and adds an optional pool of interfaces to .
> 
> Since virtualPortProfile is now used in both the domain and network
> RNG, its definition was moved into a separate file that is included by
> both.
> ---
>  docs/schemas/Makefile.am   |1 +
>  docs/schemas/domain.rng|   54 ++-
>  docs/schemas/network.rng   |   29 +
>  docs/schemas/networkcommon.rng |   50 +
>  libvirt.spec.in|1 +
>  5 files changed, 90 insertions(+), 45 deletions(-)
>  create mode 100644 docs/schemas/networkcommon.rng

ACK,

Daniel
-- 
|: http://berrange.com  -o-http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org  -o- http://virt-manager.org :|
|: http://autobuild.org   -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org   -o-   http://live.gnome.org/gtk-vnc :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list


[libvirt] [PATCH 06/10] network: RNG changes for virtual switch

2011-07-05 Thread Laine Stump
This adds  and  (which itself can
contain a ) to , adds several new options to
forward mode, and adds an optional pool of interfaces to .

Since virtualPortProfile is now used in both the domain and network
RNG, its definition was moved into a separate file that is included by
both.
---
 docs/schemas/Makefile.am   |1 +
 docs/schemas/domain.rng|   54 ++-
 docs/schemas/network.rng   |   29 +
 docs/schemas/networkcommon.rng |   50 +
 libvirt.spec.in|1 +
 5 files changed, 90 insertions(+), 45 deletions(-)
 create mode 100644 docs/schemas/networkcommon.rng

diff --git a/docs/schemas/Makefile.am b/docs/schemas/Makefile.am
index 5ef7737..75a0e73 100644
--- a/docs/schemas/Makefile.am
+++ b/docs/schemas/Makefile.am
@@ -8,6 +8,7 @@ schema_DATA = \
domainsnapshot.rng \
interface.rng \
network.rng \
+   networkcommon.rng \
nodedev.rng \
nwfilter.rng \
secret.rng \
diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index 3c8414e..65572df 100644
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -7,7 +7,7 @@
 
   
   
-
+  
   
@@ -1022,6 +1022,14 @@
   
   
 
+
+  
+
+  
+
+
+  
+
 
   
 
@@ -1167,45 +1175,6 @@
   
 
   
-  
-
-  
-
-  
-802.1Qbg
-  
-  
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-
-  
-  
-
-  
-802.1Qbh
-  
-  
-
-  
-
-  
-
-  
-
-  
   
@@ -2483,9 +2452,4 @@
   [a-zA-Z0-9_\.:]+
 
   
-  
-
-  39
-
-  
 
diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
index 6d9f06b..9e667e6 100644
--- a/docs/schemas/network.rng
+++ b/docs/schemas/network.rng
@@ -7,6 +7,7 @@
   
 
   
+  
 
   
 
@@ -77,9 +78,37 @@
 
   nat
   route
+  bridge
+  passthrough
+  private
+  vepa
 
   
 
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+
   
 
 
diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng
new file mode 100644
index 000..0251813
--- /dev/null
+++ b/docs/schemas/networkcommon.rng
@@ -0,0 +1,50 @@
+
+
+http://relaxng.org/ns/structure/1.0"; 
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";>
+
+  
+
+  39
+
+  
+
+  
+
+  
+
+  
+802.1Qbg
+  
+  
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+  
+
+  
+
+  
+  
+
+  
+802.1Qbh
+  
+  
+
+  
+
+  
+
+  
+
+  
+
diff --git a/libvirt.spec.in b/libvirt.spec.in
index bf220f3..8c059f8 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1066,6 +1066,7 @@ fi
 %{_datadir}/libvirt/schemas/storageencryption.rng
 %{_datadir}/libvirt/schemas/nwfilter.rng
 %{_datadir}/libvirt/schemas/basictypes.rng
+%{_datadir}/libvirt/schemas/networkcommon.rng
 
 %{_datadir}/libvirt/cpu_map.xml
 
-- 
1.7.3.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list