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 b3267f53b6a7c8ced467d187469c228ef3c52aaf..3b4b952f26ec8dc94486693fb8d8d4ca5a51e12a 100644 (file)
--- 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 34773514353cd87451bfb4486312c1a90d295062..b6f858e382c2804abbbe1082c4a1edf0878cd5c0 100644 (file)
--- 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 8e7714b92f3b012a0e07c6449353c5f10df7a2e7..e49bd5a70ed449dbf9bfbabc8604da53cba79065 100644 (file)
--- 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>