Skip to content

Adding testcases for cpu_modes along with vcpu plug-unplug! #6898

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
Anushree-Mathur wants to merge 1 commit into
base: master
Choose a base branch
from
+48 −3
Open

Adding testcases for cpu_modes along with vcpu plug-unplug! #6898

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
18 changes: 17 additions & 1 deletion libvirt/tests/cfg/libvirt_vcpu_plug_unplug.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,23 @@
vcpu_plug_num = 240
vcpu_unplug_num = 1
vcpu_max_num = 240

- with_cpu_mode:
only live
variants:
- host_model:
cpu_mode = "host-model"
test_itr = 5
vcpu_max_num = "8"
vcpu_current_num = "2"
vcpu_plug_num = "6"
vcpu_unplug_num = "3"
- host_passthrough:
cpu_mode = "host-passthrough"
test_itr = 5
vcpu_max_num = "8"
vcpu_current_num = "2"
vcpu_plug_num = "6"
vcpu_unplug_num = "3"
variants:
- live:
setvcpu_option = "--live"
Expand Down
33 changes: 31 additions & 2 deletions libvirt/tests/src/libvirt_vcpu_plug_unplug.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
from virttest import utils_libvirtd
from virttest import utils_test
from virttest.utils_test import libvirt
from virttest.libvirt_xml.vm_xml import VMXML
from virttest.libvirt_xml import xcepts
from virttest.libvirt_xml.vm_xml import VMXML, VMCPUXML

from provider.cpu import patch_total_cpu_count_s390x

Expand Down Expand Up @@ -46,7 +47,12 @@ def run(test, params, env):
12. Repeat step 2 to check again.
13. Repeat step 7 to recover domain.
14. Repeat step 2 to check again.
15. Recover test environment.
15. Bringup guest with host-model or host-passthrough.
16. Repeat step 3 to plug vcpu.
17. Repeat step 2 to check again
18. Repeat step 9 to unplug vcpus
19. Repeat step 2 to check again
20 Recover test environment.
"""

def manipulate_domain(vm_name, vm_operation, recover=False):
Expand Down Expand Up @@ -240,6 +246,7 @@ def check_setvcpus_result(cmd_result, expect_error):
with_stress = "yes" == params.get("run_stress", "no")
iterations = int(params.get("test_itr", 1))
topology_correction = "yes" == params.get("topology_correction", "no")
cpu_mode = params.get("cpu_mode")
# Init expect vcpu count values
expect_vcpu_num = {'max_config': vcpu_max_num, 'max_live': vcpu_max_num,
'cur_config': vcpu_current_num,
Expand Down Expand Up @@ -298,6 +305,28 @@ def check_setvcpus_result(cmd_result, expect_error):
vmxml.set_agent_channel()
else:
vmxml.remove_agent_channels()
if cpu_mode:
logging.info("Setting CPU mode to: %s", cpu_mode)
try:
cpu_xml = vmxml.cpu
except xcepts.LibvirtXMLNotFoundError:
logging.debug("No CPU element found, creating new one")
cpu_xml = VMCPUXML()
Comment thread
coderabbitai[bot] marked this conversation as resolved.

cpu_xml.mode = cpu_mode
vmxml.cpu = cpu_xml
# If host-model, convert model name to lowercase
if cpu_mode == 'host-model':
vmxml.sync()
vmxml = VMXML.new_from_inactive_dumpxml(vm_name)
cpu_xml = vmxml.cpu
if hasattr(cpu_xml, 'model') and cpu_xml.model:
logging.info("Converting CPU model from '%s' to '%s'",
cpu_xml.model, cpu_xml.model.lower())
cpu_xml.model = cpu_xml.model.lower()
vmxml.cpu = cpu_xml
logging.info("CPU mode set successfully")

vmxml.sync()

vmxml.set_vm_vcpus(vm_name, vcpu_max_num, vcpu_current_num,
Expand Down
Loading