test: refactor baseline loading into a common function

Besides the refactor there is one behavior change. The function can
return an empty baseline if there isn't an existing instance/CPU, where
the previous implementations raised an exception.

Signed-off-by: Pablo Barbáchano <[email protected]>

Author: pb8o

tests/framework/stats/baseline.py

@@ -3,7 +3,9 @@
 """Module for common statistic tests baselines providers."""
 
 from abc import ABC, abstractmethod
+from collections import defaultdict
 
+from framework.properties import global_props
 from framework.utils import DictQuery
 
 
@@ -21,3 +23,15 @@ def get(self, ms_name: str, st_name: str) -> dict:
 
         ...combination.
         """
+
+    def read_baseline(self, data: dict):
+        """
+        Read baseline data from a dictionary
+        """
+        baselines = defaultdict(dict)
+        for instance, cpus in data["hosts"]["instances"].items():
+            for cpu in cpus["cpus"]:
+                cpu_model = cpu["model"]
+                for baseline, val in cpu["baselines"].items():
+                    baselines[instance, cpu_model][baseline] = val
+        return baselines.get((global_props.instance, global_props.cpu_model))

tests/integration_tests/performance/test_block_performance.py

@@ -21,7 +21,6 @@
     get_kernel_version,
     run_cmd,
 )
-from framework.utils_cpuid import get_cpu_model_name, get_instance_type
 from integration_tests.performance.configs import defs
 
 TEST_ID = "block_performance"
@@ -45,18 +44,8 @@ class BlockBaselinesProvider(BaselineProvider):
 
     def __init__(self, env_id, fio_id):
         """Block baseline provider initialization."""
-        cpu_model_name = get_cpu_model_name()
-        baselines = list(
-            filter(
-                lambda cpu_baseline: cpu_baseline["model"] == cpu_model_name,
-                CONFIG["hosts"]["instances"][get_instance_type()]["cpus"],
-            )
-        )
-
-        super().__init__(DictQuery({}))
-        if len(baselines) > 0:
-            super().__init__(DictQuery(baselines[0]))
-
+        baseline = self.read_baseline(CONFIG)
+        super().__init__(DictQuery(baseline))
         self._tag = "baselines/{}/" + env_id + "/{}/" + fio_id
 
     def get(self, ms_name: str, st_name: str) -> dict:

tests/integration_tests/performance/test_network_latency.py

@@ -13,7 +13,6 @@
 from framework.stats.baseline import Provider as BaselineProvider
 from framework.stats.metadata import DictProvider as DictMetadataProvider
 from framework.utils import CpuMap, DictQuery, get_kernel_version
-from framework.utils_cpuid import get_cpu_model_name, get_instance_type
 from integration_tests.performance.configs import defs
 
 TEST_ID = "network_latency"
@@ -36,18 +35,8 @@ class NetLatencyBaselineProvider(BaselineProvider):
 
     def __init__(self, env_id):
         """Network latency baseline provider initialization."""
-        cpu_model_name = get_cpu_model_name()
-        baselines = list(
-            filter(
-                lambda cpu_baseline: cpu_baseline["model"] == cpu_model_name,
-                CONFIG_DICT["hosts"]["instances"][get_instance_type()]["cpus"],
-            )
-        )
-
-        super().__init__(DictQuery({}))
-        if len(baselines) > 0:
-            super().__init__(DictQuery(baselines[0]))
-
+        baseline = self.read_baseline(CONFIG_DICT)
+        super().__init__(DictQuery(baseline))
         self._tag = "baselines/{}/" + env_id + "/{}/ping"
 
     def get(self, ms_name: str, st_name: str) -> dict:

tests/integration_tests/performance/test_network_tcp_throughput.py

@@ -21,7 +21,6 @@
     get_kernel_version,
     run_cmd,
 )
-from framework.utils_cpuid import get_cpu_model_name, get_instance_type
 from integration_tests.performance.configs import defs
 
 TEST_ID = "network_tcp_throughput"
@@ -56,18 +55,8 @@ class NetTCPThroughputBaselineProvider(BaselineProvider):
 
     def __init__(self, env_id, iperf_id):
         """Network TCP throughput baseline provider initialization."""
-        cpu_model_name = get_cpu_model_name()
-        baselines = list(
-            filter(
-                lambda cpu_baseline: cpu_baseline["model"] == cpu_model_name,
-                CONFIG_DICT["hosts"]["instances"][get_instance_type()]["cpus"],
-            )
-        )
-
-        super().__init__(DictQuery({}))
-        if len(baselines) > 0:
-            super().__init__(DictQuery(baselines[0]))
-
+        baseline = self.read_baseline(CONFIG_DICT)
+        super().__init__(DictQuery(baseline))
         self._tag = "baselines/{}/" + env_id + "/{}/" + iperf_id
 
     def get(self, ms_name: str, st_name: str) -> dict:

tests/integration_tests/performance/test_snapshot_restore_performance.py

@@ -16,7 +16,6 @@
 from framework.stats.baseline import Provider as BaselineProvider
 from framework.stats.metadata import DictProvider as DictMetadataProvider
 from framework.utils import DictQuery, get_kernel_version
-from framework.utils_cpuid import get_cpu_model_name, get_instance_type
 from integration_tests.performance.configs import defs
 
 TEST_ID = "snapshot_restore_performance"
@@ -44,18 +43,8 @@ class SnapRestoreBaselinesProvider(BaselineProvider):
 
     def __init__(self, env_id, workload):
         """Snapshot baseline provider initialization."""
-        cpu_model_name = get_cpu_model_name()
-        baselines = list(
-            filter(
-                lambda cpu_baseline: cpu_baseline["model"] == cpu_model_name,
-                CONFIG_DICT["hosts"]["instances"][get_instance_type()]["cpus"],
-            )
-        )
-
-        super().__init__(DictQuery({}))
-        if len(baselines) > 0:
-            super().__init__(DictQuery(baselines[0]))
-
+        baseline = self.read_baseline(CONFIG_DICT)
+        super().__init__(DictQuery(baseline))
         self._tag = "baselines/{}/" + env_id + "/{}/" + workload
 
     def get(self, ms_name: str, st_name: str) -> dict:

tests/integration_tests/performance/test_vsock_throughput.py

@@ -20,7 +20,6 @@
     get_kernel_version,
     run_cmd,
 )
-from framework.utils_cpuid import get_cpu_model_name, get_instance_type
 from framework.utils_vsock import VSOCK_UDS_PATH, make_host_port_path
 from integration_tests.performance.configs import defs
 
@@ -55,17 +54,8 @@ class VsockThroughputBaselineProvider(BaselineProvider):
 
     def __init__(self, env_id, iperf_id):
         """Vsock throughput baseline provider initialization."""
-        cpu_model_name = get_cpu_model_name()
-        baselines = list(
-            filter(
-                lambda cpu_baseline: cpu_baseline["model"] == cpu_model_name,
-                CONFIG_DICT["hosts"]["instances"][get_instance_type()]["cpus"],
-            )
-        )
-        super().__init__(DictQuery({}))
-        if len(baselines) > 0:
-            super().__init__(DictQuery(baselines[0]))
-
+        baseline = self.read_baseline(CONFIG_DICT)
+        super().__init__(DictQuery(baseline))
         self._tag = "baselines/{}/" + env_id + "/{}/" + iperf_id
 
     def get(self, ms_name: str, st_name: str) -> dict: