From 2a6c4e6212c3f342132a2aca22c84bbf886dc79b Mon Sep 17 00:00:00 2001

From: John Snow <jsnow@redhat.com>

Date: Wed, 20 Mar 2019 16:16:22 +0100

Subject: [PATCH 024/163] iotests: change qmp_log filters to expect QMP objects

 only

RH-Author: John Snow <jsnow@redhat.com>

Message-id: <20190320161631.14841-11-jsnow@redhat.com>

Patchwork-id: 84946

O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 10/19] iotests: change qmp_log filters to expect QMP objects only

Bugzilla: 1668956

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

As laid out in the previous commit's message:

```

Several places in iotests deal with serializing objects into JSON

strings, but to add pretty-printing it seems desirable to localize

all of those cases.

log() seems like a good candidate for that centralized behavior.

log() can already serialize json objects, but when it does so,

it assumes filters=[] operates on QMP objects, not strings.

qmp_log currently operates by dumping outgoing and incoming QMP

objects into strings and filtering them assuming that filters=[]

are string filters.

```

Therefore:

Change qmp_log to treat filters as if they're always qmp object filters,

then change the logging call to rely on log()'s ability to serialize QMP

objects, so we're not duplicating that effort.

Add a qmp version of filter_testfiles and adjust the only caller using

it for qmp_log to use the qmp version.

Signed-off-by: John Snow <jsnow@redhat.com>

Message-Id: <20181221093529.23855-10-jsnow@redhat.com>

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Signed-off-by: Eric Blake <eblake@redhat.com>

(cherry picked from commit 08fcd6111e1949f456e1b232ebeeb0cc17019a92)

Signed-off-by: John Snow <jsnow@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 tests/qemu-iotests/206        |  4 ++--

 tests/qemu-iotests/iotests.py | 28 +++++++++++++++++++++++++---

 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/tests/qemu-iotests/206 b/tests/qemu-iotests/206

index e92550f..5bb738b 100755

--- a/tests/qemu-iotests/206

+++ b/tests/qemu-iotests/206

@@ -27,7 +27,7 @@ iotests.verify_image_format(supported_fmts=['qcow2'])

 def blockdev_create(vm, options):

     result = vm.qmp_log('blockdev-create',

-                        filters=[iotests.filter_testfiles],

+                        filters=[iotests.filter_qmp_testfiles],

                         job_id='job0', options=options)

     if 'return' in result:

@@ -55,7 +55,7 @@ with iotests.FilePath('t.qcow2') as disk_path, \

                           'size': 0 })

     vm.qmp_log('blockdev-add',

-               filters=[iotests.filter_testfiles],

+               filters=[iotests.filter_qmp_testfiles],

                driver='file', filename=disk_path,

                node_name='imgfile')

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py

index 30d198a..d2a8fbd 100644

--- a/tests/qemu-iotests/iotests.py

+++ b/tests/qemu-iotests/iotests.py

@@ -240,10 +240,33 @@ def filter_qmp_event(event):

         event['timestamp']['microseconds'] = 'USECS'

     return event

+def filter_qmp(qmsg, filter_fn):

+    '''Given a string filter, filter a QMP object's values.

+    filter_fn takes a (key, value) pair.'''

+    # Iterate through either lists or dicts;

+    if isinstance(qmsg, list):

+        items = enumerate(qmsg)

+    else:

+        items = qmsg.items()

+

+    for k, v in items:

+        if isinstance(v, list) or isinstance(v, dict):

+            qmsg[k] = filter_qmp(v, filter_fn)

+        else:

+            qmsg[k] = filter_fn(k, v)

+    return qmsg

+

 def filter_testfiles(msg):

     prefix = os.path.join(test_dir, "%s-" % (os.getpid()))

     return msg.replace(prefix, 'TEST_DIR/PID-')

+def filter_qmp_testfiles(qmsg):

+    def _filter(key, value):

+        if key == 'filename' or key == 'backing-file':

+            return filter_testfiles(value)

+        return value

+    return filter_qmp(qmsg, _filter)

+

 def filter_generated_node_ids(msg):

     return re.sub("#block[0-9]+", "NODE_NAME", msg)

@@ -459,10 +482,9 @@ class VM(qtest.QEMUQtestMachine):

             ("execute", cmd),

             ("arguments", ordered_kwargs(kwargs))

         ))

-        logmsg = json.dumps(full_cmd)

-        log(logmsg, filters)

+        log(full_cmd, filters)

         result = self.qmp(cmd, **kwargs)

-        log(json.dumps(result, sort_keys=True), filters)

+        log(result, filters)

         return result

     def run_job(self, job, auto_finalize=True, auto_dismiss=False):

-- 

1.8.3.1