ft-orchestration make loop offsets for ft-replay optional

Author: pascal260303

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

@@ -114,6 +114,7 @@ class SimConfig(YAMLWizard):
     probe: Optional[ProbeCfg] = None
     generator: Optional[FtGeneratorConfig] = None
     prefilter_ranges: Optional[list[str]] = None
+    apply_loop_offsets: Optional[bool] = True
 
     def get_probe_conf(self, probe_type: str, default: ProbeCfg) -> dict:
         """Get probe configuration for a specific probe type (merged with the default configuration).

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

@@ -165,6 +165,7 @@ def setup_replicator(
     prefilter_conf: list[str],
     loop_cnt: int,
     unit_cnt: int,
+    apply_loop_offset: bool,
 ) -> tuple[FlowReplicator, list[str]]:
     """
     Setup replicator units and loops so that there is enough bits in an IP prefix
@@ -215,9 +216,9 @@ def setup_replicator(
         )
         for subnet in prefilter_conf:
             extended_prefilter_conf.add(ip_network_add_offset(subnet, offset))
-
-    loop_offset = unit_cnt * 2 ** (32 - prefix)
-    generator.set_loop_modifiers(srcip_offset=loop_offset, dstip_offset=loop_offset)
+    if apply_loop_offset:
+        loop_offset = unit_cnt * 2 ** (32 - prefix)
+        generator.set_loop_modifiers(srcip_offset=loop_offset, dstip_offset=loop_offset)
     extended_prefilter_conf = {
         ip_network_add_offset(subnet, loop_n * loop_offset)
         for subnet in extended_prefilter_conf
@@ -336,6 +337,7 @@ def finalizer_download_logs():
         scenario.test.get_prefilter_conf(scenario.default),
         scenario.test.loops,
         scenario.test.get_replicator_units(scenario.sampling),
+        scenario.test.apply_loop_offsets,
     )
     if len(prefilter_conf) > 0:
         probe_instance.set_prefilter(prefilter_conf)

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

@@ -100,7 +100,11 @@ def create_evaluation_segments(
 
 
 def setup_replicator(
-    generator: Replicator, conf: FtGeneratorConfig, multiplier: float, unit_cnt: int
+    generator: Replicator,
+    conf: FtGeneratorConfig,
+    multiplier: float,
+    unit_cnt: int,
+    apply_loop_offsets: bool,
 ) -> tuple[FlowReplicator, list[SMSubnetSegment]]:
     """
     Setup replicator units and loops so that there is enough bits in an IP prefix
@@ -157,10 +161,11 @@ def setup_replicator(
         )
 
     # loop offset
-    generator.set_loop_modifiers(
-        srcip_offset=loop_units * 2 ** (32 - prefix),
-        dstip_offset=loop_units * 2 ** (32 - prefix),
-    )
+    if apply_loop_offsets:
+        generator.set_loop_modifiers(
+            srcip_offset=loop_units * 2 ** (32 - prefix),
+            dstip_offset=loop_units * 2 ** (32 - prefix),
+        )
     segments = create_evaluation_segments(
         conf.ipv4.ip_range, conf.ipv6.ip_range, prefix, unit_cnt, loop_units
     )
@@ -277,6 +282,7 @@ def finalizer_download_logs():
         generator_conf,
         scenario.test.multiplier,
         int(1 / scenario.sampling),
+        scenario.test.apply_loop_offsets,
     )
     speed = (
         scenario.test.speed_multiplier

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

@@ -98,7 +98,11 @@ def validate(
 
 
 def setup_replicator(
-    generator: Replicator, conf: FtGeneratorConfig, loop_cnt: int, unit_cnt: int
+    generator: Replicator,
+    conf: FtGeneratorConfig,
+    loop_cnt: int,
+    unit_cnt: int,
+    apply_loop_offsets: bool,
 ) -> FlowReplicator:
     """
     Setup replicator units and loops so that there is enough bits in an IP prefix
@@ -141,10 +145,11 @@ def setup_replicator(
             dstip=Replicator.AddConstant(unit_n * 2 ** (32 - prefix)),
         )
 
-    generator.set_loop_modifiers(
-        srcip_offset=unit_cnt * 2 ** (32 - prefix),
-        dstip_offset=unit_cnt * 2 ** (32 - prefix),
-    )
+    if apply_loop_offsets:
+        generator.set_loop_modifiers(
+            srcip_offset=unit_cnt * 2 ** (32 - prefix),
+            dstip_offset=unit_cnt * 2 ** (32 - prefix),
+        )
     logging.getLogger().info(
         "Generator - ipv4 range: %s, ipv6 range: %s",
         conf.ipv4.ip_range,
@@ -245,7 +250,11 @@ def run_single_test(
         probe_instance.start()
 
         flow_replicator = setup_replicator(
-            generator_instance, generator_conf, loops, replicator_units
+            generator_instance,
+            generator_conf,
+            loops,
+            replicator_units,
+            scenario.test.apply_loop_offsets,
         )
         generator_instance.start_profile(
             profile_path,