Perf/Measurement/Results: add metric names to result descriptions

Signed-off-by: Ondrej Lichtner <[email protected]>
LNST-project · Feb 1, 2024 · 581d4ce · 581d4ce
1 parent c426c5e
commit 581d4ce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lnst/RecipeCommon/Perf/Measurements/Results/FlowMeasurementResults.py b/lnst/RecipeCommon/Perf/Measurements/Results/FlowMeasurementResults.py
@@ -141,30 +141,30 @@ def describe(self):
         desc = []
         desc.append(str(self.flow))
         desc.append(
-            "Generator measured throughput: {tput:.2f} +-{deviation:.2f}({percentage:.2f}%) {unit} per second.".format(
+            "Generator measured throughput (generator_results): {tput:.2f} +-{deviation:.2f}({percentage:.2f}%) {unit} per second.".format(
                 tput=generator.average,
                 deviation=generator.std_deviation,
                 percentage=self._deviation_percentage(generator),
                 unit=generator.unit,
             )
         )
         desc.append(
-            "Generator process CPU data: {cpu:.2f} +-{cpu_deviation:.2f} {cpu_unit} per second.".format(
+            "Generator process CPU data (generator_cpu_stats): {cpu:.2f} +-{cpu_deviation:.2f} {cpu_unit} per second.".format(
                 cpu=generator_cpu.average,
                 cpu_deviation=generator_cpu.std_deviation,
                 cpu_unit=generator_cpu.unit,
             )
         )
         desc.append(
-            "Receiver measured throughput: {tput:.2f} +-{deviation:.2f}({percentage:.2f}%) {unit} per second.".format(
+            "Receiver measured throughput (receiver_results): {tput:.2f} +-{deviation:.2f}({percentage:.2f}%) {unit} per second.".format(
                 tput=receiver.average,
                 deviation=receiver.std_deviation,
                 percentage=self._deviation_percentage(receiver),
                 unit=receiver.unit,
             )
         )
         desc.append(
-            "Receiver process CPU data: {cpu:.2f} +-{cpu_deviation:.2f} {cpu_unit} per second.".format(
+            "Receiver process CPU data (receiver_cpu_stats): {cpu:.2f} +-{cpu_deviation:.2f} {cpu_unit} per second.".format(
                 cpu=receiver_cpu.average,
                 cpu_deviation=receiver_cpu.std_deviation,
                 cpu_unit=receiver_cpu.unit,

diff --git a/lnst/RecipeCommon/Perf/Measurements/Results/TcRunMeasurementResults.py b/lnst/RecipeCommon/Perf/Measurements/Results/TcRunMeasurementResults.py
@@ -52,7 +52,7 @@ def description(self):
                f" tc run with {self.rule_install_rate.value} rules" \
                f" num_instances={self.measurement.num_instances}" \
                f" took {self.rule_install_rate.duration} seconds " \
-               f"({self.rule_install_rate.average} rules/sec)"
+               f"(rule_install_rate={self.rule_install_rate.average} rules/sec)"
 
     @property
     def time_taken(self):

diff --git a/lnst/RecipeCommon/Perf/Measurements/Results/XDPBenchMeasurementResults.py b/lnst/RecipeCommon/Perf/Measurements/Results/XDPBenchMeasurementResults.py
@@ -41,12 +41,12 @@ def describe(self) -> str:
         desc = []
         desc.append(str(self.flow))
         desc.append(
-            "Generator generated: {tput:,f} {unit} per second.".format(
+            "Generator generated (generator_results): {tput:,f} {unit} per second.".format(
                 tput=generator.average, unit=generator.unit
             )
         )
         desc.append(
-            "Receiver processed: {tput:,f} {unit} per second.".format(
+            "Receiver processed (receiver_results): {tput:,f} {unit} per second.".format(
                 tput=receiver.average, unit=receiver.unit
             )
         )