openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
John Ferlan 2018-06-20 15:52:30 -04:00
parent af0e6580cd
commit a02d879858
24 changed files with 9 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/storagevolxml2argvdata/qcow2-1.1.argv
View File

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

2
tests/storagevolxml2argvdata/qcow2-compat.argv
View File

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

2
tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv
View File

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

2
tests/storagevolxml2argvdata/qcow2-lazy.argv
View File

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

2
tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv
View File

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

2
tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv
View File

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

2
tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv
View File

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

2
tests/storagevolxml2argvdata/qcow2-nocapacity.argv
View File

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

2
tests/storagevolxml2argvdata/qcow2-nocow-compat.argv
View File

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

3
tests/storagevolxml2xmlin/vol-qcow2-0.10-lazy.xml
View File

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

3
tests/storagevolxml2xmlin/vol-qcow2-1.1.xml
View File

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

3
tests/storagevolxml2xmlin/vol-qcow2-lazy.xml
View File

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

3
tests/storagevolxml2xmlin/vol-qcow2-nobacking.xml
View File

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

3
tests/storagevolxml2xmlin/vol-qcow2-nocapacity-backing.xml
View File

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

3
tests/storagevolxml2xmlin/vol-qcow2-nocapacity.xml
View File

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

3
tests/storagevolxml2xmlin/vol-qcow2-nocow.xml
View File

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

3
tests/storagevolxml2xmlin/vol-qcow2.xml
View File

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

3
tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml
View File

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

3
tests/storagevolxml2xmlout/vol-qcow2-1.1.xml
View File

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

3
tests/storagevolxml2xmlout/vol-qcow2-lazy.xml
View File

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

3
tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml
View File

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

3
tests/storagevolxml2xmlout/vol-qcow2-nocapacity.xml
View File

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

3
tests/storagevolxml2xmlout/vol-qcow2-nocow.xml
View File

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

3
tests/storagevolxml2xmlout/vol-qcow2.xml
View File

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