Skip to content

Commit

Permalink
Netkvm: Fix session handling issue during netkvm driver installation
Browse files Browse the repository at this point in the history
Installing the netkvm driver on an existing network interface caused
session handling issues, leading to test failures. This patch changes
the session handling from SSH to the serial session by replacing
vm.wait_for_login() with vm.wait_for_serial_login(). It also adds a ping
test to verify network connectivity after the driver installation.

Signed-off-by: wji <[email protected]>
  • Loading branch information
heywji committed Nov 1, 2024
1 parent 417a8a6 commit 7e02e0d
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions qemu/tests/single_driver_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import re

from aexpect import ShellTimeoutError
from virttest import error_context, utils_misc
from virttest import error_context, utils_misc, utils_net
from virttest.utils_test.qemu import windrv_verify_running
from virttest.utils_windows import virtio_win, wmic

Expand Down Expand Up @@ -147,7 +147,8 @@ def run(test, params, env):
vm.destroy()
vm.create()
vm = env.get_vm(params["main_vm"])
session = vm.wait_for_login()
# This is a workaround for session logout issue
session = vm.wait_for_serial_login()
else:
session = vm.reboot(session)

Expand Down Expand Up @@ -175,6 +176,18 @@ def run(test, params, env):
lambda: not session.cmd_status(chk_cmd), 600, 60, 10
):
test.fail("Failed to install driver '%s'" % driver_name)
if "Red Hat VirtIO Ethernet Adapter" in device_name:
ext_host = utils_net.get_ip_address_by_interface(
ifname="%s" % params.get("netdst")
)
test.log.info("ext_host of netkvm adapter is %s", ext_host)
guest_ip = vm.get_address("nic2")
test.log.info("guest_ip of netkvm adapter is %s", guest_ip)
status, output = utils_net.ping(
ext_host, interface=guest_ip, count=10, timeout=60, session=session
)
if status:
test.fail("Ping %s failed, output=%s" % (ext_host, output))

installed_any |= True
if not installed_any:
Expand Down

0 comments on commit 7e02e0d

Please sign in to comment.