Skip to content

Commit 9623b63

Browse files
committed
Remove 2 checkpoints for passt
Delete 2 checkpoints: 1) Check the socket dir, when vm destroyed, the passt socket dir is not cleared for passt+vhostuser. In CNV, this is not an issue, tracked in RHEL-80285. (We can restore the check after the bug is fixed) 2) When start vm with interface using passt, and the qemu support reconect parameter, there is "reconnect:5" or "reconnect=5" in qemu cmd once qemu support reconnect feature. But since qemu 10.1, the parameter change to "reconnect-ms:5000" or "reconnect-ms=5000". To make is simple, delete this qemu cmd check, and just check the function that if the passt process will reconnect after killed is enough. Signed-off-by: Yalan Zhang <yalzhang@redhat.com>
1 parent bf32062 commit 9623b63

File tree

4 files changed

+0
-10
lines changed

4 files changed

+0
-10
lines changed

libvirt/tests/cfg/virtual_network/passt/passt_reconnect.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
outside_ip = 'www.redhat.com'
66
start_vm = no
77
mtu = 65520
8-
qemu_cmd_check = "reconnect":5
98
variants user_type:
109
- root_user:
1110
test_user = root
@@ -24,7 +23,6 @@
2423
- default:
2524
- vhostuser:
2625
vhostuser = 'yes'
27-
qemu_cmd_check = "reconnect=5"
2826
func_supported_since_libvirt_ver = (10, 10, 0)
2927
variants:
3028
- ip_portfw:

libvirt/tests/src/virtual_network/passt/passt_attach_detach.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@ def run(test, params, env):
159159
if 'detach' not in scenario:
160160
vm.destroy()
161161
passt.check_passt_pid_not_exist()
162-
if not vhostuser and os.listdir(socket_dir):
163-
test.fail(f'Socket dir is not empty: {os.listdir(socket_dir)}')
164162
else:
165163
vmxml = vm_xml.VMXML.new_from_dumpxml(vm_name,
166164
virsh_instance=virsh_ins)

libvirt/tests/src/virtual_network/passt/passt_function.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ def run(test, params, env):
133133
vm.destroy()
134134

135135
passt.check_passt_pid_not_exist()
136-
if not vhostuser and os.listdir(socket_dir):
137-
test.fail(f'Socket dir is not empty: {os.listdir(socket_dir)}')
138136

139137
finally:
140138
firewalld.start()

libvirt/tests/src/virtual_network/passt/passt_reconnect.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from virttest.staging import service
1616
from virttest.staging import utils_memory
1717
from virttest.utils_libvirt import libvirt_unprivileged
18-
from virttest.utils_test import libvirt
1918

2019
from provider.virtual_network import network_base
2120
from provider.virtual_network import passt
@@ -62,7 +61,6 @@ def run(test, params, env):
6261
params['socket_dir'] = socket_dir = eval(params.get('socket_dir'))
6362
params['proc_checks'] = proc_checks = eval(params.get('proc_checks', '{}'))
6463
mtu = params.get('mtu')
65-
qemu_cmd_check = params.get('qemu_cmd_check')
6664
outside_ip = params.get('outside_ip')
6765
host_iface = params.get('host_iface')
6866
host_iface = host_iface if host_iface else utils_net.get_default_gateway(
@@ -92,8 +90,6 @@ def run(test, params, env):
9290
passt.vm_add_iface(vmxml, iface_attrs, virsh_ins)
9391
vm.start()
9492

95-
libvirt.check_qemu_cmd_line(qemu_cmd_check)
96-
9793
passt_proc = passt.get_proc_info('passt')
9894
LOG.debug(f'passt process info: {passt_proc}')
9995

0 commit comments

Comments
 (0)