[4.18] [Storage] Remove outdated tests and skips (#4928) (#5074)

Manual cherry-pick:
#4928

Remove 
test_data_protection.py, 
test_local_storage.py, 
and CDI scratch space upgrade tests (before/after), along with their
fixtures, constants, and unused imports.

Assisted-by: Claude <noreply@anthropic.com>

---------

Signed-off-by: Jenia Peimer <jpeimer@redhat.com>

Author: jpeimer

tests/storage/conftest.py

@@ -363,16 +363,6 @@ def rhel_vm_name(request):
     return request.param["vm_name"]
 
 
-@pytest.fixture(scope="session")
-def available_hpp_storage_class(skip_test_if_no_hpp_sc, cluster_storage_classes):
-    """
-    Get an HPP storage class if there is any in the cluster
-    """
-    for storage_class in cluster_storage_classes:
-        if storage_class.name in HPP_STORAGE_CLASSES:
-            return storage_class
-
-
 @pytest.fixture()
 def rhel_vm_for_snapshot(
     admin_client,

tests/storage/test_data_protection.py

@@ -9,7 +9,6 @@
     create_snapshot_for_upgrade,
     create_vm_for_snapshot_upgrade_tests,
 )
-from tests.storage.utils import update_scratch_space_sc
 from utilities.constants import HOTPLUG_DISK_SERIAL
 from utilities.storage import create_dv, virtctl_volume
 from utilities.virt import (
@@ -22,51 +21,6 @@
 LOGGER = logging.getLogger(__name__)
 
 
-@pytest.fixture(scope="session")
-def skip_if_less_than_two_storage_classes(cluster_storage_classes):
-    if len(cluster_storage_classes) < 2:
-        pytest.skip("Need two Storage Classes at least.")
-
-
-@pytest.fixture(scope="session")
-def storage_class_for_updating_cdiconfig_scratch(
-    skip_if_less_than_two_storage_classes, cdi_config, cluster_storage_classes
-):
-    """
-    Choose one StorageClass which is not the current one for scratch space.
-    """
-    current_sc_for_scratch = cdi_config.scratch_space_storage_class_from_status
-    LOGGER.info(f"The current StorageClass for scratch space on CDIConfig is: {current_sc_for_scratch}")
-    for sc in cluster_storage_classes:
-        if sc.instance.metadata.get("name") != current_sc_for_scratch:
-            LOGGER.info(f"Candidate StorageClass: {sc.instance.metadata.name}")
-            return sc
-
-
-@pytest.fixture(scope="session")
-def override_cdiconfig_scratch_spec(
-    hyperconverged_resource_scope_session,
-    cdi_config,
-    storage_class_for_updating_cdiconfig_scratch,
-):
-    """
-    Change spec.scratchSpaceStorageClass to the selected StorageClass on CDIConfig.
-    """
-    if storage_class_for_updating_cdiconfig_scratch:
-        new_sc = storage_class_for_updating_cdiconfig_scratch.name
-
-    with update_scratch_space_sc(
-        cdi_config=cdi_config, new_sc=new_sc, hco=hyperconverged_resource_scope_session
-    ) as edited_cdi_config:
-        yield edited_cdi_config
-
-
-@pytest.fixture(scope="session")
-def skip_if_not_override_cdiconfig_scratch_space(override_cdiconfig_scratch_spec):
-    if not override_cdiconfig_scratch_spec:
-        pytest.skip("Skip test because the scratch space was not changed.")
-
-
 @pytest.fixture(scope="session")
 def cirros_vm_for_upgrade_a(
     upgrade_namespace_scope_session,

tests/storage/test_local_storage.py

@@ -4,7 +4,6 @@
 from ocp_resources.virtual_machine_restore import VirtualMachineRestore
 
 from tests.upgrade_params import (
-    CDI_SCRATCH_PRESERVE_NODE_ID,
     HOTPLUG_VM_AFTER_UPGRADE_NODE_ID,
     IUO_UPGRADE_TEST_DEPENDENCY_NODE_ID,
     IUO_UPGRADE_TEST_ORDERING_NODE_ID,
@@ -35,25 +34,6 @@
 class TestUpgradeStorage:
     """Pre-upgrade tests"""
 
-    @pytest.mark.sno
-    @pytest.mark.polarion("CNV-4880")
-    @pytest.mark.order(before=IUO_UPGRADE_TEST_ORDERING_NODE_ID)
-    @pytest.mark.dependency(name=f"{STORAGE_NODE_ID_PREFIX}::test_cdiconfig_scratch_overriden_before_upgrade")
-    def test_cdiconfig_scratch_overriden_before_upgrade(
-        self,
-        cdi_config,
-        storage_class_for_updating_cdiconfig_scratch,
-        override_cdiconfig_scratch_spec,
-    ):
-        """
-        Check that the scratch StorageClass configuration should be changed before CNV upgrade
-        """
-        expected_sc = storage_class_for_updating_cdiconfig_scratch.instance.metadata.name
-        actual_sc = cdi_config.scratch_space_storage_class_from_status
-        assert actual_sc == expected_sc, (
-            "The scratchSpaceStorageClass on CDIConfig config should be changed before upgrade"
-        )
-
     @pytest.mark.sno
     @pytest.mark.polarion("CNV-5993")
     @pytest.mark.order(before=IUO_UPGRADE_TEST_ORDERING_NODE_ID)
@@ -106,32 +86,6 @@ def test_vm_with_hotplug_before_upgrade(
 
     """ Post-upgrade tests """
 
-    @pytest.mark.sno
-    @pytest.mark.polarion("CNV-2952")
-    @pytest.mark.order(after=IUO_UPGRADE_TEST_ORDERING_NODE_ID)
-    @pytest.mark.dependency(
-        name=CDI_SCRATCH_PRESERVE_NODE_ID,
-        depends=[
-            IUO_UPGRADE_TEST_DEPENDENCY_NODE_ID,
-            f"{STORAGE_NODE_ID_PREFIX}::test_cdiconfig_scratch_overriden_before_upgrade",
-        ],
-        scope=DEPENDENCY_SCOPE_SESSION,
-    )
-    def test_cdiconfig_scratch_preserved_after_upgrade(
-        self,
-        skip_if_not_override_cdiconfig_scratch_space,
-        cdi_config,
-        storage_class_for_updating_cdiconfig_scratch,
-    ):
-        """
-        Check that the scratch StorageClass configuration should be preserved by the upgrade
-        """
-        expected_sc = storage_class_for_updating_cdiconfig_scratch.instance.metadata.name
-        actual_sc = cdi_config.scratch_space_storage_class_from_status
-        assert actual_sc == expected_sc, (
-            "The scratchSpaceStorageClass on CDIConfig config should not change after upgrade"
-        )
-
     @pytest.mark.sno
     @pytest.mark.polarion("CNV-5994")
     @pytest.mark.order(after=IUO_UPGRADE_TEST_ORDERING_NODE_ID)