iotests: filter few more luks specific create options
This allows more tests to be able to have same output on both qcow2 luks encrypted images and raw luks images Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> Message-Id: <20200625125548.870061-3-mreitz@redhat.com>
This commit is contained in:
Maxim Levitsky
Max Reitz
parent
57ee95ed4e
commit
cbb32e79dd
|
|
@ -34,7 +34,7 @@ QMP_VERSION
|
|||
|
||||
=== Encrypted image QCow ===
|
||||
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on encrypt.key-secret=sec0
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on
|
||||
Testing:
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
|
|
@ -46,7 +46,7 @@ QMP_VERSION
|
|||
|
||||
=== Encrypted image LUKS ===
|
||||
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encrypt.format=luks encrypt.key-secret=sec0
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
|
||||
Testing:
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
|
|
@ -58,7 +58,7 @@ QMP_VERSION
|
|||
|
||||
=== Missing driver ===
|
||||
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on encrypt.key-secret=sec0
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on
|
||||
Testing: -S
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
QA output created by 134
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on encrypt.key-secret=sec0
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on
|
||||
|
||||
== reading whole image ==
|
||||
read 134217728/134217728 bytes at offset 0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
QA output created by 158
|
||||
== create base ==
|
||||
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728 encryption=on encrypt.key-secret=sec0
|
||||
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728 encryption=on
|
||||
|
||||
== writing whole image ==
|
||||
wrote 134217728/134217728 bytes at offset 0
|
||||
|
|
@ -10,7 +10,7 @@ wrote 134217728/134217728 bytes at offset 0
|
|||
read 134217728/134217728 bytes at offset 0
|
||||
128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
== create overlay ==
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base encryption=on encrypt.key-secret=sec0
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base encryption=on
|
||||
|
||||
== writing part of a cluster ==
|
||||
wrote 1024/1024 bytes at offset 0
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
QA output created by 188
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216
|
||||
|
||||
== reading whole image ==
|
||||
read 16777216/16777216 bytes at offset 0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
QA output created by 189
|
||||
== create base ==
|
||||
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=16777216 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10
|
||||
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=16777216
|
||||
|
||||
== writing whole image ==
|
||||
wrote 16777216/16777216 bytes at offset 0
|
||||
|
|
@ -10,7 +10,7 @@ wrote 16777216/16777216 bytes at offset 0
|
|||
read 16777216/16777216 bytes at offset 0
|
||||
16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
== create overlay ==
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216 backing_file=TEST_DIR/t.IMGFMT.base encrypt.format=luks encrypt.key-secret=sec1 encrypt.iter-time=10
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216 backing_file=TEST_DIR/t.IMGFMT.base
|
||||
|
||||
== writing part of a cluster ==
|
||||
wrote 1024/1024 bytes at offset 0
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
QA output created by 198
|
||||
== create base ==
|
||||
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=16777216 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10
|
||||
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=16777216
|
||||
|
||||
== writing whole image base ==
|
||||
wrote 16777216/16777216 bytes at offset 0
|
||||
16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
== create overlay ==
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216 backing_file=TEST_DIR/t.IMGFMT.base encrypt.format=luks encrypt.key-secret=sec1 encrypt.iter-time=10
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216 backing_file=TEST_DIR/t.IMGFMT.base
|
||||
|
||||
== writing whole image layer ==
|
||||
wrote 16777216/16777216 bytes at offset 0
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ QA output created by 263
|
|||
|
||||
testing LUKS qcow2 encryption
|
||||
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
|
||||
== reading the whole image ==
|
||||
read 1048576/1048576 bytes at offset 0
|
||||
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
|
|
@ -21,7 +21,7 @@ read 982528/982528 bytes at offset 66048
|
|||
|
||||
testing legacy AES qcow2 encryption
|
||||
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=aes encrypt.key-secret=sec0
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
|
||||
== reading the whole image ==
|
||||
read 1048576/1048576 bytes at offset 0
|
||||
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ QA output created by 284
|
|||
|
||||
testing LUKS qcow2 encryption
|
||||
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
|
||||
|
||||
== cluster size 512
|
||||
== checking image refcounts ==
|
||||
|
|
@ -21,7 +21,7 @@ wrote 1/1 bytes at offset 512
|
|||
|
||||
== rechecking image refcounts ==
|
||||
No errors were found on the image.
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
|
||||
|
||||
== cluster size 2048
|
||||
== checking image refcounts ==
|
||||
|
|
@ -40,7 +40,7 @@ wrote 1/1 bytes at offset 2048
|
|||
|
||||
== rechecking image refcounts ==
|
||||
No errors were found on the image.
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
|
||||
|
||||
== cluster size 32768
|
||||
== checking image refcounts ==
|
||||
|
|
|
|||
|
|
@ -178,16 +178,13 @@ _filter_img_create()
|
|||
| tr '\n' '\0' \
|
||||
| $SED -e 's/ \([a-z0-9_.-]*\)=/\n\1=/g' \
|
||||
| grep -a -e '^fmt' -e '^size' -e '^backing' -e '^preallocation' \
|
||||
-e '^encrypt' "${grep_data_file[@]}" \
|
||||
-e '^encryption' "${grep_data_file[@]}" \
|
||||
| $SED "${filename_filters[@]}" \
|
||||
-e 's/^\(fmt\)/0-\1/' \
|
||||
-e 's/^\(size\)/1-\1/' \
|
||||
-e 's/^\(backing\)/2-\1/' \
|
||||
-e 's/^\(data_file\)/3-\1/' \
|
||||
-e 's/^\(encryption\)/4-\1/' \
|
||||
-e 's/^\(encrypt\.format\)/5-\1/' \
|
||||
-e 's/^\(encrypt\.key-secret\)/6-\1/' \
|
||||
-e 's/^\(encrypt\.iter-time\)/7-\1/' \
|
||||
-e 's/^\(preallocation\)/8-\1/' \
|
||||
| sort \
|
||||
| $SED -e 's/^[0-9]-//' \
|
||||
|
|
|
|||
Loading…
Reference in New Issue