adjust pvc size to match minimumSupportedPvcSize in T2

Author: Ahmad-Hafe

tests/storage/cdi_clone/conftest.py

@@ -1,12 +1,19 @@
 import pytest
 from ocp_resources.data_source import DataSource
 from ocp_resources.datavolume import DataVolume
+from ocp_resources.storage_profile import StorageProfile
 
 from tests.storage.utils import create_cirros_dv
-from utilities.constants import OS_FLAVOR_FEDORA
+from utilities.constants import OS_FLAVOR_FEDORA, Images
 from utilities.storage import data_volume
 
 
+def get_storage_profile_minimum_supported_pvc_size(storage_class_name, admin_client):
+    storage_profile = StorageProfile(name=storage_class_name, client=admin_client)
+    annotations = getattr(storage_profile.instance.metadata, "annotations", {}) or {}
+    return annotations.get("cdi.kubevirt.io/minimumSupportedPvcSize")
+
+
 @pytest.fixture(scope="module")
 def cirros_dv_with_filesystem_volume_mode(
     unprivileged_client,
@@ -25,6 +32,7 @@ def cirros_dv_with_filesystem_volume_mode(
 @pytest.fixture(scope="module")
 def cirros_dv_with_block_volume_mode(
     unprivileged_client,
+    admin_client,
     namespace,
     storage_class_with_block_volume_mode,
 ):
@@ -34,6 +42,11 @@ def cirros_dv_with_block_volume_mode(
         name="cirros-block",
         storage_class=storage_class_with_block_volume_mode,
         volume_mode=DataVolume.VolumeMode.BLOCK,
+        dv_size=get_storage_profile_minimum_supported_pvc_size(
+            storage_class_name=storage_class_with_block_volume_mode,
+            admin_client=admin_client,
+        )
+        or Images.Cirros.DEFAULT_DV_SIZE,
     )
 
 

tests/storage/cdi_upload/test_upload_virtctl.py

@@ -275,14 +275,15 @@ def empty_pvc(
     storage_class_matrix__module__,
     storage_class_name_scope_module,
     worker_node1,
+    storage_profile_minimum_supported_pvc_size,
 ):
     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=DEFAULT_DV_SIZE,
+        size=storage_profile_minimum_supported_pvc_size or DEFAULT_DV_SIZE,
         hostpath_node=worker_node1.name
         if sc_is_hpp_with_immediate_volume_binding(sc=storage_class_name_scope_module)
         else None,

tests/storage/conftest.py

@@ -21,6 +21,7 @@
 from ocp_resources.route import Route
 from ocp_resources.secret import Secret
 from ocp_resources.storage_class import StorageClass
+from ocp_resources.storage_profile import StorageProfile
 from ocp_resources.virtual_machine_cluster_instancetype import (
     VirtualMachineClusterInstancetype,
 )
@@ -552,6 +553,12 @@ def data_volume_template_metadata(multi_storage_cirros_vm):
     return multi_storage_cirros_vm.data_volume_template["metadata"]
 
 
+def get_storage_profile_minimum_supported_pvc_size(storage_class_name, admin_client):
+    storage_profile = StorageProfile(name=storage_class_name, client=admin_client)
+    annotations = getattr(storage_profile.instance.metadata, "annotations", {}) or {}
+    return annotations.get("cdi.kubevirt.io/minimumSupportedPvcSize")
+
+
 @pytest.fixture()
 def storage_class_name_scope_function(storage_class_matrix__function__):
     return [*storage_class_matrix__function__][0]
@@ -562,6 +569,13 @@ def storage_class_name_scope_module(storage_class_matrix__module__):
     return [*storage_class_matrix__module__][0]
 
 
+@pytest.fixture(scope="module")
+def storage_profile_minimum_supported_pvc_size(storage_class_name_scope_module, admin_client):
+    return get_storage_profile_minimum_supported_pvc_size(
+        storage_class_name=storage_class_name_scope_module, admin_client=admin_client
+    )
+
+
 @pytest.fixture(scope="module")
 def storage_class_name_immediate_binding_scope_module(storage_class_matrix_immediate_matrix__module__):
     return [*storage_class_matrix_immediate_matrix__module__][0]