[libvirt] [PATCH v3 04/10] tests: Remove qcow2 encryption from storagevol tests

John Ferlan jferlan at redhat.com
Wed Jun 20 23:01:13 UTC 2018 

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 at redhat.com>
---
 tests/storagevolxml2argvdata/qcow2-1.1.argv                            | 2 +-
 tests/storagevolxml2argvdata/qcow2-compat.argv                         | 2 +-
 tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv            | 2 +-
 tests/storagevolxml2argvdata/qcow2-lazy.argv                           | 2 +-
 .../qcow2-nobacking-convert-prealloc-compat.argv                       | 2 +-
 tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv      | 2 +-
 tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv    | 2 +-
 tests/storagevolxml2argvdata/qcow2-nocapacity.argv                     | 2 +-
 tests/storagevolxml2argvdata/qcow2-nocow-compat.argv                   | 2 +-
 tests/storagevolxml2xmlin/vol-qcow2-0.10-lazy.xml                      | 3 ---
 tests/storagevolxml2xmlin/vol-qcow2-1.1.xml                            | 3 ---
 tests/storagevolxml2xmlin/vol-qcow2-lazy.xml                           | 3 ---
 tests/storagevolxml2xmlin/vol-qcow2-nobacking.xml                      | 3 ---
 tests/storagevolxml2xmlin/vol-qcow2-nocapacity-backing.xml             | 3 ---
 tests/storagevolxml2xmlin/vol-qcow2-nocapacity.xml                     | 3 ---
 tests/storagevolxml2xmlin/vol-qcow2-nocow.xml                          | 3 ---
 tests/storagevolxml2xmlin/vol-qcow2.xml                                | 3 ---
 tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml                     | 3 ---
 tests/storagevolxml2xmlout/vol-qcow2-1.1.xml                           | 3 ---
 tests/storagevolxml2xmlout/vol-qcow2-lazy.xml                          | 3 ---
 tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml                     | 3 ---
 tests/storagevolxml2xmlout/vol-qcow2-nocapacity.xml                    | 3 ---
 tests/storagevolxml2xmlout/vol-qcow2-nocow.xml                         | 3 ---
 tests/storagevolxml2xmlout/vol-qcow2.xml                               | 3 ---
 24 files changed, 9 insertions(+), 54 deletions(-)

diff --git a/tests/storagevolxml2argvdata/qcow2-1.1.argv b/tests/storagevolxml2argvdata/qcow2-1.1.argv
index c4dcb1bc3c..71ff67378e 100644
--- 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 37ad2c078d..fcb6bed782 100644
--- 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 5f365b1f84..f99717ad40 100644
--- 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 b7058b84cc..c3c09cefef 100644
--- 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 3d93ec8480..f3e230654b 100644
--- 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 903c94e33d..841d683965 100644
--- 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 73499178e7..22dd9381a4 100644
--- 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 fd88055890..a922d12042 100644
--- 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 d5a7547011..826001f73b 100644
--- 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 5bf98b7c84..6007c183d3 100644
--- 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 696e1e0750..9c42464ae3 100644
--- 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 c1d7875d66..48c3d65d98 100644
--- 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 6a6bd5bef3..a21a68d417 100644
--- 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 f8e439bc56..2e508c6731 100644
--- 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 9746900f5c..2dede04295 100644
--- 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 661475be73..30859536fc 100644
--- 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 49a7de33d3..f576c7b3ed 100644
--- 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 1f799dae01..9b666ad5bc 100644
--- 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 14f805ff2a..c033f5bd57 100644
--- 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 68a9756d4f..ee79e26050 100644
--- 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 075dc6996b..e8281e3b50 100644
--- 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 223e6892fd..dbf9003213 100644
--- 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 31dc57873c..a7d612135f 100644
--- 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 31dc57873c..a7d612135f 100644
--- 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>
-- 
2.14.4

More information about the libvir-list mailing list