ft-orchestration nprobe dont start multiple instances if not using zx and add default values for cento and yaf

Author: pascal260303

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

@@ -89,7 +89,7 @@ class CentoSettings(ABC):
     active_poll: Optional[bool] = False
     tunnel: Optional[bool] = False
     skip_fragments: Optional[bool] = False
-    uniflows: Optional[bool] = False
+    uniflows: bool = True
     send_dont_wait: Optional[bool] = False
     hw_timestamp: Optional[bool] = False
 

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

@@ -238,12 +238,12 @@ def _before_start(self):
         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)
+                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)
 
     def start(self):
         """Start the probe."""

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

@@ -51,7 +51,7 @@ class OutputOptions(ABC):
         groupby: Optional[str] = None
         rotate: Optional[str] = None
         lock: Optional[str] = None
-        udp_temp_timeout: Optional[str] = None
+        udp_temp_timeout: Optional[int] = 600
 
     output: Optional[OutputOptions] = None
 
@@ -74,13 +74,13 @@ class DecodeOptions(ABC):
     @typed_dataclass
     @dataclass
     class ExportOptions(ABC):
-        silk: Optional[bool] = None
-        uniflow: Optional[bool] = None
-        force_ip6: Optional[bool] = None
-        flow_stats: Optional[bool] = None
+        silk: Optional[bool] = False
+        uniflow: bool = True
+        force_ip6: Optional[bool] = False
+        flow_stats: Optional[bool] = False
         delta: bool = True  # Required for packet and byte counter
-        mac: Optional[bool] = None
-        metadata: Optional[bool] = None
+        mac: Optional[bool] = False
+        metadata: Optional[bool] = False
 
     export: Optional[ExportOptions] = None
 
@@ -102,8 +102,8 @@ class ExportOptions(ABC):
     export_payload: Optional[bool] = None
     export_payload_applabels: Optional[str] = None
     udp_payload: Optional[bool] = None
-    stats: Optional[str] = None
-    no_tombstone: Optional[bool] = None
+    stats: int = 0
+    no_tombstone: Optional[bool] = True
     tombstone_configured_id: Optional[int] = None
     ingress: Optional[int] = None
     egress: Optional[int] = None
@@ -268,7 +268,7 @@ def dataclass_to_lua_table(obj, sep: str = "\n") -> str:
             return sep.join(lua)
 
         with open(self._config_file, "w") as f:
-            f.write("-- Generated yaf.conf (Lua format for --config)\n\n")
+            f.write("-- Generated settings.conf (Lua format for --config)\n\n")
             f.write(dataclass_to_lua_table(settings))
             f.write("\n")
 
@@ -277,7 +277,6 @@ def _prepare_cmd(self, config_file: str) -> str:
         args.extend(["-c", config_file])
         if self._verbose:
             args.append("--verbose")
-        args.append(f"--ipfix={self._settings.output.protocol}")
 
         return " ".join(args)