From f45029be6ce107fed169a8b3b565a06103df1881 Mon Sep 17 00:00:00 2001
From: Roni Kishner <rkishner@redhat.com>
Date: Wed, 3 Jun 2026 19:45:51 +0300
Subject: [PATCH] Remove DataSource storage class fallback from DV template
 helper (#4985)

##### What this PR does / why we need it:
When calling `data_volume_template_with_source_ref_dict` we should
either use it with explicit `storage_class` field, or omit the field and
use the default storage class.
Relying on the storage class of the DataSources can cause miss
interpretations, while also causing issues since it is not possible to
match the storage class to the DataSource, if a snap shot storage class
is used.

##### Which issue(s) this PR fixes:
Failing tests when snapshot storage classes are set.

##### Special notes for reviewer:
Since we could not decide the storage class according to the
`VolumeSnapshot` that was used when creating the VM, this is the
approach we decided to use.

##### jira-ticket:
<!-- full-ticket-url needs to be provided. This would add a link to the
pull request to the jira and close it when the pull request is merged
If the task is not tracked by a Jira ticket, just write "NONE".
-->
https://redhat.atlassian.net/browse/CNV-88988

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Bug Fixes**
* Data volumes now use only an explicitly provided storage class and no
longer inherit or default from referenced sources, preventing unexpected
storage-class selection.

* **Tests**
* Test suite updated to validate scoped storage-class selection; test
fixtures adjusted to consistently provide the chosen storage class
across scopes.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

Signed-off-by: Roni Kishner <rkishner@redhat.com>
---
 tests/conftest.py                                            | 5 +++++
 .../golden_images/test_common_templates_data_volumes.py      | 3 ++-
 tests/storage/conftest.py                                    | 5 -----
 utilities/storage.py                                         | 3 +--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 7cc78751dc..a15cdf1155 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -2629,6 +2629,11 @@ def rwx_fs_available_storage_classes_names(cluster_storage_classes_names):
     ]
 
 
+@pytest.fixture()
+def storage_class_name_scope_function(storage_class_matrix__function__):
+    return [*storage_class_matrix__function__][0]
+
+
 @pytest.fixture(scope="session")
 def rhsm_credentials_from_bitwarden():
     return get_cnv_tests_secret_by_name(secret_name="RHSM_CREDENTIALS")
diff --git a/tests/infrastructure/golden_images/test_common_templates_data_volumes.py b/tests/infrastructure/golden_images/test_common_templates_data_volumes.py
index 987f723fda..a430611c8b 100644
--- a/tests/infrastructure/golden_images/test_common_templates_data_volumes.py
+++ b/tests/infrastructure/golden_images/test_common_templates_data_volumes.py
@@ -15,9 +15,9 @@
 
 @pytest.fixture()
 def vm_from_golden_image_multi_storage(
-    request,
     unprivileged_client,
     namespace,
+    storage_class_name_scope_function,
     golden_image_data_source_multi_storage_scope_function,
 ):
     with VirtualMachineForTests(
@@ -27,6 +27,7 @@ def vm_from_golden_image_multi_storage(
         vm_instance_type=VirtualMachineClusterInstancetype(name=U1_SMALL),
         data_volume_template=data_volume_template_with_source_ref_dict(
             data_source=golden_image_data_source_multi_storage_scope_function,
+            storage_class=storage_class_name_scope_function,
         ),
     ) as vm:
         running_vm(vm=vm)
diff --git a/tests/storage/conftest.py b/tests/storage/conftest.py
index f0ba33e4f1..77e948ef2f 100644
--- a/tests/storage/conftest.py
+++ b/tests/storage/conftest.py
@@ -497,11 +497,6 @@ def data_volume_template_metadata(multi_storage_cirros_vm):
     return multi_storage_cirros_vm.data_volume_template["metadata"]
 
 
-@pytest.fixture()
-def storage_class_name_scope_function(storage_class_matrix__function__):
-    return [*storage_class_matrix__function__][0]
-
-
 @pytest.fixture(scope="module")
 def storage_class_name_scope_module(storage_class_matrix__module__):
     return [*storage_class_matrix__module__][0]
diff --git a/utilities/storage.py b/utilities/storage.py
index c69dcf96fd..71e3221067 100644
--- a/utilities/storage.py
+++ b/utilities/storage.py
@@ -564,12 +564,11 @@ def data_volume_template_dict(
 
 
 def data_volume_template_with_source_ref_dict(data_source, storage_class=None):
-    source_dict = data_source.source.instance.to_dict()
     dv = DataVolume(
         name=utilities.infra.unique_name(name=data_source.name),
         namespace=data_source.namespace,
         size=get_dv_size_from_datasource(data_source=data_source),
-        storage_class=storage_class or source_dict["spec"].get("storageClassName"),
+        storage_class=storage_class,
         api_name="storage",
         source_ref={
             "kind": data_source.kind,