Merge pull request #6767 from meinaLi/fix_https

Virtual disk: fix URL returned error issue for https network disk

Author: cliping

libvirt/tests/cfg/virtual_disks/virtual_disks_https.cfg

@@ -4,14 +4,14 @@
     target_disk = "sdb"
     disk_format = "raw"
     source_host_name = "insect.mm.fcix.net"
-    source_iso_name = "/fedora/linux/releases/41/Server/x86_64/iso/Fedora-Server-netinst-x86_64-41-1.4.iso"
+    base_url = "https://insect.mm.fcix.net/fedora/linux/releases/"
     cookie_name = "vmware_soap_session"
     cookie_value = "314455dbd2eaafd7d76b3b7828f0a3e3956450f9"
     expected_xpaths = [{'element_attrs': [".//ssl[@verify='yes']"]}, {'element_attrs': [".//readahead[@size='1024']"]}, {'element_attrs': [".//timeout[@seconds='60']"]}]
     cookie_in_dumpxml = "${cookie_name}.*${cookie_value}"
     driver_dict = "'driver': {'name': 'qemu', 'type': '${disk_format}'}"
     source_extra_dict = "'cookies': {'cookie_name': '${cookie_name}', 'cookie': '${cookie_value}'}, 'readahead': '1024', 'timeout': '60', 'ssl': 'yes'"
-    source_dict = "'source': {'hosts': [{'name': '${source_host_name}'}], 'attrs': {'protocol': 'https', 'name': '${source_iso_name}'}, ${source_extra_dict}}"
+    source_dict = "'source': {'hosts': [{'name': '${source_host_name}'}], 'attrs': {'protocol': 'https', 'name': '%s'}, ${source_extra_dict}}"
     disk_dict = {'type_name': 'network', 'readonly': True, 'device': '%s', ${driver_dict}, ${source_dict}, 'target': {'dev': '${target_disk}', 'bus': 'scsi'}}
     func_supported_since_libvirt_ver = (10, 10, 0)
     variants:

libvirt/tests/src/virtual_disks/virtual_disks_https.py

@@ -1,3 +1,7 @@
+import re
+import logging
+from urllib.request import urlopen
+
 from virttest import virsh
 from virttest import libvirt_version
 
@@ -7,6 +11,68 @@
 from virttest.utils_libvirtd import Libvirtd
 from virttest.utils_config import LibvirtQemuConfig
 
+LOG = logging.getLogger('avocado.' + __name__)
+
+
+def get_latest_fedora_version(base_url):
+    """
+    Get the latest Fedora version from the releases directory.
+
+    :param base_url: Base URL of Fedora releases directory
+    :return: Latest version number as string
+    """
+    try:
+        html = urlopen(base_url, timeout=10).read().decode('utf-8')
+        vers = re.findall(r'>(\d+)/<', html)
+        if not vers:
+            raise RuntimeError(f"No version directories found at {base_url}")
+        LOG.info(f"Found the latest Fedora version: {max(vers, key=int)}")
+        return max(vers, key=int)
+    except Exception as e:
+        raise Exception(f"Failed to get latest version from {base_url}: {str(e)}")
+
+
+def get_fedora_iso_build(base_url, version, arch="x86_64", server_type="Server"):
+    """
+    Get the exact build number from the ISO directory listing.
+
+    :param base_url: Base URL of Fedora releases directory
+    :param version: Fedora version number
+    :param arch: System architecture, default is "x86_64"
+    :param server_type: Server type, default is "Server"
+    :return: Build number as string (e.g., "1.6")
+    """
+    iso_dir_url = f"{base_url}{version}/{server_type}/{arch}/iso/"
+    try:
+        html = urlopen(iso_dir_url, timeout=10).read().decode('utf-8')
+        pattern = rf"Fedora-{server_type}-netinst-{arch}-{version}-([\d.]+)\.iso"
+        match = re.search(pattern, html)
+        if not match:
+            raise RuntimeError(f"Cannot find netinst ISO filename in directory listing at {iso_dir_url}")
+        LOG.info(f"Found the Fedora build number: {match.group(1)}")
+        return match.group(1)
+    except Exception as e:
+        raise Exception(f"Failed to get build number from {iso_dir_url}: {str(e)}")
+
+
+def get_latest_fedora_iso_url(base_url, arch="x86_64", server_type="Server"):
+    """
+    Get the latest Fedora Server netinst ISO path or URL.
+
+    :param base_url: Base URL of Fedora releases
+    :param arch: System architecture, default is "x86_64"
+    :param server_type: Server type, default is "Server"
+    :return: ISO path
+    """
+    version = get_latest_fedora_version(base_url)
+    build = get_fedora_iso_build(base_url, version, arch, server_type)
+
+    iso_path = (
+        f"/fedora/linux/releases/{version}/{server_type}/{arch}/iso/"
+        f"Fedora-{server_type}-netinst-{arch}-{version}-{build}.iso"
+    )
+    return iso_path
+
 
 def run(test, params, env):
     """
@@ -34,7 +100,8 @@ def prepare_disk():
         :param disk_obj: return the disk object.
         """
         network_device = params.get("network_device")
-        disk_dict = eval(params.get("disk_dict", "{}") % network_device)
+        iso_path = get_latest_fedora_iso_url(base_url, arch="x86_64", server_type="Server")
+        disk_dict = eval(params.get("disk_dict", "{}") % (network_device, iso_path))
         disk_obj = libvirt_vmxml.create_vm_device_by_type("disk", disk_dict)
         if not with_hotplug:
             libvirt.add_vm_device(vmxml, disk_obj)
@@ -64,6 +131,7 @@ def check_result(disk_in_vm=True):
     expected_xpaths = eval(params.get("expected_xpaths"))
     cookie_in_dumpxml = params.get("cookie_in_dumpxml")
     with_hotplug = "yes" == params.get("with_hotplug", "no")
+    base_url = params.get("base_url")
 
     vmxml = vm_xml.VMXML.new_from_inactive_dumpxml(vm_name)
     backup_vmxml = vmxml.copy()