testing one_packet_flows add more threshold tests

Author: pascal260303

testing/simulation/one_packet_flows.yml

@@ -4,14 +4,14 @@ description: One Packet per flow
 marks: [small_mtu, one_packet]
 requirements:
   speed: 100
-profile: /home/student/2025-bsc-kuppler-flowmeter/one_packet_flows_2.csv
+profile: /home/student/2025-bsc-kuppler-flowmeter/one_packet_flows.csv
 mtu: 2048
 sampling: 1
 
 # default configuration describing the setup during profile collection
 default:
-  pps: 86291
-  mbps: 790
+  pps: 81814
+  mbps: 760
   generator: []
     #ipv4:
     #  fragmentation_probability: 0.05%
@@ -26,14 +26,12 @@ default:
 sim_general:
   - id: one_packet_precise
     marks: [precise]
-    speed_multiplier: 1.0
     analysis:
       model: "precise"
       use_statistic_counter: true
 
   - id: one_packet_statistical
     marks: []
-    speed_multiplier: 1.0
     analysis:
       model: "statistical"
       use_statistic_counter: true
@@ -50,6 +48,7 @@ sim_general:
           diff: 1
         - key: DURATION
           diff: 1
+
   - id: one_packet_speedup_400G
     marks: [speedup]
     mbps: 400000
@@ -69,14 +68,34 @@ sim_general:
         - key: MB / S
           diff: 0.5
         - key: DURATION
-          diff: 0.5
+          diff: 0.5  
 
 sim_threshold:
   - id: one_packet_throughput
     marks: []
-    mbps_accuracy: 50
+    mbps_accuracy: 100
+    mbps_required: 50000
+    analysis:
+      use_statistic_counter: true
+      metrics:
+        - key: PACKETS
+          diff: 0.001
+        - key: BYTES
+          diff: 0.001
+        - key: FLOWS
+          diff: 0.001
+        - key: PACKETS / S
+          diff: 0.5
+        - key: MB / S
+          diff: 0.5
+        - key: DURATION
+          diff: 0.5
+  - id: one_packet_limit_cache_size
+    marks: []
+    mbps_accuracy: 100
     mbps_required: 50000
-    loops: 10
+    probe:
+      cache_size: 14 # exponent to the power of 2
     analysis:
       use_statistic_counter: true
       metrics:
@@ -91,4 +110,50 @@ sim_threshold:
         - key: MB / S
           diff: 0.5
         - key: DURATION
-          diff: 0.5
+          diff: 0.5
+    
+  - id: one_packet_short_timeout
+    marks: []
+    mbps_accuracy: 100
+    mbps_required: 50000
+    probe:
+      active_timeout: 10
+      inactive_timeout: 10
+    analysis:
+      use_statistic_counter: true
+      metrics:
+        - key: PACKETS
+          diff: 0.001
+        - key: BYTES
+          diff: 0.001
+        - key: FLOWS
+          diff: 0.001
+        - key: PACKETS / S
+          diff: 0.5
+        - key: MB / S
+          diff: 0.5
+        - key: DURATION
+          diff: 0.5
+
+  - id: one_packet_one_min_timeout
+    marks: []
+    mbps_accuracy: 100
+    mbps_required: 50000
+    probe:
+      active_timeout: 60
+      inactive_timeout: 60
+    analysis:
+      use_statistic_counter: true
+      metrics:
+        - key: PACKETS
+          diff: 0.001
+        - key: BYTES
+          diff: 0.001
+        - key: FLOWS
+          diff: 0.001
+        - key: PACKETS / S
+          diff: 0.5
+        - key: MB / S
+          diff: 0.5
+        - key: DURATION
+          diff: 0.5

tools/ft-orchestration/src/collector/ipfixcol2.py

@@ -9,7 +9,6 @@
 """
 
 import logging
-import os
 import shutil
 import tempfile
 import xml.etree.ElementTree as ET
@@ -308,7 +307,6 @@ def download_logs(self, directory: str):
                 self._rsync.pull_path(log_file, directory)
             except RsyncException as err:
                 logging.getLogger().warning("%s", err)
-        shutil.move(os.path.join(self._log_dir, "flows.csv"), directory)
         shutil.move(self._log_file, directory)
 
     def cleanup(self):