Improve package installation for network utilities

utils_package: add package_install_any to try multiple candidates
utils_net: update package install to support multiple dhcp clients

Signed-off-by: Wenli Quan <wquan@redhat.com>

Author: quanwenli

virttest/utils_net.py

@@ -4628,7 +4628,9 @@ def create_ovs_bridge(
     if session:
         runner = session.cmd
     iface_name = get_net_if(runner=runner, state="UP", ip_options=ip_options)[0]
-    if not utils_package.package_install(["tmux", "dhcp-client"], session):
+    if not utils_package.package_install(
+        ["tmux"], session
+    ) or not utils_package.package_install_any(["dhcp-client", "dhcpcd"], session):
         raise exceptions.TestError("Failed to install the required packages.")
 
     res = utils_misc.cmd_status_output(
@@ -4672,8 +4674,9 @@ def delete_ovs_bridge(
     if session:
         runner = session.cmd
     iface_name = get_net_if(runner=runner, state="UP", ip_options=ip_options)[0]
-    if not utils_package.package_install(["tmux", "dhcp-client"], session):
-        raise exceptions.TestError("Failed to install the required packages.")
+    if not utils_package.package_install(
+        ["tmux"], session
+    ) or not utils_package.package_install_any(["dhcp-client", "dhcpcd"], session):
 
     res = utils_misc.cmd_status_output(
         "which ovs-vsctl", shell=True, ignore_status=False, session=session
@@ -4777,7 +4780,9 @@ def create_linux_bridge_tmux(
     """
     # Create bridge
     br_path = "/sys/class/net/%s" % linux_bridge_name
-    if not utils_package.package_install(["tmux", "dhcp-client", "net-tools"], session):
+    if not utils_package.package_install(
+        ["tmux", "net-tools"], session
+    ) or not utils_package.package_install_any(["dhcp-client", "dhcpcd"], session):
         raise exceptions.TestError("Failed to install the required packages.")
     if session:
         bridge_exists = session.cmd_status("ip link show %s" % linux_bridge_name) == 0

virttest/utils_package.py

@@ -237,17 +237,20 @@ def package_install(pkg, session=None, timeout=PKG_MGR_TIMEOUT):
     return utils_misc.wait_for(mgr.install, timeout)
 
 
-def package_remove(pkg, session=None, timeout=PKG_MGR_TIMEOUT):
+def package_install_any(candidates, session=None, timeout=PKG_MGR_TIMEOUT):
     """
-    Try to remove packages on system with package manager.
+    Try to install packages from candidates in order until one succeeds.
 
-    :param pkg: package name or list of packages
+    :param candidates: iterable of package names to try in order
     :param session: session Object
-    :param timeout: timeout for remove with session
-    :return: True if all packages removed, False if any error
+    :param timeout: timeout for each install session
+    :return: True if any candidate installed successfully, else False
     """
-    mgr = package_manager(session, pkg)
-    return utils_misc.wait_for(mgr.remove, timeout)
+    for pkg in candidates:
+        mgr = package_manager(session, pkg)
+        if utils_misc.wait_for(mgr.install, timeout):
+            return True
+    return False
 
 
 def package_upgrade(pkg, session=None, timeout=PKG_MGR_TIMEOUT):