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

add mem file for vcpu_misc: snapshot scenario #5767

Merged
merged 1 commit into from
Jul 22, 2024
Merged

add mem file for vcpu_misc: snapshot scenario #5767

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
2 changes: 2 additions & 0 deletions libvirt/tests/cfg/cpu/vcpu_misc.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
- snapshot:
cpu_mode = "host-model"
test_operations = "do_snapshot"
mem_file = " /tmp/mem_file"
snapshot_options = "{} --memspec ${mem_file}"
expected_str_after_startup = 'mode="custom"'
aarch64:
cpu_mode = "host-passthrough"
Expand Down
17 changes: 12 additions & 5 deletions libvirt/tests/src/cpu/vcpu_misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,20 +189,24 @@ def run(test, params, env):
:param params: Dictionary with the test parameters
:param env: Dictionary with test environment.
"""
def do_snapshot(vm_name, expected_str):
def do_snapshot(vm_name, expected_str, params):
"""
Run snapshot related commands: snapshot-create-as, snapshot-list
snapshot-dumpxml, snapshot-revert

:param vm_name: vm name
:param expected_str: expected string in snapshot-dumpxml
:param params: dict, test parameters
:raise: test.fail if virsh command failed
"""
snapshot_name = vm_name + "-snap"
snapshot_options = params.get("snapshot_options")
virsh_dargs = {'debug': True}

cmd_result = virsh.snapshot_create_as(vm_name, snapshot_name,
**virsh_dargs)
vm.start()
vm.wait_for_login().close()
cmd_result = virsh.snapshot_create_as(
vm_name, snapshot_options.format(snapshot_name), **virsh_dargs)
libvirt.check_exit_status(cmd_result)

try:
Expand All @@ -219,6 +223,7 @@ def do_snapshot(vm_name, expected_str):
cmd_result = virsh.snapshot_revert(vm_name, "", "--current",
**virsh_dargs)
libvirt.check_exit_status(cmd_result)
vm.destroy()

libvirt_version.is_libvirt_feature_supported(params)
vm_name = params.get('main_vm')
Expand All @@ -238,6 +243,7 @@ def do_snapshot(vm_name, expected_str):
bkxml = vmxml.copy()
managed_save_file = "/var/lib/libvirt/qemu/save/%s.save" % vm_name
maxphysaddr = params.get('maxphysaddr')
mem_file = params.get('mem_file')

try:
if check_vendor_id:
Expand Down Expand Up @@ -269,8 +275,7 @@ def do_snapshot(vm_name, expected_str):
if test_operations:
for action in test_operations.split(","):
if action == "do_snapshot":
do_snapshot(vm_name, expected_str_before_startup)

do_snapshot(vm_name, expected_str_before_startup, params)
if virsh_edit_cmd:
status = libvirt.exec_virsh_edit(vm_name, virsh_edit_cmd.split(","))
if status == status_error:
Expand Down Expand Up @@ -310,6 +315,8 @@ def do_snapshot(vm_name, expected_str):
logging.debug("Recover test environment")
if os.path.exists(managed_save_file):
virsh.managedsave_remove(vm_name, debug=True)
if os.path.exists(mem_file):
os.remove(mem_file)
if vm.is_alive():
vm.destroy()
libvirt.clean_up_snapshots(vm_name, domxml=bkxml)
Expand Down
Loading