[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 51/56] iotests/image-fleecing: rename tgt_node
From: |
Hanna Reitz |
Subject: |
[PULL 51/56] iotests/image-fleecing: rename tgt_node |
Date: |
Wed, 1 Sep 2021 17:16:14 +0200 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Actually target of backup(sync=None) is not a final backup target:
image fleecing is intended to be used with external tool, which will
copy data from fleecing node to some real backup target.
Also, we are going to add a test case for "push backup with fleecing",
where instead of exporting fleecing node by NBD, we'll start a backup
job from fleecing node to real backup target.
To avoid confusion, let's rename temporary fleecing node now.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210824083856.17408-32-vsementsov@virtuozzo.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
tests/qemu-iotests/tests/image-fleecing | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/qemu-iotests/tests/image-fleecing
b/tests/qemu-iotests/tests/image-fleecing
index 961941bb27..ec4ef5f3f6 100755
--- a/tests/qemu-iotests/tests/image-fleecing
+++ b/tests/qemu-iotests/tests/image-fleecing
@@ -71,6 +71,7 @@ with iotests.FilePath('base.img') as base_img_path, \
log('')
src_node = 'source'
+ tmp_node = 'temp'
vm.add_blockdev(f'driver={iotests.imgfmt},file.driver=file,'
f'file.filename={base_img_path},node-name={src_node}')
vm.add_device('virtio-scsi')
@@ -82,12 +83,11 @@ with iotests.FilePath('base.img') as base_img_path, \
log('--- Setting up Fleecing Graph ---')
log('')
- tgt_node = 'fleeceNode'
- # create tgt_node backed by src_node
+ # create tmp_node backed by src_node
log(vm.qmp('blockdev-add', {
'driver': 'qcow2',
- 'node-name': tgt_node,
+ 'node-name': tmp_node,
'file': {
'driver': 'file',
'filename': fleece_img_path,
@@ -99,19 +99,19 @@ with iotests.FilePath('base.img') as base_img_path, \
log(vm.qmp('blockdev-backup',
job_id='fleecing',
device=src_node,
- target=tgt_node,
+ target=tmp_node,
sync='none'))
log('')
log('--- Setting up NBD Export ---')
log('')
- nbd_uri = 'nbd+unix:///%s?socket=%s' % (tgt_node, nbd_sock_path)
+ nbd_uri = 'nbd+unix:///%s?socket=%s' % (tmp_node, nbd_sock_path)
log(vm.qmp('nbd-server-start',
{'addr': { 'type': 'unix',
'data': { 'path': nbd_sock_path } } }))
- log(vm.qmp('nbd-server-add', device=tgt_node))
+ log(vm.qmp('nbd-server-add', device=tmp_node))
log('')
log('--- Sanity Check ---')
@@ -149,7 +149,7 @@ with iotests.FilePath('base.img') as base_img_path, \
assert e is not None
log(e, filters=[iotests.filter_qmp_event])
log(vm.qmp('nbd-server-stop'))
- log(vm.qmp('blockdev-del', node_name=tgt_node))
+ log(vm.qmp('blockdev-del', node_name=tmp_node))
vm.shutdown()
log('')
--
2.31.1
- [PULL 43/56] python/qemu/machine.py: refactor _qemu_args(), (continued)
- [PULL 43/56] python/qemu/machine.py: refactor _qemu_args(), Hanna Reitz, 2021/09/01
- [PULL 42/56] qapi: publish copy-before-write filter, Hanna Reitz, 2021/09/01
- [PULL 44/56] python/qemu/machine: QEMUMachine: improve qmp() method, Hanna Reitz, 2021/09/01
- [PULL 45/56] python:QEMUMachine: template typing for self returning methods, Hanna Reitz, 2021/09/01
- [PULL 46/56] iotests/222: fix pylint and mypy complains, Hanna Reitz, 2021/09/01
- [PULL 47/56] iotests/222: constantly use single quotes for strings, Hanna Reitz, 2021/09/01
- [PULL 48/56] iotests: move 222 to tests/image-fleecing, Hanna Reitz, 2021/09/01
- [PULL 50/56] iotests/image-fleecing: proper source device, Hanna Reitz, 2021/09/01
- [PULL 49/56] iotests.py: hmp_qemu_io: support qdev, Hanna Reitz, 2021/09/01
- [PULL 52/56] iotests/image-fleecing: prepare for adding new test-case, Hanna Reitz, 2021/09/01
- [PULL 51/56] iotests/image-fleecing: rename tgt_node,
Hanna Reitz <=
- [PULL 53/56] iotests/image-fleecing: add test-case for copy-before-write filter, Hanna Reitz, 2021/09/01
- [PULL 54/56] block/block-copy: block_copy_state_new(): drop extra arguments, Hanna Reitz, 2021/09/01
- [PULL 55/56] block/export/fuse.c: fix fuse-lseek on uclibc or musl, Hanna Reitz, 2021/09/01
- [PULL 56/56] block/file-win32: add reopen handlers, Hanna Reitz, 2021/09/01
- Re: [PULL 00/56] Block patches, Peter Maydell, 2021/09/02
- Re: [PULL 00/56] Block patches, Peter Maydell, 2021/09/02