Merge pull request #6646 from nanli1/fix_virtual_network_case_failed_when_get_gateway

virtual network: fix for getting gateway, boot msg match and throughout checkpoint issue on rhel 9.2

Author: cliping

libvirt/tests/cfg/virtual_network/rom/iface_rom_disable_pxe_boot.cfg

@@ -8,7 +8,7 @@
     variants firmware:
         - seabios:
             firmware_type = "seabios"
-            boot_msg = "SeaBIOS "
+            boot_msg = "BIOS"
             os_attrs = "${basic_os}"
         - uefi:
             only q35, aarch64

libvirt/tests/src/virtual_network/migrate/migrate_with_bridge_type_interface.py

@@ -105,7 +105,7 @@ def setup_test():
             utils_net.create_linux_bridge_tmux(bridge_name, iface_name=host_iface)
 
             remote_host_iface = utils_net.get_default_gateway(
-                iface_name=True, session=remote_session, force_dhcp=True, json=True)
+                iface_name=True, session=remote_session, force_dhcp=False, json=True)
             params.update({"remote_host_iface": remote_host_iface})
             utils_net.create_linux_bridge_tmux(
                 bridge_name, iface_name=remote_host_iface, session=remote_session)
@@ -200,7 +200,7 @@ def teardown_test():
     iface_dict = eval(params.get("iface_dict", "{}"))
     host_iface = params.get('host_iface')
     host_iface = host_iface if host_iface else utils_net.get_default_gateway(
-        iface_name=True, force_dhcp=True, json=True)
+        iface_name=True, force_dhcp=False, json=True)
 
     vm_name = guest_os.get_vm(params)
     vm = env.get_vm(vm_name)

libvirt/tests/src/virtual_network/qos/check_actual_network_throughput.py

@@ -46,6 +46,7 @@ def run(test, params, env):
     net_xml = NetworkXML.new_from_net_dumpxml('default')
     bk_net_xml = net_xml.copy()
     firewalld = service.Factory.create_service("firewalld")
+    iface_type = params.get("iface_type")
 
     try:
         if br_type == 'linux_br':
@@ -119,11 +120,12 @@ def run(test, params, env):
         )
         vm_sess.close()
         vm.destroy()
-        ovs_list_cmd = 'ovs-vsctl list qos'
-        ovs_list_output = process.run(ovs_list_cmd).stdout_text
-        if ovs_list_output:
-            test.fail(f'There should be no output of command {ovs_list_cmd}.'
-                      f'But we got {ovs_list_output}')
+        if iface_type == "bridge" and br_type == "ovs_br":
+            ovs_list_cmd = 'ovs-vsctl list qos'
+            ovs_list_output = process.run(ovs_list_cmd).stdout_text
+            if ovs_list_output:
+                test.fail(f'There should be no output of command {ovs_list_cmd}.'
+                          f'But we got {ovs_list_output}')
 
     finally:
         bkxml.sync()

libvirt/tests/src/virtual_network/rom/iface_rom_disable_pxe_boot.py

@@ -75,11 +75,11 @@ def teardown_test():
 
     if not utils_misc.wait_for(
             lambda: utils_net.get_default_gateway(
-                iface_name=True, force_dhcp=True, json=True) is not None, timeout=15):
+                iface_name=True, force_dhcp=False, json=True) is not None, timeout=15):
         test.fail("Cannot get default gateway in 15s")
     host_iface = params.get("host_iface")
     iface_name = host_iface if host_iface else utils_net.get_default_gateway(
-        iface_name=True, force_dhcp=True).split()[0]
+        iface_name=True, force_dhcp=False).split()[0]
     utils_net.create_linux_bridge_tmux(bridge_name, iface_name)
     iface_attrs = eval(params.get("iface_attrs") % bridge_name)
     disk_order = int(params.get("disk_order"))