consolidated fixtures, modified vm_test scope

Author: albarker-rh

tests/observability/metrics/conftest.py

@@ -146,7 +146,7 @@ def error_state_vm(unique_namespace, unprivileged_client):
         yield
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture()
 def vm_list(unique_namespace):
     """
     Creates n vms, waits for them all to go to running state and cleans them up at the end
@@ -580,11 +580,6 @@ def initial_metric_value(request, prometheus):
     return int(get_metrics_value(prometheus=prometheus, metrics_name=request.param))
 
 
-@pytest.fixture(scope="module")
-def initial_metric_value_scope_module(request, prometheus):
-    return int(get_metrics_value(prometheus=prometheus, metrics_name=request.param))
-
-
 @pytest.fixture()
 def deleted_vmi(running_metric_vm):
     running_metric_vm.delete(wait=True)

tests/observability/metrics/constants.py

@@ -26,6 +26,6 @@
 KUBEVIRT_VMI_PHASE_TRANSITION_TIME_FROM_DELETION_SECONDS_SUM_SUCCEEDED = (
     "kubevirt_vmi_phase_transition_time_from_deletion_seconds_sum{phase='Succeeded'}"
 )
-KUBEVIRT_VM_CREATED_BY_POD_TOTAL = "kubevirt_vm_created_by_pod_total"
+SUM_KUBEVIRT_VM_CREATED_BY_POD_TOTAL = "sum(kubevirt_vm_created_by_pod_total)"
 BINDING_NAME = "binding_name"
 BINDING_TYPE = "binding_type"

tests/observability/metrics/test_vms_metrics.py

@@ -14,10 +14,10 @@
 
 from tests.observability.metrics.constants import (
     KUBEVIRT_CONSOLE_ACTIVE_CONNECTIONS_BY_VMI,
-    KUBEVIRT_VM_CREATED_BY_POD_TOTAL,
     KUBEVIRT_VM_DISK_ALLOCATED_SIZE_BYTES,
     KUBEVIRT_VMI_PHASE_TRANSITION_TIME_FROM_DELETION_SECONDS_SUM_SUCCEEDED,
     KUBEVIRT_VNC_ACTIVE_CONNECTIONS_BY_VMI,
+    SUM_KUBEVIRT_VM_CREATED_BY_POD_TOTAL,
 )
 from tests.observability.metrics.utils import (
     compare_metric_file_system_values_with_vm_file_system_values,
@@ -515,18 +515,18 @@ def test_kubevirt_vmi_phase_transition_from_deletion_seconds_sum_windows(
 
 class TestVmCreatedByPodTotal:
     @pytest.mark.parametrize(
-        "initial_metric_value_scope_module",
+        "initial_metric_value",
         [
             pytest.param(
-                f"sum({KUBEVIRT_VM_CREATED_BY_POD_TOTAL})",
+                SUM_KUBEVIRT_VM_CREATED_BY_POD_TOTAL,
                 marks=pytest.mark.polarion("CNV-12361"),
             )
         ],
         indirect=True,
     )
-    def test_kubevirt_vm_created_by_pod_total(self, prometheus, initial_metric_value_scope_module, vm_list):
+    def test_kubevirt_vm_created_by_pod_total(self, prometheus, initial_metric_value, vm_list):
         validate_metrics_value(
             prometheus=prometheus,
-            metric_name=f"sum({KUBEVIRT_VM_CREATED_BY_POD_TOTAL})",
-            expected_value=str(initial_metric_value_scope_module + NUM_TEST_VMS),
+            metric_name=SUM_KUBEVIRT_VM_CREATED_BY_POD_TOTAL,
+            expected_value=str(initial_metric_value + NUM_TEST_VMS),
         )