virtio_win_installer: add pretest for installer

In the situation of only having installer related
files, try to create a standard virtio-win iso
and testing the basic install/uninstall/update
function, qga and drivers version check.

Signed-off-by: Xiaoling Gao <xiagao@redhat.com>

Author: xiagao

generic/tests/netperf.py

@@ -173,8 +173,9 @@ def mtu_set(mtu):
             session = vm.wait_for_login(nic_index=2, timeout=login_timeout)
             for driver_name in driver_name.split():
                 inf_path = win_driver_utils.get_driver_inf_path(
-                    session, test, media_type, driver_name
+                    session, test, media_type, driver_name, params
                 )
+
                 if driver_name == "netkvm":
                     device_name = params.get("device_name")
                     device_hwid = params.get("device_hwid")

provider/virtio_fs_utils.py

@@ -307,10 +307,19 @@ def get_viofs_exe_path(test, params, session):
     exe_middle_path = (
         "{name}\\{arch}" if media_type == "iso" else "{arch}\\{name}"
     ).format(name=guest_name, arch=guest_arch)
-    exe_file_name = "virtiofs.exe"
-    exe_find_cmd = 'dir /b /s %s\\%s | findstr "\\%s\\\\"'
-    exe_find_cmd %= (viowin_ltr, exe_file_name, exe_middle_path)
-    exe_path = session.cmd(exe_find_cmd).strip()
+
+    exe_file_name = params.get("exe_file_name", "virtiofs.exe")
+    formal_exe_find_cmd = (
+        'dir /b /s VIOWIN_LTR\\EXE_FILE_NAME | findstr "\\EXE_MID_PATH\\\\"'
+    )
+    exe_find_cmd = params.get("exe_find_cmd", formal_exe_find_cmd)
+
+    exe_find_cmd_new = exe_find_cmd.replace(
+        'VIOWIN_LTR', viowin_ltr).replace(
+        'EXE_FILE_NAME', exe_file_name).replace(
+        'EXE_MID_PATH', exe_middle_path)
+
+    exe_path = session.cmd(exe_find_cmd_new).strip()
     test.log.info("Found exe file '%s'", exe_path)
     return exe_path
 

provider/win_driver_installer_test.py

@@ -28,6 +28,8 @@
     "vioinput",
     "fwcfg",
     "viomem",
+    "viosock",
+    "viogpudo",
 ]
 
 device_hwid_list = [
@@ -42,6 +44,8 @@
     '"PCI\\VEN_1AF4&DEV_1052"',
     '"ACPI\\VEN_QEMU&DEV_0002"',
     r'"PCI\VEN_1AF4&DEV_1002" "PCI\VEN_1AF4&DEV_1058"',
+    r'"PCI\VEN_1AF4&DEV_1053" "PCI\VEN_1AF4&DEV_1012"',
+    r'"PCI\VEN_1AF4&DEV_1050&SUBSYS_11001AF4&REV_01"',
 ]
 
 device_name_list = [
@@ -56,6 +60,8 @@
     "VirtIO Input Driver",
     "QEMU FwCfg Device",
     "VirtIO Viomem Driver",
+    "VirtIO Socket Driver",
+    "Red Hat VirtIO GPU DOD controller",
 ]
 
 
@@ -184,7 +190,7 @@ def driver_check(session, test, params):
                 continue
         error_context.context("%s Driver Check" % driver_name, LOG_JOB.info)
         inf_path = win_driver_utils.get_driver_inf_path(
-            session, test, media_type, driver_name
+            session, test, media_type, driver_name, params
         )
         expected_ver = session.cmd(
             "type %s | findstr /i /r DriverVer.*=" % inf_path, timeout=360
@@ -222,6 +228,18 @@ def check_gagent_version(session, test, gagent_pkg_info_cmd, expected_gagent_ver
     """
     error_context.context("Check if gagent version is correct.", LOG_JOB.info)
     actual_gagent_version = session.cmd_output(gagent_pkg_info_cmd).split()[-2]
+
+    exe_ver_cmd = r'"c:\program files\qemu-ga\qemu-ga.exe" --version'
+    gagent_exe_version = session.cmd_output(exe_ver_cmd)
+
+    test.log.info(
+        "actual_gagent_version version is %s, "
+        "qga version by installer is %s, "
+        "gagent exe version is %s",
+        actual_gagent_version,
+        expected_gagent_version,
+        gagent_exe_version,
+    )
     if actual_gagent_version != expected_gagent_version:
         test.fail(
             "gagent version is not right, expected is %s but got %s"

provider/win_driver_utils.py

@@ -5,13 +5,11 @@
 """
 
 import logging
-import os
 import re
 import time
 
 import aexpect
-from virttest import data_dir, error_context, utils_misc, utils_test
-from virttest.utils_version import VersionInterval
+from virttest import error_context, utils_misc, utils_test
 from virttest.utils_windows import system, virtio_win, wmic
 
 LOG_JOB = logging.getLogger("avocado.test")
@@ -127,14 +125,15 @@ def uninstall_driver(session, test, devcon_path, driver_name, device_name, devic
         )
 
 
-def get_driver_inf_path(session, test, media_type, driver_name):
+def get_driver_inf_path(session, test, media_type, driver_name, params):
     """
     Get driver inf path from virtio win iso,such as E:\viofs\2k19\amd64.
 
     :param session: The guest session object.
     :param test: kvm test object.
     :param media_type: media type.
     :param driver_name: driver name.
+    :param params: the dict used for parameters
     """
     try:
         get_drive_letter = getattr(virtio_win, "drive_letter_%s" % media_type)
@@ -151,20 +150,28 @@ def get_driver_inf_path(session, test, media_type, driver_name):
     guest_arch = get_arch_dirname(session)
     if not guest_arch:
         test.error("Could not get architecture dirname of the vm")
-
+    # for formal virtio-win iso
     inf_middle_path = (
         "{name}\\{arch}" if media_type == "iso" else "{arch}\\{name}"
     ).format(name=guest_name, arch=guest_arch)
-    inf_find_cmd = 'dir /b /s %s\\%s.inf | findstr "\\%s\\\\"'
-    inf_find_cmd %= (viowin_ltr, driver_name, inf_middle_path)
-    inf_path = session.cmd(inf_find_cmd, timeout=OPERATION_TIMEOUT).strip()
+    formal_inf_find_cmd = "dir /b /s VIOWIN_LTR\\DRIVER_NAME.inf |"
+    formal_inf_find_cmd += ' findstr "\\INF_MID_PATH\\\\'
+    inf_find_cmd = params.get("inf_find_cmd", formal_inf_find_cmd)
+
+    inf_find_cmd_new = (
+        inf_find_cmd.replace("VIOWIN_LTR", viowin_ltr)
+        .replace("DRIVER_NAME", driver_name)
+        .replace("INF_MID_PATH", inf_middle_path)
+    )
+
+    inf_path = session.cmd(inf_find_cmd_new, timeout=OPERATION_TIMEOUT).strip()
     LOG_JOB.info("Found inf file '%s'", inf_path)
     return inf_path
 
 
 @error_context.context_aware
 def install_driver_by_virtio_media(
-    session, test, devcon_path, media_type, driver_name, device_hwid
+    session, test, devcon_path, media_type, driver_name, device_hwid, params
 ):
     """
     Install driver by virtio media.
@@ -175,6 +182,7 @@ def install_driver_by_virtio_media(
     :param media_type: media type.
     :param driver_name: driver name.
     :param device_hwid: device hardware id.
+    :param params: the dict used for parameters
     """
     devcon_path = utils_misc.set_winutils_letter(session, devcon_path)
     status, output = session.cmd_status_output(
@@ -188,7 +196,7 @@ def install_driver_by_virtio_media(
         output = session.cmd_output("%s find %s" % (devcon_path, hwid))
         if re.search("No matching devices found", output, re.I):
             continue
-        inf_path = get_driver_inf_path(session, test, media_type, driver_name)
+        inf_path = get_driver_inf_path(session, test, media_type, driver_name, params)
         inst_cmd = "%s updateni %s %s" % (devcon_path, inf_path, hwid)
         status, output = session.cmd_status_output(inst_cmd, INSTALL_TIMEOUT)
         # acceptable status: OK(0), REBOOT(1)
@@ -239,15 +247,6 @@ def run_installer(vm, session, test, params, run_installer_cmd):
     :param run_installer_cmd: install/uninstall/repair cmd.
     :return session: a new session after restart of installer
     """
-    cdrom_virtio = params["cdrom_virtio"]
-    installer_restart_version = params.get(
-        "installer_restart_version", "[1.9.37.0, 1.9.40.0]"
-    )
-    cdrom_virtio_path = os.path.basename(
-        utils_misc.get_path(data_dir.get_data_dir(), cdrom_virtio)
-    )
-    match = re.search(r"virtio-win-(\d+\.\d+(?:\.\d+)?-\d+)", cdrom_virtio_path)
-    cdrom_virtio_version = re.sub("-", ".", match.group(1))
     # run installer cmd
     run_installer_cmd = utils_misc.set_winutils_letter(session, run_installer_cmd)
     session.cmd(run_installer_cmd)
@@ -256,18 +255,14 @@ def run_installer(vm, session, test, params, run_installer_cmd):
         lambda: not autoit_installer_check(params, session), 240, 2, 2
     ):
         test.fail("Autoit exe stop there for 240s, please have a check.")
-    restart_con_ver = cdrom_virtio_version in VersionInterval(installer_restart_version)
     restart_con_repair = "repair" in run_installer_cmd
-    if restart_con_ver or restart_con_repair:
-        # Wait for vm re-start by installer itself
+    if restart_con_repair:
+        # Wait for vm re-start by installer itself, only repair has self-restart
         if not utils_misc.wait_for(lambda: not session.is_responsive(), 120, 5, 5):
             test.fail(
                 "The previous session still exists,seems that the vm doesn't restart."
             )
         session = vm.wait_for_login(timeout=360)
-    # for the early virtio-win instller, rebooting is needed.
-    if cdrom_virtio_version in VersionInterval("(,1.9.37.0)"):
-        session = vm.reboot(session)
     return session
 
 

qemu/tests/cfg/win_virtio_driver_installer_pretest.cfg

@@ -0,0 +1,150 @@
+- win_virtio_driver_installer_pretest:
+    type = win_virtio_driver_installer_pretest
+    only Windows
+    virtio_win_media_type = iso
+    cdroms += " virtio"
+    clone_master = yes
+    master_images_clone = image1
+    remove_image_image1 = yes
+    cd_format_fixed = ide
+    drive_format_image1 = ide
+    q35:
+        cd_format_fixed = ahci
+        drive_format_image1 = ahci
+    vio_driver_chk_cmd = 'driverquery /si | find /i "%s"'
+    chk_timeout = 240
+    install_script_path = "WIN_UTILS:\install.au3"
+    repair_script_path = "WIN_UTILS:\repair.au3"
+    uninstall_script_path = "WIN_UTILS:\uninstall.au3"
+    run_install_cmd = 'WIN_UTILS:\AutoIt3_%PROCESSOR_ARCHITECTURE%.exe C:\install.au3'
+    run_repair_cmd = 'WIN_UTILS:\AutoIt3_%PROCESSOR_ARCHITECTURE%.exe C:\repair.au3'
+    run_uninstall_cmd = 'WIN_UTILS:\AutoIt3_%PROCESSOR_ARCHITECTURE%.exe C:\uninstall.au3'
+    signed_check_cmd = 'wmic product where name="Virtio-win-driver-installer" | findstr "Red Hat, Inc."'
+    monitor_type = qmp
+    monitors = qmp1
+    mem_stat_check_list = 'stat-free-memory'
+    check_mem_diff = 300
+    guest_compare_threshold = 300
+    guest_mem_ratio = 0.025
+    devcon_dirname = "win7_"
+    i386:
+        devcon_dirname += "x86"
+        qemu_ga_pkg = qemu-ga-i386.msi
+        msi_name = virtio-win-gt-x86.msi
+        uninstall_msi_script = "uninstall_via_msi_x86.au3"
+    x86_64:
+        devcon_dirname += "amd64"
+        qemu_ga_pkg = qemu-ga-x86_64.msi
+        msi_name = virtio-win-gt-x64.msi
+        uninstall_msi_script = "uninstall_via_msi_x64.au3"
+    uninstall_msi_script_path = "WIN_UTILS:\${uninstall_msi_script}"
+    devcon_path = "WIN_UTILS:\devcon\${devcon_dirname}\devcon.exe"
+    gagent_install_cmd = "start /wait %s /quiet"
+    gagent_pkg_info_cmd = 'wmic product where name="Qemu guest agent"'
+    gagent_uninstall_cmd = "wmic product where name='Qemu guest agent' call uninstall"
+    threshold = 0.025
+    nic_model_nic1 = rtl8139
+    q35:
+        nic_model_nic1 = e1000e
+    # install winfsp tool
+    i386, i686:
+        install_winfsp_path = 'C:\Program Files'
+    x86_64:
+        install_winfsp_path = 'C:\Program Files (x86)'
+    nics += " nic2"
+    nic_model_nic2 = virtio
+    no_virtio_rng:
+        virtio_rngs += " rng0"
+        backend_rng0 = rng-builtin
+        backend_type = builtin
+    images += " stg0 stg1"
+    image_name_stg0 = "images/stg0"
+    image_name_stg1 = "images/stg1"
+    image_size_stg0 = 5G
+    image_size_stg1 = 10G
+    drive_format_stg0 = virtio
+    drive_format_stg1 = scsi-hd
+    remove_image_stg0 = yes
+    remove_image_stg1 = yes
+    force_create_image_stg0 = yes
+    force_create_image_stg1 = yes
+    serials += " vs"
+    serial_type_vs = virtserialport
+    balloon = balloon0
+    balloon_dev_devid = balloon0
+    balloon_dev_add_bus = yes
+    install_balloon_service = "%s:\Balloon\blnsvr.exe -i"
+    uninstall_balloon_service = "%s:\Balloon\blnsvr.exe -u"
+    status_balloon_service = "%s:\Balloon\blnsvr.exe status"
+    run_balloon_service = "%s:\Balloon\blnsvr.exe -r"
+    stop_balloon_service = "%s:\Balloon\blnsvr.exe -s"
+    inputs = input1
+    input_dev_bus_type_input1 = virtio
+    input_dev_type_input1 = mouse
+    vmcoreinfo = yes
+    filesystems = fs
+    fs_driver = virtio-fs
+    fs_source_type = mount
+    fs_source_dir = virtio_fs_test/
+    force_create_fs_source = yes
+    remove_fs_source = yes
+    fs_target = 'myfs'
+    fs_driver_props = {"queue-size": 1024}
+    Win10.i386:
+        mem = 4096
+    mem_devs = mem1
+    backend_mem_mem1 = memory-backend-file
+    mem-path_mem1 = /dev/shm
+    size_mem1 = ${mem}M
+    use_mem_mem1 = no
+    share_mem = yes
+    guest_numa_nodes = shm0
+    numa_memdev_shm0 = mem-mem1
+    numa_nodeid_shm0 = 0
+    fs_binary_extra_options = " -o cache=auto"
+    exe_file_name = "virtiofs.exe"
+    exe_find_cmd = 'dir /b /s VIOWIN_LTR\EXE_FILE_NAME'
+    inf_find_cmd = 'dir /b /s VIOWIN_LTR\DRIVER_NAME.inf'
+    cdrom_virtio = '/home/virtio-win-pretest.iso'
+    # add vsock device, except for Win10
+    ! Win10:
+        vsocks = vhost_vsock0
+    # add virtio vga device
+    vga = "virtio"
+    # add viomem
+    x86_64:
+        # virtio-mem is not supported on 32-bit systems
+        # and viomem is supported from 1.9.40-0
+        boot_with_viomem = yes
+        slots_mem = 20
+        maxmem_mem = 80G
+        mem_devs += ' vmem0'
+        backend_mem_vmem0 = memory-backend-memfd
+        node_memory_vmem0 = "0"
+        vm_memdev_model_vmem0 = "virtio-mem"
+        size_mem_vmem0 = 8G
+        requested-size_memory_vmem0 = 1G
+        memdev_memory_vmem0 = "mem-vmem0"
+    i386:
+        # mainly to cover win10.i386 test without viomem
+        boot_with_viomem = no
+    variants:
+        - create_iso:
+            create_iso = yes
+            driver_folder_name = Virtio-Win
+            guest_path = "C:\Program Files\${driver_folder_name}\*"
+            host_installer_path = "/home/installer/"
+            mkiso_cmd = "mkisofs -o ${cdrom_virtio} -input-charset iso8859-1 -J -R -V "Virtio-Win" ${host_installer_path}"
+        - install_uninstall:
+            install_uninstall_test = yes
+        - update:
+            update_test = yes
+            static_ip = 192.168.0.11
+            static_mask = 255.255.255.0
+            static_gateway = 192.168.0.5
+            static_dns = 192.168.0.1
+            setup_ip_cmd = 'netsh interface ip set address "%s" static ${static_ip} ${static_mask} ${static_gateway}'
+            setup_dns_cmd = 'netsh interface ip add dns "%s" ${static_dns} validate=no'
+        - repair:
+            repair_test = yes
+            msi_uninstall_cmd = "msiexec.exe /q /passive /x %s"