From: Ján Tomko <jtomko@redhat.com>
Date: Thu, 16 May 2013 13:43:06 +0000 (+0200)
Subject: schema: make source optional in volume XML
X-Git-Tag: v1.0.6-rc1~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25b98d31ec5519a914551a6cab15c8d8b4e67034;p=thirdparty%2Flibvirt.git

schema: make source optional in volume XML

We don't parse it anyway.

https://bugzilla.redhat.com/show_bug.cgi?id=893273
---

diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng
index ca8ce56ebd..4649d9151f 100644
--- a/docs/schemas/storagevol.rng
+++ b/docs/schemas/storagevol.rng
@@ -20,7 +20,9 @@
           <text/>
         </element>
       </optional>
-      <ref name='source'/>
+      <optional>
+        <ref name='source'/>
+      </optional>
       <ref name='sizing'/>
       <ref name='target'/>
       <optional>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 04b76ba0d3..2140d9ddf0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -78,6 +78,7 @@ EXTRA_DIST =		\
 	storagepoolxml2xmlin \
 	storagepoolxml2xmlout \
 	storagevolxml2argvdata \
+	storagevolschemadata \
 	storagevolschematest \
 	storagevolxml2xmlin \
 	storagevolxml2xmlout \
diff --git a/tests/storagevolschemadata/qcow2-no-source.xml b/tests/storagevolschemadata/qcow2-no-source.xml
new file mode 100644
index 0000000000..777294ec14
--- /dev/null
+++ b/tests/storagevolschemadata/qcow2-no-source.xml
@@ -0,0 +1,29 @@
+<volume>
+  <name>OtherDemo.img</name>
+  <key>/var/lib/libvirt/images/OtherDemo.img</key>
+  <capacity unit="G">5</capacity>
+  <allocation>294912</allocation>
+  <target>
+    <path>/var/lib/libvirt/images/OtherDemo.img</path>
+    <format type='qcow2'/>
+    <permissions>
+      <mode>0644</mode>
+      <owner>0</owner>
+      <group>0</group>
+      <label>unconfined_u:object_r:virt_image_t:s0</label>
+    </permissions>
+    <encryption format='qcow'>
+      <secret type='passphrase' uuid='e78d4b51-a2af-485f-b0f5-afca709a80f4'/>
+    </encryption>
+  </target>
+  <backingStore>
+    <path>/dev/null</path>
+    <format type='raw'/>
+    <permissions>
+      <mode>0644</mode>
+      <owner>0</owner>
+      <group>0</group>
+      <label>unconfined_u:object_r:virt_image_t:s0</label>
+    </permissions>
+  </backingStore>
+</volume>
diff --git a/tests/storagevolschematest b/tests/storagevolschematest
index e1afa8dd9c..9045e6b414 100755
--- a/tests/storagevolschematest
+++ b/tests/storagevolschematest
@@ -4,7 +4,7 @@
 . $srcdir/test-lib.sh
 . $abs_srcdir/schematestutils.sh
 
-DIRS="storagevolxml2xmlin storagevolxml2xmlout"
+DIRS="storagevolxml2xmlin storagevolxml2xmlout storagevolschemadata"
 SCHEMA="storagevol.rng"
 
 check_schema "$DIRS" "$SCHEMA"