storagevolxml2argvdata: Rewrap all output files

Use scripts/test-wrap-argv.py to rewrap the output files so that any
further changes don't introduce churn since we are rewrapping the output
automatically now.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

tests/storagevolxml2argvdata/iso-input.argv

@@ -1,2 +1,4 @@
-qemu-img convert -f raw -O raw /var/lib/libvirt/images/test.iso \
-/var/lib/libvirt/images/sparse.img
+qemu-img \
+convert \
+-f raw \
+-O raw /var/lib/libvirt/images/test.iso /var/lib/libvirt/images/sparse.img

tests/storagevolxml2argvdata/iso.argv

@@ -1 +1,3 @@
-qemu-img create -f raw /var/lib/libvirt/images/test.iso 1024K
+qemu-img \
+create \
+-f raw /var/lib/libvirt/images/test.iso 1024K

tests/storagevolxml2argvdata/logical-from-qcow2.argv

@@ -1,2 +1,4 @@
-qemu-img convert -f qcow2 -O raw /var/lib/libvirt/images/OtherDemo.img \
-/dev/HostVG/Swap
+qemu-img \
+convert \
+-f qcow2 \
+-O raw /var/lib/libvirt/images/OtherDemo.img /dev/HostVG/Swap

tests/storagevolxml2argvdata/luks-cipher.argv

@@ -1,5 +1,7 @@
-qemu-img create -f luks \
+qemu-img \
+create \
+-f luks \
 --object secret,id=LuksDemo.img_encrypt0,file=/path/to/secretFile \
 -o key-secret=LuksDemo.img_encrypt0,cipher-alg=serpent-256,cipher-mode=cbc,\
-hash-alg=sha256,ivgen-alg=plain64,ivgen-hash-alg=sha256 \
-/var/lib/libvirt/images/LuksDemo.img 5242880K
+hash-alg=sha256,ivgen-alg=plain64,\
+ivgen-hash-alg=sha256 /var/lib/libvirt/images/LuksDemo.img 5242880K

tests/storagevolxml2argvdata/luks-convert-encrypt.argv

@@ -1,11 +1,18 @@
-qemu-img create -f luks \
+qemu-img \
+create \
+-f luks \
 --object secret,id=LuksDemo.img_encrypt0,file=/path/to/secretFile \
--o key-secret=LuksDemo.img_encrypt0 \
-/var/lib/libvirt/images/LuksDemo.img 5242880K
-qemu-img convert --image-opts -n --target-image-opts \
+-o key-secret=LuksDemo.img_encrypt0 /var/lib/libvirt/images/LuksDemo.img \
+5242880K
+qemu-img \
+convert \
+--image-opts \
+-n \
+--target-image-opts \
 --object secret,id=LuksDemo.img_encrypt0,file=/path/to/secretFile \
---object secret,id=OtherDemo.img_encrypt0,file=/path/to/inputSecretFile \
-driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,\
-key-secret=OtherDemo.img_encrypt0 \
-driver=luks,file.filename=/var/lib/libvirt/images/LuksDemo.img,\
+--object secret,id=OtherDemo.img_encrypt0,\
+file=/path/to/inputSecretFile driver=luks,\
+file.filename=/var/lib/libvirt/images/OtherDemo.img,\
+key-secret=OtherDemo.img_encrypt0 driver=luks,\
+file.filename=/var/lib/libvirt/images/LuksDemo.img,\
 key-secret=LuksDemo.img_encrypt0

tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv

@@ -1,7 +1,14 @@
-qemu-img create -f qcow2 \
+qemu-img \
+create \
+-f qcow2 \
 -o compat=0.10 /var/lib/libvirt/images/sparse-qcow2.img 1073741824K
-qemu-img convert --image-opts -n --target-image-opts \
---object secret,id=OtherDemo.img_encrypt0,file=/path/to/inputSecretFile \
-driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,\
-key-secret=OtherDemo.img_encrypt0 \
-driver=qcow2,file.filename=/var/lib/libvirt/images/sparse-qcow2.img
+qemu-img \
+convert \
+--image-opts \
+-n \
+--target-image-opts \
+--object secret,id=OtherDemo.img_encrypt0,\
+file=/path/to/inputSecretFile driver=luks,\
+file.filename=/var/lib/libvirt/images/OtherDemo.img,\
+key-secret=OtherDemo.img_encrypt0 driver=qcow2,\
+file.filename=/var/lib/libvirt/images/sparse-qcow2.img

tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv

@@ -1,7 +1,13 @@
-qemu-img create -f raw \
-/var/lib/libvirt/images/sparse.img 1073741824K
-qemu-img convert --image-opts -n --target-image-opts \
---object secret,id=OtherDemo.img_encrypt0,file=/path/to/inputSecretFile \
-driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,\
-key-secret=OtherDemo.img_encrypt0 \
-driver=raw,file.filename=/var/lib/libvirt/images/sparse.img
+qemu-img \
+create \
+-f raw /var/lib/libvirt/images/sparse.img 1073741824K
+qemu-img \
+convert \
+--image-opts \
+-n \
+--target-image-opts \
+--object secret,id=OtherDemo.img_encrypt0,\
+file=/path/to/inputSecretFile driver=luks,\
+file.filename=/var/lib/libvirt/images/OtherDemo.img,\
+key-secret=OtherDemo.img_encrypt0 driver=raw,\
+file.filename=/var/lib/libvirt/images/sparse.img

tests/storagevolxml2argvdata/luks-convert-qcow2.argv

@@ -1,9 +1,16 @@
-qemu-img create -f luks \
+qemu-img \
+create \
+-f luks \
 --object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile \
--o key-secret=OtherDemo.img_encrypt0 \
-/var/lib/libvirt/images/OtherDemo.img 5242880K
-qemu-img convert --image-opts -n --target-image-opts \
---object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile \
-driver=qcow2,file.filename=/var/lib/libvirt/images/sparse-qcow2.img \
-driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,\
+-o key-secret=OtherDemo.img_encrypt0 /var/lib/libvirt/images/OtherDemo.img \
+5242880K
+qemu-img \
+convert \
+--image-opts \
+-n \
+--target-image-opts \
+--object secret,id=OtherDemo.img_encrypt0,\
+file=/path/to/secretFile driver=qcow2,\
+file.filename=/var/lib/libvirt/images/sparse-qcow2.img driver=luks,\
+file.filename=/var/lib/libvirt/images/OtherDemo.img,\
 key-secret=OtherDemo.img_encrypt0

tests/storagevolxml2argvdata/luks-convert.argv

@@ -1,9 +1,15 @@
-qemu-img create -f luks \
+qemu-img \
+create \
+-f luks \
 --object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile \
--o key-secret=OtherDemo.img_encrypt0 \
-/var/lib/libvirt/images/OtherDemo.img 5242880K
-qemu-img convert --image-opts -n --target-image-opts \
---object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile \
-driver=raw,file.filename=/var/lib/libvirt/images/sparse.img \
-driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,\
+-o key-secret=OtherDemo.img_encrypt0 /var/lib/libvirt/images/OtherDemo.img \
+5242880K
+qemu-img \
+convert \
+--image-opts \
+-n \
+--target-image-opts \
+--object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile driver=raw,\
+file.filename=/var/lib/libvirt/images/sparse.img driver=luks,\
+file.filename=/var/lib/libvirt/images/OtherDemo.img,\
 key-secret=OtherDemo.img_encrypt0

tests/storagevolxml2argvdata/luks.argv

@@ -1,4 +1,6 @@
-qemu-img create -f luks \
+qemu-img \
+create \
+-f luks \
 --object secret,id=LuksDemo.img_encrypt0,file=/path/to/secretFile \
--o key-secret=LuksDemo.img_encrypt0 \
-/var/lib/libvirt/images/LuksDemo.img 5242880K
+-o key-secret=LuksDemo.img_encrypt0 /var/lib/libvirt/images/LuksDemo.img \
+5242880K

tests/storagevolxml2argvdata/qcow2-1.1.argv

@@ -1,3 +1,5 @@
-qemu-img create -f qcow2 -b /dev/null \
--o backing_fmt=raw,compat=1.1 \
-/var/lib/libvirt/images/OtherDemo.img 5242880K
+qemu-img \
+create \
+-f qcow2 \
+-b /dev/null \
+-o backing_fmt=raw,compat=1.1 /var/lib/libvirt/images/OtherDemo.img 5242880K

tests/storagevolxml2argvdata/qcow2-compat.argv

@@ -1,3 +1,5 @@
-qemu-img create -f qcow2 -b /dev/null \
--o backing_fmt=raw,compat=0.10 \
-/var/lib/libvirt/images/OtherDemo.img 5242880K
+qemu-img \
+create \
+-f qcow2 \
+-b /dev/null \
+-o backing_fmt=raw,compat=0.10 /var/lib/libvirt/images/OtherDemo.img 5242880K

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

@@ -1,3 +1,5 @@
-qemu-img convert -f raw -O qcow2 \
--o compat=0.10 \
-/dev/HostVG/Swap /var/lib/libvirt/images/OtherDemo.img
+qemu-img \
+convert \
+-f raw \
+-O qcow2 \
+-o compat=0.10 /dev/HostVG/Swap /var/lib/libvirt/images/OtherDemo.img

tests/storagevolxml2argvdata/qcow2-lazy.argv

@@ -1,3 +1,6 @@
-qemu-img create -f qcow2 -b /dev/null \
--o backing_fmt=raw,compat=1.1,lazy_refcounts \
-/var/lib/libvirt/images/OtherDemo.img 5242880K
+qemu-img \
+create \
+-f qcow2 \
+-b /dev/null \
+-o backing_fmt=raw,compat=1.1,\
+lazy_refcounts /var/lib/libvirt/images/OtherDemo.img 5242880K

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

@@ -1,3 +1,7 @@
-qemu-img convert -f raw -O qcow2 \
--o preallocation=metadata,compat=0.10 \
-/var/lib/libvirt/images/sparse.img /var/lib/libvirt/images/OtherDemo.img
+qemu-img \
+convert \
+-f raw \
+-O qcow2 \
+-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

@@ -1,3 +1,5 @@
-qemu-img create -f qcow2 \
--o preallocation=metadata,compat=0.10 \
-/var/lib/libvirt/images/OtherDemo.img 5242880K
+qemu-img \
+create \
+-f qcow2 \
+-o preallocation=metadata,\
+compat=0.10 /var/lib/libvirt/images/OtherDemo.img 5242880K

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

@@ -1,4 +1,7 @@
-qemu-img convert -f raw -O qcow2 \
--o preallocation=falloc,compat=0.10 \
-/var/lib/libvirt/images/sparse.img \
+qemu-img \
+convert \
+-f raw \
+-O qcow2 \
+-o preallocation=falloc,\
+compat=0.10 /var/lib/libvirt/images/sparse.img \
 /var/lib/libvirt/images/OtherDemo.img

tests/storagevolxml2argvdata/qcow2-nocapacity.argv

@@ -1,5 +1,5 @@
-qemu-img create \
+qemu-img \
+create \
 -f qcow2 \
 -b /dev/null \
--o backing_fmt=raw,compat=0.10 \
-/var/lib/libvirt/images/OtherDemo.img
+-o backing_fmt=raw,compat=0.10 /var/lib/libvirt/images/OtherDemo.img

tests/storagevolxml2argvdata/qcow2-nocow-compat.argv

@@ -1,3 +1,6 @@
-qemu-img create -f qcow2 -b /dev/null \
--o backing_fmt=raw,nocow=on,compat=0.10 \
-/var/lib/libvirt/images/OtherDemo.img 5242880K
+qemu-img \
+create \
+-f qcow2 \
+-b /dev/null \
+-o backing_fmt=raw,nocow=on,\
+compat=0.10 /var/lib/libvirt/images/OtherDemo.img 5242880K

tests/storagevolxml2argvdata/qcow2-nocow.argv

@@ -1,3 +1,6 @@
-qemu-img create -f qcow2 -b /dev/null \
--o backing_fmt=raw,encryption=on,nocow=on \
-/var/lib/libvirt/images/OtherDemo.img 5242880K
+qemu-img \
+create \
+-f qcow2 \
+-b /dev/null \
+-o backing_fmt=raw,encryption=on,\
+nocow=on /var/lib/libvirt/images/OtherDemo.img 5242880K

tests/storagevolxml2argvdata/qcow2-zerocapacity.argv

@@ -1 +1,4 @@
-qemu-img create -f qcow2 -o compat=0.10 /var/lib/libvirt/images/OtherDemo.img 0K
+qemu-img \
+create \
+-f qcow2 \
+-o compat=0.10 /var/lib/libvirt/images/OtherDemo.img 0K