[PATCH 07/19] storagevolxml2argvdata: Rewrap all output files
Peter Krempa
pkrempa at redhat.com
Thu Feb 11 15:37:46 UTC 2021
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 at redhat.com>
---
tests/storagevolxml2argvdata/iso-input.argv | 6 +++--
tests/storagevolxml2argvdata/iso.argv | 4 +++-
.../logical-from-qcow2.argv | 6 +++--
tests/storagevolxml2argvdata/luks-cipher.argv | 8 ++++---
.../luks-convert-encrypt.argv | 23 ++++++++++++-------
.../luks-convert-encrypt2fileqcow2.argv | 19 ++++++++++-----
.../luks-convert-encrypt2fileraw.argv | 20 ++++++++++------
.../luks-convert-qcow2.argv | 21 +++++++++++------
.../storagevolxml2argvdata/luks-convert.argv | 20 ++++++++++------
tests/storagevolxml2argvdata/luks.argv | 8 ++++---
tests/storagevolxml2argvdata/qcow2-1.1.argv | 8 ++++---
.../storagevolxml2argvdata/qcow2-compat.argv | 8 ++++---
.../qcow2-from-logical-compat.argv | 8 ++++---
tests/storagevolxml2argvdata/qcow2-lazy.argv | 9 +++++---
...ow2-nobacking-convert-prealloc-compat.argv | 10 +++++---
.../qcow2-nobacking-prealloc-compat.argv | 8 ++++---
.../qcow2-nocapacity-convert-prealloc.argv | 9 +++++---
.../qcow2-nocapacity.argv | 6 ++---
.../qcow2-nocow-compat.argv | 9 +++++---
tests/storagevolxml2argvdata/qcow2-nocow.argv | 9 +++++---
.../qcow2-zerocapacity.argv | 5 +++-
21 files changed, 147 insertions(+), 77 deletions(-)
diff --git a/tests/storagevolxml2argvdata/iso-input.argv b/tests/storagevolxml2argvdata/iso-input.argv
index 1db0265945..203f27ca22 100644
--- 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 172a255eb8..f74505ecec 100644
--- 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 7beded8478..c1b3cef4b9 100644
--- 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 a8a19f03ff..bb4438949c 100644
--- 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 78bce96aaa..456ae621d1 100644
--- 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 fd974f863e..1320e2ee2f 100644
--- 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 82473db57b..e140850217 100644
--- 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 9124f5f27c..78cd9a2a8d 100644
--- 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 6bac814300..e4a8277d7f 100644
--- 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 336238ecab..5013c8ca7f 100644
--- 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 71ff67378e..5ee974afe9 100644
--- 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 fcb6bed782..3071d7a790 100644
--- 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 f99717ad40..1971da200d 100644
--- 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 c3c09cefef..2621b01168 100644
--- 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 f3e230654b..87489641d5 100644
--- 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 841d683965..a883030744 100644
--- 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 22dd9381a4..049d2d73b5 100644
--- 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 a922d12042..30bcfb00c7 100644
--- 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 826001f73b..5e327dab0b 100644
--- 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 e54801c78a..74eaa89835 100644
--- 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 45894931ae..95dfc65d9b 100644
--- 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
--
2.29.2
More information about the libvir-list
mailing list