External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 20:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a common xml type for ceph secret usage.

Browse Source 
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>
This commit is contained in:
Josh Durgin 2011-10-28 14:19:34 -07:00 committed by Eric Blake
parent 5fb0de2e4d
commit 7e02076624
3 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/schemas/basictypes.rng
View File

@ -97,6 +97,12 @@
</choice> </choice>
</define> </define>
<define name="genericName">
<data type="string">
<param name="pattern">[a-zA-Z0-9_\+\-]+</param>
</data>
</define>
<define name="dnsName"> <define name="dnsName">
<data type="string"> <data type="string">
<param name="pattern">[a-zA-Z0-9\.\-]+</param> <param name="pattern">[a-zA-Z0-9\.\-]+</param>

9
docs/schemas/domaincommon.rng
View File

@ -2558,8 +2558,8 @@
<attribute name='uuid'> <attribute name='uuid'>
<ref name="UUID"/> <ref name="UUID"/>
</attribute> </attribute>
<attribute name="usage"> <attribute name='usage'>
<ref name="genericName"/> <ref name='genericName'/>
</attribute> </attribute>
</choice> </choice>
</element> </element>
@ -2660,11 +2660,6 @@
<param name="pattern">[A-Za-z0-9_\.\+\-]+</param> <param name="pattern">[A-Za-z0-9_\.\+\-]+</param>
</data> </data>
</define> </define>
<define name="genericName">
<data type="string">
<param name="pattern">[a-zA-Z0-9_\+\-]+</param>
</data>
</define>
<define name="bridgeMode"> <define name="bridgeMode">
<data type="string"> <data type="string">
<param name="pattern">(vepa|bridge|private|passthrough)</param> <param name="pattern">(vepa|bridge|private|passthrough)</param>

22
docs/schemas/secret.rng
View File

@ -1,9 +1,12 @@
<?xml version="1.0"?>
<!-- A Relax NG schema for the libvirt secret properties XML format --> <!-- A Relax NG schema for the libvirt secret properties XML format -->
<grammar xmlns="http://relaxng.org/ns/structure/1.0"> <grammar xmlns="http://relaxng.org/ns/structure/1.0">
<start> <start>
<ref name='secret'/> <ref name='secret'/>
</start> </start>
<include href='basictypes.rng'/>
<define name='secret'> <define name='secret'>
<element name='secret'> <element name='secret'>
<optional> <optional>
@ -60,25 +63,8 @@
<value>ceph</value> <value>ceph</value>
</attribute> </attribute>
<element name='name'> <element name='name'>
<text/> <ref name='genericName'/>
</element> </element>
</define> </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> </grammar>