iotests: 237: Convert to VM.blockdev_create()
Instead of having a separate blockdev_create() function, make use of the VM.blockdev_create() offered by iotests.py. Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
5568933840
commit
59f61afa7e
|
@ -26,15 +26,6 @@ from iotests import imgfmt
|
||||||
|
|
||||||
iotests.verify_image_format(supported_fmts=['vmdk'])
|
iotests.verify_image_format(supported_fmts=['vmdk'])
|
||||||
|
|
||||||
def blockdev_create(vm, options):
|
|
||||||
result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
|
|
||||||
filters=[iotests.filter_qmp_testfiles])
|
|
||||||
|
|
||||||
if 'return' in result:
|
|
||||||
assert result['return'] == {}
|
|
||||||
vm.run_job('job0')
|
|
||||||
iotests.log("")
|
|
||||||
|
|
||||||
with iotests.FilePath('t.vmdk') as disk_path, \
|
with iotests.FilePath('t.vmdk') as disk_path, \
|
||||||
iotests.FilePath('t.vmdk.1') as extent1_path, \
|
iotests.FilePath('t.vmdk.1') as extent1_path, \
|
||||||
iotests.FilePath('t.vmdk.2') as extent2_path, \
|
iotests.FilePath('t.vmdk.2') as extent2_path, \
|
||||||
|
@ -50,16 +41,16 @@ with iotests.FilePath('t.vmdk') as disk_path, \
|
||||||
size = 5 * 1024 * 1024 * 1024
|
size = 5 * 1024 * 1024 * 1024
|
||||||
|
|
||||||
vm.launch()
|
vm.launch()
|
||||||
blockdev_create(vm, { 'driver': 'file',
|
vm.blockdev_create({ 'driver': 'file',
|
||||||
'filename': disk_path,
|
'filename': disk_path,
|
||||||
'size': 0 })
|
'size': 0 })
|
||||||
|
|
||||||
vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
|
vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
|
||||||
node_name='imgfile', filters=[iotests.filter_qmp_testfiles])
|
node_name='imgfile', filters=[iotests.filter_qmp_testfiles])
|
||||||
|
|
||||||
blockdev_create(vm, { 'driver': imgfmt,
|
vm.blockdev_create({ 'driver': imgfmt,
|
||||||
'file': 'imgfile',
|
'file': 'imgfile',
|
||||||
'size': size })
|
'size': size })
|
||||||
vm.shutdown()
|
vm.shutdown()
|
||||||
|
|
||||||
iotests.img_info_log(disk_path)
|
iotests.img_info_log(disk_path)
|
||||||
|
@ -74,21 +65,21 @@ with iotests.FilePath('t.vmdk') as disk_path, \
|
||||||
size = 64 * 1024 * 1024
|
size = 64 * 1024 * 1024
|
||||||
|
|
||||||
vm.launch()
|
vm.launch()
|
||||||
blockdev_create(vm, { 'driver': 'file',
|
vm.blockdev_create({ 'driver': 'file',
|
||||||
'filename': disk_path,
|
'filename': disk_path,
|
||||||
'size': 0 })
|
'size': 0 })
|
||||||
|
|
||||||
blockdev_create(vm, { 'driver': imgfmt,
|
vm.blockdev_create({ 'driver': imgfmt,
|
||||||
'file': {
|
'file': {
|
||||||
'driver': 'file',
|
'driver': 'file',
|
||||||
'filename': disk_path,
|
'filename': disk_path,
|
||||||
},
|
},
|
||||||
'size': size,
|
'size': size,
|
||||||
'extents': [],
|
'extents': [],
|
||||||
'subformat': 'monolithicSparse',
|
'subformat': 'monolithicSparse',
|
||||||
'adapter-type': 'ide',
|
'adapter-type': 'ide',
|
||||||
'hwversion': '4',
|
'hwversion': '4',
|
||||||
'zeroed-grain': False })
|
'zeroed-grain': False })
|
||||||
vm.shutdown()
|
vm.shutdown()
|
||||||
|
|
||||||
iotests.img_info_log(disk_path)
|
iotests.img_info_log(disk_path)
|
||||||
|
@ -103,20 +94,20 @@ with iotests.FilePath('t.vmdk') as disk_path, \
|
||||||
size = 32 * 1024 * 1024
|
size = 32 * 1024 * 1024
|
||||||
|
|
||||||
vm.launch()
|
vm.launch()
|
||||||
blockdev_create(vm, { 'driver': 'file',
|
vm.blockdev_create({ 'driver': 'file',
|
||||||
'filename': disk_path,
|
'filename': disk_path,
|
||||||
'size': 0 })
|
'size': 0 })
|
||||||
|
|
||||||
blockdev_create(vm, { 'driver': imgfmt,
|
vm.blockdev_create({ 'driver': imgfmt,
|
||||||
'file': {
|
'file': {
|
||||||
'driver': 'file',
|
'driver': 'file',
|
||||||
'filename': disk_path,
|
'filename': disk_path,
|
||||||
},
|
},
|
||||||
'size': size,
|
'size': size,
|
||||||
'extents': [],
|
'extents': [],
|
||||||
'subformat': 'monolithicSparse',
|
'subformat': 'monolithicSparse',
|
||||||
'adapter-type': 'buslogic',
|
'adapter-type': 'buslogic',
|
||||||
'zeroed-grain': True })
|
'zeroed-grain': True })
|
||||||
vm.shutdown()
|
vm.shutdown()
|
||||||
|
|
||||||
iotests.img_info_log(disk_path)
|
iotests.img_info_log(disk_path)
|
||||||
|
@ -128,9 +119,9 @@ with iotests.FilePath('t.vmdk') as disk_path, \
|
||||||
iotests.log("")
|
iotests.log("")
|
||||||
|
|
||||||
vm.launch()
|
vm.launch()
|
||||||
blockdev_create(vm, { 'driver': imgfmt,
|
vm.blockdev_create({ 'driver': imgfmt,
|
||||||
'file': "this doesn't exist",
|
'file': "this doesn't exist",
|
||||||
'size': size })
|
'size': size })
|
||||||
vm.shutdown()
|
vm.shutdown()
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -148,10 +139,10 @@ with iotests.FilePath('t.vmdk') as disk_path, \
|
||||||
|
|
||||||
vm.launch()
|
vm.launch()
|
||||||
for adapter_type in [ 'ide', 'buslogic', 'lsilogic', 'legacyESX' ]:
|
for adapter_type in [ 'ide', 'buslogic', 'lsilogic', 'legacyESX' ]:
|
||||||
blockdev_create(vm, { 'driver': imgfmt,
|
vm.blockdev_create({ 'driver': imgfmt,
|
||||||
'file': 'node0',
|
'file': 'node0',
|
||||||
'size': size,
|
'size': size,
|
||||||
'adapter-type': adapter_type })
|
'adapter-type': adapter_type })
|
||||||
vm.shutdown()
|
vm.shutdown()
|
||||||
|
|
||||||
# Invalid
|
# Invalid
|
||||||
|
@ -160,10 +151,10 @@ with iotests.FilePath('t.vmdk') as disk_path, \
|
||||||
|
|
||||||
vm.launch()
|
vm.launch()
|
||||||
for adapter_type in [ 'foo', 'IDE', 'legacyesx', 1 ]:
|
for adapter_type in [ 'foo', 'IDE', 'legacyesx', 1 ]:
|
||||||
blockdev_create(vm, { 'driver': imgfmt,
|
vm.blockdev_create({ 'driver': imgfmt,
|
||||||
'file': 'node0',
|
'file': 'node0',
|
||||||
'size': size,
|
'size': size,
|
||||||
'adapter-type': adapter_type })
|
'adapter-type': adapter_type })
|
||||||
vm.shutdown()
|
vm.shutdown()
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -185,10 +176,10 @@ with iotests.FilePath('t.vmdk') as disk_path, \
|
||||||
iotests.log("")
|
iotests.log("")
|
||||||
|
|
||||||
vm.launch()
|
vm.launch()
|
||||||
blockdev_create(vm, { 'driver': imgfmt,
|
vm.blockdev_create({ 'driver': imgfmt,
|
||||||
'file': 'node0',
|
'file': 'node0',
|
||||||
'size': size,
|
'size': size,
|
||||||
'subformat': 'monolithicFlat' })
|
'subformat': 'monolithicFlat' })
|
||||||
vm.shutdown()
|
vm.shutdown()
|
||||||
|
|
||||||
# Correct extent
|
# Correct extent
|
||||||
|
@ -196,11 +187,11 @@ with iotests.FilePath('t.vmdk') as disk_path, \
|
||||||
iotests.log("")
|
iotests.log("")
|
||||||
|
|
||||||
vm.launch()
|
vm.launch()
|
||||||
blockdev_create(vm, { 'driver': imgfmt,
|
vm.blockdev_create({ 'driver': imgfmt,
|
||||||
'file': 'node0',
|
'file': 'node0',
|
||||||
'size': size,
|
'size': size,
|
||||||
'subformat': 'monolithicFlat',
|
'subformat': 'monolithicFlat',
|
||||||
'extents': ['ext1'] })
|
'extents': ['ext1'] })
|
||||||
vm.shutdown()
|
vm.shutdown()
|
||||||
|
|
||||||
# Extra extent
|
# Extra extent
|
||||||
|
@ -208,11 +199,11 @@ with iotests.FilePath('t.vmdk') as disk_path, \
|
||||||
iotests.log("")
|
iotests.log("")
|
||||||
|
|
||||||
vm.launch()
|
vm.launch()
|
||||||
blockdev_create(vm, { 'driver': imgfmt,
|
vm.blockdev_create({ 'driver': imgfmt,
|
||||||
'file': 'node0',
|
'file': 'node0',
|
||||||
'size': 512,
|
'size': 512,
|
||||||
'subformat': 'monolithicFlat',
|
'subformat': 'monolithicFlat',
|
||||||
'extents': ['ext1', 'ext2', 'ext3'] })
|
'extents': ['ext1', 'ext2', 'ext3'] })
|
||||||
vm.shutdown()
|
vm.shutdown()
|
||||||
|
|
||||||
# Split formats
|
# Split formats
|
||||||
|
@ -228,11 +219,11 @@ with iotests.FilePath('t.vmdk') as disk_path, \
|
||||||
extents = [ "ext%d" % (i) for i in range(1, num_extents + 1) ]
|
extents = [ "ext%d" % (i) for i in range(1, num_extents + 1) ]
|
||||||
|
|
||||||
vm.launch()
|
vm.launch()
|
||||||
blockdev_create(vm, { 'driver': imgfmt,
|
vm.blockdev_create({ 'driver': imgfmt,
|
||||||
'file': 'node0',
|
'file': 'node0',
|
||||||
'size': size,
|
'size': size,
|
||||||
'subformat': subfmt,
|
'subformat': subfmt,
|
||||||
'extents': extents })
|
'extents': extents })
|
||||||
vm.shutdown()
|
vm.shutdown()
|
||||||
|
|
||||||
iotests.img_info_log(disk_path)
|
iotests.img_info_log(disk_path)
|
||||||
|
|
Loading…
Reference in a new issue