From 40109f0f193a6aa15858a6bbff47e6842c283d17 Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Tue, 26 Jun 2018 09:48:51 +0200

Subject: [PATCH 82/89] qemu-iotests: Rewrite 213 for blockdev-create job

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <20180626094856.6924-69-kwolf@redhat.com>

Patchwork-id: 81109

O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 68/73] qemu-iotests: Rewrite 213 for blockdev-create job

Bugzilla: 1513543

RH-Acked-by: Jeffrey Cody <jcody@redhat.com>

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

RH-Acked-by: Fam Zheng <famz@redhat.com>

This rewrites the test case 213 to work with the new x-blockdev-create

job rather than the old synchronous version of the command.

All of the test cases stay the same as before, but in order to be able

to implement proper job handling, the test case is rewritten in Python.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

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

(cherry picked from commit 0c46a69a5eb8a061134719a0a85898854eb8e533)

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

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

---

 tests/qemu-iotests/213     | 520 +++++++++++++++++----------------------------

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

 tests/qemu-iotests/group   |   4 +-

 3 files changed, 319 insertions(+), 413 deletions(-)

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

index 3a00a0f..29d25bc 100755

--- a/tests/qemu-iotests/213

+++ b/tests/qemu-iotests/213

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

-#!/bin/bash

+#!/usr/bin/env python

 #

 # Test vhdx and file image creation

 #

 # Copyright (C) 2018 Red Hat, Inc.

 #

+# Creator/Owner: Kevin Wolf <kwolf@redhat.com>

+#

 # This program is free software; you can redistribute it and/or modify

 # it under the terms of the GNU General Public License as published by

 # the Free Software Foundation; either version 2 of the License, or

@@ -18,332 +20,190 @@

 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #

-# creator

-owner=kwolf@redhat.com

-

-seq=`basename $0`

-echo "QA output created by $seq"

-

-here=`pwd`

-status=1	# failure is the default!

-

-# get standard environment, filters and checks

-. ./common.rc

-. ./common.filter

-

-_supported_fmt vhdx

-_supported_proto file

-_supported_os Linux

-

-function do_run_qemu()

-{

-    echo Testing: "$@"

-    $QEMU -nographic -qmp stdio -serial none "$@"

-    echo

-}

-

-function run_qemu()

-{

-    do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp \

-                          | _filter_qemu | _filter_imgfmt \

-                          | _filter_actual_image_size

-}

-

-echo

-echo "=== Successful image creation (defaults) ==="

-echo

-

-size=$((128 * 1024 * 1024))

-

-run_qemu <

-{ "execute": "qmp_capabilities" }

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "file",

-      "filename": "$TEST_IMG",

-      "size": 0

-  }

-}

-{ "execute": "blockdev-add",

-  "arguments": {

-      "driver": "file",

-      "node-name": "imgfile",

-      "filename": "$TEST_IMG"

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "imgfile",

-      "size": $size

-  }

-}

-{ "execute": "quit" }

-EOF

-

-_img_info --format-specific | _filter_img_info --format-specific

-

-echo

-echo "=== Successful image creation (explicit defaults) ==="

-echo

-

-# Choose a different size to show that we got a new image

-size=$((64 * 1024 * 1024))

-

-run_qemu <

-{ "execute": "qmp_capabilities" }

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "file",

-      "filename": "$TEST_IMG",

-      "size": 0

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": {

-          "driver": "file",

-          "filename": "$TEST_IMG"

-      },

-      "size": $size,

-      "log-size": 1048576,

-      "block-size": 8388608,

-      "subformat": "dynamic",

-      "block-state-zero": true

-  }

-}

-{ "execute": "quit" }

-EOF

-

-_img_info --format-specific | _filter_img_info --format-specific

-

-echo

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

-echo

-

-# Choose a different size to show that we got a new image

-size=$((32 * 1024 * 1024))

-

-run_qemu <

-{ "execute": "qmp_capabilities" }

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "file",

-      "filename": "$TEST_IMG",

-      "size": 0

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": {

-          "driver": "file",

-          "filename": "$TEST_IMG"

-      },

-      "size": $size,

-      "log-size": 8388608,

-      "block-size": 268435456,

-      "subformat": "fixed",

-      "block-state-zero": false

-  }

-}

-{ "execute": "quit" }

-EOF

-

-_img_info --format-specific | _filter_img_info --format-specific

-

-echo

-echo "=== Invalid BlockdevRef ==="

-echo

-

-run_qemu <

-{ "execute": "qmp_capabilities" }

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "this doesn't exist",

-      "size": $size

-  }

-}

-{ "execute": "quit" }

-EOF

-

-echo

-echo "=== Zero size ==="

-echo

-

-run_qemu -blockdev driver=file,filename="$TEST_IMG",node-name=node0 <

-{ "execute": "qmp_capabilities" }

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "node0",

-      "size": 0

-  }

-}

-{ "execute": "quit" }

-EOF

-

-_img_info | _filter_img_info

-

-echo

-echo "=== Maximum size ==="

-echo

-

-run_qemu -blockdev driver=file,filename="$TEST_IMG",node-name=node0 <

-{ "execute": "qmp_capabilities" }

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "node0",

-      "size": 70368744177664

-  }

-}

-{ "execute": "quit" }

-EOF

-

-_img_info | _filter_img_info

-

-echo

-echo "=== Invalid sizes ==="

-echo

-

-# TODO Negative image sizes aren't handled correctly, but this is a problem

-# with QAPI's implementation of the 'size' type and affects other commands as

-# well. Once this is fixed, we may want to add a test case here.

-

-# 1. 2^64 - 512

-# 2. 2^63 = 8 EB (qemu-img enforces image sizes less than this)

-# 3. 2^63 - 512 (generally valid, but with the image header the file will

-#                exceed 63 bits)

-# 4. 2^46 + 1 (one byte more than maximum image size)

-

-run_qemu -blockdev driver=file,filename="$TEST_IMG",node-name=node0 <

-{ "execute": "qmp_capabilities" }

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "node0",

-      "size": 18446744073709551104

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "node0",

-      "size": 9223372036854775808

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "node0",

-      "size": 9223372036854775296

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "node0",

-      "size": 70368744177665

-  }

-}

-{ "execute": "quit" }

-EOF

-

-echo

-echo "=== Invalid block size ==="

-echo

-

-run_qemu -blockdev driver=file,filename="$TEST_IMG",node-name=node0 <

-{ "execute": "qmp_capabilities" }

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "node0",

-      "size": 67108864,

-      "block-size": 1234567

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "node0",

-      "size": 67108864,

-      "block-size": 128

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "node0",

-      "size": 67108864,

-      "block-size": 3145728

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "node0",

-      "size": 67108864,

-      "block-size": 536870912

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "node0",

-      "size": 67108864,

-      "block-size": 0

-  }

-}

-{ "execute": "quit" }

-EOF

-

-echo

-echo "=== Invalid log size ==="

-echo

-

-run_qemu -blockdev driver=file,filename="$TEST_IMG",node-name=node0 <

-{ "execute": "qmp_capabilities" }

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "node0",

-      "size": 67108864,

-      "log-size": 1234567

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "node0",

-      "size": 67108864,

-      "log-size": 128

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "node0",

-      "size": 67108864,

-      "log-size": 4294967296

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "$IMGFMT",

-      "file": "node0",

-      "size": 67108864,

-      "log-size": 0

-  }

-}

-{ "execute": "quit" }

-EOF

-

-

-# success, all done

-echo "*** done"

-rm -f $seq.full

-status=0

+import iotests

+from iotests import imgfmt

+

+iotests.verify_image_format(supported_fmts=['vhdx'])

+iotests.verify_protocol(supported=['file'])

+

+def blockdev_create(vm, options):

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

+

+    if 'return' in result:

+        assert result['return'] == {}

+        vm.run_job('job0')

+    iotests.log("")

+

+with iotests.FilePath('t.vhdx') as disk_path, \

+     iotests.VM() as vm:

+

+    #

+    # Successful image creation (defaults)

+    #

+    iotests.log("=== Successful image creation (defaults) ===")

+    iotests.log("")

+

+    size = 128 * 1024 * 1024

+

+    vm.launch()

+    blockdev_create(vm, { 'driver': 'file',

+                          'filename': disk_path,

+                          'size': 0 })

+

+    vm.qmp_log('blockdev-add', driver='file', filename=disk_path,

+               node_name='imgfile')

+

+    blockdev_create(vm, { 'driver': imgfmt,

+                          'file': 'imgfile',

+                          'size': size })

+    vm.shutdown()

+

+    iotests.img_info_log(disk_path)

+

+    #

+    # Successful image creation (explicit defaults)

+    #

+    iotests.log("=== Successful image creation (explicit defaults) ===")

+    iotests.log("")

+

+    # Choose a different size to show that we got a new image

+    size = 64 * 1024 * 1024

+

+    vm.launch()

+    blockdev_create(vm, { 'driver': 'file',

+                          'filename': disk_path,

+                          'size': 0 })

+    blockdev_create(vm, { 'driver': imgfmt,

+                          'file': {

+                              'driver': 'file',

+                              'filename': disk_path,

+                          },

+                          'size': size,

+                          'log-size': 1048576,

+                          'block-size': 8388608,

+                          'subformat': 'dynamic',

+                          'block-state-zero': True })

+    vm.shutdown()

+

+    iotests.img_info_log(disk_path)

+

+    #

+    # Successful image creation (with non-default options)

+    #

+    iotests.log("=== Successful image creation (with non-default options) ===")

+    iotests.log("")

+

+    # Choose a different size to show that we got a new image

+    size = 32 * 1024 * 1024

+

+    vm.launch()

+    blockdev_create(vm, { 'driver': 'file',

+                          'filename': disk_path,

+                          'size': 0 })

+    blockdev_create(vm, { 'driver': imgfmt,

+                          'file': {

+                              'driver': 'file',

+                              'filename': disk_path,

+                          },

+                          'size': size,

+                          'log-size': 8388608,

+                          'block-size': 268435456,

+                          'subformat': 'fixed',

+                          'block-state-zero': False })

+    vm.shutdown()

+

+    iotests.img_info_log(disk_path)

+

+    #

+    # Invalid BlockdevRef

+    #

+    iotests.log("=== Invalid BlockdevRef ===")

+    iotests.log("")

+

+    vm.launch()

+    blockdev_create(vm, { 'driver': imgfmt,

+                          'file': "this doesn't exist",

+                          'size': size })

+    vm.shutdown()

+

+    #

+    # Zero size

+    #

+    iotests.log("=== Zero size ===")

+    iotests.log("")

+

+    vm.add_blockdev('driver=file,filename=%s,node-name=node0' % (disk_path))

+    vm.launch()

+    blockdev_create(vm, { 'driver': imgfmt,

+                          'file': 'node0',

+                          'size': 0 })

+    vm.shutdown()

+

+    iotests.img_info_log(disk_path)

+

+    #

+    # Maximum size

+    #

+    iotests.log("=== Maximum size ===")

+    iotests.log("")

+

+    vm.launch()

+    blockdev_create(vm, { 'driver': imgfmt,

+                          'file': 'node0',

+                          'size': 70368744177664 })

+    vm.shutdown()

+

+    iotests.img_info_log(disk_path)

+

+    #

+    # Invalid sizes

+    #

+

+    # TODO Negative image sizes aren't handled correctly, but this is a problem

+    # with QAPI's implementation of the 'size' type and affects other commands

+    # as well. Once this is fixed, we may want to add a test case here.

+

+    # 1. 2^64 - 512

+    # 2. 2^63 = 8 EB (qemu-img enforces image sizes less than this)

+    # 3. 2^63 - 512 (generally valid, but with the image header the file will

+    #                exceed 63 bits)

+    # 4. 2^46 + 1 (one byte more than maximum image size)

+

+    iotests.log("=== Invalid sizes ===")

+    iotests.log("")

+

+    vm.launch()

+    for size in [ 18446744073709551104, 9223372036854775808,

+                  9223372036854775296, 70368744177665 ]:

+        blockdev_create(vm, { 'driver': imgfmt,

+                              'file': 'node0',

+                              'size': size })

+    vm.shutdown()

+

+    #

+    # Invalid block size

+    #

+    iotests.log("=== Invalid block size ===")

+    iotests.log("")

+

+    vm.launch()

+    for bsize in [ 1234567, 128, 3145728, 536870912, 0 ]:

+        blockdev_create(vm, { 'driver': imgfmt,

+                              'file': 'node0',

+                              'size': 67108864,

+                              'block-size': bsize })

+    vm.shutdown()

+

+    #

+    # Invalid log size

+    #

+    iotests.log("=== Invalid log size ===")

+    iotests.log("")

+

+    vm.launch()

+    for lsize in [ 1234567, 128, 4294967296, 0 ]:

+        blockdev_create(vm, { 'driver': imgfmt,

+                              'file': 'node0',

+                              'size': 67108864,

+                              'log-size': lsize })

+    vm.shutdown()

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

index 8e8fc29..f18a39a 100644

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

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

@@ -1,121 +1,169 @@

-QA output created by 213

-

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

-Testing:

-QMP_VERSION

-{"return": {}}

-{"return": {}}

-{"return": {}}

-{"return": {}}

-{"return": {}}

-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

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

+{u'return': {}}

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

+{u'return': {}}

+

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

+{u'return': {}}

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

+{u'return': {}}

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

+{u'return': {}}

-image: TEST_DIR/t.IMGFMT

+image: TEST_IMG

 file format: IMGFMT

 virtual size: 128M (134217728 bytes)

+cluster_size: 8388608

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

-Testing:

-QMP_VERSION

-{"return": {}}

-{"return": {}}

-{"return": {}}

-{"return": {}}

-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

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

+{u'return': {}}

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

+{u'return': {}}

-image: TEST_DIR/t.IMGFMT

+{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'block-size': 8388608, 'driver': 'vhdx', 'subformat': 'dynamic', 'log-size': 1048576, 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.vhdx'}, 'block-state-zero': True, 'size': 67108864}}}

+{u'return': {}}

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

+{u'return': {}}

+

+image: TEST_IMG

 file format: IMGFMT

 virtual size: 64M (67108864 bytes)

+cluster_size: 8388608

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

-Testing:

-QMP_VERSION

-{"return": {}}

-{"return": {}}

-{"return": {}}

-{"return": {}}

-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

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

+{u'return': {}}

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

+{u'return': {}}

+

+{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'block-size': 268435456, 'driver': 'vhdx', 'subformat': 'fixed', 'log-size': 8388608, 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.vhdx'}, 'block-state-zero': False, 'size': 33554432}}}

+{u'return': {}}

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

+{u'return': {}}

-image: TEST_DIR/t.IMGFMT

+image: TEST_IMG

 file format: IMGFMT

 virtual size: 32M (33554432 bytes)

+cluster_size: 268435456

 === Invalid BlockdevRef ===

-Testing:

-QMP_VERSION

-{"return": {}}

-{"error": {"class": "GenericError", "desc": "Cannot find device=this doesn't exist nor node_name=this doesn't exist"}}

-{"return": {}}

-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

-

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

+{u'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': {}}

 === Zero size ===

-Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0

-QMP_VERSION

-{"return": {}}

-{"return": {}}

-{"return": {}}

-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

+{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'vhdx', 'file': 'node0', 'size': 0}}}

+{u'return': {}}

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

+{u'return': {}}

-image: TEST_DIR/t.IMGFMT

+image: TEST_IMG

 file format: IMGFMT

 virtual size: 0 (0 bytes)

+cluster_size: 8388608

 === Maximum size ===

-Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0

-QMP_VERSION

-{"return": {}}

-{"return": {}}

-{"return": {}}

-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

+{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'vhdx', 'file': 'node0', 'size': 70368744177664}}}

+{u'return': {}}

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

+{u'return': {}}

-image: TEST_DIR/t.IMGFMT

+image: TEST_IMG

 file format: IMGFMT

 virtual size: 64T (70368744177664 bytes)

+cluster_size: 67108864

 === Invalid sizes ===

-Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0

-QMP_VERSION

-{"return": {}}

-{"error": {"class": "GenericError", "desc": "Image size too large; max of 64TB"}}

-{"error": {"class": "GenericError", "desc": "Image size too large; max of 64TB"}}

-{"error": {"class": "GenericError", "desc": "Image size too large; max of 64TB"}}

-{"error": {"class": "GenericError", "desc": "Image size too large; max of 64TB"}}

-{"return": {}}

-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

-

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

+{u'return': {}}