diff --git a/libvirt/tests/src/numa/guest_numa_node_tuning/auto_memory_nodeset_placement.py b/libvirt/tests/src/numa/guest_numa_node_tuning/auto_memory_nodeset_placement.py index abe4bf3eff..37501c940c 100644 --- a/libvirt/tests/src/numa/guest_numa_node_tuning/auto_memory_nodeset_placement.py +++ b/libvirt/tests/src/numa/guest_numa_node_tuning/auto_memory_nodeset_placement.py @@ -114,7 +114,7 @@ def verify_cgroup_mem_binding(test_obj): """ mem_mode = test_obj.params.get('mem_mode') nodeset = test_obj.params.get('nodeset') - online_nodes = libvirt_numa.parse_numa_nodeset_to_str('x-y', test_obj.online_nodes) + online_nodes = libvirt_numa.convert_all_nodes_to_string(test_obj.online_nodes) vcpu_placement = eval(test_obj.params.get('vm_attrs')).get('placement') vm_pid = test_obj.vm.get_pid() cg = libvirt_cgroup.CgroupTest(vm_pid) diff --git a/libvirt/tests/src/numa/guest_numa_node_tuning/memory_binding_setting.py b/libvirt/tests/src/numa/guest_numa_node_tuning/memory_binding_setting.py index 9959238c61..54e8bfe589 100644 --- a/libvirt/tests/src/numa/guest_numa_node_tuning/memory_binding_setting.py +++ b/libvirt/tests/src/numa/guest_numa_node_tuning/memory_binding_setting.py @@ -179,7 +179,7 @@ def verify_cgroup(test_obj): """ mem_mode = test_obj.params.get('mem_mode') nodeset = numa_base.convert_to_string_with_dash(test_obj.params.get('nodeset')) - online_nodes = libvirt_numa.parse_numa_nodeset_to_str('x-y', test_obj.online_nodes) + online_nodes = libvirt_numa.convert_all_nodes_to_string(test_obj.online_nodes) vm_pid = test_obj.vm.get_pid() cg = libvirt_cgroup.CgroupTest(vm_pid) surfix = 'emulator/cpuset.mems' if cg.is_cgroup_v2_enabled() else 'cpuset.mems' diff --git a/libvirt/tests/src/numa/numa_memory.py b/libvirt/tests/src/numa/numa_memory.py index b47e448a40..d7cda36b62 100644 --- a/libvirt/tests/src/numa/numa_memory.py +++ b/libvirt/tests/src/numa/numa_memory.py @@ -200,9 +200,7 @@ def run(test, params, env): if numa_memory.get('nodeset'): numa_nodeset_format = numa_memory.get('nodeset') - numa_memory['nodeset'] = libvirt_numa.parse_numa_nodeset_to_str(numa_nodeset_format, - node_list, - ignore_error=True) + numa_memory['nodeset'] = libvirt_numa.convert_all_nodes_to_string(node_list) used_node = cpu.cpus_parser(numa_memory['nodeset']) logging.debug("set node list is %s", used_node) if not status_error: diff --git a/libvirt/tests/src/numa/numa_memory_migrate.py b/libvirt/tests/src/numa/numa_memory_migrate.py index cb51637762..044190fff4 100644 --- a/libvirt/tests/src/numa/numa_memory_migrate.py +++ b/libvirt/tests/src/numa/numa_memory_migrate.py @@ -64,8 +64,7 @@ def mem_compare(used_node, left_node): try: if numa_memory.get('nodeset'): numa_nodeset_format = numa_memory.get('nodeset') - numa_memory['nodeset'] = libvirt_numa.parse_numa_nodeset_to_str(numa_nodeset_format, - node_list) + numa_memory['nodeset'] = libvirt_numa.convert_all_nodes_to_string(node_list) used_node = cpu.cpus_parser(numa_memory['nodeset']) logging.debug("set node list is %s", used_node) diff --git a/libvirt/tests/src/virsh_cmd/domain/virsh_numatune.py b/libvirt/tests/src/virsh_cmd/domain/virsh_numatune.py index dda489868c..b808d1ed1d 100644 --- a/libvirt/tests/src/virsh_cmd/domain/virsh_numatune.py +++ b/libvirt/tests/src/virsh_cmd/domain/virsh_numatune.py @@ -197,8 +197,7 @@ def dynamic_node_replacement(params, numa_info, test_obj): numa_nodeset_format = params.get('numa_nodeset') dynamic_nodeset = params.get('dynamic_nodeset', 'no') == 'yes' if dynamic_nodeset and 'numa_nodeset' in params: - params['numa_nodeset'] = libvirt_numa.parse_numa_nodeset_to_str(numa_nodeset_format, - node_list) + params['numa_nodeset'] = libvirt_numa.convert_all_nodes_to_string(node_list) logging.debug('The parameter "numa_nodeset" from config file is going to be replaced by: {} ' 'available on this system'.format(params['numa_nodeset']))