Merge pull request autotest#5269 from hs0210/virtual_network_ethernet…

…_interface virtual_network: remove acpi settings in connectivity_check_ethernet_interface
chunfuwen · Nov 23, 2023 · ccd3ef7 · ccd3ef7
2 parents cf2f7f5 + 2ff869d
commit ccd3ef7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/libvirt/tests/cfg/virtual_network/connectivity/connectivity_check_ethernet_interface.cfg b/libvirt/tests/cfg/virtual_network/connectivity/connectivity_check_ethernet_interface.cfg
@@ -31,8 +31,7 @@
                 - macvtap:
                     vm_ping_outside = pass
                     vm_ping_host_public = fail
-            iface_attrs = {'target': {'dev': tap_name, 'managed': 'no'}, 'model': 'virtio', 'type_name': 'ethernet', **${mtu_attrs}, 'acpi': {'index': '1'}}
-            vm_iface = eno1
+            iface_attrs = {'target': {'dev': tap_name, 'managed': 'no'}, 'model': 'virtio', 'type_name': 'ethernet', **${mtu_attrs}}
         - negative_test:
             status_error = yes
             variants:

diff --git a/libvirt/tests/src/virtual_network/connectivity/connectivity_check_ethernet_interface.py b/libvirt/tests/src/virtual_network/connectivity/connectivity_check_ethernet_interface.py
@@ -11,6 +11,7 @@
 from virttest.utils_libvirt import libvirt_vmxml
 from virttest.utils_test import libvirt
 
+from provider.interface import interface_base
 from provider.virtual_network import network_base
 
 LOG = logging.getLogger('avocado.' + __name__)
@@ -50,10 +51,8 @@ def run(test, params, env):
     tap_name = tap_type + '_' + rand_id
     tap_mtu = params.get('tap_mtu')
     iface_mtu = params.get('iface_mtu')
-    vm_iface = params.get('vm_iface')
     host_ip = utils_net.get_host_ip_address(ip_ver='ipv4')
     iface_attrs = eval(params.get('iface_attrs'))
-    vm_iface = params.get('vm_iface', 'eno1')
     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(
@@ -113,6 +112,7 @@ def run(test, params, env):
                 LOG.info('MTU check of vmxml PASS')
 
             # Check mtu inside vm
+            vm_iface = interface_base.get_vm_iface(session)
             vm_iface_info = utils_net.get_linux_iface_info(iface=vm_iface,
                                                            session=session)
             vm_mtu = vm_iface_info['mtu']