ft-orchestration pass cache-size from scenario config to probe

Author: pascal260303

testing/simulation/one_packet_flows.yml

@@ -25,13 +25,15 @@ default:
 # individual tests for general simulation scenario
 sim_general:
   - id: one_packet_precise
+    speed_multiplier: 1.0
     marks: [precise]
     analysis:
       model: "precise"
       use_statistic_counter: true
 
   - id: one_packet_statistical
     marks: []
+    mbps: 748
     analysis:
       model: "statistical"
       use_statistic_counter: true

tools/ft-orchestration/src/config/scenario.py

@@ -45,6 +45,7 @@ class ProbeCfg(YAMLWizard):
     connectors: list[dict] = field(default_factory=list)
     active_timeout: Optional[int] = None
     inactive_timeout: Optional[int] = None
+    cache_size: Optional[int] = None
 
     def get_args(self, probe_type: str) -> dict:
         """Get arguments which can be passed directly to the probe builder.
@@ -68,6 +69,8 @@ def get_args(self, probe_type: str) -> dict:
             ret["active_timeout"] = self.active_timeout
         if self.inactive_timeout:
             ret["inactive_timeout"] = self.inactive_timeout
+        if self.cache_size:
+            ret["cache_size"] = self.cache_size
         for connector in self.connectors:
             if connector.get("type", "") == probe_type:
                 del connector["type"]

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

@@ -118,6 +118,13 @@ def __init__(
         interfaces_names = [ifc.name for ifc in interfaces]
         self._interfaces = interfaces_names
         self._zero_copy = any(ifc.startswith("zc:") for ifc in self._interfaces)
+
+        if "max_hash_size" not in kwargs and cache_size:
+            kwargs["hash_size"] = min(
+                2**cache_size, kwargs.get("hash_size", float("inf"))
+            )
+            kwargs["max_hash_size"] = 2**cache_size
+
         settings: CentoSettings = CentoSettings(
             interfaces=interfaces_names,
             verbose=verbose,

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

@@ -127,9 +127,12 @@ def __init__(
         interfaces_names = [ifc.name for ifc in interfaces]
         self._interfaces = interfaces_names
         self._zero_copy = any(ifc.startswith("zc:") for ifc in self._interfaces)
+
+        if "max_num_flows" not in kwargs and cache_size:
+            kwargs["max_num_flows"] = 2**cache_size
+
         settings: NProbeSettings = NProbeSettings(
             interface=interfaces_names[0],
-            max_num_flows=2**cache_size if cache_size else None,
             **kwargs,
         )
         self._executor = executor

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

@@ -207,9 +207,12 @@ def __init__(
         kwargs["pcap"] = YafSettings.PCAPOptions(**(kwargs.get("pcap", {})))
         kwargs["tls"] = YafSettings.TLSOptions(**(kwargs.get("tls", {})))
         kwargs["log"] = YafSettings.LoggingOptions(**(kwargs.get("log", {})))
+
+        if "maxflows" not in kwargs and cache_size:
+            kwargs["maxflows"] = 2**cache_size
+
         self._settings = YafSettings(
             idle_timeout=inactive_timeout,
-            maxflows=2**cache_size if cache_size else None,
             **kwargs,
         )
         self._executor = executor