passt: fix test cases on s390x

Default interfaces on s390x are named 'enc'.
ACPI is not available on s390x.

Signed-off-by: Sebastian Mitterle <smitterl@redhat.com>

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:
+                vm_iface = enc1
+                iface_attrs = {'model': 'virtio', 'ips': ${ips}, 'backend': ${backend}, 'source': {'dev': '${host_iface}'}, 'alias': ${alias}, 'type_name': 'user', 'portForwards': ${portForwards}}

libvirt/tests/cfg/virtual_network/passt/passt_connectivity_between_2vms.cfg

@@ -41,3 +41,6 @@
             conn_check_args_1 = ('TCP6', server_default_gw_v6, vm_c_iface, 41335, 41335)
             conn_check_args_2 = ('UDP4', server_default_gw, None, 21335, 21335)
             conn_check_args_3 = ('UDP6', server_default_gw_v6, vm_c_iface, 21335, 21335)
+            s390-virtio:
+                vm_c_iface = enc1
+                iface_attrs = {'model': 'virtio', **${ips}, 'backend': ${backend}, 'source': {'dev': '${host_iface}'}, 'type_name': 'user', **${portForwards}}

libvirt/tests/cfg/virtual_network/passt/passt_function.cfg

@@ -22,6 +22,9 @@
             iface_attrs = {'model': 'virtio', 'acpi': {'index': '1'}, 'type_name': 'user', 'backend': {'type': 'passt'}, 'source': {'dev': '${host_iface}'}}
             vm_iface = eno1
             vm_ping_outside = pass
+            s390-virtio:
+                iface_attrs = {'model': 'virtio', 'type_name': 'user', 'backend': {'type': 'passt'}, 'source': {'dev': '${host_iface}'}}
+                vm_iface = enc1
         - ip_portfw:
             alias = {'name': 'ua-c87b89ff-b769-4abc-921f-30d42d7aec5b'}
             backend = {'type': 'passt'}
@@ -49,3 +52,6 @@
             conn_check_args_7 = ('UDP4', 'localhost', 2025, 2025, True, None)
             conn_check_args_8 = ('UDP6', host_ip_v6, 4431, 4432, True, None)
             conn_check_args_9 = ('UDP6', '::1', 4431, 4432, False, 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

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

@@ -40,3 +40,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:
+                vm_iface = enc1
+                iface_attrs = {'model': 'virtio', **${ips}, 'backend': ${backend}, 'source': {'dev': '${host_iface}'}, **${alias}, 'type_name': 'user', **${portForwards}}

libvirt/tests/cfg/virtual_network/passt/passt_transfer_file.cfg

@@ -29,6 +29,9 @@
             iface_attrs = {'model': 'virtio', 'acpi': {'index': '1'}, **${ips}, 'backend': ${backend}, 'source': {'dev': '${host_iface}'}, **${alias}, 'type_name': 'user', **${portForwards}}
             ipv6_prefix = 128
             vm_iface = eno1
+            s390-virtio:
+                vm_iface = enc1
+                iface_attrs = {'model': 'virtio', **${ips}, 'backend': ${backend}, 'source': {'dev': '${host_iface}'}, **${alias}, 'type_name': 'user', **${portForwards}}
     variants file_size:
         - 10M:
             bs = 1M

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

@@ -98,7 +98,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)

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

@@ -109,7 +109,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)

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, will be constructed for x86_64 if None
     """
-    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: