Skip to content

Commit 9df36a7

Browse files
committed
utils_net: fix dhcp client selection logic and restart_cmd assignment
1. fix RHEL >= 10 dhcp logic wrongly applied to guest, limit it to host side only. 2. fix restart_cmd assignment Signed-off-by: Wenli Quan <wquan@redhat.com>
1 parent 368381d commit 9df36a7

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

virttest/utils_net.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,10 +1718,13 @@ def get_dhcp_client(session):
17181718
:return: tuple of dhcp command and its release argument, raises TestError if none found
17191719
"""
17201720
dhcp_clients = [("dhclient", "-r"), ("dhcpcd", "-k")]
1721-
if distro.detect().name == "rhel" and int(distro.detect().version) >= 10:
1722-
dhcp_clients = [dhcp_clients[1]]
1723-
else:
1724-
dhcp_clients = [dhcp_clients[0]]
1721+
1722+
if session is None:
1723+
if distro.detect().name == "rhel" and int(distro.detect().version) >= 10:
1724+
dhcp_clients = [dhcp_clients[1]]
1725+
else:
1726+
dhcp_clients = [dhcp_clients[0]]
1727+
17251728
for cmd, release_flag in dhcp_clients:
17261729
status, _ = utils_misc.cmd_status_output(
17271730
"which %s" % cmd, shell=True, ignore_status=True, session=session
@@ -1758,7 +1761,7 @@ def restart_guest_network(
17581761
else:
17591762
restart_cmd += "%s %s" % (dhcp_cmd, nic_ifname)
17601763
else:
1761-
restart_cmd += "%s %s; " % (dhcp_cmd, release_flag)
1764+
restart_cmd = "%s %s; " % (dhcp_cmd, release_flag)
17621765
if ip_version == "ipv6":
17631766
restart_cmd += "%s -6" % dhcp_cmd
17641767
else:

0 commit comments

Comments
 (0)