Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

blockdev_inc_backup_inc_success:remove data-file #4267

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −1
Open

blockdev_inc_backup_inc_success:remove data-file #4267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions qemu/tests/blockdev_inc_backup_after_commit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ def clone_vm_with_incremental_images(self):
params = self.main_vm.params.copy()
images = [params.objects("images")[0]] + self._inc_bk_images
params["images"] = " ".join(images)
# fix me if data-file support for backup images are requested
if params.get("enable_data_file"):
del params["enable_data_file"]

self.clone_vm = self.main_vm.clone(params=params)
self.clone_vm.create()
Expand Down
3 changes: 3 additions & 0 deletions qemu/tests/blockdev_inc_backup_inc_success.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ def clone_main_vm(self):
self.main_vm.destroy()
imgs = [self.params["images"].split()[0]] + self.inc_backup_tags
self.params["images"] = " ".join(imgs)
# fix me if data-file support for backup images are requested
if self.params.get("enable_data_file"):
del self.params["enable_data_file"]
self.prepare_main_vm()
self.clone_vm = self.main_vm

Expand Down
3 changes: 3 additions & 0 deletions qemu/tests/blockdev_inc_backup_with_guest_agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ def do_incremental_backup(self):
def restart_vm_with_inc(self):
images = self.params["images"]
self.params["images"] = " ".join([images.split()[0]] + self.inc_backup_tags)
# fix me if data-file support for backup images are requested
if self.params.get("enable_data_file"):
del self.params["enable_data_file"]
self.prepare_main_vm()
self.clone_vm = self.main_vm
self.params["images"] = images
Expand Down
3 changes: 3 additions & 0 deletions qemu/tests/blockdev_inc_backup_with_migration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ def do_incremental_backup(self):
def restart_vm_with_inc(self):
images = self.params["images"]
self.params["images"] = " ".join([images.split()[0]] + self.inc_backup_tags)
# fix me if data-file support for backup images are requested
if self.params.get("enable_data_file"):
del self.params["enable_data_file"]
self.prepare_main_vm()
self.clone_vm = self.main_vm
self.params["images"] = images
Expand Down
6 changes: 5 additions & 1 deletion qemu/tests/blockdev_inc_backup_xpt_bitmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,13 @@ def _init_arguments_by_params(self, tag):
self.bitmaps.append("bitmap_%s" % tag)
image_params["nbd_export_bitmaps"] = "bitmap_%s" % tag
self.nbd_exports.append(QemuNBDExportImage(image_params, tag))
nbd_image_params = self.params.object_params(image_params["nbd_image_tag"])
# fix me if data_file is supported for nbd expose image
if nbd_image_params.get("enable_data_file"):
del nbd_image_params["enable_data_file"]
self.nbd_images.append(
qemu_storage.QemuImg(
self.params.object_params(image_params["nbd_image_tag"]),
nbd_image_params,
None,
image_params["nbd_image_tag"],
)
Expand Down
Loading