ft-orchestration enable rss-queues setting for more input types for cento, nprobe and yaf

Author: pascal260303

tools/ft-orchestration/src/probe/cento.py

@@ -202,20 +202,13 @@ def _switch_to_zc(self, interface_name: str):
             return
 
         driver = driver.split(" ")[1].strip()
-        if driver.endswith("_zc"):
-            driver = driver[:-3]
+        if not driver.endswith("_zc"):
             Tool(
                 f"pf_ringcfg --configure-driver {driver} --rss-queues 0",
                 executor=self._executor,
                 sudo=self._sudo,
             ).run()
             time.sleep(5)
-        Tool(
-            f"pf_ringcfg --configure-driver {driver} --rss-queues {self._settings.rss_queues}",
-            executor=self._executor,
-            sudo=self._sudo,
-        ).run()
-        time.sleep(5)
 
     def _switch_back_zc(self, interface_name: str):
         driver, _ = Tool(
@@ -234,11 +227,19 @@ def _switch_back_zc(self, interface_name: str):
             sudo=self._sudo,
         ).run()
 
+    def _set_rss_queues(self, interface_name):
+        Tool(
+            f"ethtool --set-channels {interface_name} combined {self._settings.rss_queues}",
+            executor=self._executor,
+            sudo=self._sudo,
+        ).run()
+
     def _before_start(self):
         interface_names = {name.split("@")[0] for name in self._interfaces}
         for ifc in interface_names:
             if ifc.startswith("zc:"):
                 self._switch_to_zc(ifc.split(":", 1)[-1])
+            self._set_rss_queues(ifc.split(":", 1)[-1])
 
     def start(self):
         """Start the probe."""

tools/ft-orchestration/src/probe/nprobe.py

@@ -237,17 +237,19 @@ def _switch_back_zc(self, interface_name: str):
             sudo=self._sudo,
         ).run()
 
+    def _set_rss_queues(self, interface_name):
+        Tool(
+            f"ethtool --set-channels {interface_name} combined {self._settings.rss_queues}",
+            executor=self._executor,
+            sudo=self._sudo,
+        ).run()
+
     def _before_start(self):
         interface_names = {name.split("@")[0] for name in self._interfaces}
         for ifc in interface_names:
             if ifc.startswith("zc:"):
                 self._switch_to_zc(ifc.split(":", 1)[-1])
-                queues, _ = Tool(
-                    f"ethtool -n {ifc.split(':', 1)[-1]} | head -n1 | cut -c1",
-                    executor=self._executor,
-                    sudo=self._sudo,
-                ).run()
-                self._settings.rss_queues = int(queues)
+            self._set_rss_queues(ifc.split(":", 1)[-1])
 
     def start(self):
         """Start the probe."""

tools/ft-orchestration/src/probe/yaf.py

@@ -469,7 +469,7 @@ def set_prefilter(self, ip_ranges: list[str]) -> None:
         raise NotImplementedError
 
 
-class YafZC(Yaf):
+class YafPfring(Yaf):
     def __init__(
         self,
         executor: Executor,
@@ -521,10 +521,18 @@ def _duplicate_executor(self, executor: Executor, num: int = 1) -> List[Executor
 
         return executors
 
+    def _set_rss_queues(self, interface_name):
+        Tool(
+            f"ethtool --set-channels {interface_name} combined {self._rss_queues}",
+            executor=self._executor,
+            sudo=self._sudo,
+        ).run()
+
     def _before_start(self):
         for ifc in self._interfaces:
             if ifc.startswith("zc:"):
                 self._switch_to_zc(ifc.split(":", 1)[-1])
+            self._set_rss_queues(ifc.split(":", 1)[-1])
 
     def start(self):
         """Start the probe."""
@@ -590,11 +598,6 @@ def _switch_to_zc(self, interface_name: str):
                 sudo=self._sudo,
             ).run()
             time.sleep(5)
-        Tool(
-            f"ethtool --set-channels {interface_name} combined {self._rss_queues}",
-            executor=self._executor,
-            sudo=self._sudo,
-        ).run()
 
     def _switch_back_zc(self, interface_name: str):
         driver = self._get_driver(interface_name)