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>

diff --git a/tests/storagevolxml2argvdata/iso-input.argv b/tests/storagevolxml2argvdata/iso-input.argv
index 1db0265945f857effcf8d7fcde758bdcce9c7776..203f27ca22851c5fd73d5a6d93836bc165e1e296 100644 (file)
--- a/tests/storagevolxml2argvdata/iso-input.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/iso.argv b/tests/storagevolxml2argvdata/iso.argv
index 172a255eb8f5402c36a4de50371b99d75c4130ce..f74505ececbf4bead6fb987ec6a1d2d05ec7a000 100644 (file)
--- a/tests/storagevolxml2argvdata/iso.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/logical-from-qcow2.argv b/tests/storagevolxml2argvdata/logical-from-qcow2.argv
index 7beded847871d769c522b736ad9cdf6e3b71aec6..c1b3cef4b9d6a383591ab57639ab2e879edd05d2 100644 (file)
--- a/tests/storagevolxml2argvdata/logical-from-qcow2.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/luks-cipher.argv b/tests/storagevolxml2argvdata/luks-cipher.argv
index a8a19f03ffa191f46f00813107800bba9983a464..bb4438949c2eba172d792b24b9a55e2671b21481 100644 (file)
--- a/tests/storagevolxml2argvdata/luks-cipher.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt.argv b/tests/storagevolxml2argvdata/luks-convert-encrypt.argv
index 78bce96aaa8f1b5a8ec19d65f360a37336de9c29..456ae621d1f55662a9bb2c7f6bab06d16ec2e39b 100644 (file)
--- a/tests/storagevolxml2argvdata/luks-convert-encrypt.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv
index fd974f863e78d1326610a1bef736e43d25caac48..1320e2ee2fa6c6a874eb194d1fd090cb68683eeb 100644 (file)
--- a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv
index 82473db57bd93483491845b39b587be747552fbb..e14085021724d025e8c83ab8a6be1b902f884995 100644 (file)
--- a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/luks-convert-qcow2.argv b/tests/storagevolxml2argvdata/luks-convert-qcow2.argv
index 9124f5f27c222e33ecd21d5233d807de167066d8..78cd9a2a8dd493278b70a15e5db9ea7ea4dd772d 100644 (file)
--- a/tests/storagevolxml2argvdata/luks-convert-qcow2.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/luks-convert.argv b/tests/storagevolxml2argvdata/luks-convert.argv
index 6bac814300f62151bc65f97c53fcbc31c1e2ca7e..e4a8277d7f5312cef1d830a794e4799e4cc226ca 100644 (file)
--- a/tests/storagevolxml2argvdata/luks-convert.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/luks.argv b/tests/storagevolxml2argvdata/luks.argv
index 336238ecab404565a2a8e3717fcdb86e57276bde..5013c8ca7f0ba453ba426e6701a3b62603e09c95 100644 (file)
--- a/tests/storagevolxml2argvdata/luks.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/qcow2-1.1.argv b/tests/storagevolxml2argvdata/qcow2-1.1.argv
index 71ff67378e396c5af19a568003319be3c7cea183..5ee974afe95aaa0f75c513d684dcbfc1d62c64c4 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-1.1.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/qcow2-compat.argv b/tests/storagevolxml2argvdata/qcow2-compat.argv
index fcb6bed78255e5295e072dc736966766a0a5cace..3071d7a79009035021dc5ab495dc343c9376e86e 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-compat.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv
index f99717ad40f92458e260b0da2a151b4f17260735..1971da200d09e1269627cb7974dc385c845d32b4 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/qcow2-lazy.argv b/tests/storagevolxml2argvdata/qcow2-lazy.argv
index c3c09cefef58bc4a116846fae3f79688963ef5d8..2621b011684547e583bc09de6cf5c27b485d0570 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-lazy.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv
index f3e230654ba29f3f35afe0a2892d5d7b802dee4c..87489641d538675dd643076a1f75b9dcd3b56c91 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv
index 841d683965293f5c5086d6a85518cd3fb754bf79..a883030744b29c1c39fb2f229e5d50ecaa16f782 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv b/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv
index 22dd9381a4f0f59e2c878c16181ae68574d018bf..049d2d73b596df27e6648616fd59e595030546c7 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv b/tests/storagevolxml2argvdata/qcow2-nocapacity.argv
index a922d12042ef2c62d2b053cc6fc62fe251b1709d..30bcfb00c7eac03e9b3e7fa62e63e0865df6e309 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv b/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv
index 826001f73ba85dc4185a069ac9e823a50a8d208d..5e327dab0bdc92da626e0620e8e5e6e203977bbb 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/qcow2-nocow.argv b/tests/storagevolxml2argvdata/qcow2-nocow.argv
index e54801c78a8e237f68e8acb7c956440933e94bc0..74eaa89835850bb2d3c306b6fdc4e0267c1b8a04 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-nocow.argv
+++ b/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

diff --git a/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv b/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv
index 45894931ae48827d3f6126fe7b7e7f415fba7efe..95dfc65d9b80bc073bc8ee41c318a8034fc1efbb 100644 (file)
--- a/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv
+++ b/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