adjust dv size to fit GCP minimumSupportedPvcSize

Author: Ahmad-Hafe

tests/storage/cdi_import/conftest.py

@@ -142,7 +142,6 @@ def cirros_dv_unprivileged(
         name=f"cirros-dv-{storage_class_name_scope_module}",
         storage_class=storage_class_name_scope_module,
         client=unprivileged_client,
-        dv_size=DEFAULT_DV_SIZE,
     )
 
 

tests/storage/cdi_import/test_import_http.py

@@ -542,6 +542,7 @@ def test_blank_disk_import_validate_status(data_volume_multi_storage_scope_funct
     ],
 )
 def test_vmi_image_size(
+    xfail_test_if_gcp_sc,
     namespace,
     storage_class_matrix__module__,
     storage_class_name_scope_module,

tests/storage/cdi_upload/test_upload_virtctl.py

@@ -228,7 +228,9 @@ def test_virtctl_image_upload_with_exist_dv_image(
 @pytest.mark.sno
 @pytest.mark.gating
 @pytest.mark.polarion("CNV-3728")
-def test_virtctl_image_upload_pvc(download_image, namespace, storage_class_name_scope_module):
+def test_virtctl_image_upload_pvc(
+    download_image, namespace, storage_class_name_scope_module, storage_profile_minimum_supported_pvc_size
+):
     """
     Check that virtctl can create a new PVC and upload an image to it
     """
@@ -237,7 +239,7 @@ def test_virtctl_image_upload_pvc(download_image, namespace, storage_class_name_
         namespace=namespace.name,
         pvc=True,
         name=pvc_name,
-        size="1Gi",
+        size=storage_profile_minimum_supported_pvc_size,
         image_path=LOCAL_PATH,
         storage_class=storage_class_name_scope_module,
         insecure=True,
@@ -283,14 +285,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="1Gi",
+        size=storage_profile_minimum_supported_pvc_size,
         hostpath_node=worker_node1.name
         if sc_is_hpp_with_immediate_volume_binding(sc=storage_class_name_scope_module)
         else None,
@@ -311,14 +314,15 @@ def test_virtctl_image_upload_with_exist_pvc(
     namespace,
     storage_class_name_scope_module,
     schedulable_nodes,
+    storage_profile_minimum_supported_pvc_size,
 ):
     """
     Check that virtctl can upload an local disk image to an existing empty PVC
     """
     with virtctl_upload_dv(
         namespace=namespace.name,
         name=empty_pvc.name,
-        size="1Gi",
+        size=storage_profile_minimum_supported_pvc_size,
         pvc=True,
         image_path=LOCAL_PATH,
         storage_class=storage_class_name_scope_module,
@@ -387,6 +391,7 @@ def test_virtctl_image_upload_dv_with_exist_pvc(
     namespace,
     storage_class_name_scope_module,
     schedulable_nodes,
+    storage_profile_minimum_supported_pvc_size,
 ):
     """
     Check that virtctl fails gracefully when attempting to upload an image to a new data volume
@@ -395,7 +400,7 @@ def test_virtctl_image_upload_dv_with_exist_pvc(
     with virtctl_upload_dv(
         namespace=namespace.name,
         name=empty_pvc.name,
-        size="1Gi",
+        size=storage_profile_minimum_supported_pvc_size,
         image_path=LOCAL_PATH,
         storage_class=storage_class_name_scope_module,
         insecure=True,

tests/storage/conftest.py

@@ -19,6 +19,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_snapshot import VirtualMachineSnapshot
 from pytest_testconfig import config as py_config
 from timeout_sampler import TimeoutSampler
@@ -45,6 +46,7 @@
     OS_FLAVOR_CIRROS,
     SECURITY_CONTEXT,
     Images,
+    StorageClassNames,
 )
 from utilities.hco import (
     ResourceEditorValidateHCOReconcile,
@@ -190,6 +192,15 @@ def skip_test_if_no_hpp_sc(cluster_storage_classes):
         pytest.skip(f"This test runs only on one of the hpp storage classes: {HPP_STORAGE_CLASSES}")
 
 
+@pytest.fixture(scope="session")
+def xfail_test_if_gcp_sc(cluster_storage_classes):
+    existing_gcp_sc = [sc.name for sc in cluster_storage_classes if sc.name in StorageClassNames.GCP]
+    if existing_gcp_sc:
+        pytest.xfail(
+            reason=f"This test is X failed due to non supporting GCP storage class dv less than 4Gi'{existing_gcp_sc}'"
+        )
+
+
 @pytest.fixture(scope="module")
 def skip_when_hpp_no_waitforfirstconsumer(storage_class_matrix_hpp_matrix__module__):
     if not sc_volume_binding_mode_is_wffc(sc=[*storage_class_matrix_hpp_matrix__module__][0]):
@@ -591,3 +602,9 @@ 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 storage_profile_minimum_supported_pvc_size(storage_class_matrix__function__):
+    storage_profile = StorageProfile(name=[*storage_class_matrix__function__][0])
+    return storage_profile.instance.metadata.annotations.get("cdi.kubevirt.io/minimumSupportedPvcSize", "1Gi")

tests/storage/fs_overhead/test_fs_overhead.py

@@ -9,7 +9,6 @@
 from ocp_resources.persistent_volume_claim import PersistentVolumeClaim
 
 from tests.utils import create_cirros_vm
-from utilities.constants import Images
 from utilities.hco import ResourceEditorValidateHCOReconcile
 from utilities.storage import virtctl_upload_dv
 
@@ -64,12 +63,13 @@ def uploaded_cirros_dv(
     downloaded_cirros_image_full_path,
     downloaded_cirros_image_scope_class,
     storage_class_with_filesystem_volume_mode,
+    storage_profile_minimum_supported_pvc_size,
 ):
     dv_name = "uploaded-dv"
     with virtctl_upload_dv(
         namespace=namespace.name,
         name=dv_name,
-        size=Images.Cirros.DEFAULT_DV_SIZE,
+        size=storage_profile_minimum_supported_pvc_size,
         image_path=downloaded_cirros_image_full_path,
         storage_class=storage_class_with_filesystem_volume_mode,
         volume_mode=DataVolume.VolumeMode.FILE,
@@ -93,10 +93,9 @@ def test_import_vm_with_specify_fs_overhead(updated_fs_overhead_20_with_hco, vm_
 
 @pytest.mark.polarion("CNV-8637")
 def test_upload_dv_with_specify_fs_overhead(
-    updated_fs_overhead_20_with_hco,
-    uploaded_cirros_dv,
+    updated_fs_overhead_20_with_hco, uploaded_cirros_dv, storage_profile_minimum_supported_pvc_size
 ):
     assert_fs_overhead_added(
         actual_size=get_pvc_size_gib(pvc=uploaded_cirros_dv.pvc),
-        requested_size=bitmath.GiB(int(Images.Cirros.DEFAULT_DV_SIZE[0])),
+        requested_size=bitmath.parse_string_unsafe(storage_profile_minimum_supported_pvc_size).to_GiB(),
     )

tests/storage/utils.py

@@ -23,6 +23,7 @@
 from pytest_testconfig import config as py_config
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
+from tests.utils import get_default_storage_profile_minimum_supported_pvc_size
 from utilities.constants import (
     CDI_UPLOADPROXY,
     TIMEOUT_2MIN,
@@ -398,17 +399,16 @@ def create_cirros_dv(
     access_modes=None,
     volume_mode=None,
     client=None,
-    dv_size=Images.Cirros.DEFAULT_DV_SIZE,
 ):
     with create_dv(
         dv_name=f"dv-{name}",
         namespace=namespace,
         url=get_http_image_url(image_directory=Images.Cirros.DIR, image_name=Images.Cirros.QCOW2_IMG),
-        size=dv_size,
         storage_class=storage_class,
         access_modes=access_modes,
         volume_mode=volume_mode,
         client=client,
+        size=get_default_storage_profile_minimum_supported_pvc_size(),
     ) as dv:
         dv.wait_for_dv_success()
         yield dv

tests/utils.py

@@ -16,10 +16,12 @@
 from ocp_resources.datavolume import DataVolume
 from ocp_resources.kubevirt import KubeVirt
 from ocp_resources.resource import ResourceEditor
+from ocp_resources.storage_profile import StorageProfile
 from ocp_resources.template import Template
 from ocp_resources.virtual_machine import VirtualMachine
 from ocp_resources.virtual_machine_instance_migration import VirtualMachineInstanceMigration
 from pyhelper_utils.shell import run_ssh_commands
+from pytest_testconfig import config as py_config
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
 from utilities.constants import (
@@ -585,7 +587,7 @@ def create_cirros_vm(
         source="http",
         url=get_http_image_url(image_directory=Images.Cirros.DIR, image_name=Images.Cirros.QCOW2_IMG),
         storage_class=storage_class,
-        size=Images.Cirros.DEFAULT_DV_SIZE,
+        size=get_default_storage_profile_minimum_supported_pvc_size(),
         api_name="storage",
         volume_mode=volume_mode,
         secret=artifactory_secret,
@@ -608,3 +610,9 @@ def create_cirros_vm(
         if wait_running:
             running_vm(vm=vm, wait_for_interfaces=False)
         yield vm
+
+
+def get_default_storage_profile_minimum_supported_pvc_size() -> str:
+    return StorageProfile(
+        name=next(iter(py_config["system_storage_class_matrix"][0]))
+    ).instance.metadata.annotations.get("cdi.kubevirt.io/minimumSupportedPvcSize", "1Gi")