ft-orchestration pass requried variables for batch-means method in ft-analyzer

Author: pascal260303

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

@@ -109,6 +109,8 @@ class SimConfig(YAMLWizard):
     pps: Optional[int] = None
     mbps: Optional[int] = None
     speed_multiplier: Optional[float] = None
+    start_phase_duration: Optional[int] = 10
+    end_phase_duration: Optional[int] = 10
     probe: Optional[ProbeCfg] = None
     generator: Optional[FtGeneratorConfig] = None
     prefilter_ranges: Optional[list[str]] = None

tools/ft-orchestration/tests/simulation/test_simulation_general.py

@@ -63,6 +63,10 @@ def validate(
     biflows: bool,
     log_dir: os.PathLike,
     host_stats_file: os.PathLike,
+    loops: int,
+    start_phase_duration: int,
+    end_phase_duration: int,
+    speed_multiplier: float,
 ) -> tuple[StatisticalReport, Optional[PreciseReport]]:
     """Perform statistical and/or precise model evaluation of the test scenario.
 
@@ -92,15 +96,19 @@ def validate(
 
     if analysis.model == "precise":
         model = PreciseModel(
-            flows_file,
-            ref_file,
             active_timeout,
-            inactive_timeout,
-            stats,
-            log_dir,
+            flows=flows_file,
+            reference=ref_file,
+            inactive_timeout=inactive_timeout,
+            stats=stats,
+            log_dir=log_dir,
             biflows_ts_correction=biflows,
             use_statistical_counter=analysis.use_statistic_counter,
             host_stats=host_stats_file,
+            loops=loops,
+            start_phase_duration=start_phase_duration,
+            end_phase_duration=end_phase_duration,
+            speed_multiplier=speed_multiplier,
         )
         if len(prefilter_conf) > 0:
             precise_report = model.validate_precise(
@@ -128,6 +136,10 @@ def validate(
             use_statistical_counter=analysis.use_statistic_counter,
             host_stats=host_stats_file,
             inactive_timeout=inactive_timeout,
+            loops=loops,
+            start_phase_duration=start_phase_duration,
+            end_phase_duration=end_phase_duration,
+            speed_multiplier=speed_multiplier,
         )
         precise_report = None
         metrics = analysis.metrics
@@ -375,7 +387,7 @@ def finalizer_download_logs():
 
         flows_file_future.result()
         flows_file = StatisticalModel.prepare_flows_file(flows_file, stats)
-        replicated_ref = replicated_ref_future.result()
+        replicated_ref, speed_multiplier = replicated_ref_future.result()
 
     stats_report, precise_report = validate(
         analysis=scenario.test.analysis,
@@ -388,6 +400,10 @@ def finalizer_download_logs():
         log_dir=log_dir,
         host_stats_file=probe_instance.host_statistics.local_file,
         inactive_timeout=inactive_t,
+        loops=scenario.test.loops,
+        start_phase_duration=scenario.default.start_phase_duration,
+        end_phase_duration=scenario.default.end_phase_duration,
+        speed_multiplier=speed_multiplier,
     )
 
     print("")

tools/ft-orchestration/tests/simulation/test_simulation_overload.py

@@ -323,7 +323,7 @@ def finalizer_download_logs():
 
         flows_file_future.result()
         flows_file = StatisticalModel.prepare_flows_file(flows_file, stats)
-        replicated_ref = replicated_ref_future.result()
+        replicated_ref, speed_multiplier = replicated_ref_future.result()
 
     model = StatisticalModel(
         flows_file,
@@ -333,6 +333,10 @@ def finalizer_download_logs():
         use_statistical_counter=scenario.test.analysis.use_statistic_counter,
         host_stats=probe_instance.host_statistics.local_file,
         inactive_timeout=inactive_t,
+        loops=scenario.test.loops,
+        start_phase_duration=scenario.default.start_phase_duration,
+        end_phase_duration=scenario.default.end_phase_duration,
+        speed_multiplier=speed_multiplier,
     )
     report = model.validate(
         [SMRule(scenario.test.analysis.metrics, segment) for segment in segments]

tools/ft-orchestration/tests/simulation/test_simulation_threshold.py

@@ -53,6 +53,10 @@ def validate(
     log_dir: os.PathLike,
     host_stats_file: os.PathLike,
     inactive_timeout: int,
+    loops: int,
+    start_phase_duration: int,
+    end_phase_duration: int,
+    speed_mutliplier: float,
 ) -> tuple[bool, StatisticalReport]:
     """Perform statistical and/or precise model evaluation of the test scenario.
 
@@ -82,6 +86,10 @@ def validate(
         use_statistical_counter=analysis.use_statistic_counter,
         host_stats=host_stats_file,
         inactive_timeout=inactive_timeout,
+        loops=loops,
+        start_phase_duration=start_phase_duration,
+        end_phase_duration=end_phase_duration,
+        speed_multiplier=speed_mutliplier,
     )
     stats_report = model.validate([SMRule(analysis.metrics)])
     print("")
@@ -275,7 +283,7 @@ def run_single_test(
 
             flows_file_future.result()
             flows_file = StatisticalModel.prepare_flows_file(flows_file, stats)
-            replicated_ref = replicated_ref_future.result()
+            replicated_ref, speed_multiplier = replicated_ref_future.result()
 
         flow_replicator = None
         gc.collect()
@@ -288,6 +296,10 @@ def run_single_test(
             log_dir=current_log_dir,
             host_stats_file=probe_instance.host_statistics.local_file,
             inactive_timeout=inactive_t,
+            loops=scenario.test.loops,
+            start_phase_duration=scenario.default.start_phase_duration,
+            end_phase_duration=scenario.default.end_phase_duration,
+            speed_mutliplier=speed_multiplier,
         )
 
         return ret, report