Improve virtual_network provider's public function

1.Add netperf compile function in netperf_base to support some function
test need to capture output
2.Improve network_base.check_throughput can accept netperf's absolute paths
3.Improve netdst obtain method in network_base
4.Improve ovs bridge's judgement method

Assisted-by: Gemini AI
Signed-off-by: Lei Yang <leiyang@redhat.com>

Author: yanglei-rh

provider/virtual_network/netperf_base.py

@@ -1,7 +1,10 @@
 import logging
+import re
 import os
 
 from virttest import data_dir, error_context, remote, utils_misc
+from avocado.core import exceptions
+from avocado.utils import process
 
 LOG_JOB = logging.getLogger("avocado.test")
 
@@ -147,3 +150,103 @@ def netperf_record(results, filter_list, header=False, base="17", fbase="2"):
         record += "%s|" % format_result(results[key], base=base, fbase=fbase)
     record = record.rstrip("|")
     return record, key_list
+
+
+def compile_netperf_pkg(params, env, address):
+    """
+    Compile netperf source package
+
+    :param params: Test parameters dictionary
+    :param env: Test environment object
+    :param address: localhost, vm name, or ip address
+    :return: netserver_path, netperf_path
+    """
+    netperf_link = params.get("netperf_link", "netperf-2.7.1.tar.bz2")
+    netperf_src = os.path.join(data_dir.get_deps_dir("netperf"), netperf_link)
+    guest_netperf_path = params.get("guest_netperf_path", "/var/tmp/")
+
+    if address == "localhost":
+        session, install_path = None, params.get("server_path", "/var/tmp")
+    elif address in params.get('vms', '').split():
+        vm = env.get_vm(address)
+        session, install_path = vm.wait_for_login(), guest_netperf_path
+        target_ip, user, pwd = vm.get_address(), params.get("username"), params.get("password")
+    elif re.match(r"^(?:\d{1,3}\.){3}\d{1,3}$", address):
+        if params.get_boolean("remote_server", False):
+            session = remote.remote_login(
+                          "ssh",
+                          address,
+                          "22",
+                          params.get("server_user"),
+                          params.get("server_pwd"),
+                          r'[$#%]'
+                      )
+        else:
+            raise exceptions.TestError(
+                f"IP address '{address}' provided but 'remote_server' param is not set. "
+                "Set remote_server=yes to compile on remote server, or use 'localhost'."
+            )
+        install_path = params.get("server_path", "/var/tmp")
+        target_ip, user, pwd = address, params.get("server_user"), params.get("server_pwd")
+    else:
+        raise exceptions.TestError(f"Unsupported address for compilation: {address}")
+
+    if netperf_link.endswith(".tar.bz2"):
+        pack_suffix, decomp_tool = ".tar.bz2", "tar jxf"
+    elif netperf_link.endswith(".tar.gz"):
+        pack_suffix, decomp_tool = ".tar.gz", "tar zxf"
+    else:
+        raise exceptions.TestError(f"Unsupported compression format for netperf package: {netperf_link}")
+
+    full_netperf_dir = os.path.join(install_path, netperf_link[:-len(pack_suffix)])
+    nserver_path = os.path.join(full_netperf_dir, "src", "netserver")
+    nperf_path = os.path.join(full_netperf_dir, "src", "netperf")
+
+    try:
+        if session:
+            if session.cmd_status(f"test -f {nperf_path}") == 0:
+                LOG_JOB.info(f"Netperf already compiled on {address}, skipping.")
+                return nserver_path, nperf_path
+        elif os.path.exists(nperf_path):
+            LOG_JOB.info("Netperf already compiled on localhost, skipping.")
+            return nserver_path, nperf_path
+
+        if session:
+            arch = session.cmd_output("arch", timeout=10).strip()
+            decomp_cmd = f"cd {install_path} && {decomp_tool} {netperf_link}"
+        else:
+            arch = process.run("arch").stdout_text.strip()
+            decomp_cmd = f"{decomp_tool} {netperf_src} -C {install_path}"
+
+        build_type_map = {
+            "aarch64": "aarch64-unknown-linux-gnu",
+            "x86_64": "x86_64-unknown-linux-gnu",
+        }
+        build_type = build_type_map.get(arch, arch)
+        compile_cmd = (f"cd {full_netperf_dir} && ./autogen.sh && "
+                       f"CFLAGS='-Wno-implicit-function-declaration' ./configure "
+                       f"--build={build_type} --prefix={install_path} && make")
+
+        LOG_JOB.info(f"Compiling netperf from source on {address}...")
+        if session:
+            remote.copy_files_to(
+                target_ip,
+                params.get("cp_client", "scp"),
+                user,
+                pwd,
+                params.get("cp_port", "22"),
+                netperf_src,
+                install_path,
+                600
+            )
+            session.cmd(decomp_cmd, timeout=60)
+            session.cmd(compile_cmd, timeout=600)
+        else:
+            process.run(decomp_cmd, shell=True, timeout=60)
+            process.run(compile_cmd, shell=True, timeout=600)
+
+        LOG_JOB.info(f"Netperf compilation completed on {address}")
+    finally:
+        if session:
+            session.close()
+    return nserver_path, nperf_path

provider/virtual_network/network_base.py

@@ -433,7 +433,8 @@ def cleanup_for_iface(iface_type, params):
             libvirt_network.create_or_del_network(network_dict, is_del=True)
 
 
-def check_throughput(serv_runner, cli_runner, ip_addr, bw, th_type):
+def check_throughput(serv_runner, cli_runner, ip_addr, bw, th_type,
+                     netserver_cmd='netserver', netperf_cmd='netperf'):
     """
     Check actual thoughput of network using netperf
 
@@ -442,12 +443,15 @@ def check_throughput(serv_runner, cli_runner, ip_addr, bw, th_type):
     :param ip_addr: ip address
     :param bw: bandwidth setting
     :param th_type: inbound or outbound
+    :param netserver_cmd: netserver command with path (default: 'netserver')
+    :param netperf_cmd: netperf command with path (default: 'netperf')
     """
 
-    serv_runner('netserver')
-    netperf_out = cli_runner(f'netperf -H {ip_addr}')
+    serv_runner(netserver_cmd)
+    netperf_out = cli_runner(f'{netperf_cmd} -H {ip_addr}')
     LOG.debug(netperf_out)
-    serv_runner('pkill netserver')
+    netserver_bin = os.path.basename(netserver_cmd.split()[0])
+    serv_runner(f'pkill {netserver_bin}')
 
     actual_throu = float(netperf_out.strip().splitlines()[-1].split()[-1])
     expect_throu = int(bw) * 8 / 1024
@@ -757,7 +761,7 @@ def cancel_if_ovs_bridge(params, test):
     :param params: Test parameters dict
     :param test: Test object
     """
-    bridge_name = params.get('netdst', '').split(',')[0]
+    bridge_name = params.get('netdst', '')
 
     try:
         br_backend = utils_net.find_bridge_manager(bridge_name)
@@ -775,14 +779,14 @@ def setup_ovs_bridge_attrs(params, iface_attrs):
     :param iface_attrs: Interface attributes dictionary to modify
     :return: True if OVS configuration applied, False otherwise
     """
-    bridge_name = params.get('netdst', '').split(',')[0]
-    is_ovs_bridge = not isinstance(utils_net.find_bridge_manager(bridge_name), utils_net.Bridge)
-
-    if is_ovs_bridge:
-        # Configure for OVS bridge
+    netdst = params.get('netdst', '')
+    br_obj = utils_net.find_bridge_manager(netdst)
+    if br_obj is None:
+        raise exceptions.TestError(f"Bridge '{netdst}' does not exist")
+    if "OpenVSwitch" in br_obj.__class__.__name__:
         iface_attrs['type_name'] = 'bridge'
-        iface_attrs['source'] = {'bridge': bridge_name}
+        iface_attrs['source'] = {'bridge': netdst}
         iface_attrs['virtualport'] = {'type': 'openvswitch'}
-        LOG.debug(f"Configured OVS bridge: {bridge_name}")
+        LOG.debug(f"Configured OVS bridge: {netdst}")
         return True
     return False