conf: split <disk> schema into more pieces

To make <disk> schema more maintainable and to allow for moving the
pieces to a common file in the future. It relies on the ability to
override definitions as part of an include, set up in the previous
patch.

The diff is a bit hard to read, because it mixes reindentation
with refactoring; 'git diff -b --patience' may help.

* docs/schemas/domaincommon.rng (disk): Refactor into pieces.
(diskSource, diskSourceFile, diskSourceBlock, diskSourceDir)
(diskSourceVolume: New defines.
(diskSourceNetwork): Revise scope.
* docs/schemas/domainsnapshot.rng (disksnapshot): Adjust.
* tests/domainsnapshotxml2xmlin/disk-seclabel-invalid.xml,
tests/domainsnapshotxml2xmlin/disk-network-seclabel-invalid.xml: New
tests to check seclabel is forbidden in domain snapshot by schema.

Signed-off-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index df2c839e340abaf14f7e3de0e6838dfba65e337d..7739fd818f5e4ea4ea82a46c65ec4231225c64ef 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1196,176 +1196,187 @@
       <optional>
         <ref name="snapshot"/>
       </optional>
-      <interleave>
-        <choice>
-          <group>
-            <optional>
-              <attribute name="type">
-                <value>file</value>
-              </attribute>
-            </optional>
-            <interleave>
-              <optional>
-                <element name="source">
-                  <optional>
-                    <attribute name="file">
-                      <ref name="absFilePath"/>
-                    </attribute>
-                  </optional>
-                  <optional>
-                    <ref name="storageStartupPolicy"/>
-                  </optional>
-                  <optional>
-                    <ref name='devSeclabel'/>
-                  </optional>
-                </element>
-              </optional>
-            </interleave>
-          </group>
-          <group>
-            <attribute name="type">
-              <value>block</value>
-            </attribute>
-            <interleave>
-              <optional>
-                <element name="source">
-                  <optional>
-                    <attribute name="dev">
-                      <ref name="absFilePath"/>
-                    </attribute>
-                  </optional>
-                  <optional>
-                    <ref name="storageStartupPolicy"/>
-                  </optional>
-                  <optional>
-                    <ref name='devSeclabel'/>
-                  </optional>
-                </element>
-              </optional>
-            </interleave>
-          </group>
-          <group>
-            <attribute name="type">
-              <value>dir</value>
-            </attribute>
-            <interleave>
-              <optional>
-                <element name="source">
-                  <attribute name="dir">
-                    <ref name="absFilePath"/>
-                  </attribute>
-                  <optional>
-                    <ref name="storageStartupPolicy"/>
-                  </optional>
-                  <empty/>
-                </element>
-              </optional>
-            </interleave>
-          </group>
-          <group>
-            <attribute name="type">
-              <value>network</value>
+      <ref name="diskSource"/>
+    </element>
+  </define>
+
+  <define name="diskSource">
+    <choice>
+      <ref name="diskSourceFile"/>
+      <ref name="diskSourceBlock"/>
+      <ref name="diskSourceDir"/>
+      <ref name="diskSourceNetwork"/>
+      <ref name="diskSourceVolume"/>
+    </choice>
+  </define>
+
+  <define name="diskSourceFile">
+    <optional>
+      <attribute name="type">
+        <value>file</value>
+      </attribute>
+    </optional>
+    <interleave>
+      <optional>
+        <element name="source">
+          <optional>
+            <attribute name="file">
+              <ref name="absFilePath"/>
             </attribute>
-            <interleave>
-              <optional>
-                <element name="source">
-                  <ref name='diskSourceNetwork'/>
-                </element>
-              </optional>
-            </interleave>
-          </group>
-          <group>
-            <attribute name="type">
-              <value>volume</value>
+          </optional>
+          <optional>
+            <ref name="storageStartupPolicy"/>
+          </optional>
+          <optional>
+            <ref name='devSeclabel'/>
+          </optional>
+        </element>
+      </optional>
+      <ref name='storageSourceExtra'/>
+    </interleave>
+  </define>
+
+  <define name="diskSourceBlock">
+    <attribute name="type">
+      <value>block</value>
+    </attribute>
+    <interleave>
+      <optional>
+        <element name="source">
+          <optional>
+            <attribute name="dev">
+              <ref name="absFilePath"/>
             </attribute>
-            <interleave>
-              <optional>
-                <element name="source">
-                  <attribute name="pool">
-                    <ref name="genericName"/>
+          </optional>
+          <optional>
+            <ref name="storageStartupPolicy"/>
+          </optional>
+          <optional>
+            <ref name='devSeclabel'/>
+          </optional>
+        </element>
+      </optional>
+      <ref name='storageSourceExtra'/>
+    </interleave>
+  </define>
+
+  <define name="diskSourceDir">
+    <attribute name="type">
+      <value>dir</value>
+    </attribute>
+    <interleave>
+      <optional>
+        <element name="source">
+          <attribute name="dir">
+            <ref name="absFilePath"/>
+          </attribute>
+          <optional>
+            <ref name="storageStartupPolicy"/>
+          </optional>
+          <empty/>
+        </element>
+      </optional>
+      <ref name='storageSourceExtra'/>
+    </interleave>
+  </define>
+
+  <define name="diskSourceNetwork">
+    <attribute name="type">
+      <value>network</value>
+    </attribute>
+    <interleave>
+      <element name="source">
+        <attribute name="protocol">
+          <choice>
+            <value>nbd</value>
+            <value>rbd</value>
+            <value>sheepdog</value>
+            <value>gluster</value>
+            <value>iscsi</value>
+            <value>http</value>
+            <value>https</value>
+            <value>ftp</value>
+            <value>ftps</value>
+            <value>tftp</value>
+          </choice>
+        </attribute>
+        <optional>
+          <attribute name="name"/>
+        </optional>
+        <zeroOrMore>
+          <element name="host">
+            <choice>
+              <group>
+                <optional>
+                  <attribute name="transport">
+                    <choice>
+                      <value>tcp</value>
+                      <value>rdma</value>
+                    </choice>
                   </attribute>
-                  <attribute name="volume">
-                    <ref name="volName"/>
+                </optional>
+                <attribute name="name">
+                  <choice>
+                    <ref name="dnsName"/>
+                    <ref name="ipAddr"/>
+                  </choice>
+                </attribute>
+                <optional>
+                  <attribute name="port">
+                    <ref name="unsignedInt"/>
                   </attribute>
-                  <optional>
-                    <attribute name="mode">
-                      <choice>
-                        <value>host</value>
-                        <value>direct</value>
-                      </choice>
-                    </attribute>
-                  </optional>
-                  <optional>
-                    <ref name="storageStartupPolicy"/>
-                  </optional>
-                  <optional>
-                    <ref name='devSeclabel'/>
-                  </optional>
-                </element>
-              </optional>
-            </interleave>
-          </group>
-        </choice>
-        <ref name="storageSourceExtra"/>
-      </interleave>
-    </element>
+                </optional>
+              </group>
+              <group>
+                <attribute name="transport">
+                  <value>unix</value>
+                </attribute>
+                <attribute name="socket">
+                  <ref name="absFilePath"/>
+                </attribute>
+              </group>
+            </choice>
+          </element>
+        </zeroOrMore>
+        <empty/>
+      </element>
+      <ref name='storageSourceExtra'/>
+    </interleave>
   </define>
 
-  <define name="diskSourceNetwork">
-    <attribute name="protocol">
-      <choice>
-        <value>nbd</value>
-        <value>rbd</value>
-        <value>sheepdog</value>
-        <value>gluster</value>
-        <value>iscsi</value>
-        <value>http</value>
-        <value>https</value>
-        <value>ftp</value>
-        <value>ftps</value>
-        <value>tftp</value>
-      </choice>
+  <define name="diskSourceVolume">
+    <attribute name="type">
+      <value>volume</value>
     </attribute>
-    <optional>
-      <attribute name="name"/>
-    </optional>
-    <zeroOrMore>
-      <element name="host">
-        <choice>
-          <group>
-            <optional>
-              <attribute name="transport">
-                <choice>
-                  <value>tcp</value>
-                  <value>rdma</value>
-                </choice>
-              </attribute>
-            </optional>
-            <attribute name="name">
+    <interleave>
+      <optional>
+        <element name="source">
+          <attribute name="pool">
+            <ref name="genericName"/>
+          </attribute>
+          <attribute name="volume">
+            <ref name="volName"/>
+          </attribute>
+          <optional>
+            <attribute name="mode">
               <choice>
-                <ref name="dnsName"/>
-                <ref name="ipAddr"/>
+                <value>host</value>
+                <value>direct</value>
               </choice>
             </attribute>
-            <optional>
-              <attribute name="port">
-                <ref name="unsignedInt"/>
-              </attribute>
-            </optional>
-          </group>
-          <group>
-            <attribute name="transport">
-              <value>unix</value>
-            </attribute>
-            <attribute name="socket">
-              <ref name="absFilePath"/>
-            </attribute>
-          </group>
-        </choice>
-      </element>
-    </zeroOrMore>
-    <empty/>
+          </optional>
+          <optional>
+            <ref name="storageStartupPolicy"/>
+          </optional>
+          <optional>
+            <ref name='devSeclabel'/>
+          </optional>
+        </element>
+      </optional>
+      <ref name='storageSourceExtra'/>
+    </interleave>
   </define>
+
   <define name="diskTarget">
     <data type="string">
       <param name="pattern">(ioemu:)?(fd|hd|sd|vd|xvd|ubd)[a-zA-Z0-9_]+</param>

diff --git a/docs/schemas/domainsnapshot.rng b/docs/schemas/domainsnapshot.rng
index bec12dbe24a14178d1a814f08e5a7147bca1e5fe..4ab1b828f20d2065a9da7461296cc8e306dc6e1e 100644 (file)
--- a/docs/schemas/domainsnapshot.rng
+++ b/docs/schemas/domainsnapshot.rng
@@ -173,19 +173,7 @@
                 <ref name='storageSourceExtra'/>
               </interleave>
             </group>
-            <group>
-              <attribute name="type">
-                <value>network</value>
-              </attribute>
-              <interleave>
-                <optional>
-                  <element name="source">
-                    <ref name='diskSourceNetwork'/>
-                  </element>
-                </optional>
-                <ref name='storageSourceExtra'/>
-              </interleave>
-            </group>
+            <ref name='diskSourceNetwork'/>
           </choice>
         </group>
       </choice>

diff --git a/tests/domainsnapshotxml2xmlin/disk-network-seclabel-invalid.xml b/tests/domainsnapshotxml2xmlin/disk-network-seclabel-invalid.xml
new file mode 100644 (file)
index 0000000..de0de10
--- /dev/null
+++ b/tests/domainsnapshotxml2xmlin/disk-network-seclabel-invalid.xml
@@ -0,0 +1,12 @@
+<domainsnapshot>
+  <name>my snap name</name>
+  <description>!@#$%^</description>
+  <disks>
+    <disk name='hdg' snapshot='external' type='network'>
+      <source protocol='gluster' name='volume/path'>
+        <host name='host' port='1234'/>
+        <seclabel model='dac' relabel='no'/>
+      </source>
+    </disk>
+  </disks>
+</domainsnapshot>

diff --git a/tests/domainsnapshotxml2xmlin/disk-seclabel-invalid.xml b/tests/domainsnapshotxml2xmlin/disk-seclabel-invalid.xml
new file mode 100644 (file)
index 0000000..528c646
--- /dev/null
+++ b/tests/domainsnapshotxml2xmlin/disk-seclabel-invalid.xml
@@ -0,0 +1,11 @@
+<domainsnapshot>
+  <name>my snap name</name>
+  <description>!@#$%^</description>
+  <disks>
+    <disk name='hde' snapshot='external' type='file'>
+      <source file='/path/to/new2'>
+        <seclabel model='dac' relabel='no'/>
+      </source>
+    </disk>
+  </disks>
+</domainsnapshot>