Merge pull request #5949 from smitterl/iface_stat_dac

iface_stat: fix test on s390x
autotest · Oct 24, 2024 · e5cd0ed · e5cd0ed
2 parents bb415e8 + ec05d07
commit e5cd0ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/libvirt/tests/cfg/virtual_network/iface_stat.cfg b/libvirt/tests/cfg/virtual_network/iface_stat.cfg
@@ -22,3 +22,5 @@
                                 - macvtap:
                                     func_supported_since_libvirt_ver = (9, 2, 0)
                     iface_attrs = {'acpi': {'index': '5'}, 'target': {'dev': tap_name, 'managed': 'no'}, 'model': 'virtio', 'type_name': 'ethernet'}
+                    s390-virtio:
+                        iface_attrs = {'target': {'dev': tap_name, 'managed': 'no'}, 'model': 'virtio', 'type_name': 'ethernet'}
diff --git a/libvirt/tests/src/virtual_network/iface_stat.py b/libvirt/tests/src/virtual_network/iface_stat.py
@@ -187,6 +187,7 @@ def _collect_and_compare_stat(vm_name, session, **virsh_args):
                 unpr_vmxml.del_device('interface', by_tag=True)
                 libvirt_vmxml.modify_vm_device(unpr_vmxml, 'interface',
                                                iface_attrs)
+                unpr_vmxml.del_seclabel(by_attr=[('model', 'dac')])
                 network_base.define_vm_for_unprivileged_user(unpr_user,
                                                              unpr_vmxml)
                 unpr_vm_name = unpr_vmxml.vm_name