diff --git a/libvirt/tests/cfg/virtual_network/passt/passt_attach_detach.cfg b/libvirt/tests/cfg/virtual_network/passt/passt_attach_detach.cfg index 4b0062b4d5..9003f3b0f1 100644 --- a/libvirt/tests/cfg/virtual_network/passt/passt_attach_detach.cfg +++ b/libvirt/tests/cfg/virtual_network/passt/passt_attach_detach.cfg @@ -45,3 +45,6 @@ conn_check_args_1 = ('TCP6', 'localhost', 31339, 41339, True, None) conn_check_args_2 = ('UDP4', 'localhost', 2025, 2025, True, None) conn_check_args_3 = ('UDP6', 'localhost', 2025, 2025, True, None) + s390-virtio: + iface_attrs = {'model': 'virtio', 'ips': ${ips}, 'backend': ${backend}, 'source': {'dev': '${host_iface}'}, 'alias': ${alias}, 'type_name': 'user', 'portForwards': ${portForwards}} + vm_iface = enc1 diff --git a/libvirt/tests/src/virtual_network/passt/passt_attach_detach.py b/libvirt/tests/src/virtual_network/passt/passt_attach_detach.py index 153e644084..e060a8a781 100644 --- a/libvirt/tests/src/virtual_network/passt/passt_attach_detach.py +++ b/libvirt/tests/src/virtual_network/passt/passt_attach_detach.py @@ -65,17 +65,17 @@ def run(test, params, env): scenario = params.get('scenario') virsh_uri = params.get('virsh_uri') add_iface = 'yes' == params.get('add_iface', 'no') - host_ip = utils_net.get_host_ip_address(ip_ver='ipv4') - host_ip_v6 = utils_net.get_host_ip_address(ip_ver='ipv6') + host_iface = params.get('host_iface') + host_iface = host_iface if host_iface else utils_net.get_net_if( + state="UP")[0] + host_ip = utils_net.get_ip_address_by_interface(host_iface, ip_ver='ipv4') + host_ip_v6 = utils_net.get_ip_address_by_interface(host_iface, ip_ver='ipv6') iface_attrs = eval(params.get('iface_attrs')) params['socket_dir'] = socket_dir = eval(params.get('socket_dir')) params['proc_checks'] = proc_checks = eval(params.get('proc_checks', '{}')) vm_iface = params.get('vm_iface', 'eno1') mtu = params.get('mtu') outside_ip = params.get('outside_ip') - host_iface = params.get('host_iface') - host_iface = host_iface if host_iface else utils_net.get_net_if( - state="UP")[0] log_file = f'/run/user/{user_id}/passt.log' iface_attrs['backend']['logFile'] = log_file iface_attrs['source']['dev'] = host_iface @@ -124,7 +124,7 @@ def run(test, params, env): test.fail(f'Logfile of passt "{log_file}" not created') session = vm.wait_for_serial_login(timeout=60) - passt.check_vm_ip(iface_attrs, session, host_iface) + passt.check_vm_ip(iface_attrs, session, host_iface, vm_iface) passt.check_vm_mtu(session, vm_iface, mtu) passt.check_default_gw(session) passt.check_nameserver(session) @@ -138,7 +138,8 @@ def run(test, params, env): firewalld.stop() LOG.debug(f'Service status of firewalld: {firewalld.status()}') passt.check_connection(vm, vm_iface, - ['TCP4', 'TCP6', 'UDP4', 'UDP6']) + ['TCP4', 'TCP6', 'UDP4', 'UDP6'], + host_iface) if 'portForwards' in iface_attrs: passt.check_portforward(vm, host_ip, params)