mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iotests: 257: drop unused Drive.device field

Browse Source 
After previous commit Drive.device is actually unused. Drop it together
with .name property.  While being here reuse .node in qmp commands
instead of writing 'drive0' twice.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190920142056.12778-11-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2019-09-20 17:20:51 +03:00 committed by Max Reitz
parent 5c4343b89d
commit f164845479
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tests/qemu-iotests/257
View File

@ -148,11 +148,6 @@ class Drive:
self.fmt = None self.fmt = None
self.size = None self.size = None
self.node = None self.node = None
self.device = None
@property
def name(self):
return self.node or self.device
def img_create(self, fmt, size): def img_create(self, fmt, size):
self.fmt = fmt self.fmt = fmt
@ -201,7 +196,7 @@ def blockdev_backup(vm, device, target, sync, **kwargs):
def blockdev_backup_mktarget(drive, target_id, filepath, sync, **kwargs): def blockdev_backup_mktarget(drive, target_id, filepath, sync, **kwargs):
target_drive = Drive(filepath, vm=drive.vm) target_drive = Drive(filepath, vm=drive.vm)
target_drive.create_target(target_id, drive.fmt, drive.size) target_drive.create_target(target_id, drive.fmt, drive.size)
blockdev_backup(drive.vm, drive.name, target_id, sync, **kwargs) blockdev_backup(drive.vm, drive.node, target_id, sync, **kwargs)
def reference_backup(drive, n, filepath): def reference_backup(drive, n, filepath):
log("--- Reference Backup #{:d} ---\n".format(n)) log("--- Reference Backup #{:d} ---\n".format(n))
@ -229,7 +224,7 @@ def perform_writes(drive, n):
pattern.offset, pattern.offset,
pattern.size) pattern.size)
log(cmd) log(cmd)
log(drive.vm.hmp_qemu_io(drive.name, cmd)) log(drive.vm.hmp_qemu_io(drive.node, cmd))
bitmaps = drive.vm.query_bitmaps() bitmaps = drive.vm.query_bitmaps()
log({'bitmaps': bitmaps}, indent=2) log({'bitmaps': bitmaps}, indent=2)
log('') log('')
@ -324,18 +319,17 @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
}] }]
} }
drive0.node = 'drive0'
vm.qmp_log('blockdev-add', vm.qmp_log('blockdev-add',
filters=[iotests.filter_qmp_testfiles], filters=[iotests.filter_qmp_testfiles],
node_name="drive0", node_name=drive0.node,
driver=drive0.fmt, driver=drive0.fmt,
file=file_config) file=file_config)
drive0.node = 'drive0'
drive0.device = 'device0'
# Use share-rw to allow writes directly to the node; # Use share-rw to allow writes directly to the node;
# The anonymous block-backend for this configuration prevents us # The anonymous block-backend for this configuration prevents us
# from using HMP's qemu-io commands to address the device. # from using HMP's qemu-io commands to address the device.
vm.qmp_log("device_add", id=drive0.device, vm.qmp_log("device_add", id='device0',
drive=drive0.name, driver="scsi-hd", drive=drive0.node, driver="scsi-hd",
share_rw=True) share_rw=True)
log('') log('')
@ -343,7 +337,7 @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
perform_writes(drive0, 0) perform_writes(drive0, 0)
reference_backup(drive0, 0, fbackup0) reference_backup(drive0, 0, fbackup0)
log('--- Add Bitmap ---\n') log('--- Add Bitmap ---\n')
vm.qmp_log("block-dirty-bitmap-add", node=drive0.name, vm.qmp_log("block-dirty-bitmap-add", node=drive0.node,
name="bitmap0", granularity=GRANULARITY) name="bitmap0", granularity=GRANULARITY)
log('') log('')
ebitmap = EmulatedBitmap() ebitmap = EmulatedBitmap()
@ -358,7 +352,7 @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
# 1 - Test Backup (w/ Optional induced failure) # 1 - Test Backup (w/ Optional induced failure)
if failure == 'intermediate': if failure == 'intermediate':
# Activate blkdebug induced failure for second-to-next read # Activate blkdebug induced failure for second-to-next read
log(vm.hmp_qemu_io(drive0.name, 'flush')) log(vm.hmp_qemu_io(drive0.node, 'flush'))
log('') log('')
job = backup(drive0, 1, bsync1, msync_mode, job = backup(drive0, 1, bsync1, msync_mode,
bitmap="bitmap0", bitmap_mode=bsync_mode) bitmap="bitmap0", bitmap_mode=bsync_mode)
@ -426,7 +420,7 @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
log('--- Cleanup ---\n') log('--- Cleanup ---\n')
vm.qmp_log("block-dirty-bitmap-remove", vm.qmp_log("block-dirty-bitmap-remove",
node=drive0.name, name="bitmap0") node=drive0.node, name="bitmap0")
bitmaps = vm.query_bitmaps() bitmaps = vm.query_bitmaps()
log({'bitmaps': bitmaps}, indent=2) log({'bitmaps': bitmaps}, indent=2)
vm.shutdown() vm.shutdown()
@ -467,22 +461,21 @@ def test_backup_api():
'filename': drive0.path 'filename': drive0.path
} }
drive0.node = 'drive0'
vm.qmp_log('blockdev-add', vm.qmp_log('blockdev-add',
filters=[iotests.filter_qmp_testfiles], filters=[iotests.filter_qmp_testfiles],
node_name="drive0", node_name=drive0.node,
driver=drive0.fmt, driver=drive0.fmt,
file=file_config) file=file_config)
drive0.node = 'drive0' vm.qmp_log("device_add", id='device0',
drive0.device = 'device0' drive=drive0.node, driver="scsi-hd")
vm.qmp_log("device_add", id=drive0.device,
drive=drive0.name, driver="scsi-hd")
log('') log('')
target0 = Drive(backup_path, vm=vm) target0 = Drive(backup_path, vm=vm)
target0.create_target("backup_target", drive0.fmt, drive0.size) target0.create_target("backup_target", drive0.fmt, drive0.size)
log('') log('')
vm.qmp_log("block-dirty-bitmap-add", node=drive0.name, vm.qmp_log("block-dirty-bitmap-add", node=drive0.node,
name="bitmap0", granularity=GRANULARITY) name="bitmap0", granularity=GRANULARITY)
log('') log('')
@ -521,7 +514,7 @@ def test_backup_api():
log("-- Sync mode {:s} tests --\n".format(sync_mode)) log("-- Sync mode {:s} tests --\n".format(sync_mode))
for bitmap in (None, 'bitmap404', 'bitmap0'): for bitmap in (None, 'bitmap404', 'bitmap0'):
for policy in error_cases[sync_mode][bitmap]: for policy in error_cases[sync_mode][bitmap]:
blockdev_backup(drive0.vm, drive0.name, "backup_target", blockdev_backup(drive0.vm, drive0.node, "backup_target",
sync_mode, job_id='api_job', sync_mode, job_id='api_job',
bitmap=bitmap, bitmap_mode=policy) bitmap=bitmap, bitmap_mode=policy)
log('') log('')