From: Josh Durgin <josh.durgin@dreamhost.com>
Date: Fri, 28 Oct 2011 21:19:34 +0000 (-0700)
Subject: Use a common xml type for ceph secret usage.
X-Git-Tag: v0.9.7-rc1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e02076624950e55593293114b23d0e133cf72b4;p=thirdparty%2Flibvirt.git

Use a common xml type for ceph secret usage.

The types used in domaincommon.rng and secret.rng should be the same.

Move genericName to basictypes.rng, then drop redundant types now
that secret.rng uses basictypes.rng.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng
index b3267f53b6..3b4b952f26 100644
--- a/docs/schemas/basictypes.rng
+++ b/docs/schemas/basictypes.rng
@@ -97,6 +97,12 @@
     </choice>
   </define>
 
+  <define name="genericName">
+    <data type="string">
+      <param name="pattern">[a-zA-Z0-9_\+\-]+</param>
+    </data>
+  </define>
+
   <define name="dnsName">
     <data type="string">
       <param name="pattern">[a-zA-Z0-9\.\-]+</param>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 3477351435..b6f858e382 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2558,8 +2558,8 @@
         <attribute name='uuid'>
           <ref name="UUID"/>
         </attribute>
-        <attribute name="usage">
-          <ref name="genericName"/>
+        <attribute name='usage'>
+          <ref name='genericName'/>
         </attribute>
       </choice>
     </element>
@@ -2660,11 +2660,6 @@
       <param name="pattern">[A-Za-z0-9_\.\+\-]+</param>
     </data>
   </define>
-  <define name="genericName">
-    <data type="string">
-      <param name="pattern">[a-zA-Z0-9_\+\-]+</param>
-    </data>
-  </define>
   <define name="bridgeMode">
     <data type="string">
       <param name="pattern">(vepa|bridge|private|passthrough)</param>
diff --git a/docs/schemas/secret.rng b/docs/schemas/secret.rng
index 8e7714b92f..e49bd5a70e 100644
--- a/docs/schemas/secret.rng
+++ b/docs/schemas/secret.rng
@@ -1,9 +1,12 @@
+<?xml version="1.0"?>
 <!-- A Relax NG schema for the libvirt secret properties XML format -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0">
   <start>
     <ref name='secret'/>
   </start>
 
+  <include href='basictypes.rng'/>
+
   <define name='secret'>
     <element name='secret'>
       <optional>
@@ -60,25 +63,8 @@
       <value>ceph</value>
     </attribute>
     <element name='name'>
-      <text/>
+      <ref name='genericName'/>
     </element>
   </define>
 
-  <define name="UUID">
-    <choice>
-      <data type="string">
-        <param name="pattern">[a-fA-F0-9]{32}</param>
-      </data>
-      <data type="string">
-        <param name="pattern">[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}</param>
-      </data>
-    </choice>
-  </define>
-
-  <define name="absFilePath">
-    <data type="string">
-      <param name="pattern">/[a-zA-Z0-9_\.\+\-&amp;/%]+</param>
-    </data>
-  </define>
-
 </grammar>