Merge pull request #169 from redhat-partner-solutions/sanity_localhos…

…t_update

Replace localhost with dut or trafficgen IPs, add firmware mount, and pull driver for trafficgen reset

sriov/common/utils.py

@@ -1112,3 +1112,29 @@ def get_nic_model(ssh_obj: ShellHandler, pf: str) -> str:
     cmd = [f"lshw -C network -businfo | grep {pf}"]
     outs, _ = execute_and_assert(ssh_obj, cmd, 0)
     return re.split("\\s{2,}", outs[0][0])[-1].strip()
+
+
+def get_driver_pci(ssh_obj: ShellHandler, pci: str) -> str:
+    """Get the base driver (i40e or ice) by the PCI address
+
+    Args:
+        ssh_obj (ShellHandler): ssh connection obj
+        pci (str): pci address
+
+    Returns:
+        str: The driver this pci address is bound to
+    """
+    drivers = ["i40e", "ice"]
+    modprobe_cmds = []
+    cmds = []
+    for driver in drivers:
+        modprobe_cmds.append(f"modprobe {driver}")
+        cmds.append(f"find /sys/bus/pci/drivers/{driver}/ -name {pci}")
+    outs, _ = execute_and_assert(ssh_obj, modprobe_cmds, 0)
+    outs, _ = execute_and_assert(ssh_obj, cmds, 0)
+    if outs[0]:
+        return drivers[0]
+    elif outs[1]:
+        return drivers[1]
+    else:
+        assert Exception("Driver not in list: ", drivers)

sriov/tests/SR_IOV_Sanity_Performance/test_SR_IOV_Sanity_Performance.py

@@ -127,7 +127,10 @@ def test_SRIOV_Sanity_Performance(dut, trafficgen, settings, testdata):
     testdata.testpmd_id = outs[0][0]
 
     # Check testpmd is running
-    cmd = f"curl localhost:{settings.config['testpmd_port']}/testpmd/status"
+    cmd = (
+        f"curl {settings.config['dut']['host']}:"
+        f"{settings.config['testpmd_port']}/testpmd/status"
+    )
     assert execute_until_timeout(dut, cmd)
 
     # Start trafficgen
@@ -139,6 +142,7 @@ def test_SRIOV_Sanity_Performance(dut, trafficgen, settings, testdata):
         f"{settings.config['container_manager']} run -d --rm --privileged "
         f"-p {settings.config['trafficgen_port']}:{settings.config['trafficgen_port']} "
         "-v /dev:/dev -v /sys:/sys -v /lib/modules:/lib/modules "
+        "-v /lib/firmware:/lib/firmware "
         f"--cpuset-cpus {trafficgen_cpus_string} "
         f"-e pci_list={trafficgen_pfs_pci[0]},{trafficgen_pfs_pci[1]} "
         f"{settings.config['trafficgen_img']}"
@@ -147,16 +151,18 @@ def test_SRIOV_Sanity_Performance(dut, trafficgen, settings, testdata):
     testdata.trafficgen_id = outs[0][0]
 
     client_cmd = (
-        f"{settings.config['container_manager']} run --rm --privileged --net=host "
-        f"{settings.config['trafficgen_img']} client status --server-addr localhost "
+        f"{settings.config['container_manager']} run --rm --privileged "
+        f"{settings.config['trafficgen_img']} client status "
+        f"--server-addr {settings.config['trafficgen']['host']} "
         f"--server-port {settings.config['trafficgen_port']}"
     )
-    assert execute_until_timeout(trafficgen, client_cmd)
+    assert execute_until_timeout(trafficgen, client_cmd, 60)
 
     # Warmup
     client_cmd = [
-        f"{settings.config['container_manager']} run --rm --privileged --net=host "
-        f"{settings.config['trafficgen_img']} client start --server-addr localhost "
+        f"{settings.config['container_manager']} run --rm --privileged "
+        f"{settings.config['trafficgen_img']} client start "
+        f"--server-addr {settings.config['trafficgen']['host']} "
         f"--server-port {settings.config['trafficgen_port']} --timeout 60"
     ]
     execute_and_assert(
@@ -166,8 +172,9 @@ def test_SRIOV_Sanity_Performance(dut, trafficgen, settings, testdata):
         cmd_timeout=70,
     )
     client_cmd = [
-        f"{settings.config['container_manager']} run --rm --privileged --net=host "
-        f"{settings.config['trafficgen_img']} client stop --server-addr localhost "
+        f"{settings.config['container_manager']} run --rm --privileged "
+        f"{settings.config['trafficgen_img']} client stop "
+        f"--server-addr {settings.config['trafficgen']['host']} "
         f"--server-port {settings.config['trafficgen_port']}"
     ]
     outs, errs = execute_and_assert(
@@ -178,8 +185,9 @@ def test_SRIOV_Sanity_Performance(dut, trafficgen, settings, testdata):
 
     # Actual test
     client_cmd = [
-        f"{settings.config['container_manager']} run --rm --privileged --net=host "
-        f"{settings.config['trafficgen_img']} client auto --server-addr localhost "
+        f"{settings.config['container_manager']} run --rm --privileged "
+        f"{settings.config['trafficgen_img']} client auto "
+        f"--server-addr {settings.config['trafficgen']['host']} "
         f"--server-port {settings.config['trafficgen_port']}"
     ]
     outs, errs = execute_and_assert(

sriov/tests/conftest.py

@@ -17,6 +17,7 @@
     destroy_vfs,
     bind_driver,
     execute_and_assert,
+    get_driver_pci,
 )
 
 
@@ -54,15 +55,27 @@ def settings(dut, trafficgen) -> Config:
     settings = get_settings_obj()
     pf1_name = settings.config["dut"]["interface"]["pf1"]["name"]
     settings.config["dut"]["interface"]["pf1"]["pci"] = get_pci_address(dut, pf1_name)
+    settings.config["dut"]["interface"]["pf1"]["driver"] = get_driver_pci(
+        dut, settings.config["dut"]["interface"]["pf1"]["pci"]
+    )
     settings.config["dut"]["interface"]["pf2"]["pci"] = get_pci_address(
         dut, settings.config["dut"]["interface"]["pf2"]["name"]
     )
+    settings.config["dut"]["interface"]["pf2"]["driver"] = get_driver_pci(
+        dut, settings.config["dut"]["interface"]["pf2"]["pci"]
+    )
     settings.config["trafficgen"]["interface"]["pf1"]["pci"] = get_pci_address(
         trafficgen, settings.config["trafficgen"]["interface"]["pf1"]["name"]
     )
+    settings.config["trafficgen"]["interface"]["pf1"]["driver"] = get_driver_pci(
+        trafficgen, settings.config["trafficgen"]["interface"]["pf1"]["pci"]
+    )
     settings.config["trafficgen"]["interface"]["pf2"]["pci"] = get_pci_address(
         trafficgen, settings.config["trafficgen"]["interface"]["pf2"]["name"]
     )
+    settings.config["trafficgen"]["interface"]["pf2"]["driver"] = get_driver_pci(
+        trafficgen, settings.config["trafficgen"]["interface"]["pf2"]["pci"]
+    )
     create_vfs(dut, pf1_name, 1)
     vf1_name = settings.config["dut"]["interface"]["vf1"]["name"]
     settings.config["dut"]["interface"]["vf1"]["pci"] = get_pci_address(dut, vf1_name)
@@ -161,17 +174,17 @@ def _cleanup(
         ]
         execute_and_assert(trafficgen, kill_trafficgen, 0)
 
-    trafficgen_pfs_pci = []
+    trafficgen_pfs_pci = {}
     if "pf1" in settings.config["trafficgen"]["interface"]:
-        trafficgen_pfs_pci.append(
+        trafficgen_pfs_pci[
             settings.config["trafficgen"]["interface"]["pf1"]["pci"]
-        )
+        ] = settings.config["trafficgen"]["interface"]["pf1"]["driver"]
     if "pf2" in settings.config["trafficgen"]["interface"]:
-        trafficgen_pfs_pci.append(
+        trafficgen_pfs_pci[
             settings.config["trafficgen"]["interface"]["pf2"]["pci"]
-        )
+        ] = settings.config["trafficgen"]["interface"]["pf2"]["driver"]
     for pf in trafficgen_pfs_pci:
-        assert bind_driver(trafficgen, pf, "i40e")
+        assert bind_driver(trafficgen, pf, trafficgen_pfs_pci[pf])
 
     reset_command(dut, testdata)