apply reviewer's suggestions

Signed-off-by: Adam Cinko <acinko@redhat.com>

Author: acinko-rh

tests/storage/test_wffc.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 HonorWaitForFirstConsumer test suite
 """
@@ -34,32 +35,39 @@
 
 
 WFFC_DV_NAME = "wffc-dv-name"
+DEFAULT_BLANK_DV_SIZE = "1Gi"
+
+
+@pytest.fixture(scope="module")
+def wffc_storage_class_name_scope_module(
+    storage_class_matrix_wffc_matrix__module__,
+):
+    return next(iter(storage_class_matrix_wffc_matrix__module__))
 
 
 @pytest.fixture()
-def blank_dv_wffc_scope_function(request, unprivileged_client, namespace, storage_class_matrix_wffc_matrix__module__):
+def blank_dv_wffc_scope_function(request, unprivileged_client, namespace, wffc_storage_class_name_scope_module):
     with create_dv(
         source="blank",
         dv_name=f"dv-{request.param['dv_name']}",
         namespace=namespace.name,
-        size="1Gi",
-        storage_class=next(iter(storage_class_matrix_wffc_matrix__module__)),
+        size=DEFAULT_BLANK_DV_SIZE,
+        storage_class=wffc_storage_class_name_scope_module,
         consume_wffc=False,
         client=unprivileged_client,
     ) as dv:
         yield dv
 
 
 @pytest.fixture()
-def blank_dv_template_wffc_scope_function(request, namespace, storage_class_matrix_wffc_matrix__module__):
-    storage_class_name = next(iter(storage_class_matrix_wffc_matrix__module__))
+def blank_dv_template_wffc_scope_function(request, namespace, wffc_storage_class_name_scope_module):
     blank_dv_template = DataVolume(
         name=f"dv-{request.param['dv_name']}",
         namespace=namespace.name,
         source="blank",
-        size="1Gi",
-        storage_class=storage_class_name,
-        access_modes=storage_class_matrix_wffc_matrix__module__[storage_class_name]["access_mode"],
+        size=DEFAULT_BLANK_DV_SIZE,
+        storage_class=wffc_storage_class_name_scope_module,
+        api_name="storage",
     )
     blank_dv_template.to_dict()
     return blank_dv_template.res
@@ -79,24 +87,23 @@ def uploaded_wffc_dv(namespace, unprivileged_client):
 def uploaded_dv_via_virtctl_wffc(
     namespace,
     downloaded_cirros_image_full_path,
-    downloaded_cirros_image_scope_class,
-    storage_class_matrix_wffc_matrix__module__,
+    wffc_storage_class_name_scope_module,
 ):
     with virtctl_upload_dv(
         client=namespace.client,
         namespace=namespace.name,
         name=WFFC_DV_NAME,
         size=Images.Cirros.DEFAULT_DV_SIZE,
         image_path=downloaded_cirros_image_full_path,
-        storage_class=[*storage_class_matrix_wffc_matrix__module__][0],
+        storage_class=wffc_storage_class_name_scope_module,
         insecure=True,
         consume_wffc=False,
     ) as res:
         yield res
 
 
 @pytest.fixture()
-def vm_from_uploaded_dv(namespace, uploaded_dv_via_virtctl_wffc, uploaded_wffc_dv, unprivileged_client):
+def vm_from_uploaded_dv(uploaded_wffc_dv, unprivileged_client):
     with create_vm_from_dv(
         dv=uploaded_wffc_dv,
         vm_name=WFFC_DV_NAME,
@@ -124,7 +131,6 @@ class TestWFFCUploadVirtctl:
     @pytest.mark.s390x
     def test_wffc_fail_to_upload_dv_via_virtctl(
         self,
-        namespace,
         uploaded_dv_via_virtctl_wffc,
         uploaded_wffc_dv,
     ):
@@ -154,15 +160,15 @@ def test_wffc_create_vm_from_uploaded_dv_via_virtctl(
         self,
         downloaded_cirros_image_full_path,
         vm_from_uploaded_dv,
-        storage_class_matrix_wffc_matrix__module__,
+        wffc_storage_class_name_scope_module,
     ):
         with virtctl_upload_dv(
             client=vm_from_uploaded_dv.client,
             namespace=vm_from_uploaded_dv.namespace,
             name=WFFC_DV_NAME,
             size=Images.Cirros.DEFAULT_DV_SIZE,
             image_path=downloaded_cirros_image_full_path,
-            storage_class=[*storage_class_matrix_wffc_matrix__module__][0],
+            storage_class=wffc_storage_class_name_scope_module,
             insecure=True,
             consume_wffc=False,
             cleanup=False,
@@ -173,59 +179,32 @@ def test_wffc_create_vm_from_uploaded_dv_via_virtctl(
             check_disk_count_in_vm(vm=vm_from_uploaded_dv)
 
 
-@pytest.mark.sno
-@pytest.mark.polarion("CNV-4739")
-@pytest.mark.s390x
-def test_wffc_import_registry_dv(
-    unprivileged_client,
-    namespace,
-    storage_class_matrix_wffc_matrix__module__,
-):
-    dv_name = "cnv-4739"
-    with create_dv(
-        source="registry",
-        dv_name=dv_name,
-        namespace=namespace.name,
-        url=f"docker://quay.io/kubevirt/{Images.Cirros.DISK_DEMO}",
-        storage_class=[*storage_class_matrix_wffc_matrix__module__][0],
-        consume_wffc=True,
-        client=unprivileged_client,
-    ) as dv:
-        dv.wait_for_dv_success()
-        create_vm_from_dv(client=unprivileged_client, dv=dv, vm_name=dv_name)
-
-
 @pytest.mark.sno
 @pytest.mark.s390x
 @pytest.mark.polarion("CNV-4742")
 @pytest.mark.parametrize(
-    "rhel10_data_source_scope_module",
-    [pytest.param({"dv_name": "wffc-4742"})],
-    indirect=True,
-)
-@pytest.mark.parametrize(
-    "blank_dv_wffc_scope_function",
-    [pytest.param({"dv_name": "blank-wffc-4742"})],
+    "rhel10_data_source_scope_module,blank_dv_wffc_scope_function",
+    [
+        ({"dv_name": "wffc-4742"}, {"dv_name": "blank-wffc-4742"}),
+    ],
     indirect=True,
 )
 def test_wffc_add_dv_to_vm_with_data_volume_template(
     unprivileged_client,
     namespace,
-    storage_class_matrix_wffc_matrix__module__,
+    wffc_storage_class_name_scope_module,
     rhel10_data_source_scope_module,
     blank_dv_wffc_scope_function,
 ):
-    dv_template = data_volume_template_with_source_ref_dict(
-        data_source=rhel10_data_source_scope_module,
-        storage_class=next(iter(storage_class_matrix_wffc_matrix__module__)),
-    )
-
     with VirtualMachineForTests(
         client=unprivileged_client,
         name="cnv-4742-vm",
         namespace=namespace.name,
         os_flavor=OS_FLAVOR_RHEL,
-        data_volume_template=dv_template,
+        data_volume_template=data_volume_template_with_source_ref_dict(
+            data_source=rhel10_data_source_scope_module,
+            storage_class=wffc_storage_class_name_scope_module,
+        ),
         memory_guest=Images.Rhel.DEFAULT_MEMORY_SIZE,
     ) as vm:
         validate_vm_and_disk_count(vm=vm)
@@ -245,7 +224,7 @@ def test_wffc_add_dv_to_vm_with_data_volume_template(
 def test_wffc_vm_with_two_data_volume_templates(
     unprivileged_client,
     namespace,
-    storage_class_matrix_wffc_matrix__module__,
+    wffc_storage_class_name_scope_module,
     rhel10_data_source_scope_module,
     blank_dv_template_wffc_scope_function,
 ):
@@ -256,7 +235,7 @@ def test_wffc_vm_with_two_data_volume_templates(
         os_flavor=OS_FLAVOR_RHEL,
         data_volume_template=data_volume_template_with_source_ref_dict(
             data_source=rhel10_data_source_scope_module,
-            storage_class=next(iter(storage_class_matrix_wffc_matrix__module__)),
+            storage_class=wffc_storage_class_name_scope_module,
         ),
         memory_guest=Images.Rhel.DEFAULT_MEMORY_SIZE,
     ) as vm: