ft-orchestration fix ipfixcol2 log download when test failed

Author: pascal260303

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

@@ -302,6 +302,14 @@ def download_logs(self, directory: str):
         directory : str
             Path to a local directory where logs should be stored.
         """
+        retries = 3
+        while self._executor.is_running() and retries > 0:
+            try:
+                self.stop()
+            except Exception:
+                self._executor.wait_or_kill()
+            retries -= 1
+
         if self._executor.is_running():
             self._executor.terminate()
 

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

@@ -12,6 +12,7 @@
 import gc
 import ipaddress
 import logging
+import math
 import os
 import shutil
 import sys
@@ -201,8 +202,11 @@ def test_simulation_threshold(
 
     def cleanup():
         for obj in objects_to_cleanup:
-            obj.stop()
-            obj.cleanup()
+            try:
+                obj.stop()
+                obj.cleanup()
+            except Exception as e:
+                logging.error(e)
 
     objects_for_final_cleanup = []
 
@@ -329,9 +333,10 @@ def run_single_test(loops: int, speed: MbpsSpeed) -> tuple[bool, StatisticalRepo
         try:
             # run test
             result, report = run_single_test(
-                max(1, int(speed_current / scenario.default.mbps)),
+                max(1, int(math.ceil(speed_current / scenario.default.mbps))),
                 MbpsSpeed(speed_current),
             )
+            report.print_results()
         except Exception as e:
             result = False
             report = None
@@ -354,10 +359,13 @@ def run_single_test(loops: int, speed: MbpsSpeed) -> tuple[bool, StatisticalRepo
                 - speed_current % scenario.test.mbps_accuracy
             )
 
-        # cleanup devices
-        finalizer_download_logs()
-        if request.config.getoption("archive_test_data") == "always":
-            shutil.move(tmp_dir, os.path.join(current_log_dir, "data"))
+        try:
+            # cleanup devices
+            finalizer_download_logs()
+            if request.config.getoption("archive_test_data") == "always":
+                shutil.move(tmp_dir, os.path.join(current_log_dir, "data"))
+        except Exception as e:
+            logging.error(e)
         cleanup()
         objects_to_cleanup = []
         gc.collect()