ft-orchestration MergedStats class to use mpstat, vmstat und pidstat at the same time

Author: pascal260303

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

@@ -19,7 +19,7 @@
     Daemon,
     ExecutableProcessError,
 )
-from src.probe.mpstat import MpStat
+from src.stats.merged import MergedStats
 from src.probe.probe_target import ProbeTarget
 
 SETTINGS_TO_ARGS: dict[str, str] = {
@@ -141,7 +141,7 @@ def __init__(
         if self._zero_copy:
             assert_tool_is_installed("pf_ringcfg", executor)
         self._cmd = self._prepare_cmd(target, protocols, settings)
-        self.host_statistics = MpStat(stats_executor, self._cmd.split(" ", 1)[0])
+        self.host_statistics = MergedStats(stats_executor, self._cmd.split(" ", 1)[0])
 
         self._local_workdir = tempfile.mkdtemp()
         self._log_file = Path(self._local_workdir, "cento.log")

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

@@ -25,7 +25,7 @@
 )
 from lbr_testsuite.executable.rsync import RsyncException
 from src.probe.interface import ProbeException, ProbeInterface
-from src.probe.mpstat import MpStat
+from src.stats.merged import MergedStats
 
 FLOWMONEXP_BIN = "/usr/bin/flowmonexp5"
 FLOWMONEXP_LOG = Path("/data/components/flowmonexp/log")
@@ -193,7 +193,9 @@ def __init__(
         else:
             stats_executor = LocalExecutor()
 
-        self.host_statistics = MpStat(stats_executor, os.path.basename(FLOWMONEXP_BIN))
+        self.host_statistics = MergedStats(
+            stats_executor, os.path.basename(FLOWMONEXP_BIN)
+        )
 
         dpdk_is_active = Tool(
             "systemctl -q is-active dpdk-controller.service",

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

@@ -9,80 +9,7 @@
 """
 
 from abc import ABC, abstractmethod
-from os import PathLike
-from lbr_testsuite.executable import Executor
-
-
-class HostStats(ABC):
-    """
-    Abstract class defining an interface for a program that reads statistics from a host.
-    """
-
-    @abstractmethod
-    def __init__(self, executor: Executor, watch_cmd: str):
-        """
-        Constructor.
-
-        Args:
-            executor (Executor): Executor object.
-            watch_cmd (str): Program name to watch statistics for.
-        """
-        pass
-
-    @property
-    @abstractmethod
-    def cpus(self) -> int:
-        """
-        Number of CPUs.
-        """
-        pass
-
-    @property
-    @abstractmethod
-    def total_ram(self) -> int:
-        """
-        Size of RAM in kB.
-        """
-        pass
-
-    @property
-    @abstractmethod
-    def local_file(self) -> PathLike:
-        """
-        Path to locally stored CSV file.
-        """
-        pass
-
-    @abstractmethod
-    def start(self):
-        """
-        Start collecting statistics.
-        """
-        pass
-
-    @abstractmethod
-    def stop(self):
-        """
-        Stop collecting statistics.
-        """
-        pass
-
-    @abstractmethod
-    def cleanup(self):
-        """
-        Remove temporary files.
-        """
-        pass
-
-    @abstractmethod
-    def get_csv(self, output_dir: PathLike):
-        """
-        Download the CSV file containing statistics to the output directory.
-
-        Args:
-            output_dir (PathLike): Path where to copy CSV to.
-        """
-        pass
+from src.stats.interface import HostStats
 
 
 class ProbeException(Exception):

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

@@ -28,7 +28,7 @@
 from src.common.utils import duplicate_executor
 from src.config.common import InterfaceCfg
 from src.probe.interface import ProbeException, ProbeInterface
-from src.probe.mpstat import MpStat
+from src.stats.merged import MergedStats
 from src.probe.probe_target import ProbeTarget
 from lbr_testsuite.executable import ExecutableProcessError
 
@@ -392,7 +392,7 @@ def __init__(
 
         assert_tool_is_installed("ipfixprobe", executor)
         self._cmd = self._prepare_cmd(target, protocols, settings)
-        self.host_statistics = MpStat(stats_executor, self._cmd.split(" ", 1)[0])
+        self.host_statistics = MergedStats(stats_executor, self._cmd.split(" ", 1)[0])
 
         self._local_workdir = tempfile.mkdtemp()
         self._log_file = Path(self._local_workdir, "ipfixprobe.log")

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

@@ -22,7 +22,7 @@
     Daemon,
     ExecutableProcessError,
 )
-from src.probe.mpstat import MpStat
+from src.stats.merged import MergedStats
 from src.probe.probe_target import ProbeTarget
 
 SETTINGS_TO_ARGS: dict[str, str] = {
@@ -150,7 +150,7 @@ def __init__(
         if self._zero_copy:
             assert_tool_is_installed("pf_ringcfg", executor)
         self._cmd = self._prepare_cmd(target, protocols, settings)
-        self.host_statistics = MpStat(stats_executor, self._cmd.split(" ", 1)[0])
+        self.host_statistics = MergedStats(stats_executor, self._cmd.split(" ", 1)[0])
 
         self._local_workdir = tempfile.mkdtemp()
         self._log_files = []

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

@@ -20,7 +20,7 @@
 from src.common.utils import duplicate_executor
 from src.config.common import InterfaceCfg
 from src.probe.interface import ProbeException, ProbeInterface
-from src.probe.mpstat import MpStat
+from src.stats.merged import MergedStats
 from src.probe.probe_target import ProbeTarget
 
 
@@ -150,7 +150,7 @@ def __init__(
         self._log_file = path.join(self._local_workdir, f"{self._binary}.log")
         self._config_file = path.join(self._local_workdir, "settings.conf")
         self._cmd = None
-        self.host_statistics = MpStat(stats_executor, self._binary)
+        self.host_statistics = MergedStats(stats_executor, self._binary)
         self._rsync = Rsync(executor)
         self._rss_queues_pcap = rss_queues
 

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

@@ -19,7 +19,7 @@
 from src.common.utils import duplicate_executor
 from src.config.common import InterfaceCfg
 from src.probe.interface import ProbeException, ProbeInterface
-from src.probe.mpstat import MpStat
+from src.stats.merged import MergedStats
 from src.probe.probe_target import ProbeTarget
 
 
@@ -234,7 +234,7 @@ def __init__(
         self._log_file = path.join(self._local_workdir, "yaf.log")
         self._config_file = path.join(self._local_workdir, "settings.conf")
         self._cmd = None
-        self.host_statistics = MpStat(stats_executor, "yaf")
+        self.host_statistics = MergedStats(stats_executor, "yaf")
         self._rsync = Rsync(executor)
         self._rss_queues_pcap = rss_queues
 

tools/ft-orchestration/src/stats/__init__.py

@@ -0,0 +1,75 @@
+from abc import ABC, abstractmethod
+from os import PathLike
+from lbr_testsuite.executable import Executor
+
+
+class HostStats(ABC):
+    """
+    Abstract class defining an interface for a program that reads statistics from a host.
+    """
+
+    @abstractmethod
+    def __init__(self, executor: Executor, watch_cmd: str):
+        """
+        Constructor.
+
+        Args:
+            executor (Executor): Executor object.
+            watch_cmd (str): Program name to watch statistics for.
+        """
+        pass
+
+    @property
+    @abstractmethod
+    def cpus(self) -> int:
+        """
+        Number of CPUs.
+        """
+        pass
+
+    @property
+    @abstractmethod
+    def total_ram(self) -> int:
+        """
+        Size of RAM in kB.
+        """
+        pass
+
+    @property
+    @abstractmethod
+    def local_file(self) -> PathLike:
+        """
+        Path to locally stored CSV file.
+        """
+        pass
+
+    @abstractmethod
+    def start(self):
+        """
+        Start collecting statistics.
+        """
+        pass
+
+    @abstractmethod
+    def stop(self):
+        """
+        Stop collecting statistics.
+        """
+        pass
+
+    @abstractmethod
+    def cleanup(self):
+        """
+        Remove temporary files.
+        """
+        pass
+
+    @abstractmethod
+    def get_csv(self, output_dir: PathLike):
+        """
+        Download the CSV file containing statistics to the output directory.
+
+        Args:
+            output_dir (PathLike): Path where to copy CSV to.
+        """
+        pass