From 8d1e45a4b4c46bae4c2b453ef575407bfd8b3539 Mon Sep 17 00:00:00 2001

From: John Snow <jsnow@redhat.com>

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

Subject: [PATCH 017/163] iotests: Unify log outputs between Python 2 and 3

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

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

Patchwork-id: 84940

O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 03/19] iotests: Unify log outputs between Python 2 and 3

Bugzilla: 1668956

RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

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

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

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

From: Max Reitz <mreitz@redhat.com>

When dumping an object into the log, there are differences between

Python 2 and 3.  First, unicode strings are prefixed by 'u' in Python 2

(they are no longer in 3, because unicode strings are the default

there).  Second, the order of keys in dicts may differ.  Third,

especially long numbers are longs in Python 2 and thus get an 'L'

suffix, which does not happen in Python 3.

We can get around all of these differences by dumping objects (lists and

dicts) in a language-independent format, namely JSON.  The JSON

generator even allows emitting dicts with their keys sorted

alphabetically.

This changes the output of all tests that use these logging functions

(dict keys are ordered now, strings in dicts are now enclosed in double

quotes instead of single quotes, the 'L' suffix of large integers is

dropped, and "true" and "false" are now in lower case).

The quote change necessitates a small change to a filter used in test

207.

Suggested-by: Eduardo Habkost <ehabkost@redhat.com>

Signed-off-by: Max Reitz <mreitz@redhat.com>

Reviewed-by: Cleber Rosa <crosa@redhat.com>

Message-Id: <20181022135307.14398-10-mreitz@redhat.com>

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

(cherry picked from commit e21b5f34d669b82087597273f3783626947291a0)

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

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

---

 tests/qemu-iotests/194.out    |  22 +-

 tests/qemu-iotests/202.out    |  12 +-

 tests/qemu-iotests/203.out    |  14 +-

 tests/qemu-iotests/206.out    | 218 ++++++++---------

 tests/qemu-iotests/207        |   2 +-

 tests/qemu-iotests/207.out    |  72 +++---

 tests/qemu-iotests/208.out    |   8 +-

 tests/qemu-iotests/210.out    |  94 ++++----

 tests/qemu-iotests/211.out    | 102 ++++----

 tests/qemu-iotests/212.out    | 174 +++++++-------

 tests/qemu-iotests/213.out    | 182 +++++++--------

 tests/qemu-iotests/216.out    |   4 +-

 tests/qemu-iotests/218.out    |  20 +-

 tests/qemu-iotests/219.out    | 526 +++++++++++++++++++++---------------------

 tests/qemu-iotests/222.out    |  24 +-

 tests/qemu-iotests/234.out    |  36 +--

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

 17 files changed, 762 insertions(+), 758 deletions(-)

diff --git a/tests/qemu-iotests/194.out b/tests/qemu-iotests/194.out

index 50ac50d..7185785 100644

--- a/tests/qemu-iotests/194.out

+++ b/tests/qemu-iotests/194.out

@@ -1,18 +1,18 @@

 Launching VMs...

 Launching NBD server on destination...

-{u'return': {}}

-{u'return': {}}

+{"return": {}}

+{"return": {}}

 Starting `drive-mirror` on source...

-{u'return': {}}

+{"return": {}}

 Waiting for `drive-mirror` to complete...

-{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'device': u'mirror-job0', u'type': u'mirror', u'speed': 0, u'len': 1073741824, u'offset': 1073741824}, u'event': u'BLOCK_JOB_READY'}

+{"data": {"device": "mirror-job0", "len": 1073741824, "offset": 1073741824, "speed": 0, "type": "mirror"}, "event": "BLOCK_JOB_READY", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

 Starting migration...

-{u'return': {}}

-{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'setup'}, u'event': u'MIGRATION'}

-{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'active'}, u'event': u'MIGRATION'}

-{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'completed'}, u'event': u'MIGRATION'}

+{"return": {}}

+{"data": {"status": "setup"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

+{"data": {"status": "active"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

+{"data": {"status": "completed"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

 Gracefully ending the `drive-mirror` job on source...

-{u'return': {}}

-{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'device': u'mirror-job0', u'type': u'mirror', u'speed': 0, u'len': 1073741824, u'offset': 1073741824}, u'event': u'BLOCK_JOB_COMPLETED'}

+{"return": {}}

+{"data": {"device": "mirror-job0", "len": 1073741824, "offset": 1073741824, "speed": 0, "type": "mirror"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

 Stopping the NBD server on destination...

-{u'return': {}}

+{"return": {}}

diff --git a/tests/qemu-iotests/202.out b/tests/qemu-iotests/202.out

index d5ea374..9a8619e 100644

--- a/tests/qemu-iotests/202.out

+++ b/tests/qemu-iotests/202.out

@@ -1,11 +1,11 @@

 Launching VM...

 Adding IOThread...

-{u'return': {}}

+{"return": {}}

 Adding blockdevs...

-{u'return': {}}

-{u'return': {}}

+{"return": {}}

+{"return": {}}

 Setting iothread...

-{u'return': {}}

-{u'return': {}}

+{"return": {}}

+{"return": {}}

 Creating external snapshots...

-{u'return': {}}

+{"return": {}}

diff --git a/tests/qemu-iotests/203.out b/tests/qemu-iotests/203.out

index 1a11f09..9d4abba 100644

--- a/tests/qemu-iotests/203.out

+++ b/tests/qemu-iotests/203.out

@@ -1,11 +1,11 @@

 Launching VM...

 Setting IOThreads...

-{u'return': {}}

-{u'return': {}}

+{"return": {}}

+{"return": {}}

 Enabling migration QMP events...

-{u'return': {}}

+{"return": {}}

 Starting migration...

-{u'return': {}}

-{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'setup'}, u'event': u'MIGRATION'}

-{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'active'}, u'event': u'MIGRATION'}

-{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'completed'}, u'event': u'MIGRATION'}

+{"return": {}}

+{"data": {"status": "setup"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

+{"data": {"status": "active"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

+{"data": {"status": "completed"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

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

index 789eebe..91f4db5 100644

--- a/tests/qemu-iotests/206.out

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

@@ -1,16 +1,16 @@

 === Successful image creation (defaults) ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

-

-{'execute': 'blockdev-add', 'arguments': {'node_name': 'imgfile', 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}

-{u'return': {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'qcow2', 'file': 'imgfile', 'size': 134217728}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2", "size": 0}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

+

+{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2", "node_name": "imgfile"}}

+{"return": {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "qcow2", "file": "imgfile", "size": 134217728}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 image: TEST_IMG

 file format: IMGFMT

@@ -24,15 +24,15 @@ Format specific information:

 === Successful image creation (inline blockdev-add, explicit defaults) ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'nocow': False, 'preallocation': 'off', 'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2", "nocow": false, "preallocation": "off", "size": 0}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 65536, 'refcount-bits': 16, 'version': 'v3', 'preallocation': 'off', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}, 'lazy-refcounts': False, 'driver': 'qcow2', 'size': 67108864}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"cluster-size": 65536, "driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2"}, "lazy-refcounts": false, "preallocation": "off", "refcount-bits": 16, "size": 67108864, "version": "v3"}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 image: TEST_IMG

 file format: IMGFMT

@@ -46,15 +46,15 @@ Format specific information:

 === Successful image creation (v3 non-default options) ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'nocow': True, 'preallocation': 'falloc', 'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2", "nocow": true, "preallocation": "falloc", "size": 0}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 2097152, 'refcount-bits': 1, 'version': 'v3', 'preallocation': 'metadata', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}, 'lazy-refcounts': True, 'driver': 'qcow2', 'size': 33554432}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"cluster-size": 2097152, "driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2"}, "lazy-refcounts": true, "preallocation": "metadata", "refcount-bits": 1, "size": 33554432, "version": "v3"}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 image: TEST_IMG

 file format: IMGFMT

@@ -68,15 +68,15 @@ Format specific information:

 === Successful image creation (v2 non-default options) ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2", "size": 0}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 512, 'backing-fmt': 'qcow2', 'driver': 'qcow2', 'version': 'v2', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}, 'backing-file': 'TEST_DIR/PID-t.qcow2.base', 'size': 33554432}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"backing-file": "TEST_DIR/PID-t.qcow2.base", "backing-fmt": "qcow2", "cluster-size": 512, "driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2"}, "size": 33554432, "version": "v2"}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 image: TEST_IMG

 file format: IMGFMT

@@ -90,10 +90,10 @@ Format specific information:

 === Successful image creation (encrypted) ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'encrypt': {'key-secret': 'keysec0', 'iter-time': 10, 'cipher-mode': 'ctr', 'ivgen-hash-alg': 'md5', 'cipher-alg': 'twofish-128', 'format': 'luks', 'ivgen-alg': 'plain64', 'hash-alg': 'sha1'}, 'driver': 'qcow2', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}, 'size': 33554432}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "qcow2", "encrypt": {"cipher-alg": "twofish-128", "cipher-mode": "ctr", "format": "luks", "hash-alg": "sha1", "iter-time": 10, "ivgen-alg": "plain64", "ivgen-hash-alg": "md5", "key-secret": "keysec0"}, "file": {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2"}, "size": 33554432}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 image: TEST_IMG

 file format: IMGFMT

@@ -144,113 +144,113 @@ Format specific information:

 === Invalid BlockdevRef ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'qcow2', 'file': "this doesn't exist", 'size': 33554432}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "qcow2", "file": "this doesn't exist", "size": 33554432}}}

+{"return": {}}

 Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exist

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 === Invalid sizes ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'qcow2', 'file': 'node0', 'size': 1234}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "qcow2", "file": "node0", "size": 1234}}}

+{"return": {}}

 Job failed: Image size must be a multiple of 512 bytes

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'qcow2', 'file': 'node0', 'size': 18446744073709551104L}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "qcow2", "file": "node0", "size": 18446744073709551104}}}

+{"return": {}}

 Job failed: Could not resize image: Image size cannot be negative

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'qcow2', 'file': 'node0', 'size': 9223372036854775808L}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "qcow2", "file": "node0", "size": 9223372036854775808}}}

+{"return": {}}

 Job failed: Could not resize image: Image size cannot be negative

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'qcow2', 'file': 'node0', 'size': 9223372036854775296}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "qcow2", "file": "node0", "size": 9223372036854775296}}}

+{"return": {}}

 Job failed: Could not resize image: Failed to grow the L1 table: File too large

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 === Invalid version ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'version': 'v1', 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}

-{u'error': {u'class': u'GenericError', u'desc': u"Invalid parameter 'v1'"}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "qcow2", "file": "node0", "size": 67108864, "version": "v1"}}}

+{"error": {"class": "GenericError", "desc": "Invalid parameter 'v1'"}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'lazy-refcounts': True, 'version': 'v2', 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "qcow2", "file": "node0", "lazy-refcounts": true, "size": 67108864, "version": "v2"}}}

+{"return": {}}

 Job failed: Lazy refcounts only supported with compatibility level 1.1 and above (use version=v3 or greater)

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'refcount-bits': 8, 'version': 'v2', 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "qcow2", "file": "node0", "refcount-bits": 8, "size": 67108864, "version": "v2"}}}

+{"return": {}}

 Job failed: Different refcount widths than 16 bits require compatibility level 1.1 or above (use version=v3 or greater)

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 === Invalid backing file options ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'preallocation': 'full', 'driver': 'qcow2', 'backing-file': '/dev/null', 'file': 'node0', 'size': 67108864}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"backing-file": "/dev/null", "driver": "qcow2", "file": "node0", "preallocation": "full", "size": 67108864}}}

+{"return": {}}

 Job failed: Backing file and preallocation cannot be used at the same time

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'backing-fmt': 'qcow2', 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"backing-fmt": "qcow2", "driver": "qcow2", "file": "node0", "size": 67108864}}}

+{"return": {}}

 Job failed: Backing format cannot be used without backing file

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 === Invalid cluster size ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 1234, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"cluster-size": 1234, "driver": "qcow2", "file": "node0", "size": 67108864}}}

+{"return": {}}

 Job failed: Cluster size must be a power of two between 512 and 2048k

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 128, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"cluster-size": 128, "driver": "qcow2", "file": "node0", "size": 67108864}}}

+{"return": {}}

 Job failed: Cluster size must be a power of two between 512 and 2048k

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 4194304, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"cluster-size": 4194304, "driver": "qcow2", "file": "node0", "size": 67108864}}}

+{"return": {}}

 Job failed: Cluster size must be a power of two between 512 and 2048k

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 0, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"cluster-size": 0, "driver": "qcow2", "file": "node0", "size": 67108864}}}

+{"return": {}}

 Job failed: Cluster size must be a power of two between 512 and 2048k

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 512, 'driver': 'qcow2', 'file': 'node0', 'size': 281474976710656}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"cluster-size": 512, "driver": "qcow2", "file": "node0", "size": 281474976710656}}}

+{"return": {}}

 Job failed: Could not resize image: Failed to grow the L1 table: File too large

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 === Invalid refcount width ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'refcount-bits': 128, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "qcow2", "file": "node0", "refcount-bits": 128, "size": 67108864}}}

+{"return": {}}

 Job failed: Refcount width must be a power of two and may not exceed 64 bits

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'refcount-bits': 0, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "qcow2", "file": "node0", "refcount-bits": 0, "size": 67108864}}}

+{"return": {}}

 Job failed: Refcount width must be a power of two and may not exceed 64 bits

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'refcount-bits': 7, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "qcow2", "file": "node0", "refcount-bits": 7, "size": 67108864}}}

+{"return": {}}

 Job failed: Refcount width must be a power of two and may not exceed 64 bits

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

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

index 444ae23..687b2ca 100755

--- a/tests/qemu-iotests/207

+++ b/tests/qemu-iotests/207

@@ -28,7 +28,7 @@ iotests.verify_image_format(supported_fmts=['raw'])

 iotests.verify_protocol(supported=['ssh'])

 def filter_hash(msg):

-    return re.sub("'hash': '[0-9a-f]+'", "'hash': HASH", msg)

+    return re.sub('"hash": "[0-9a-f]+"', '"hash": HASH', msg)

 def blockdev_create(vm, options):

     result = vm.qmp_log('blockdev-create', job_id='job0', options=options,

diff --git a/tests/qemu-iotests/207.out b/tests/qemu-iotests/207.out

index 078b7e6..45ac7c2 100644

--- a/tests/qemu-iotests/207.out

+++ b/tests/qemu-iotests/207.out

@@ -1,9 +1,9 @@

 === Successful image creation (defaults) ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "ssh", "location": {"path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 4194304}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}

 file format: IMGFMT

@@ -16,49 +16,49 @@ virtual size: 4.0M (4194304 bytes)

 === Test host-key-check options ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'mode': 'none'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 8388608}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"mode": "none"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 8388608}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}

 file format: IMGFMT

 virtual size: 8.0M (8388608 bytes)

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'mode': 'known_hosts'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"mode": "known_hosts"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 4194304}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}

 file format: IMGFMT

 virtual size: 4.0M (4194304 bytes)

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'hash': 'wrong', 'type': 'md5', 'mode': 'hash'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 2097152}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"hash": "wrong", "mode": "hash", "type": "md5"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 2097152}}}

+{"return": {}}

 Job failed: remote host key does not match host_key_check 'wrong'

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'hash': HASH, 'type': 'md5', 'mode': 'hash'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 8388608}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"hash": HASH, "mode": "hash", "type": "md5"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 8388608}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}

 file format: IMGFMT

 virtual size: 8.0M (8388608 bytes)

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'hash': 'wrong', 'type': 'sha1', 'mode': 'hash'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 2097152}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"hash": "wrong", "mode": "hash", "type": "sha1"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 2097152}}}

+{"return": {}}

 Job failed: remote host key does not match host_key_check 'wrong'

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'hash': HASH, 'type': 'sha1', 'mode': 'hash'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"hash": HASH, "mode": "hash", "type": "sha1"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 4194304}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}

 file format: IMGFMT

@@ -66,15 +66,15 @@ virtual size: 4.0M (4194304 bytes)

 === Invalid path and user ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': '/this/is/not/an/existing/path', 'host-key-check': {'mode': 'none'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"mode": "none"}, "path": "/this/is/not/an/existing/path", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 4194304}}}

+{"return": {}}

 Job failed: failed to open remote file '/this/is/not/an/existing/path': Failed opening remote file (libssh2 error code: -31)

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'mode': 'none'}, 'user': 'invalid user', 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"mode": "none"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}, "user": "invalid user"}, "size": 4194304}}}

+{"return": {}}

 Job failed: failed to authenticate using publickey authentication and the identities held by your ssh-agent

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

diff --git a/tests/qemu-iotests/208.out b/tests/qemu-iotests/208.out

index 3687e9d..9ff2582 100644

--- a/tests/qemu-iotests/208.out

+++ b/tests/qemu-iotests/208.out

@@ -1,9 +1,9 @@

 Launching VM...

 Starting NBD server...

-{u'return': {}}

+{"return": {}}

 Adding NBD export...

-{u'return': {}}

+{"return": {}}

 Creating external snapshot...

-{u'return': {}}

+{"return": {}}

 Stopping NBD server...

-{u'return': {}}

+{"return": {}}

diff --git a/tests/qemu-iotests/210.out b/tests/qemu-iotests/210.out

index 078ba54..923cb05 100644

--- a/tests/qemu-iotests/210.out

+++ b/tests/qemu-iotests/210.out

@@ -1,16 +1,16 @@

 === Successful image creation (defaults) ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.luks'}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

-

-{'execute': 'blockdev-add', 'arguments': {'node_name': 'imgfile', 'driver': 'file', 'filename': 'TEST_DIR/PID-t.luks'}}

-{u'return': {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'iter-time': 10, 'driver': 'luks', 'file': 'imgfile', 'size': 134217728}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "file", "filename": "TEST_DIR/PID-t.luks", "size": 0}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

+

+{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.luks", "node_name": "imgfile"}}

+{"return": {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "luks", "file": "imgfile", "iter-time": 10, "key-secret": "keysec0", "size": 134217728}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}

 file format: IMGFMT

@@ -54,15 +54,15 @@ Format specific information:

 === Successful image creation (with non-default options) ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.luks'}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "file", "filename": "TEST_DIR/PID-t.luks", "size": 0}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'hash-alg': 'sha1', 'cipher-mode': 'ctr', 'cipher-alg': 'twofish-128', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.luks'}, 'iter-time': 10, 'ivgen-alg': 'plain64', 'ivgen-hash-alg': 'md5', 'driver': 'luks', 'size': 67108864}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"cipher-alg": "twofish-128", "cipher-mode": "ctr", "driver": "luks", "file": {"driver": "file", "filename": "TEST_DIR/PID-t.luks"}, "hash-alg": "sha1", "iter-time": 10, "ivgen-alg": "plain64", "ivgen-hash-alg": "md5", "key-secret": "keysec0", "size": 67108864}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}

 file format: IMGFMT

@@ -106,18 +106,18 @@ Format specific information:

 === Invalid BlockdevRef ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'luks', 'file': "this doesn't exist", 'size': 67108864}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "luks", "file": "this doesn't exist", "size": 67108864}}}

+{"return": {}}

 Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exist

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 === Zero size ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'iter-time': 10, 'driver': 'luks', 'file': 'node0', 'size': 0}}}

-{u'return': {}}

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "luks", "file": "node0", "iter-time": 10, "key-secret": "keysec0", "size": 0}}}

+{"return": {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}

 file format: IMGFMT

@@ -161,34 +161,34 @@ Format specific information:

 === Invalid sizes ===

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 18446744073709551104L}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "luks", "file": "node0", "key-secret": "keysec0", "size": 18446744073709551104}}}

+{"return": {}}

 Job failed: The requested file size is too large

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 9223372036854775808L}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "luks", "file": "node0", "key-secret": "keysec0", "size": 9223372036854775808}}}

+{"return": {}}

 Job failed: The requested file size is too large

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

-{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 9223372036854775296}}}

-{u'return': {}}

+{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": {"driver": "luks", "file": "node0", "key-secret": "keysec0", "size": 9223372036854775296}}}

+{"return": {}}

 Job failed: The requested file size is too large

-{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

-{u'return': {}}

+{"execute": "job-dismiss", "arguments": {"id": "job0"}}

+{"return": {}}

 === Resize image with invalid sizes ===

-{'execute': 'block_resize', 'arguments': {'size': 9223372036854775296, 'node_name': 'node1'}}

-{u'error': {u'class': u'GenericError', u'desc': u'The requested file size is too large'}}

-{'execute': 'block_resize', 'arguments': {'size': 9223372036854775808L, 'node_name': 'node1'}}

-{u'error': {u'class': u'GenericError', u'desc': u"Invalid parameter type for 'size', expected: integer"}}

-{'execute': 'block_resize', 'arguments': {'size': 18446744073709551104L, 'node_name': 'node1'}}

-{u'error': {u'class': u'GenericError', u'desc': u"Invalid parameter type for 'size', expected: integer"}}

-{'execute': 'block_resize', 'arguments': {'size': -9223372036854775808, 'node_name': 'node1'}}

-{u'error': {u'class': u'GenericError', u'desc': u"Parameter 'size' expects a >0 size"}}