ft-orchestration make cache_size overwrite other values

Author: pascal260303

testing/simulation/one_packet_flows.yml

@@ -96,7 +96,7 @@ sim_threshold:
   - id: one_packet_short_timeout
     marks: []
     mbps_accuracy: 100
-    mbps_required: 900
+    mbps_required: 1000
     speed_max: 12500
     probe:
       active_timeout: 10
@@ -120,7 +120,7 @@ sim_threshold:
   - id: one_packet_one_min_timeout
     marks: []
     mbps_accuracy: 100
-    mbps_required: 5000
+    mbps_required: 1000
     speed_max: 12500
     probe:
       active_timeout: 60

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

@@ -119,7 +119,7 @@ def __init__(
         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:
+        if cache_size:
             kwargs["hash_size"] = min(
                 2**cache_size, kwargs.get("hash_size", float("inf"))
             )

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

@@ -128,7 +128,7 @@ def __init__(
         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:
+        if cache_size:
             kwargs["max_num_flows"] = 2**cache_size
 
         settings: NProbeSettings = NProbeSettings(

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

@@ -208,7 +208,7 @@ def __init__(
         kwargs["tls"] = YafSettings.TLSOptions(**(kwargs.get("tls", {})))
         kwargs["log"] = YafSettings.LoggingOptions(**(kwargs.get("log", {})))
 
-        if "maxflows" not in kwargs and cache_size:
+        if cache_size:
             kwargs["maxflows"] = 2**cache_size
 
         self._settings = YafSettings(