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: NJohn Ferlan <jferlan@redhat.com>
ACKed-by: NMichal Privoznik <mprivozn@redhat.com>

tests/storagevolxml2argvdata/qcow2-1.1.argv

 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

tests/storagevolxml2argvdata/qcow2-compat.argv

 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

tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv

 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

tests/storagevolxml2argvdata/qcow2-lazy.argv

 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

tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv

 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

tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv

 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

tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv

 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

tests/storagevolxml2argvdata/qcow2-nocapacity.argv

 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

tests/storagevolxml2argvdata/qcow2-nocow-compat.argv

 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

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/>

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>

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/>

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>

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>

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>

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>

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>

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/>

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>

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/>

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>

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>

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>

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>