diff --git a/provider/virtual_network/passt.py b/provider/virtual_network/passt.py index 14822134b89..6a74e3781f8 100644 --- a/provider/virtual_network/passt.py +++ b/provider/virtual_network/passt.py @@ -169,15 +169,17 @@ def check_proc(target): raise exceptions.TestFail(';'.join(failed_check)) -def check_vm_ip(iface_attrs, session, host_iface): +def check_vm_ip(iface_attrs, session, host_iface, vm_iface=None): """ Check if vm ip and prefix meet expectation :param iface_attrs: attributes of interface :param session: shell session instance of vm :param host_iface: host interface + :param vm_iface: VM interface, can be omitted on x86_64 """ - vm_iface = 'eno' + iface_attrs.get('acpi', {'index': '1'})['index'] + if not vm_iface: + vm_iface = 'eno' + iface_attrs.get('acpi', {'index': '1'})['index'] vm_ip, prefix = get_iface_ip_and_prefix(vm_iface, session=session) LOG.debug(f'VM ip and prefix: {vm_ip}, {prefix}') if 'ips' in iface_attrs: @@ -379,7 +381,7 @@ def check_port_listen(ports, protocol, host_ip=None): """ if protocol.lower() not in ('tcp', 'udp'): raise exceptions.TestError(f'Unsupported protocol: {protocol}') - cmd_listen = process.run(f"ss -{protocol[0].lower()}lpn|egrep 'passt.avx2'", + cmd_listen = process.run(f"ss -{protocol[0].lower()}lpn|egrep 'passt'", shell=True).stdout_text for item in ports: if item in cmd_listen: