mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-01-19 12:03:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

qemu-iotests: Rewrite 211 for blockdev-create job

Browse Source 
This rewrites the test case 211 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>
This commit is contained in:
Kevin Wolf 2018-05-23 18:19:00 +02:00
parent 5ba141dc6f
commit abbab72cad
3 changed files with 198 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

315
tests/qemu-iotests/211
View File

@ -1,9 +1,11 @@
#!/bin/bash #!/usr/bin/env python
# #
# Test VDI and file image creation # Test VDI and file image creation
# #
# Copyright (C) 2018 Red Hat, Inc. # 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 # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
@ -18,229 +20,154 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
# creator import iotests
owner=kwolf@redhat.com from iotests import imgfmt
seq=`basename $0` iotests.verify_image_format(supported_fmts=['vdi'])
echo "QA output created by $seq" iotests.verify_protocol(supported=['file'])
here=`pwd` def blockdev_create(vm, options):
status=1 # failure is the default! result = vm.qmp_log('x-blockdev-create', job_id='job0', options=options)
# get standard environment, filters and checks if 'return' in result:
. ./common.rc assert result['return'] == {}
. ./common.filter vm.run_job('job0')
iotests.log("")
_supported_fmt vdi with iotests.FilePath('t.vdi') as disk_path, \
_supported_proto file iotests.VM() as vm:
_supported_os Linux
function do_run_qemu() #
{ # Successful image creation (defaults)
echo Testing: "$@" #
$QEMU -nographic -qmp stdio -serial none "$@" iotests.log("=== Successful image creation (defaults) ===")
echo iotests.log("")
}
function run_qemu() size = 128 * 1024 * 1024
{
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp \
| _filter_qemu | _filter_imgfmt \
| _filter_actual_image_size
}
echo vm.launch()
echo "=== Successful image creation (defaults) ===" blockdev_create(vm, { 'driver': 'file',
echo 'filename': disk_path,
'size': 0 })
size=$((128 * 1024 * 1024)) vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
node_name='imgfile')
run_qemu <<EOF blockdev_create(vm, { 'driver': imgfmt,
{ "execute": "qmp_capabilities" } 'file': 'imgfile',
{ "execute": "x-blockdev-create", 'size': size })
"arguments": { vm.shutdown()
"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 iotests.img_info_log(disk_path)
$QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map iotests.log(iotests.qemu_img_pipe('map', '--output=json', disk_path))
echo #
echo "=== Successful image creation (explicit defaults) ===" # Successful image creation (explicit defaults)
echo #
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
size=$((64 * 1024 * 1024))
run_qemu <<EOF vm.launch()
{ "execute": "qmp_capabilities" } blockdev_create(vm, { 'driver': 'file',
{ "execute": "x-blockdev-create", 'filename': disk_path,
"arguments": { 'size': 0 })
"driver": "file", blockdev_create(vm, { 'driver': imgfmt,
"filename": "$TEST_IMG", 'file': {
"size": 0 'driver': 'file',
} 'filename': disk_path,
}
{ "execute": "x-blockdev-create",
"arguments": {
"driver": "$IMGFMT",
"file": {
"driver": "file",
"filename": "$TEST_IMG"
}, },
"size": $size, 'size': size,
"preallocation": "off" 'preallocation': 'off' })
} vm.shutdown()
}
{ "execute": "quit" }
EOF
_img_info --format-specific | _filter_img_info --format-specific iotests.img_info_log(disk_path)
$QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map iotests.log(iotests.qemu_img_pipe('map', '--output=json', disk_path))
echo #
echo "=== Successful image creation (with non-default options) ===" # Successful image creation (with non-default options)
echo #
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
size=$((32 * 1024 * 1024))
run_qemu <<EOF vm.launch()
{ "execute": "qmp_capabilities" } blockdev_create(vm, { 'driver': 'file',
{ "execute": "x-blockdev-create", 'filename': disk_path,
"arguments": { 'size': 0 })
"driver": "file", blockdev_create(vm, { 'driver': imgfmt,
"filename": "$TEST_IMG", 'file': {
"size": 0 'driver': 'file',
} 'filename': disk_path,
}
{ "execute": "x-blockdev-create",
"arguments": {
"driver": "$IMGFMT",
"file": {
"driver": "file",
"filename": "$TEST_IMG"
}, },
"size": $size, 'size': size,
"preallocation": "metadata" 'preallocation': 'metadata' })
} vm.shutdown()
}
{ "execute": "quit" }
EOF
_img_info --format-specific | _filter_img_info --format-specific iotests.img_info_log(disk_path)
$QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map iotests.log(iotests.qemu_img_pipe('map', '--output=json', disk_path))
echo #
echo "=== Invalid BlockdevRef ===" # Invalid BlockdevRef
echo #
iotests.log("=== Invalid BlockdevRef ===")
iotests.log("")
run_qemu <<EOF vm.launch()
{ "execute": "qmp_capabilities" } blockdev_create(vm, { 'driver': imgfmt,
{ "execute": "x-blockdev-create", 'file': "this doesn't exist",
"arguments": { 'size': size })
"driver": "$IMGFMT", vm.shutdown()
"file": "this doesn't exist",
"size": $size
}
}
{ "execute": "quit" }
EOF
echo #
echo "=== Zero size ===" # Zero size
echo #
iotests.log("=== Zero size ===")
iotests.log("")
run_qemu -blockdev driver=file,filename="$TEST_IMG",node-name=node0 <<EOF vm.add_blockdev('driver=file,filename=%s,node-name=node0' % (disk_path))
{ "execute": "qmp_capabilities" } vm.launch()
{ "execute": "x-blockdev-create", blockdev_create(vm, { 'driver': imgfmt,
"arguments": { 'file': 'node0',
"driver": "$IMGFMT", 'size': 0 })
"file": "node0", vm.shutdown()
"size": 0
}
}
{ "execute": "quit" }
EOF
_img_info | _filter_img_info iotests.img_info_log(disk_path)
echo #
echo "=== Maximum size ===" # Maximum size
echo #
iotests.log("=== Maximum size ===")
iotests.log("")
run_qemu -blockdev driver=file,filename="$TEST_IMG",node-name=node0 <<EOF vm.launch()
{ "execute": "qmp_capabilities" } blockdev_create(vm, { 'driver': imgfmt,
{ "execute": "x-blockdev-create", 'file': 'node0',
"arguments": { 'size': 562949819203584 })
"driver": "$IMGFMT", vm.shutdown()
"file": "node0",
"size": 562949819203584
}
}
{ "execute": "quit" }
EOF
_img_info | _filter_img_info iotests.img_info_log(disk_path)
echo #
echo "=== Invalid sizes ===" # Invalid sizes
echo #
# TODO Negative image sizes aren't handled correctly, but this is a problem # 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 # with QAPI's implementation of the 'size' type and affects other commands
# well. Once this is fixed, we may want to add a test case here. # as well. Once this is fixed, we may want to add a test case here.
# 1. 2^64 - 512 # 1. 2^64 - 512
# 2. 2^63 = 8 EB (qemu-img enforces image sizes less than this) # 2. 2^63 = 8 EB (qemu-img enforces image sizes less than this)
# 3. 0x1fffff8000001 (one byte more than maximum image size for VDI) # 3. 0x1fffff8000001 (one byte more than maximum image size for VDI)
run_qemu -blockdev driver=file,filename="$TEST_IMG",node-name=node0 <<EOF iotests.log("=== Invalid sizes ===")
{ "execute": "qmp_capabilities" } iotests.log("")
{ "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": 562949819203585
}
}
{ "execute": "quit" }
EOF
# success, all done vm.launch()
echo "*** done" for size in [ 18446744073709551104, 9223372036854775808, 562949819203585 ]:
rm -f $seq.full blockdev_create(vm, { 'driver': imgfmt,
status=0 'file': 'node0',
'size': size })
vm.shutdown()

133
tests/qemu-iotests/211.out
View File

@ -1,97 +1,112 @@
QA output created by 211
=== Successful image creation (defaults) === === Successful image creation (defaults) ===
Testing: {'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vdi'}}}
QMP_VERSION {u'return': {}}
{"return": {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
{"return": {}} {u'return': {}}
{"return": {}}
{"return": {}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
image: TEST_DIR/t.IMGFMT {'execute': 'blockdev-add', 'arguments': {'node_name': 'imgfile', 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vdi'}}
{u'return': {}}
{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'vdi', 'file': 'imgfile', 'size': 134217728}}}
{u'return': {}}
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
{u'return': {}}
image: TEST_IMG
file format: IMGFMT file format: IMGFMT
virtual size: 128M (134217728 bytes) virtual size: 128M (134217728 bytes)
cluster_size: 1048576
[{ "start": 0, "length": 134217728, "depth": 0, "zero": true, "data": false}] [{ "start": 0, "length": 134217728, "depth": 0, "zero": true, "data": false}]
=== Successful image creation (explicit defaults) === === Successful image creation (explicit defaults) ===
Testing: {'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vdi'}}}
QMP_VERSION {u'return': {}}
{"return": {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
{"return": {}} {u'return': {}}
{"return": {}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
image: TEST_DIR/t.IMGFMT {'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'preallocation': 'off', 'driver': 'vdi', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.vdi'}, 'size': 67108864}}}
{u'return': {}}
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
{u'return': {}}
image: TEST_IMG
file format: IMGFMT file format: IMGFMT
virtual size: 64M (67108864 bytes) virtual size: 64M (67108864 bytes)
cluster_size: 1048576
[{ "start": 0, "length": 67108864, "depth": 0, "zero": true, "data": false}] [{ "start": 0, "length": 67108864, "depth": 0, "zero": true, "data": false}]
=== Successful image creation (with non-default options) === === Successful image creation (with non-default options) ===
Testing: {'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vdi'}}}
QMP_VERSION {u'return': {}}
{"return": {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
{"return": {}} {u'return': {}}
{"return": {}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
image: TEST_DIR/t.IMGFMT {'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'preallocation': 'metadata', 'driver': 'vdi', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.vdi'}, 'size': 33554432}}}
{u'return': {}}
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
{u'return': {}}
image: TEST_IMG
file format: IMGFMT file format: IMGFMT
virtual size: 32M (33554432 bytes) virtual size: 32M (33554432 bytes)
[{ "start": 0, "length": 3072, "depth": 0, "zero": false, "data": true, "offset": OFFSET}, cluster_size: 1048576
{ "start": 3072, "length": 33551360, "depth": 0, "zero": true, "data": true, "offset": OFFSET}]
[{ "start": 0, "length": 3072, "depth": 0, "zero": false, "data": true, "offset": 1024},
{ "start": 3072, "length": 33551360, "depth": 0, "zero": true, "data": true, "offset": 4096}]
=== Invalid BlockdevRef === === Invalid BlockdevRef ===
Testing: {'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'vdi', 'file': "this doesn't exist", 'size': 33554432}}}
QMP_VERSION {u'return': {}}
{"return": {}} Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exist
{"error": {"class": "GenericError", "desc": "Cannot find device=this doesn't exist nor node_name=this doesn't exist"}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
{"return": {}} {u'return': {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
=== Zero size === === Zero size ===
Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0 {'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'vdi', 'file': 'node0', 'size': 0}}}
QMP_VERSION {u'return': {}}
{"return": {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
{"return": {}} {u'return': {}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
image: TEST_DIR/t.IMGFMT image: TEST_IMG
file format: IMGFMT file format: IMGFMT
virtual size: 0 (0 bytes) virtual size: 0 (0 bytes)
cluster_size: 1048576
=== Maximum size === === Maximum size ===
Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0 {'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'vdi', 'file': 'node0', 'size': 562949819203584}}}
QMP_VERSION {u'return': {}}
{"return": {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
{"return": {}} {u'return': {}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
image: TEST_DIR/t.IMGFMT image: TEST_IMG
file format: IMGFMT file format: IMGFMT
virtual size: 512T (562949819203584 bytes) virtual size: 512T (562949819203584 bytes)
cluster_size: 1048576
=== Invalid sizes === === Invalid sizes ===
Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0 {'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'vdi', 'file': 'node0', 'size': 18446744073709551104L}}}
QMP_VERSION {u'return': {}}
{"return": {}} Job failed: Unsupported VDI image size (size is 0xfffffffffffffe00, max supported is 0x1fffff8000000)
{"error": {"class": "GenericError", "desc": "Unsupported VDI image size (size is 0xfffffffffffffe00, max supported is 0x1fffff8000000)"}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
{"error": {"class": "GenericError", "desc": "Unsupported VDI image size (size is 0x8000000000000000, max supported is 0x1fffff8000000)"}} {u'return': {}}
{"error": {"class": "GenericError", "desc": "Unsupported VDI image size (size is 0x1fffff8000001, max supported is 0x1fffff8000000)"}}
{"return": {}} {'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'vdi', 'file': 'node0', 'size': 9223372036854775808L}}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}} {u'return': {}}
Job failed: Unsupported VDI image size (size is 0x8000000000000000, max supported is 0x1fffff8000000)
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
{u'return': {}}
{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'vdi', 'file': 'node0', 'size': 562949819203585}}}
{u'return': {}}
Job failed: Unsupported VDI image size (size is 0x1fffff8000001, max supported is 0x1fffff8000000)
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
{u'return': {}}
*** done

2
tests/qemu-iotests/group
View File

@ -209,9 +209,9 @@
208 rw auto quick 208 rw auto quick
209 rw auto quick 209 rw auto quick
210 rw auto 210 rw auto
211 rw auto quick
# TODO The following commented out tests need to be reworked to work # TODO The following commented out tests need to be reworked to work
# with the x-blockdev-create job # with the x-blockdev-create job
#211 rw auto quick
#212 rw auto quick #212 rw auto quick
#213 rw auto quick #213 rw auto quick
214 rw auto 214 rw auto