tests: Remove qcow2 encryption from storagevol tests

We're about to disallow creation of a qcow2 encrypted storage
volume, so let's remove the qcow encryption element from the
tests which are testing whether other format='qcow2' related
features work properly.

Signed-off-by: John Ferlan <jferlan@redhat.com>
ACKed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/storagevolxml2argvdata/qcow2-1.1.argv b/tests/storagevolxml2argvdata/qcow2-1.1.argv
index c4dcb1bc3c9412887f7bdbc486f7fcd50cd61ea7..71ff67378e396c5af19a568003319be3c7cea183 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-1.1.argv
+++ b/tests/storagevolxml2argvdata/qcow2-1.1.argv
@@ -1,3 +1,3 @@
 qemu-img create -f qcow2 -b /dev/null \
--o backing_fmt=raw,encryption=on,compat=1.1 \
+-o backing_fmt=raw,compat=1.1 \
 /var/lib/libvirt/images/OtherDemo.img 5242880K

diff --git a/tests/storagevolxml2argvdata/qcow2-compat.argv b/tests/storagevolxml2argvdata/qcow2-compat.argv
index 37ad2c078d1eb25bf71098ec251f5341f52193fe..fcb6bed78255e5295e072dc736966766a0a5cace 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-compat.argv
+++ b/tests/storagevolxml2argvdata/qcow2-compat.argv
@@ -1,3 +1,3 @@
 qemu-img create -f qcow2 -b /dev/null \
--o backing_fmt=raw,encryption=on,compat=0.10 \
+-o backing_fmt=raw,compat=0.10 \
 /var/lib/libvirt/images/OtherDemo.img 5242880K

diff --git a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv
index 5f365b1f8400e116c328980f3d783b90e410d550..f99717ad40f92458e260b0da2a151b4f17260735 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv
+++ b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv
@@ -1,3 +1,3 @@
 qemu-img convert -f raw -O qcow2 \
--o encryption=on,compat=0.10 \
+-o compat=0.10 \
 /dev/HostVG/Swap /var/lib/libvirt/images/OtherDemo.img

diff --git a/tests/storagevolxml2argvdata/qcow2-lazy.argv b/tests/storagevolxml2argvdata/qcow2-lazy.argv
index b7058b84cc2c58204ea29c377bf6870e2acf64fd..c3c09cefef58bc4a116846fae3f79688963ef5d8 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-lazy.argv
+++ b/tests/storagevolxml2argvdata/qcow2-lazy.argv
@@ -1,3 +1,3 @@
 qemu-img create -f qcow2 -b /dev/null \
--o backing_fmt=raw,encryption=on,compat=1.1,lazy_refcounts \
+-o backing_fmt=raw,compat=1.1,lazy_refcounts \
 /var/lib/libvirt/images/OtherDemo.img 5242880K

diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv
index 3d93ec8480893d6828d232671796c98a2468978d..f3e230654ba29f3f35afe0a2892d5d7b802dee4c 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv
+++ b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv
@@ -1,3 +1,3 @@
 qemu-img convert -f raw -O qcow2 \
--o encryption=on,preallocation=metadata,compat=0.10 \
+-o preallocation=metadata,compat=0.10 \
 /var/lib/libvirt/images/sparse.img /var/lib/libvirt/images/OtherDemo.img

diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv
index 903c94e33d6ba0c23e391b5a69e951ed27fa06a4..841d683965293f5c5086d6a85518cd3fb754bf79 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv
+++ b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv
@@ -1,3 +1,3 @@
 qemu-img create -f qcow2 \
--o encryption=on,preallocation=metadata,compat=0.10 \
+-o preallocation=metadata,compat=0.10 \
 /var/lib/libvirt/images/OtherDemo.img 5242880K

diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv b/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv
index 73499178e702ff9a2c63f05de3189cb0b8688099..22dd9381a4f0f59e2c878c16181ae68574d018bf 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv
+++ b/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv
@@ -1,4 +1,4 @@
 qemu-img convert -f raw -O qcow2 \
--o encryption=on,preallocation=falloc,compat=0.10 \
+-o preallocation=falloc,compat=0.10 \
 /var/lib/libvirt/images/sparse.img \
 /var/lib/libvirt/images/OtherDemo.img

diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv b/tests/storagevolxml2argvdata/qcow2-nocapacity.argv
index fd8805589035e2e580412b553e15ffabc6726ed0..a922d12042ef2c62d2b053cc6fc62fe251b1709d 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv
+++ b/tests/storagevolxml2argvdata/qcow2-nocapacity.argv
@@ -1,5 +1,5 @@
 qemu-img create \
 -f qcow2 \
 -b /dev/null \
--o backing_fmt=raw,encryption=on,compat=0.10 \
+-o backing_fmt=raw,compat=0.10 \
 /var/lib/libvirt/images/OtherDemo.img

diff --git a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv b/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv
index d5a7547011bf7edd7770c1860a951119bf613d0f..826001f73ba85dc4185a069ac9e823a50a8d208d 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv
+++ b/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv
@@ -1,3 +1,3 @@
 qemu-img create -f qcow2 -b /dev/null \
--o backing_fmt=raw,encryption=on,nocow=on,compat=0.10 \
+-o backing_fmt=raw,nocow=on,compat=0.10 \
 /var/lib/libvirt/images/OtherDemo.img 5242880K

diff --git a/tests/storagevolxml2xmlin/vol-qcow2-0.10-lazy.xml b/tests/storagevolxml2xmlin/vol-qcow2-0.10-lazy.xml
index 5bf98b7c84eb76d8fda65fc28c2a7346fdf2ec3f..6007c183d317a14739e238ea7deadb4d132bdb75 100644 (file)
--- a/tests/storagevolxml2xmlin/vol-qcow2-0.10-lazy.xml
+++ b/tests/storagevolxml2xmlin/vol-qcow2-0.10-lazy.xml
@@ -14,9 +14,6 @@
       <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>
     <compat>0.10</compat>
     <features>
       <lazy_refcounts/>

diff --git a/tests/storagevolxml2xmlin/vol-qcow2-1.1.xml b/tests/storagevolxml2xmlin/vol-qcow2-1.1.xml
index 696e1e07501796cd2912fbd163173d11b195ae8d..9c42464ae3280bc546aa7b1e81aa737ea28dcf72 100644 (file)
--- a/tests/storagevolxml2xmlin/vol-qcow2-1.1.xml
+++ b/tests/storagevolxml2xmlin/vol-qcow2-1.1.xml
@@ -14,9 +14,6 @@
       <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>
     <features/>
   </target>
   <backingStore>

diff --git a/tests/storagevolxml2xmlin/vol-qcow2-lazy.xml b/tests/storagevolxml2xmlin/vol-qcow2-lazy.xml
index c1d7875d668e7068f67dede6cacef09035b30768..48c3d65d98a1ae42649907a77b976146c69e6a02 100644 (file)
--- a/tests/storagevolxml2xmlin/vol-qcow2-lazy.xml
+++ b/tests/storagevolxml2xmlin/vol-qcow2-lazy.xml
@@ -14,9 +14,6 @@
       <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>
     <compat>1.1</compat>
     <features>
       <lazy_refcounts/>

diff --git a/tests/storagevolxml2xmlin/vol-qcow2-nobacking.xml b/tests/storagevolxml2xmlin/vol-qcow2-nobacking.xml
index 6a6bd5bef3a5be77e3b59a81b2433752199ec017..a21a68d4179740d1af85d2a17a865e30328ae162 100644 (file)
--- a/tests/storagevolxml2xmlin/vol-qcow2-nobacking.xml
+++ b/tests/storagevolxml2xmlin/vol-qcow2-nobacking.xml
@@ -14,8 +14,5 @@
       <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>
 </volume>

diff --git a/tests/storagevolxml2xmlin/vol-qcow2-nocapacity-backing.xml b/tests/storagevolxml2xmlin/vol-qcow2-nocapacity-backing.xml
index f8e439bc56df6a9bb478b2ffb4c3f2ab0a2a0cf2..2e508c6731dc48b4e1fabffd6bd4db33911b496f 100644 (file)
--- a/tests/storagevolxml2xmlin/vol-qcow2-nocapacity-backing.xml
+++ b/tests/storagevolxml2xmlin/vol-qcow2-nocapacity-backing.xml
@@ -12,9 +12,6 @@
       <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>

diff --git a/tests/storagevolxml2xmlin/vol-qcow2-nocapacity.xml b/tests/storagevolxml2xmlin/vol-qcow2-nocapacity.xml
index 9746900f5c2e825a3d7027e65e8eb1a53dde1a26..2dede04295e29d8c3cb06c384d3b11cb4c843b0f 100644 (file)
--- a/tests/storagevolxml2xmlin/vol-qcow2-nocapacity.xml
+++ b/tests/storagevolxml2xmlin/vol-qcow2-nocapacity.xml
@@ -12,8 +12,5 @@
       <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>
 </volume>

diff --git a/tests/storagevolxml2xmlin/vol-qcow2-nocow.xml b/tests/storagevolxml2xmlin/vol-qcow2-nocow.xml
index 661475be7358d27a2f41bbeaf65a58e57b0ab3a0..30859536fc983ec748e8a71436ee43fe670feeff 100644 (file)
--- a/tests/storagevolxml2xmlin/vol-qcow2-nocow.xml
+++ b/tests/storagevolxml2xmlin/vol-qcow2-nocow.xml
@@ -14,9 +14,6 @@
       <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>
     <nocow/>
   </target>
   <backingStore>

diff --git a/tests/storagevolxml2xmlin/vol-qcow2.xml b/tests/storagevolxml2xmlin/vol-qcow2.xml
index 49a7de33d39413c2313ce3177a17f1a694ad97fd..f576c7b3ed361605f44bbd6957d1a2c8c8271147 100644 (file)
--- a/tests/storagevolxml2xmlin/vol-qcow2.xml
+++ b/tests/storagevolxml2xmlin/vol-qcow2.xml
@@ -14,9 +14,6 @@
       <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>

diff --git a/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml b/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml
index 1f799dae0106ba1d593b1832bb886af2d5ab565c..9b666ad5bc0a6ba4e98f61a528a2d347083404c4 100644 (file)
--- a/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml
+++ b/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml
@@ -14,9 +14,6 @@
       <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>
     <compat>0.10</compat>
     <features>
       <lazy_refcounts/>

diff --git a/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml b/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml
index 14f805ff2a5a9e7148b0e951f87b6ef7a4817f5d..c033f5bd57eae37c463d27b6de1acc3385500528 100644 (file)
--- a/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml
+++ b/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml
@@ -14,9 +14,6 @@
       <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>
     <compat>1.1</compat>
     <features/>
   </target>

diff --git a/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml b/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml
index 68a9756d4fb444a13cb5b6c4dd043589b4608644..ee79e26050ff830ba32fd7aeb29e1b08712b7b3d 100644 (file)
--- a/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml
+++ b/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml
@@ -14,9 +14,6 @@
       <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>
     <compat>1.1</compat>
     <features>
       <lazy_refcounts/>

diff --git a/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml b/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml
index 075dc6996b85889cc7d98e57626aedc26fadc7d4..e8281e3b5065149bc17fcc4c70e729ac3caf5f91 100644 (file)
--- a/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml
+++ b/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml
@@ -14,8 +14,5 @@
       <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>
 </volume>

diff --git a/tests/storagevolxml2xmlout/vol-qcow2-nocapacity.xml b/tests/storagevolxml2xmlout/vol-qcow2-nocapacity.xml
index 223e6892fde120c92c6e306e871e71e6838e6bc4..dbf9003213b4217affa26de8953d7e6ef179d208 100644 (file)
--- a/tests/storagevolxml2xmlout/vol-qcow2-nocapacity.xml
+++ b/tests/storagevolxml2xmlout/vol-qcow2-nocapacity.xml
@@ -14,8 +14,5 @@
       <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>
 </volume>

diff --git a/tests/storagevolxml2xmlout/vol-qcow2-nocow.xml b/tests/storagevolxml2xmlout/vol-qcow2-nocow.xml
index 31dc57873c9dfa062a6c160d6122073a61fa53e6..a7d612135f6d2d401a5ee728cec637857726ab51 100644 (file)
--- a/tests/storagevolxml2xmlout/vol-qcow2-nocow.xml
+++ b/tests/storagevolxml2xmlout/vol-qcow2-nocow.xml
@@ -14,9 +14,6 @@
       <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>

diff --git a/tests/storagevolxml2xmlout/vol-qcow2.xml b/tests/storagevolxml2xmlout/vol-qcow2.xml
index 31dc57873c9dfa062a6c160d6122073a61fa53e6..a7d612135f6d2d401a5ee728cec637857726ab51 100644 (file)
--- a/tests/storagevolxml2xmlout/vol-qcow2.xml
+++ b/tests/storagevolxml2xmlout/vol-qcow2.xml
@@ -14,9 +14,6 @@
       <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>