removed hco_namespace, creating new namespace for test

Author: albarker-rh

tests/observability/metrics/conftest.py

@@ -15,6 +15,7 @@
 
 from tests.observability.metrics.constants import (
     KUBEVIRT_CONSOLE_ACTIVE_CONNECTIONS_BY_VMI,
+    KUBEVIRT_VM_CREATED_BY_POD_TOTAL,
     KUBEVIRT_VMI_MIGRATIONS_IN_RUNNING_PHASE,
     KUBEVIRT_VMI_MIGRATIONS_IN_SCHEDULING_PHASE,
     KUBEVIRT_VMI_STATUS_ADDRESSES,
@@ -622,12 +623,18 @@ def aaq_resource_hard_limit_and_used(application_aware_resource_quota):
 
 
 @pytest.fixture()
-def vm_in_hco_namespace(hco_namespace):
-    vm_name = "hco-vm"
+def vm_created_pod_total_initial_metric_value(prometheus, namespace):
+    metric_query = f"sum({KUBEVIRT_VM_CREATED_BY_POD_TOTAL}{{namespace='{namespace.name}'}})"
+    return int(get_metrics_value(prometheus=prometheus, metrics_name=metric_query))
+
+
+@pytest.fixture()
+def vm_in_new_namespace(namespace):
+    vm_name = "vm-created-by-pod-total-vm"
 
     with VirtualMachineForTests(
         name=vm_name,
-        namespace=hco_namespace.name,
+        namespace=namespace.name,
         body=fedora_vm_body(name=vm_name),
         ssh=False,
     ) as vm:

tests/observability/metrics/test_vms_metrics.py

@@ -513,27 +513,17 @@ def test_kubevirt_vmi_phase_transition_from_deletion_seconds_sum_windows(
 
 
 class TestVmCreatedByPodTotal:
-    metric_query = f"sum({KUBEVIRT_VM_CREATED_BY_POD_TOTAL}{{namespace='openshift-cnv'}})"
-
-    @pytest.mark.parametrize(
-        "initial_metric_value",
-        [
-            pytest.param(
-                metric_query,
-                marks=pytest.mark.polarion("CNV-12361"),
-            )
-        ],
-        indirect=True,
-    )
+    @pytest.mark.polarion("CNV-12361")
     def test_kubevirt_vm_created_by_pod_total(
         self,
         prometheus,
-        hco_namespace,
-        initial_metric_value,
-        vm_in_hco_namespace,
+        namespace,
+        vm_created_pod_total_initial_metric_value,
+        vm_in_new_namespace,
     ):
+        metric_query = f"sum({KUBEVIRT_VM_CREATED_BY_POD_TOTAL}{{namespace='{namespace.name}'}})"
         validate_metrics_value(
             prometheus=prometheus,
-            metric_name=self.metric_query,
-            expected_value=str(initial_metric_value + 1),
+            metric_name=metric_query,
+            expected_value=str(vm_created_pod_total_initial_metric_value + 1),
         )