[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 04/17] iotests.py: rewrite default luks support in qemu_img
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v3 04/17] iotests.py: rewrite default luks support in qemu_img |
Date: |
Tue, 14 Sep 2021 13:25:34 +0300 |
Move the logic to more generic qemu_img_pipe_and_status(). Also behave
better when we have several -o options. And reuse argument parser of
course.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
tests/qemu-iotests/iotests.py | 36 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index fed7e1f640..a838737c28 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -146,9 +146,13 @@ def qemu_img_create_prepare_args(args: List[str]) ->
List[str]:
args = args[1:]
p = argparse.ArgumentParser(allow_abbrev=False)
+ # -o option may be specified several times
+ p.add_argument('-o', action='append', default=[])
p.add_argument('-f')
parsed, remaining = p.parse_known_args(args)
+ opts_list = parsed.o
+
result = ['create']
if parsed.f is not None:
result += ['-f', parsed.f]
@@ -157,8 +161,18 @@ def qemu_img_create_prepare_args(args: List[str]) ->
List[str]:
# like extended_l2 or compression_type for qcow2. Test may want to create
# additional images in other formats that doesn't support these options.
# So, use IMGOPTS only for images created in imgfmt format.
- if parsed.f == imgfmt and 'IMGOPTS' in os.environ:
- result += ['-o', os.environ['IMGOPTS']]
+ imgopts = os.environ.get('IMGOPTS')
+ if imgopts and parsed.f == imgfmt:
+ opts_list.insert(0, imgopts)
+
+ # default luks support
+ if parsed.f == 'luks' and \
+ all('key-secret' not in opts for opts in opts_list):
+ result += ['--object', luks_default_secret_object]
+ opts_list.append(luks_default_key_secret_opt)
+
+ for opts in opts_list:
+ result += ['-o', opts]
result += remaining
@@ -189,23 +203,7 @@ def ordered_qmp(qmsg, conv_keys=True):
return qmsg
def qemu_img_create(*args):
- args = list(args)
-
- # default luks support
- if '-f' in args and args[args.index('-f') + 1] == 'luks':
- if '-o' in args:
- i = args.index('-o')
- if 'key-secret' not in args[i + 1]:
- args[i + 1].append(luks_default_key_secret_opt)
- args.insert(i + 2, '--object')
- args.insert(i + 3, luks_default_secret_object)
- else:
- args = ['-o', luks_default_key_secret_opt,
- '--object', luks_default_secret_object] + args
-
- args.insert(0, 'create')
-
- return qemu_img(*args)
+ return qemu_img('create', *args)
def qemu_img_measure(*args):
return json.loads(qemu_img_pipe("measure", "--output", "json", *args))
--
2.29.2
- [PATCH v3 00/17] iotests: support zstd, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 04/17] iotests.py: rewrite default luks support in qemu_img,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v3 01/17] iotests.py: img_info_log(): rename imgopts argument, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 05/17] iotest 303: explicit compression type, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 02/17] iotests.py: qemu_img*("create"): support IMGOPTS='compression_type=zstd', Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 06/17] iotest 065: explicit compression type, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 03/17] iotests: drop qemu_img_verbose() helper, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 08/17] iotests.py: filter compression type out, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 09/17] iotest 302: use img_info_log() helper, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 07/17] iotests.py: filter out successful output of qemu-img create, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 17/17] iotests: declare lack of support for compresion_type in IMGOPTS, Vladimir Sementsov-Ogievskiy, 2021/09/14