ft-orchestration use shutil.move instead of copy

Author: pascal260303

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

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

tools/ft-orchestration/src/generator/ft_replay.py

@@ -610,7 +610,7 @@ def start_profile(
         cache_rsync = Rsync(self._executor, data_dir=path.dirname(self._report))
         try:
             report = cache_rsync.pull_path(self._report, self._work_dir)
-            shutil.copy(report, report_path)
+            shutil.move(report, report_path)
             self._report_pull_failed = False
         except AssertionError:
             self._report_path = report_path
@@ -653,10 +653,10 @@ def download_logs(self, directory: str) -> None:
         Path(directory).mkdir(parents=True, exist_ok=True)
         for file in log_files:
             if Path(file).exists():
-                shutil.copy(file, directory)
+                shutil.move(file, directory)
 
         if self._verbose:
-            shutil.copy(self._config_file, directory)
+            shutil.move(self._config_file, directory)
 
     def stats(self) -> GeneratorStats:
         """Get stats of last generator run.
@@ -684,7 +684,7 @@ def stats(self) -> GeneratorStats:
         if self._report_pull_failed:
             cache_rsync = Rsync(self._executor, data_dir=path.dirname(self._report))
             report = cache_rsync.pull_path(self._report, self._work_dir)
-            shutil.copy(report, self._report_path)
+            shutil.move(report, self._report_path)
 
         return GeneratorStats(pkts, bts, start_time, end_time)
 

tools/ft-orchestration/src/generator/tcpreplay.py

@@ -251,7 +251,7 @@ def start_profile(
 
         self.start(pcap, speed, loop_count)
 
-        shutil.copy(report, report_path)
+        shutil.move(report, report_path)
 
     def stats(self) -> GeneratorStats:
         """Get stats based on process from ``start`` method.
@@ -321,7 +321,7 @@ def download_logs(self, directory: str):
         """
 
         Path(directory).mkdir(parents=True, exist_ok=True)
-        shutil.copy(self._log_file, directory)
+        shutil.move(self._log_file, directory)
 
     @staticmethod
     def _get_speed_arg(speed: ReplaySpeed) -> str:

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

@@ -375,7 +375,7 @@ def download_logs(self, directory: str):
             Path to a local directory where logs should be stored.
         """
         try:
-            shutil.copy(self._log_file, directory)
+            shutil.move(self._log_file, directory)
             self.host_statistics.get_csv(directory)
         except PermissionError as err:
             logging.getLogger().warning("Cannot download ipfixprobe log, %s", err)

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

@@ -524,7 +524,7 @@ def download_logs(self, directory: str):
             Path to a local directory where logs should be stored.
         """
         try:
-            shutil.copy(self._log_file, directory)
+            shutil.move(self._log_file, directory)
             self.host_statistics.get_csv(directory)
         except PermissionError as err:
             logging.getLogger().warning("Cannot download ipfixprobe log, %s", err)

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

@@ -408,7 +408,7 @@ def download_logs(self, directory: str):
         """
         try:
             for log_file in self._log_files:
-                shutil.copy(log_file, directory)
+                shutil.move(log_file, directory)
             self.host_statistics.get_csv(directory)
         except PermissionError as err:
             logging.getLogger().warning("Cannot download ipfixprobe log, %s", err)

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

@@ -441,8 +441,8 @@ def download_logs(self, directory: str):
             Path to a local directory where logs should be stored.
         """
         try:
-            shutil.copy(self._log_file, directory)
-            shutil.copy(self._config_file, directory)
+            shutil.move(self._log_file, directory)
+            shutil.move(self._config_file, directory)
             self.host_statistics.get_csv(directory)
         except PermissionError as err:
             logging.getLogger().warning("Cannot download ipfixprobe log, %s", err)

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

@@ -337,7 +337,7 @@ def run_single_test(loops: int, speed: MbpsSpeed) -> tuple[bool, StatisticalRepo
         # cleanup devices
         finalizer_download_logs()
         if request.config.getoption("archive_test_data") == "always":
-            shutil.copytree(tmp_dir, os.path.join(current_log_dir, "data"))
+            shutil.move(tmp_dir, os.path.join(current_log_dir, "data"))
         cleanup()
         objects_to_cleanup = []
         gc.collect()