[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 01/11] storage: Refactor the rng schema for storage pool auth



The attributes/elements for auth type "chap" and "ceph" are complete
different, this separates them into groups.

And add "interleave" for "login" and "passwd" attributes of "chap"
type auth.
---
 docs/schemas/storagepool.rng | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng
index 3c2158a..2595e37 100644
--- a/docs/schemas/storagepool.rng
+++ b/docs/schemas/storagepool.rng
@@ -280,28 +280,30 @@
 
   <define name='sourceinfoauth'>
     <element name='auth'>
-      <attribute name='type'>
-        <choice>
-          <value>chap</value>
-          <value>ceph</value>
-        </choice>
-      </attribute>
       <choice>
-        <attribute name='login'>
-          <text/>
-        </attribute>
-        <attribute name='username'>
-          <text/>
-        </attribute>
+        <group>
+          <attribute name='type'>
+            <value>chap</value>
+          </attribute>
+          <interleave>
+            <attribute name='login'>
+              <text/>
+            </attribute>
+            <attribute name='passwd'>
+              <text/>
+            </attribute>
+          </interleave>
+        </group>
+        <group>
+          <attribute name='type'>
+            <value>ceph</value>
+          </attribute>
+          <attribute name='username'>
+            <text/>
+          </attribute>
+          <ref name='sourceinfoauthsecret'/>
+       </group>
       </choice>
-      <optional>
-        <attribute name='passwd'>
-          <text/>
-        </attribute>
-      </optional>
-      <optional>
-        <ref name='sourceinfoauthsecret'/>
-      </optional>
     </element>
   </define>
 
-- 
1.8.1.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]