Fix the s390x tier2 storage tests which are failing due to missing DEFAULT_DV_SIZE. (RedHatQE#2143)

##### Short description:

- Some of the tests are failing in s390x as they are using less size
than the required size. So i have changed those tests to use
DEFAULT_DV_SIZE constant which will give the required size based on the
Architecture.
- Test test_disk_falloc is not working with /dev/zero on s390x due to
some issue. So I am using /dev/urandom for s390x.


##### More details:

##### What this PR does / why we need it:

##### Which issue(s) this PR fixes:

##### Special notes for reviewer:

##### 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".
-->


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

- **Tests**
- Standardized default DataVolume sizes across storage tests by using a
shared image size constant.
- Updated upload and virtctl upload tests to use the centralized default
size.
- Harmonized an HTTP import disk-fill test: switched to an Alpine
image/source, updated image/size/wait parameters, changed disk-fill to
use non-zero data, and generalized the expected "No space left on
device" message.
- Expanded console prompt tests to accept both root (#) and user ($)
prompts.

- **Chores**
- Added Alpine OS flavor, normalized Alpine image names, and excluded
Alpine from cloud-init by default.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Signed-off-by: Vamsi Krishna Siddu <vamsikrishna.siddu@ibm.com>

Author: vamsikrishna-siddu

tests/storage/cdi_import/test_import_http.py

@@ -30,6 +30,7 @@
 )
 from utilities import console
 from utilities.constants import (
+    OS_FLAVOR_ALPINE,
     OS_FLAVOR_RHEL,
     TIMEOUT_1MIN,
     TIMEOUT_5MIN,
@@ -532,29 +533,33 @@ def test_blank_disk_import_validate_status(data_volume_multi_storage_scope_funct
 
 
 @pytest.mark.parametrize(
-    "dv_from_http_import",
+    "data_volume_multi_storage_scope_function",
     [
         pytest.param(
             {
                 "dv_name": "cnv-3065",
-                "file_name": Images.Cdi.QCOW2_IMG,
-                "source": HTTPS,
-                "size": "100Mi",
-                "configmap_name": INTERNAL_HTTP_CONFIGMAP_NAME,
+                "source": HTTP,
+                "image": f"{Images.Alpine.DIR}/{Images.Alpine.QCOW2_IMG}",
+                "dv_size": Images.Alpine.DEFAULT_DV_SIZE,
+                "wait": True,
             },
             marks=pytest.mark.polarion("CNV-3065"),
         ),
     ],
     indirect=True,
 )
 @pytest.mark.sno
-def test_disk_falloc(internal_http_configmap, dv_from_http_import):
-    dv_from_http_import.wait_for_dv_success()
-    with create_vm_from_dv(dv=dv_from_http_import) as vm_dv:
+def test_disk_falloc(data_volume_multi_storage_scope_function):
+    data_volume_multi_storage_scope_function.wait_for_dv_success()
+    with create_vm_from_dv(
+        dv=data_volume_multi_storage_scope_function,
+        os_flavor=OS_FLAVOR_ALPINE,
+        memory_guest=Images.Alpine.DEFAULT_MEMORY_SIZE,
+    ) as vm_dv:
         with console.Console(vm=vm_dv) as vm_console:
             LOGGER.info("Fill disk space.")
-            vm_console.sendline("dd if=/dev/zero of=file bs=1M")
-            vm_console.expect("dd: writing 'file': No space left on device", timeout=TIMEOUT_1MIN)
+            vm_console.sendline("dd if=/dev/urandom of=file bs=1M")
+            vm_console.expect("No space left on device", timeout=TIMEOUT_1MIN)
 
 
 @pytest.mark.destructive

tests/storage/cdi_upload/test_upload.py

@@ -188,7 +188,7 @@ def test_successful_upload_with_supported_formats(
             {
                 "dv_name": "cnv-2018",
                 "source": "upload",
-                "dv_size": "3Gi",
+                "dv_size": Images.Cirros.DEFAULT_DV_SIZE,
                 "wait": False,
             },
             marks=(pytest.mark.polarion("CNV-2018")),

tests/storage/cdi_upload/test_upload_virtctl.py

@@ -67,7 +67,7 @@ def test_successful_virtctl_upload_no_url(namespace, tmpdir):
     with virtctl_upload_dv(
         namespace=namespace.name,
         name=pvc_name,
-        size="1Gi",
+        size=DEFAULT_DV_SIZE,
         storage_class=py_config["default_storage_class"],
         image_path=local_name,
         insecure=True,
@@ -120,7 +120,7 @@ def test_image_upload_with_overridden_url(
     with virtctl_upload_dv(
         namespace=namespace.name,
         name=pvc_name,
-        size="1Gi",
+        size=DEFAULT_DV_SIZE,
         storage_class=py_config["default_storage_class"],
         image_path=local_name,
         insecure=True,
@@ -144,7 +144,7 @@ def test_virtctl_image_upload_with_ca(
     with virtctl_upload_dv(
         namespace=namespace.name,
         name=pvc_name,
-        size="1Gi",
+        size=DEFAULT_DV_SIZE,
         storage_class=py_config["default_storage_class"],
         image_path=local_path,
     ) as res:
@@ -263,7 +263,7 @@ def test_virtctl_image_upload_with_exist_dv(download_image, namespace, storage_c
         source="upload",
         dv_name=dv_name,
         namespace=namespace.name,
-        size="1Gi",
+        size=DEFAULT_DV_SIZE,
         storage_class=storage_class_name_scope_module,
     ) as dv:
         dv.wait_for_status(status=DataVolume.Status.UPLOAD_READY, timeout=120)
@@ -295,7 +295,7 @@ def empty_pvc(
         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=DEFAULT_DV_SIZE,
         hostpath_node=worker_node1.name
         if sc_is_hpp_with_immediate_volume_binding(sc=storage_class_name_scope_module)
         else None,

tests/storage/test_cdi_certificate.py

@@ -194,7 +194,7 @@ def test_upload_after_certs_renewal(
     with virtctl_upload_dv(
         namespace=namespace.name,
         name=dv_name,
-        size="1Gi",
+        size=Images.Cirros.DEFAULT_DV_SIZE,
         image_path=LOCAL_QCOW2_IMG_PATH,
         storage_class=storage_class_name_immediate_binding_scope_module,
         insecure=True,
@@ -213,7 +213,7 @@ def test_upload_after_certs_renewal(
             {
                 "dv_name": "dv-source",
                 "image": f"{Images.Cirros.DIR}/{Images.Cirros.QCOW2_IMG}",
-                "dv_size": "1Gi",
+                "dv_size": Images.Cirros.DEFAULT_DV_SIZE,
                 "wait": True,
             },
         ),
@@ -258,7 +258,7 @@ def test_upload_after_validate_aggregated_api_cert(
     with virtctl_upload_dv(
         namespace=namespace.name,
         name=dv_name,
-        size="1Gi",
+        size=Images.Cirros.DEFAULT_DV_SIZE,
         image_path=LOCAL_QCOW2_IMG_PATH,
         storage_class=storage_class_name_immediate_binding_scope_module,
         insecure=True,
@@ -314,7 +314,7 @@ def test_cert_exposure_rotation(
     with virtctl_upload_dv(
         namespace=namespace.name,
         name="cnv-5708",
-        size="1Gi",
+        size=Images.Cirros.DEFAULT_DV_SIZE,
         storage_class=py_config["default_storage_class"],
         image_path=downloaded_cirros_image,
         insecure=False,

tests/storage/test_disk_preallocation.py

@@ -114,7 +114,7 @@ def test_preallocation_dv(
                 "dv_name": "cnv-5513",
                 "source": "http",
                 "image": f"{Images.Cirros.DIR}/{Images.Cirros.QCOW2_IMG}",
-                "dv_size": "100Mi",
+                "dv_size": Images.Cirros.DEFAULT_DV_SIZE,
             },
             marks=pytest.mark.polarion("CNV-5513"),
         ),
@@ -142,7 +142,7 @@ def test_preallocation_globally_dv_spec_without_preallocation(
                 "dv_name": "cnv-5741",
                 "source": "http",
                 "image": f"{Images.Cirros.DIR}/{Images.Cirros.QCOW2_IMG}",
-                "dv_size": "200Mi",
+                "dv_size": Images.Cirros.DEFAULT_DV_SIZE,
                 "preallocation": False,
             },
             marks=pytest.mark.polarion("CNV-5741"),

tests/storage/utils.py

@@ -86,7 +86,7 @@ def upload_image_to_dv(dv_name, storage_ns_name, storage_class, client, consume_
         source="upload",
         dv_name=dv_name,
         namespace=storage_ns_name,
-        size="3Gi",
+        size=Images.Cirros.DEFAULT_DV_SIZE,
         storage_class=storage_class,
         client=client,
         consume_wffc=consume_wffc,

utilities/console.py

@@ -48,7 +48,7 @@ def __init__(
         self.timeout = timeout
         self.child = None
         self.login_prompt = "login:"
-        self.prompt = prompt if prompt else [r"\$"]
+        self.prompt = prompt if prompt else [r"#", r"\$"]
         self.cmd = self._generate_cmd()
         self.base_dir = get_data_collector_base_directory()
 

utilities/constants.py

@@ -44,6 +44,7 @@
 
 #  OS constants
 OS_FLAVOR_CIRROS = "cirros"
+OS_FLAVOR_ALPINE = "alpine"
 OS_FLAVOR_WINDOWS = "win"
 OS_FLAVOR_RHEL = "rhel"
 OS_FLAVOR_FEDORA = "fedora"
@@ -52,7 +53,7 @@
 class ArchImages:
     class X86_64:  # noqa: N801
         BASE_CIRROS_NAME = "cirros-0.4.0-x86_64-disk"
-        BASE_ALPINE_NAME = "alpine-3.20.1-x86_64-disk"
+        BASE_ALPINE_NAME = "alpine-x86_64-disk"
         Cirros = Cirros(
             RAW_IMG=f"{BASE_CIRROS_NAME}.raw",
             RAW_IMG_GZ=f"{BASE_CIRROS_NAME}.raw.gz",
@@ -109,7 +110,7 @@ class X86_64:  # noqa: N801
         Cdi = Cdi(QCOW2_IMG="cirros-qcow2.img")
 
     class ARM64:
-        BASE_ALPINE_NAME = "alpine-3.20.1-aarch64-disk"
+        BASE_ALPINE_NAME = "alpine-aarch64-disk"
         Cirros = Cirros(
             RAW_IMG_XZ="cirros-0.4.0-aarch64-disk.raw.xz",
         )
@@ -130,7 +131,7 @@ class ARM64:
         Cdi = Cdi()
 
     class S390X:
-        BASE_ALPINE_NAME = "alpine-3.20.1-s390x-disk"
+        BASE_ALPINE_NAME = "alpine-s390x-disk"
         Cirros = Cirros(
             # TODO: S390X does not support Cirros; this is a workaround until tests are moved to Fedora
             RAW_IMG="Fedora-Cloud-Base-Generic-41-1.4.s390x.raw",

utilities/unittests/test_console.py

@@ -24,7 +24,7 @@ def test_console_init_with_defaults(self, mock_vm_no_namespace):
         assert console.timeout == 30
         assert console.child is None
         assert console.login_prompt == "login:"
-        assert console.prompt == [r"\$"]
+        assert console.prompt == [r"#", r"\$"]
 
     def test_console_init_with_custom_values(self, mock_vm_no_namespace):
         """Test Console initialization with custom values"""
@@ -207,7 +207,7 @@ def test_console_connect_with_username_and_password(self, mock_get_dir):
         console.child.sendline.assert_any_call("testuser")
         console.child.expect.assert_any_call("Password:")
         console.child.sendline.assert_any_call("testpass")
-        console.child.expect.assert_any_call([r"\$"])
+        console.child.expect.assert_any_call([r"#", r"\$"])
 
     @patch("console.get_data_collector_base_directory")
     def test_console_connect_username_only(self, mock_get_dir):
@@ -251,7 +251,7 @@ def test_console_connect_no_username(self, mock_get_dir):
 
         # Should only send newlines and expect prompt
         console.child.send.assert_any_call("\n\n")
-        console.child.expect.assert_any_call([r"\$"])
+        console.child.expect.assert_any_call([r"#", r"\$"])
         # Should not expect login prompt
         login_calls = [call for call in console.child.expect.call_args_list if "login:" in str(call)]
         assert len(login_calls) == 0
@@ -274,7 +274,7 @@ def test_console_disconnect_with_username(self, mock_get_dir):
         console.disconnect()
 
         console.child.send.assert_any_call("\n\n")
-        console.child.expect.assert_any_call([r"\$"])
+        console.child.expect.assert_any_call([r"#", r"\$"])
         console.child.send.assert_any_call("exit")
         console.child.send.assert_any_call("\n\n")
         console.child.expect.assert_any_call("login:")
@@ -297,7 +297,7 @@ def test_console_disconnect_no_username(self, mock_get_dir):
         console.disconnect()
 
         console.child.send.assert_any_call("\n\n")
-        console.child.expect.assert_any_call([r"\$"])
+        console.child.expect.assert_any_call([r"#", r"\$"])
         # Should not send exit command
         exit_calls = [call for call in console.child.send.call_args_list if "exit" in str(call)]
         assert len(exit_calls) == 0

utilities/virt.py

@@ -56,6 +56,7 @@
     IP_FAMILY_POLICY_PREFER_DUAL_STACK,
     LINUX_AMD_64,
     LINUX_STR,
+    OS_FLAVOR_ALPINE,
     OS_FLAVOR_CIRROS,
     OS_FLAVOR_FEDORA,
     OS_FLAVOR_WINDOWS,
@@ -94,7 +95,7 @@
 K8S_TAINT = "node.kubernetes.io/unschedulable"
 NO_SCHEDULE = "NoSchedule"
 CIRROS_IMAGE = "kubevirt/cirros-container-disk-demo:latest"
-FLAVORS_EXCLUDED_FROM_CLOUD_INIT = (OS_FLAVOR_WINDOWS, OS_FLAVOR_CIRROS)
+FLAVORS_EXCLUDED_FROM_CLOUD_INIT = (OS_FLAVOR_WINDOWS, OS_FLAVOR_CIRROS, OS_FLAVOR_ALPINE)
 VM_ERROR_STATUSES = [
     VirtualMachine.Status.CRASH_LOOPBACK_OFF,
     VirtualMachine.Status.ERROR_UNSCHEDULABLE,