[Storage] DV stop status functions

tests/storage/cdi_clone/conftest.py

@@ -2,6 +2,7 @@
 from ocp_resources.datavolume import DataVolume
 
 from tests.storage.constants import QUAY_FEDORA_CONTAINER_IMAGE
+from tests.storage.stop_status_utils import dv_stop_status_restart_threshold
 from utilities.constants import REGISTRY_STR, Images
 from utilities.storage import create_dv, data_volume
 
@@ -37,7 +38,7 @@ def fedora_dv_with_filesystem_volume_mode(
         volume_mode=DataVolume.VolumeMode.FILE,
         client=unprivileged_client,
     ) as dv:
-        dv.wait_for_dv_success()
+        dv.wait_for_dv_success(stop_status_func=dv_stop_status_restart_threshold, dv=dv)
         yield dv
 
 
@@ -57,5 +58,5 @@ def fedora_dv_with_block_volume_mode(
         volume_mode=DataVolume.VolumeMode.BLOCK,
         client=unprivileged_client,
     ) as dv:
-        dv.wait_for_dv_success()
+        dv.wait_for_dv_success(stop_status_func=dv_stop_status_restart_threshold, dv=dv)
         yield dv

tests/storage/cdi_clone/test_clone.py

@@ -6,6 +6,7 @@
 from ocp_resources.datavolume import DataVolume
 
 from tests.os_params import FEDORA_LATEST, WINDOWS_11, WINDOWS_11_TEMPLATE_LABELS
+from tests.storage.stop_status_utils import dv_stop_status_restart_threshold
 from tests.storage.utils import (
     assert_pvc_snapshot_clone_annotation,
     assert_use_populator,
@@ -93,7 +94,11 @@ def test_successful_clone_of_large_image(
         storage_class=data_volume_multi_storage_scope_function.storage_class,
         client=namespace.client,
     ) as cdv:
-        cdv.wait_for_dv_success(timeout=WINDOWS_CLONE_TIMEOUT)
+        cdv.wait_for_dv_success(
+            timeout=WINDOWS_CLONE_TIMEOUT,
+            stop_status_func=dv_stop_status_restart_threshold,
+            dv=cdv,
+        )
 
 
 @pytest.mark.sno
@@ -125,7 +130,10 @@ def test_successful_vm_restart_with_cloned_dv(
             cdv.wait_for_status(status=DataVolume.Status.PENDING_POPULATION, timeout=TIMEOUT_1MIN)
             cdv.pvc.wait()
         else:
-            cdv.wait_for_dv_success()
+            cdv.wait_for_dv_success(
+                stop_status_func=dv_stop_status_restart_threshold,
+                dv=cdv,
+            )
         with create_vm_from_dv(
             client=unprivileged_client,
             dv=cdv,
@@ -180,7 +188,11 @@ def test_successful_vm_from_cloned_dv_windows(
         source_pvc=data_volume_multi_storage_scope_function.name,
         storage_class=data_volume_multi_storage_scope_function.storage_class,
     ) as cdv:
-        cdv.wait_for_dv_success(timeout=WINDOWS_CLONE_TIMEOUT)
+        cdv.wait_for_dv_success(
+            timeout=WINDOWS_CLONE_TIMEOUT,
+            stop_status_func=dv_stop_status_restart_threshold,
+            dv=cdv,
+        )
         create_windows_vm_validate_guest_agent_info(
             dv=cdv,
             namespace=namespace,
@@ -227,7 +239,10 @@ def test_successful_snapshot_clone(
         source_pvc=data_volume_snapshot_capable_storage_scope_function.name,
         storage_class=storage_class,
     ) as cdv:
-        cdv.wait_for_dv_success()
+        cdv.wait_for_dv_success(
+            stop_status_func=dv_stop_status_restart_threshold,
+            dv=cdv,
+        )
         if OS_FLAVOR_WINDOWS not in data_volume_snapshot_capable_storage_scope_function.url.split("/")[-1]:
             with create_vm_from_dv(
                 client=unprivileged_client,

tests/storage/stop_status_utils.py

@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+import logging
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ocp_resources.datavolume import DataVolume
+
+LOGGER = logging.getLogger(__name__)
+
+
+def dv_stop_status_restart_threshold(dv: DataVolume, restart_count_threshold: int = 3) -> bool:
+    """Function for detecting excessive DV restarts.
+
+    Args:
+        dv: The DataVolume to check.
+        restart_count_threshold: The threshold for restart count (default: 3).
+
+    Returns:
+        True if restarts exceed threshold.
+
+    Example::
+        dv.wait_for_dv_success(
+            stop_status_func=dv_stop_status_after_three_restarts,
+            dv=dv,
+            restart_count_threshold=4,
+        )
+    """
+    dv_status = getattr(dv.instance, "status", None)
+    restart_count = getattr(dv_status, "restartCount", 0) or 0
+    if restart_count >= restart_count_threshold:
+        LOGGER.error(f"DV {dv.name} has {restart_count} restarts, stopping")
+        return True
+    return False