[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v9 08/10] qcow2.py: Introduce '-j' key to dump in JSON format
From: |
Andrey Shinkevich |
Subject: |
[PATCH v9 08/10] qcow2.py: Introduce '-j' key to dump in JSON format |
Date: |
Mon, 13 Jul 2020 10:27:54 +0300 |
Add the command key to the qcow2.py arguments list to dump QCOW2
metadata in JSON format. Here is the suggested way to do that. The
implementation of the dump in JSON format is in the patch that follows.
Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
---
tests/qemu-iotests/qcow2.py | 19 +++++++++++++++----
tests/qemu-iotests/qcow2_format.py | 16 ++++++++--------
2 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py
index 0910e6a..7402279 100755
--- a/tests/qemu-iotests/qcow2.py
+++ b/tests/qemu-iotests/qcow2.py
@@ -26,16 +26,19 @@ from qcow2_format import (
)
+dump_json = False
+
+
def cmd_dump_header(fd):
h = QcowHeader(fd)
- h.dump()
+ h.dump(dump_json)
print()
- h.dump_extensions()
+ h.dump_extensions(dump_json)
def cmd_dump_header_exts(fd):
h = QcowHeader(fd)
- h.dump_extensions()
+ h.dump_extensions(dump_json)
def cmd_set_header(fd, name, value):
@@ -134,6 +137,11 @@ cmds = [
def main(filename, cmd, args):
+ global dump_json
+ dump_json = '-j' in sys.argv
+ if dump_json:
+ sys.argv.remove('-j')
+ args.remove('-j')
fd = open(filename, "r+b")
try:
for name, handler, num_args, desc in cmds:
@@ -151,11 +159,14 @@ def main(filename, cmd, args):
def usage():
- print("Usage: %s <file> <cmd> [<arg>, ...]" % sys.argv[0])
+ print("Usage: %s <file> <cmd> [<arg>, ...] [<key>, ...]" % sys.argv[0])
print("")
print("Supported commands:")
for name, handler, num_args, desc in cmds:
print(" %-20s - %s" % (name, desc))
+ print("")
+ print("Supported keys:")
+ print(" %-20s - %s" % ('-j', 'Dump in JSON format'))
if __name__ == '__main__':
diff --git a/tests/qemu-iotests/qcow2_format.py
b/tests/qemu-iotests/qcow2_format.py
index 22be3ee..a9bd5a8 100644
--- a/tests/qemu-iotests/qcow2_format.py
+++ b/tests/qemu-iotests/qcow2_format.py
@@ -109,7 +109,7 @@ class Qcow2Struct(metaclass=Qcow2StructMeta):
self.__dict__ = dict((field[2], values[i])
for i, field in enumerate(self.fields))
- def dump(self):
+ def dump(self, dump_json=None):
for f in self.fields:
value = self.__dict__[f[2]]
if isinstance(f[1], str):
@@ -140,8 +140,8 @@ class Qcow2BitmapExt(Qcow2Struct):
[Qcow2BitmapDirEntry(fd, cluster_size=self.cluster_size)
for _ in range(self.nb_bitmaps)]
- def dump(self):
- super().dump()
+ def dump(self, dump_json=None):
+ super().dump(dump_json)
for entry in self.bitmap_directory:
print()
entry.dump()
@@ -185,7 +185,7 @@ class Qcow2BitmapDirEntry(Qcow2Struct):
self.bitmap_table = Qcow2BitmapTable(raw_table=table,
cluster_size=self.cluster_size)
- def dump(self):
+ def dump(self, dump_json=None):
print(f'{"Bitmap name":<25} {self.name}')
super(Qcow2BitmapDirEntry, self).dump()
self.bitmap_table.dump()
@@ -293,13 +293,13 @@ class QcowHeaderExtension(Qcow2Struct):
else:
self.obj = None
- def dump(self):
+ def dump(self, dump_json=None):
super().dump()
if self.obj is None:
print(f'{"data":<25} {self.data_str}')
else:
- self.obj.dump()
+ self.obj.dump(dump_json)
@classmethod
def create(cls, magic, data):
@@ -398,8 +398,8 @@ class QcowHeader(Qcow2Struct):
buf = buf[0:header_bytes-1]
fd.write(buf)
- def dump_extensions(self):
+ def dump_extensions(self, dump_json=None):
for ex in self.extensions:
print('Header extension:')
- ex.dump()
+ ex.dump(dump_json)
print()
--
1.8.3.1
- [PATCH v9 00/10] iotests: Dump QCOW2 dirty bitmaps metadata, Andrey Shinkevich, 2020/07/13
- [PATCH v9 02/10] qcow2_format.py: make printable data an extension class member, Andrey Shinkevich, 2020/07/13
- [PATCH v9 08/10] qcow2.py: Introduce '-j' key to dump in JSON format,
Andrey Shinkevich <=
- [PATCH v9 04/10] qcow2_format.py: dump bitmap flags in human readable way., Andrey Shinkevich, 2020/07/13
- [PATCH v9 03/10] qcow2_format.py: change Qcow2BitmapExt initialization method, Andrey Shinkevich, 2020/07/13
- [PATCH v9 09/10] qcow2_format.py: collect fields to dump in JSON format, Andrey Shinkevich, 2020/07/13
- [PATCH v9 10/10] qcow2_format.py: support dumping metadata in JSON format, Andrey Shinkevich, 2020/07/13
- [PATCH v9 06/10] qcow2_format.py: pass cluster size to substructures, Andrey Shinkevich, 2020/07/13
- [PATCH v9 05/10] qcow2_format.py: Dump bitmap directory information, Andrey Shinkevich, 2020/07/13
- [PATCH v9 07/10] qcow2_format.py: Dump bitmap table serialized entries, Andrey Shinkevich, 2020/07/13
- [PATCH v9 01/10] qcow2: Fix capitalization of header extension constant., Andrey Shinkevich, 2020/07/13
- Re: [PATCH v9 00/10] iotests: Dump QCOW2 dirty bitmaps metadata, Eric Blake, 2020/07/13