[Storage] Use blank dv instead of Cirros in test_fail_to_vmexport_with_unprivileged_client_no_permissions (RedHatQE#2665)

##### Short description:
Improving test
`test_fail_to_vmexport_with_unprivileged_client_no_permissions` to use a
blank data source with unprivileged lcient to create a vmexport
instance.
##### More details:

##### What this PR does / why we need it:
Change the test to use a blank data source instead a cirros one
##### Which issue(s) this PR fixes:

##### Special notes for reviewer:

##### jira-ticket:
https://issues.redhat.com/browse/CNV-69121


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

* **Tests**
* Improved VM export tests: added an admin-created data-volume fixture,
renamed the unprivileged-created fixture, removed redundant readiness
waits, and simplified parameterization to rely on the new fixtures.
* **Utilities**
* Added a reusable helper to create blank data volumes for tests,
consolidating creation and readiness handling to reduce setup
duplication.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: josemacassan

tests/storage/vm_export/conftest.py

@@ -19,13 +19,12 @@
 from ocp_resources.virtual_machine_export import VirtualMachineExport
 from ocp_resources.virtual_machine_snapshot import VirtualMachineSnapshot
 from pyhelper_utils.shell import run_ssh_commands
-from pytest_testconfig import py_config
 
 from tests.storage.vm_export.constants import VM_EXPORT_TEST_FILE_CONTENT, VM_EXPORT_TEST_FILE_NAME
-from tests.storage.vm_export.utils import get_manifest_from_vmexport, get_manifest_url
-from utilities.constants import OS_FLAVOR_RHEL, TIMEOUT_1MIN, U1_SMALL, UNPRIVILEGED_PASSWORD, UNPRIVILEGED_USER
+from tests.storage.vm_export.utils import create_blank_dv_by_specific_user, get_manifest_from_vmexport, get_manifest_url
+from utilities.constants import OS_FLAVOR_RHEL, U1_SMALL, UNPRIVILEGED_PASSWORD, UNPRIVILEGED_USER
 from utilities.infra import create_ns, login_with_user_password
-from utilities.storage import create_dv, data_volume_template_with_source_ref_dict
+from utilities.storage import data_volume_template_with_source_ref_dict
 from utilities.virt import VirtualMachineForTests, running_vm
 
 
@@ -151,18 +150,22 @@ def vm_from_vmexport(
 
 
 @pytest.fixture()
-def blank_dv_created_by_specific_user(namespace, unprivileged_client):
-    with create_dv(
-        source="blank",
-        dv_name="blank-dv-by-unprivileged-user",
-        namespace=namespace.name,
-        size="1Gi",
-        storage_class=py_config["default_storage_class"],
-        consume_wffc=False,
-        bind_immediate=True,
+def blank_dv_created_by_unprivileged_user(namespace, unprivileged_client):
+    with create_blank_dv_by_specific_user(
         client=unprivileged_client,
+        namespace_name=namespace.name,
+        dv_name="blank-dv-by-unprivileged-user",
+    ) as dv:
+        yield dv
+
+
+@pytest.fixture()
+def blank_dv_created_by_admin_user(namespace, admin_client):
+    with create_blank_dv_by_specific_user(
+        client=admin_client,
+        namespace_name=namespace.name,
+        dv_name="blank-dv-by-admin-user",
     ) as dv:
-        dv.wait_for_dv_success(timeout=TIMEOUT_1MIN)
         yield dv
 
 

tests/storage/vm_export/test_vm_export.py

@@ -10,10 +10,8 @@
 from ocp_resources.resource import Resource
 from ocp_resources.virtual_machine_export import VirtualMachineExport
 from pyhelper_utils.shell import run_ssh_commands
-from pytest_testconfig import config as py_config
 
 from tests.storage.vm_export.constants import VM_EXPORT_TEST_FILE_CONTENT, VM_EXPORT_TEST_FILE_NAME
-from utilities.constants import Images
 from utilities.infra import run_virtctl_command
 from utilities.virt import running_vm
 
@@ -25,38 +23,33 @@
 
 
 @pytest.mark.parametrize(
-    "namespace, data_volume_scope_function",
+    "namespace",
     [
         pytest.param(
             {"use_unprivileged_client": False},
-            {
-                "dv_name": "cirros-dv-9338",
-                "image": f"{Images.Cirros.DIR}/{Images.Cirros.QCOW2_IMG}",
-                "dv_size": Images.Cirros.DEFAULT_DV_SIZE,
-                "storage_class": py_config["default_storage_class"],
-            },
             marks=pytest.mark.polarion("CNV-9338"),
         )
     ],
     indirect=True,
 )
 @pytest.mark.s390x
 def test_fail_to_vmexport_with_unprivileged_client_no_permissions(
+    namespace,
+    blank_dv_created_by_admin_user,
     unprivileged_client,
-    data_volume_scope_function,
 ):
     with pytest.raises(
         ApiException,
         match=ERROR_MSG_USER_CANNOT_CREATE_VM_EXPORT,
     ):
         with VirtualMachineExport(
             name="vmexport-unprivileged",
-            namespace=data_volume_scope_function.namespace,
+            namespace=blank_dv_created_by_admin_user.namespace,
             client=unprivileged_client,
             source={
                 "apiGroup": "",
                 "kind": PersistentVolumeClaim.kind,
-                "name": data_volume_scope_function.name,
+                "name": blank_dv_created_by_admin_user.name,
             },
         ) as vmexport:
             assert not vmexport, "VMExport created by unprivileged client"
@@ -79,14 +72,14 @@ def test_vmexport_snapshot_manifests(
 @pytest.mark.s390x
 @pytest.mark.polarion("CNV-11597")
 def test_virtctl_vmexport_unprivileged(
-    vmexport_download_path, blank_dv_created_by_specific_user, virtctl_unprivileged_client
+    vmexport_download_path, blank_dv_created_by_unprivileged_user, virtctl_unprivileged_client
 ):
     return_code, out, err = run_virtctl_command(
         command=shlex.split(
-            f"vmexport download test-pvc-export-unprivileged --pvc={blank_dv_created_by_specific_user.name} "
+            f"vmexport download test-pvc-export-unprivileged --pvc={blank_dv_created_by_unprivileged_user.name} "
             f"--output {vmexport_download_path}"
         ),
-        namespace=blank_dv_created_by_specific_user.namespace,
+        namespace=blank_dv_created_by_unprivileged_user.namespace,
         verify_stderr=False,
     )
     assert return_code, f"Failed to run virtctl vmexport by unprivileged user, out: {out}, err: {err}."

tests/storage/vm_export/utils.py

@@ -5,10 +5,18 @@
 import io
 import logging
 import shlex
+from contextlib import contextmanager
+from typing import Generator
 
 import yaml
+from kubernetes.dynamic import DynamicClient
+from ocp_resources.datavolume import DataVolume
 from ocp_resources.virtual_machine import VirtualMachine
 from pyhelper_utils.shell import run_command
+from pytest_testconfig import config as py_config
+
+from utilities.constants import TIMEOUT_1MIN
+from utilities.storage import create_dv
 
 LOGGER = logging.getLogger(__name__)
 
@@ -34,3 +42,23 @@ def get_manifest_url(vmexport_external_links, manifest_type):
     ).get("url")
     assert url, f"Manifest url '{manifest_type}' in vmexport external links {vmexport_external_links} not found"
     return url
+
+
+@contextmanager
+def create_blank_dv_by_specific_user(
+    client: DynamicClient,
+    namespace_name: str,
+    dv_name: str,
+) -> Generator[DataVolume]:
+    with create_dv(
+        source="blank",
+        dv_name=dv_name,
+        namespace=namespace_name,
+        size="1Gi",
+        storage_class=py_config["default_storage_class"],
+        consume_wffc=False,
+        bind_immediate=True,
+        client=client,
+    ) as dv:
+        dv.wait_for_dv_success(timeout=TIMEOUT_1MIN)
+        yield dv