CherryPicked: [cnv-4.20] Remove duplicate HPP observability tests already covered in T1

original PR: RedHatQE#3853

Author: OhadRevah

tests/conftest.py

@@ -202,7 +202,6 @@
     VirtualMachineForTests,
     create_vm_cloning_job,
     fedora_vm_body,
-    get_all_virt_pods_with_running_status,
     get_base_templates_list,
     get_hyperconverged_kubevirt,
     get_hyperconverged_ovs_annotations,
@@ -1998,11 +1997,6 @@ def compact_cluster(nodes, workers, control_plane_nodes):
     return len(nodes) == len(workers) == len(control_plane_nodes) == 3
 
 
-@pytest.fixture()
-def virt_pods_with_running_status(admin_client, hco_namespace):
-    return get_all_virt_pods_with_running_status(dyn_client=admin_client, hco_namespace=hco_namespace)
-
-
 @pytest.fixture(scope="session")
 def bin_directory(tmpdir_factory):
     return tmpdir_factory.mktemp("bin")

tests/observability/conftest.py

@@ -2,19 +2,8 @@
 
 import pytest
 from ocp_resources.ssp import SSP
-from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
-from tests.observability.utils import (
-    get_olm_namespace,
-)
-from utilities.constants import (
-    TIMEOUT_5MIN,
-    TIMEOUT_5SEC,
-    VIRT_OPERATOR,
-)
 from utilities.hco import ResourceEditorValidateHCOReconcile
-from utilities.infra import scale_deployment_replicas
-from utilities.virt import get_all_virt_pods_with_running_status
 
 LOGGER = logging.getLogger(__name__)
 ANNOTATIONS_FOR_VIRT_OPERATOR_ENDPOINT = {
@@ -36,52 +25,3 @@ def paused_ssp_operator(admin_client, hco_namespace, ssp_resource_scope_class):
         list_resource_reconcile=[SSP],
     ):
         yield
-
-
-@pytest.fixture(scope="session")
-def olm_namespace():
-    return get_olm_namespace()
-
-
-@pytest.fixture(scope="class")
-def disabled_olm_operator(olm_namespace):
-    with scale_deployment_replicas(
-        deployment_name="olm-operator",
-        namespace=olm_namespace.name,
-        replica_count=0,
-    ):
-        yield
-
-
-@pytest.fixture(scope="class")
-def disabled_virt_operator(admin_client, hco_namespace, disabled_olm_operator):
-    virt_pods_with_running_status = get_all_virt_pods_with_running_status(
-        dyn_client=admin_client, hco_namespace=hco_namespace
-    )
-    virt_pods_count_before_disabling_virt_operator = len(virt_pods_with_running_status.keys())
-    with scale_deployment_replicas(
-        deployment_name=VIRT_OPERATOR,
-        namespace=hco_namespace.name,
-        replica_count=0,
-    ):
-        yield
-
-    samples = TimeoutSampler(
-        wait_timeout=TIMEOUT_5MIN,
-        sleep=TIMEOUT_5SEC,
-        func=get_all_virt_pods_with_running_status,
-        dyn_client=admin_client,
-        hco_namespace=hco_namespace,
-    )
-    sample = None
-    try:
-        for sample in samples:
-            if len(sample.keys()) == virt_pods_count_before_disabling_virt_operator:
-                return True
-    except TimeoutExpiredError:
-        LOGGER.error(
-            f"After restoring replicas for {VIRT_OPERATOR},"
-            f"{virt_pods_with_running_status} virt pods were expected to be in running state."
-            f"Here are available virt pods: {sample}"
-        )
-        raise

tests/observability/storage/__init__.py

@@ -1,8 +1,6 @@
 import datetime
 import logging
 
-from kubernetes.dynamic.exceptions import ResourceNotFoundError
-from ocp_resources.namespace import Namespace
 from ocp_utilities.monitoring import Prometheus
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
@@ -55,10 +53,3 @@ def verify_no_listed_alerts_on_cluster(prometheus: Prometheus, alerts_list: list
                 continue
             fired_alerts[alert] = alerts_by_name
     assert not fired_alerts, f"Alerts should not be fired on healthy cluster.\n {fired_alerts}"
-
-
-def get_olm_namespace() -> Namespace:
-    olm_ns = Namespace(name="openshift-operator-lifecycle-manager")
-    if olm_ns.exists:
-        return olm_ns
-    raise ResourceNotFoundError(f"Namespace: {olm_ns.name} not found.")

tests/observability/storage/conftest.py

@@ -2280,21 +2280,6 @@ def wait_for_kubevirt_conditions(
     )
 
 
-def get_all_virt_pods_with_running_status(dyn_client, hco_namespace):
-    virt_pods_with_status = {
-        pod.name: pod.status
-        for pod in Pod.get(
-            dyn_client=dyn_client,
-            namespace=hco_namespace.name,
-        )
-        if pod.name.startswith("virt")
-    }
-    assert all(pod_status == Pod.Status.RUNNING for pod_status in virt_pods_with_status.values()), (
-        f"All virt pods were expected to be in running state.Here are all virt pods:{virt_pods_with_status}"
-    )
-    return virt_pods_with_status
-
-
 def wait_for_kv_stabilize(admin_client, hco_namespace):
     wait_for_kubevirt_conditions(admin_client=admin_client, hco_namespace=hco_namespace)
     wait_for_hco_conditions(admin_client=admin_client, hco_namespace=hco_namespace)