Skip to content

Commit

Permalink
Update for option format -- added
Browse files Browse the repository at this point in the history 
These changes are to align with below patch.
avocado-framework/avocado-vt#3722

Signed-off-by: Dan Zheng <[email protected]>
  • Loading branch information
@dzhengfy
dzhengfy committed Jul 25, 2023
1 parent 320e17c commit 7c520f7
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 41 deletions.
34 changes: 17 additions & 17 deletions libvirt/tests/cfg/virsh_cmd/domain/virsh_emulatorpin.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
- none:
emulatorpin_options =
- live:
emulatorpin_options = "live"
emulatorpin_options = "--live"
- current:
emulatorpin_options = "current"
emulatorpin_options = "--current"
- shutoff_guest:
start_vm = "no"
variants:
Expand All @@ -26,9 +26,9 @@
- none:
emulatorpin_options =
- config:
emulatorpin_options = "config"
emulatorpin_options = "--config"
- current:
emulatorpin_options = "current"
emulatorpin_options = "--current"
- set_emulatorpin_parameter:
change_parameters = "yes"
variants:
Expand All @@ -54,9 +54,9 @@
- emulatorpin_options:
variants:
- config:
emulatorpin_options = "config"
emulatorpin_options = "--config"
- current:
emulatorpin_options = "current"
emulatorpin_options = "--current"
- running_guest:
start_vm = "yes"
variants:
Expand Down Expand Up @@ -86,9 +86,9 @@
- emulatorpin_options:
variants:
- live:
emulatorpin_options = "live"
emulatorpin_options = "--live"
- current:
emulatorpin_options = "current"
emulatorpin_options = "--current"
- negative_testing:
status_error = "yes"
variants:
Expand All @@ -100,16 +100,16 @@
- emulatorpin_options:
variants:
- invalid:
emulatorpin_options = "hello"
emulatorpin_options = "--hello"
- shutoff_guest:
start_vm = "no"
variants:
- emulatorpin_options:
variants:
- invalid:
emulatorpin_options = "hello"
emulatorpin_options = "--hello"
- live:
emulatorpin_options = "live"
emulatorpin_options = "--live"
- set_emulatorpin_parameter:
change_parameters = "yes"
variants:
Expand Down Expand Up @@ -138,11 +138,11 @@
- emulatorpin_options:
variants:
- live:
emulatorpin_options = "live"
emulatorpin_options = "--live"
- config:
emulatorpin_options = "config"
emulatorpin_options = "--config"
- current:
emulatorpin_options = "current"
emulatorpin_options = "--current"
- shutoff_guest:
start_vm = "no"
variants:
Expand All @@ -162,8 +162,8 @@
- emulatorpin_options:
variants:
- live:
emulatorpin_options = "live"
emulatorpin_options = "--live"
- config:
emulatorpin_options = "config"
emulatorpin_options = "--config"
- current:
emulatorpin_options = "current"
emulatorpin_options = "--current"
40 changes: 20 additions & 20 deletions libvirt/tests/cfg/virsh_cmd/domain/virsh_numatune.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
- options:
variants:
- config:
options = "config"
options = "--config"
- current:
options = "current"
options = "--current"
- change_nodeset:
variants:
- comma_list:
Expand All @@ -44,9 +44,9 @@
- options:
variants:
- config:
options = "config"
options = "--config"
- current:
options = "current"
options = "--current"
- running_guest:
start_vm = "yes"
numa_mode = 'restrictive'
Expand All @@ -65,9 +65,9 @@
- options:
variants:
- live:
options = "live"
options = "--live"
- current:
options = "current"
options = "--current"
- get_numa_parameter:
variants:
- running_guest:
Expand All @@ -78,9 +78,9 @@
- none:
options =
- live:
options = "live"
options = "--live"
- current:
options = "current"
options = "--current"
- shutoff_guest:
start_vm = "no"
variants:
Expand All @@ -89,9 +89,9 @@
- none:
options =
- config:
options = "config"
options = "--config"
- current:
options = "current"
options = "--current"
- negative_testing:
status_error = "yes"
variants:
Expand All @@ -103,7 +103,7 @@
- options:
variants:
- none:
options = "hello"
options = "--hello"
- cgroup:
variants:
- stop:
Expand All @@ -115,9 +115,9 @@
- options:
variants:
- none:
options = "hello"
options = "--hello"
- config:
options = "live"
options = "--live"
- set_numa_parameter:
change_parameters = "yes"
variants:
Expand All @@ -134,7 +134,7 @@
- options:
variants:
- config:
options = "live"
options = "--live"
- change_nodeset:
variants:
- comma_list:
Expand All @@ -156,11 +156,11 @@
- options:
variants:
- live:
options = "live"
options = "--live"
- config:
options = "config"
options = "--config"
- current:
options = "current"
options = "--current"
- cgroup:
variants:
- stop:
Expand All @@ -183,8 +183,8 @@
- options:
variants:
- live:
options = "live"
options = "--live"
- config:
options = "config"
options = "--config"
- current:
options = "current"
options = "--current"
2 changes: 1 addition & 1 deletion libvirt/tests/src/cpu/guestpin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def set_condition(vm_name, condn, reset=False, guestbt=None):
vm_sockets, vm_cores, vm_threads)
if config_pin:
cpustats = {}
result = virsh.emulatorpin(vm_name, cpus_list[-1], "config",
result = virsh.emulatorpin(vm_name, cpus_list[-1], "--config",
debug=True)
libvirt.check_exit_status(result)
result = virsh.vcpupin(vm_name, "0", cpus_list[0], "--config",
Expand Down
2 changes: 1 addition & 1 deletion libvirt/tests/src/cpu/powerpc_hmi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def set_condn(action, recover=False):
for i in range(cur_vcpu):
virsh.vcpupin(vm_name, i, hmi_cpu, "--live",
ignore_status=False, debug=True)
virsh.emulatorpin(vm_name, hmi_cpu, "live",
virsh.emulatorpin(vm_name, hmi_cpu, "--live",
ignore_status=False, debug=True)
elif action == "filetrans":
utils_test.run_file_transfer(test, params, env)
Expand Down
4 changes: 2 additions & 2 deletions libvirt/tests/src/numa/numa_config_with_auto_placement.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ def run_all_commands(vm_name, config_type, cpu_range):
:param config_type: one of the value: 'default','config', ''
commands with the command as a key and error message as a value
"""
commands = {virsh.numatune: [check_numatune, 'config'],
commands = {virsh.numatune: [check_numatune, '--config'],
virsh.vcpupin: [check_vcpupin, '--config'],
virsh.emulatorpin: [check_emulatorpin, 'config'],
virsh.emulatorpin: [check_emulatorpin, '--config'],
virsh.iothreadinfo: [check_iothreadinfo, '--config']}
for command in commands:
# Run commands prior test
Expand Down

0 comments on commit 7c520f7

Please sign in to comment.