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: NJosh Durgin <josh.durgin@dreamhost.com>
Signed-off-by: NEric Blake <eblake@redhat.com>

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>

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>

docs/schemas/secret.rng

+<?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>