Skip to content

CherryPicked: [cnv-4.22] Remove DataSource storage class fallback from DV template helper #5140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cnv-tests-github-webhook-dollierp wants to merge 1 commit into from
Closed

CherryPicked: [cnv-4.22] Remove DataSource storage class fallback from DV template helper #5140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 2 additions & 1 deletion tests/infrastructure/golden_images/test_common_templates_data_volumes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions tests/storage/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 1 addition & 2 deletions utilities/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down