Skip to content

Virtual disk: add new test scenario of discard_granularity #6626

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

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

Virtual disk: add new test scenario of discard_granularity #6626

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
4 changes: 2 additions & 2 deletions libvirt/tests/cfg/virtual_disks/virtual_disks_discard_granularity.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@
status_error_msg = "discard_granularity must be a multiple|discard_granularity must be 512"
- boundary_vm_start:
only coldplug..virtio
define_error_msg = "Invalid value for attribute.*discard_granularity.*"
expected_attribute = "no"
variants:
- value_zero:
discard_granularity = '0'
discard_granularity_in_unit = '0K'
- value_minus:
discard_granularity = '-1'
define_error = "yes"
define_error_msg = "Invalid value for attribute.*discard_granularity.*"
- value_max:
discard_granularity = '4294967296'
define_error = "yes"
define_error_msg = "Invalid value for attribute.*discard_granularity.*"
- value_max_minus_one:
discard_granularity = '4294967295'
discard_granularity_in_unit = '1K'
Expand Down
14 changes: 11 additions & 3 deletions libvirt/tests/src/virtual_disks/virtual_disks_discard_granularity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ def check_vm_dumpxml(params, test, expected_attribute=True):
expected_discard_granularity = params.get("discard_granularity")
if actual_discard_granularity != expected_discard_granularity:
test.fail("actual discard_granularity: %s is not equal to expected: %s" % (actual_discard_granularity, expected_discard_granularity))
else:
test.log.debug("Get expected discard_granularity: %s" % actual_discard_granularity)


def run(test, params, env):
Expand Down Expand Up @@ -207,7 +209,7 @@ def run(test, params, env):
socket_path = params.get("socket_file")
vsock_service_id = start_vhost_sock_service(vhost_source_file_path, socket_path)
# For invalid discard granularity test, it need update value accordingly
elif test_scenario in ["failure_vm_tart"]:
elif test_scenario in ["failure_vm_start"]:
params.update({'discard_granularity': params.get('invalid_discard_granularity')})

device_obj = create_customized_disk(params)
Expand Down Expand Up @@ -254,8 +256,14 @@ def run(test, params, env):
debug=True, ignore_status=True)
error_msg = params.get("error_msg")
libvirt.check_result(result, error_msg)
elif test_scenario in ["boundary_vm_tart"]:
expected_attribute = "yes" == params.get("expected_attribute")
elif test_scenario in ["boundary_vm_start"]:
expected_attribute = "yes" == params.get("expected_attribute", "no")
discard_granularity = params.get("discard_granularity")
if discard_granularity == '0':
if libvirt_version.version_compare(11, 7, 0):
expected_attribute = True
else:
expected_attribute = False
check_vm_dumpxml(params, test, expected_attribute)
else:
if not check_blockio_discard_granularity(vm, new_disk, discard_granularity_in_unit):
Expand Down