test coverage dataimportcron source pvc uptodated

Author: Ahmad-Hafe

tests/conftest.py

@@ -2902,3 +2902,11 @@ def nmstate_namespace(admin_client):
 @pytest.fixture()
 def ipv6_single_stack_cluster(ipv4_supported_cluster, ipv6_supported_cluster):
     return ipv6_supported_cluster and not ipv4_supported_cluster
+
+
+@pytest.fixture()
+def data_import_cron_namespace(unprivileged_client):
+    yield from create_ns(
+        unprivileged_client=unprivileged_client,
+        name="data-import-cron-using-default-sc",
+    )

tests/infrastructure/golden_images/update_boot_source/test_ssp_data_import_crons.py

@@ -21,7 +21,6 @@
 )
 from utilities.constants import BIND_IMMEDIATE_ANNOTATION, TIMEOUT_1MIN, TIMEOUT_2MIN, TIMEOUT_5MIN, TIMEOUT_10MIN
 from utilities.hco import ResourceEditorValidateHCOReconcile
-from utilities.infra import create_ns
 from utilities.ssp import (
     get_data_import_crons,
     matrix_auto_boot_data_import_cron_prefixes,
@@ -168,12 +167,12 @@ def vm_from_custom_data_import_cron(custom_data_source_scope_function, namespace
         yield vm
 
 
-@pytest.fixture()
-def data_import_cron_namespace(unprivileged_client):
-    yield from create_ns(
-        unprivileged_client=unprivileged_client,
-        name="data-import-cron-using-default-sc",
-    )
+# @pytest.fixture()
+# def data_import_cron_namespace(unprivileged_client):
+#     yield from create_ns(
+#         unprivileged_client=unprivileged_client,
+#         name="data-import-cron-using-default-sc",
+#     )
 
 
 @pytest.fixture()

tests/storage/cdi_upload/test_upload_virtctl.py

@@ -24,10 +24,8 @@
     ErrorMsg,
     check_disk_count_in_vm,
     check_upload_virtctl_result,
-    create_dummy_first_consumer_pod,
     create_dv,
     get_downloaded_artifact,
-    sc_is_hpp_with_immediate_volume_binding,
     sc_volume_binding_mode_is_wffc,
     virtctl_upload_dv,
 )
@@ -277,30 +275,30 @@ def test_virtctl_image_upload_with_exist_dv(download_image, namespace, storage_c
                     check_disk_count_in_vm(vm=vm)
 
 
-@pytest.fixture()
-def empty_pvc(
-    namespace,
-    storage_class_matrix__module__,
-    storage_class_name_scope_module,
-    worker_node1,
-):
-    with PersistentVolumeClaim(
-        name="empty-pvc",
-        namespace=namespace.name,
-        storage_class=storage_class_name_scope_module,
-        volume_mode=storage_class_matrix__module__[storage_class_name_scope_module]["volume_mode"],
-        accessmodes=storage_class_matrix__module__[storage_class_name_scope_module]["access_mode"],
-        size="1Gi",
-        hostpath_node=worker_node1.name
-        if sc_is_hpp_with_immediate_volume_binding(sc=storage_class_name_scope_module)
-        else None,
-    ) as pvc:
-        if sc_volume_binding_mode_is_wffc(sc=storage_class_name_scope_module):
-            # For PVC to bind on WFFC, it must be consumed
-            # (this was previously solved by hard coding hostpath_node at all times)
-            create_dummy_first_consumer_pod(pvc=pvc)
-        pvc.wait_for_status(status=PersistentVolumeClaim.Status.BOUND, timeout=60)
-        yield pvc
+# @pytest.fixture()
+# def empty_pvc(
+#     namespace,
+#     storage_class_matrix__module__,
+#     storage_class_name_scope_module,
+#     worker_node1,
+# ):
+#     with PersistentVolumeClaim(
+#         name="empty-pvc",
+#         namespace=namespace.name,
+#         storage_class=storage_class_name_scope_module,
+#         volume_mode=storage_class_matrix__module__[storage_class_name_scope_module]["volume_mode"],
+#         accessmodes=storage_class_matrix__module__[storage_class_name_scope_module]["access_mode"],
+#         size="1Gi",
+#         hostpath_node=worker_node1.name
+#         if sc_is_hpp_with_immediate_volume_binding(sc=storage_class_name_scope_module)
+#         else None,
+#     ) as pvc:
+#         if sc_volume_binding_mode_is_wffc(sc=storage_class_name_scope_module):
+#             # For PVC to bind on WFFC, it must be consumed
+#             # (this was previously solved by hard coding hostpath_node at all times)
+#             create_dummy_first_consumer_pod(pvc=pvc)
+#         pvc.wait_for_status(status=PersistentVolumeClaim.Status.BOUND, timeout=60)
+#         yield pvc
 
 
 @pytest.mark.sno

tests/storage/conftest.py

@@ -15,6 +15,7 @@
 from ocp_resources.config_map import ConfigMap
 from ocp_resources.csi_driver import CSIDriver
 from ocp_resources.deployment import Deployment
+from ocp_resources.persistent_volume_claim import PersistentVolumeClaim
 from ocp_resources.resource import ResourceEditor
 from ocp_resources.route import Route
 from ocp_resources.secret import Secret
@@ -59,8 +60,10 @@
 )
 from utilities.storage import (
     create_cirros_dv_for_snapshot_dict,
+    create_dummy_first_consumer_pod,
     data_volume,
     get_downloaded_artifact,
+    sc_is_hpp_with_immediate_volume_binding,
     sc_volume_binding_mode_is_wffc,
     write_file,
 )
@@ -591,3 +594,29 @@ def storage_class_name_scope_module(storage_class_matrix__module__):
 @pytest.fixture(scope="session")
 def cluster_csi_drivers_names():
     yield [csi_driver.name for csi_driver in list(CSIDriver.get())]
+
+
+@pytest.fixture()
+def empty_pvc(
+    namespace,
+    storage_class_matrix__module__,
+    storage_class_name_scope_module,
+    worker_node1,
+):
+    with PersistentVolumeClaim(
+        name="empty-pvc",
+        namespace=namespace.name,
+        storage_class=storage_class_name_scope_module,
+        volume_mode=storage_class_matrix__module__[storage_class_name_scope_module]["volume_mode"],
+        accessmodes=storage_class_matrix__module__[storage_class_name_scope_module]["access_mode"],
+        size="1Gi",
+        hostpath_node=worker_node1.name
+        if sc_is_hpp_with_immediate_volume_binding(sc=storage_class_name_scope_module)
+        else None,
+    ) as pvc:
+        if sc_volume_binding_mode_is_wffc(sc=storage_class_name_scope_module):
+            # For PVC to bind on WFFC, it must be consumed
+            # (this was previously solved by hard coding hostpath_node at all times)
+            create_dummy_first_consumer_pod(pvc=pvc)
+        pvc.wait_for_status(status=PersistentVolumeClaim.Status.BOUND, timeout=60)
+        yield pvc

tests/storage/test_data_import_cron.py

@@ -15,6 +15,7 @@
 from ocp_resources.volume_snapshot import VolumeSnapshot
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
+from tests.storage.utils import wait_for_data_import_cron_ready_and_updated
 from utilities.constants import (
     BIND_IMMEDIATE_ANNOTATION,
     OUTDATED,
@@ -25,6 +26,8 @@
     Images,
 )
 from utilities.storage import (
+    create_dummy_first_consumer_pod,
+    sc_volume_binding_mode_is_wffc,
     wait_for_succeeded_dv,
     wait_for_volume_snapshot_ready_to_use,
 )
@@ -205,6 +208,63 @@ def second_object_cleanup(
     resource_class(namespace=namespace.name, name=second_object_name).clean_up()
 
 
+@pytest.fixture()
+def data_import_cron_pvc_source(
+    unprivileged_client,
+    data_import_cron_namespace,
+    storage_class_with_filesystem_volume_mode,
+    pvc_for_source_data_import_cron,
+):
+    # cron_template_spec = golden_images_data_import_cron_spec.template.spec
+    with DataImportCron(
+        name="pvc-import-cron",
+        namespace=data_import_cron_namespace.name,
+        schedule="*/1 * * * *",
+        managed_data_source="pvc-import-datasource",
+        annotations=BIND_IMMEDIATE_ANNOTATION,
+        template={
+            "spec": {
+                "source": {
+                    "pvc": {
+                        "name": pvc_for_source_data_import_cron.name,
+                        "namespace": pvc_for_source_data_import_cron.namespace,
+                    }
+                },
+                "sourceFormat": "pvc",
+                "volumeMode": "Filesystem",
+                "storage": {
+                    "storageClassName": storage_class_with_filesystem_volume_mode,
+                    "accessModes": [PersistentVolumeClaim.AccessMode.RWO],
+                    "resources": {"requests": {"storage": "10Gi"}},
+                },
+            }
+        },
+    ) as data_import_cron:
+        wait_for_data_import_cron_ready_and_updated(
+            namespace=data_import_cron_namespace.name, name=data_import_cron.name
+        )
+        yield data_import_cron
+
+
+@pytest.fixture()
+def pvc_for_source_data_import_cron(
+    namespace, storage_class_with_filesystem_volume_mode, storage_class_name_scope_module
+):
+    with PersistentVolumeClaim(
+        name="source-pvc-test",
+        namespace=namespace.name,
+        accessmodes=PersistentVolumeClaim.AccessMode.RWO,
+        size="1Gi",
+        storage_class=storage_class_with_filesystem_volume_mode,
+    ) as pvc:
+        if sc_volume_binding_mode_is_wffc(sc=storage_class_name_scope_module):
+            # For PVC to bind on WFFC, it must be consumed
+            # (this was previously solved by hard coding hostpath_node at all times)
+            create_dummy_first_consumer_pod(pvc=pvc)
+        pvc.wait_for_status(status=PersistentVolumeClaim.Status.BOUND, timeout=60)
+        yield pvc
+
+
 @pytest.mark.gating
 @pytest.mark.polarion("CNV-7602")
 def test_data_import_cron_garbage_collection(
@@ -224,3 +284,16 @@ def test_data_import_cron_garbage_collection(
     assert resource_class(namespace=namespace.name, name=second_object_name).exists, (
         f"Second {resource_class.kind} '{second_object_name}' does not exist"
     )
+
+
+class TestDataImportCronPvcSource:
+    @pytest.mark.polarion("CNV-11842")
+    def test_data_import_cron_with_pvc_source_ready(
+        self, namespace, pvc_for_source_data_import_cron, data_import_cron_pvc_source
+    ):
+        pvc_uid = pvc_for_source_data_import_cron.instance.metadata.uid
+        digest_full = data_import_cron_pvc_source.instance.status.currentImports[0].Digest
+        digest_uid = digest_full.split("uid:")[1]  # Extract just the UUID part
+        assert pvc_for_source_data_import_cron.instance.metadata.uid == digest_uid, (
+            f"PVC UID {pvc_uid} does not match DataImportCron Digest {digest_uid}"
+        )

tests/storage/utils.py

@@ -8,6 +8,7 @@
 from ocp_resources.cluster_role import ClusterRole
 from ocp_resources.config_map import ConfigMap
 from ocp_resources.daemonset import DaemonSet
+from ocp_resources.data_import_cron import DataImportCron
 from ocp_resources.datavolume import DataVolume
 from ocp_resources.hostpath_provisioner import HostPathProvisioner
 from ocp_resources.pod import Pod
@@ -23,12 +24,7 @@
 from pytest_testconfig import config as py_config
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
-from utilities.constants import (
-    CDI_UPLOADPROXY,
-    TIMEOUT_2MIN,
-    TIMEOUT_30MIN,
-    Images,
-)
+from utilities.constants import CDI_UPLOADPROXY, TIMEOUT_2MIN, TIMEOUT_5SEC, TIMEOUT_30MIN, Images
 from utilities.hco import ResourceEditorValidateHCOReconcile
 from utilities.infra import (
     cleanup_artifactory_secret_and_config_map,
@@ -487,3 +483,29 @@ def clean_up_multiprocess(processes, object_list):
             print(f"Error killing process {process}, associated with {object_name}: {e}")
         finally:
             process.close()
+
+
+def wait_for_data_import_cron_ready_and_updated(namespace, name):
+    up_to_date_status = "UpToDate"
+    LOGGER.info(f"Wait for dataimportcron '{name}' in '{namespace}' to be '{up_to_date_status}'")
+    try:
+        for sample in TimeoutSampler(
+            wait_timeout=TIMEOUT_2MIN,
+            sleep=TIMEOUT_5SEC,
+            func=get_data_import_cron_conditions,
+            namespace=namespace,
+            name=name,
+        ):
+            if sample:
+                return True
+    except TimeoutExpiredError:
+        fail_msg = f"failed to reach {up_to_date_status} status True"
+        LOGGER.error(f"The dataimportcron {name} {fail_msg}")
+        raise
+
+
+def get_data_import_cron_conditions(namespace, name):
+    data_import_cron = DataImportCron(namespace=namespace, name=name)
+    for condition in data_import_cron.instance.status.get("conditions"):
+        if condition["type"] == "UpToDate":
+            return condition["status"]