Test branch

.github/workflows/ci.yml

@@ -12,11 +12,11 @@ jobs:
   travis-check:
 
     name: Python ${{ matrix.python-version }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.8, 3.9, 3.11, 3.12]
       fail-fast: false
 
     steps:
@@ -29,12 +29,19 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Update pip
+        run: pip install --upgrade pip
       - name: Install dependencies
         run: |
          pip install sphinx${SPHINX_VERSION:+==$SPHINX_VERSION}
          pip install -r requirements-travis.txt
       - name: Run inspekt
-        run: inspekt checkall --disable-style E501,E265,W601,W605,E402,E722,E741 --no-license-check
+        run: inspekt checkall --disable-style E501,E265,W601,W605,E402,E722,E741 --disable-lint W,R,C,E1002,E1101,E1103,E1120,F0401,I0011,E0601,E0602,E0606 --no-license-check
       - run: echo "This job's status is ${{ job.status }}."
       - name: Run spellchecker
-        run: pylint --errors-only --disable=all --enable=spelling --spelling-dict=en_US --spelling-private-dict-file=spell.ignore *
+        run: |
+         set +e
+         pylint --errors-only --disable=all --enable=spelling --spelling-dict=en_US --spelling-private-dict-file=spell.ignore *
+         exitcode=$?
+         set -e
+         test $exitcode == 32 -o $exitcode == 0

contributor_reviewer_maintainer_guidelines.rst

@@ -1,2 +1,2 @@
 Please follow up the same best practices as avocado-vt:
-https://github.com/avocado-framework/avocado-vt/blob/master/PR_Review_And_Contribute_Practices.txt
+https://github.com/avocado-framework/avocado-vt/blob/master/docs/source/contributing/Guidelines.rst

libvirt/tests/cfg/backingchain/blockcommit/check_allocation_watermark_during_blockcommit.cfg

@@ -2,24 +2,40 @@
     type = check_allocation_watermark_during_blockcommit
     target_disk = "vdb"
     domstats_option = " --block --backing | grep allocation "
+    changing_index = "4"
+    changing_alloc = "block.${changing_index}.allocation"
     disappear_index = "4"
     disappear_alloc = "block.${disappear_index}.allocation"
     lvm_num = 3
     snap_nums = 3
-    virsh_opt = " -k0"
+    write_file_bs = "1M"
+    write_file_count = "400"
+    lv_size = "200M"
     variants case:
         - inactive_layer:
-            commit_option = "--top ${target_disk}[3] --base ${target_disk}[1] --wait --verbose --bandwidth 10"
+            commit_option = "--top ${target_disk}[3] --base ${target_disk}[1] --wait --verbose --bandwidth 1"
             commit_success_msg = "Commit complete"
         - active_layer:
-            commit_option = " --wait --verbose --pivot --bandwidth 10"
+            commit_option = " --wait --verbose --pivot --bandwidth 1"
             commit_success_msg = "Successfully pivoted"
     variants:
         - file_disk:
+            storage_type = nfs
+            set_sebool_local = 'yes'
+            local_boolean_varible = 'virt_use_nfs'
+            setup_local_nfs = "yes"
+            nfs_mount_src = "/var/lib/avocado/data/avocado-vt/nfs-export"
+            nfs_mount_dir = "/var/lib/avocado/data/avocado-vt/nfs-mount"
+            nfs_mount_options = "rw"
+            export_ip = "*"
+            export_dir = "/var/lib/avocado/data/avocado-vt/nfs-export"
+            export_options= "rw,root_squash"
+            local_boolean_value = "on"
             disk_type = "nfs"
             disk_dict = {"type_name":"file", "target":{"dev": "${target_disk}", "bus": "virtio"}, "driver": {"name": "qemu", "type":"qcow2"}}
             extra_option = ",snapshot=external --diskspec vda,snapshot=no "
         - block_disk:
             disk_type = "block"
-            disk_dict = {"type_name":"${disk_type}", "target":{"dev": "${target_disk}", "bus": "virtio"}, "driver": {"name": "qemu", "type":"raw"}}
-            extra_option = ",snapshot=external,stype=block --diskspec vda,snapshot=no --reuse-external "
+            convert_format = "qcow2"
+            disk_dict = {"type_name":"${disk_type}", "target":{"dev": "${target_disk}", "bus": "virtio"}, "driver": {"name": "qemu", "type":"qcow2"}}
+            extra_option = ",snapshot=external,stype=block --diskspec vda,snapshot=no --reuse-external"

libvirt/tests/cfg/backingchain/blockcopy/blockcopy_with_different_dest_xml.cfg

@@ -20,6 +20,7 @@
         - block_disk:
             dest_disk_type = "block"
             dest_disk_dict = {"type_name":"${dest_disk_type}", "target":{"dev": "${target_disk}", "bus": "virtio"}, "driver": {"name": "qemu", "type":"raw"}}
+            simulated_iscsi = "modprobe scsi_debug dev_size_mb=800"
         - rbd_with_auth_disk:
             dest_disk_type = "rbd_with_auth"
             mon_host = "EXAMPLE_MON_HOST"
@@ -30,6 +31,23 @@
             rbd_image_size = "${image_size}"
             sec_dict = {"secret_ephemeral": "no", "secret_private": "yes", "description": "sec_desc", "usage": "ceph", "usage_name": "cephlibvirt"}
             dest_disk_dict = {"type_name":"network", "target":{"dev": "${target_disk}", "bus": "scsi"}, "driver": {"name": "qemu", "type":"raw"}}
+        - rbd_with_luks_and_auth:
+            source_disk_dict = {"type_name":"${source_disk_type}", "target":{"dev": "${target_disk}", "bus": "scsi"}, "driver": {"name": "qemu", "type":"qcow2"}}
+            dest_disk_type = "rbd_with_luks_and_auth"
+            mon_host = "EXAMPLE_MON_HOST"
+            auth_key = "EXAMPLE_AUTH_KEY"
+            auth_user = "EXAMPLE_AUTH_USER"
+            image_path = "EXAMPLE_IMAGE_PATH"
+            client_name = "EXAMPLE_CLIENT_NAME"
+            rbd_image_size = "${image_size}"
+            ceph_usage_name="cephlibvirt"
+            sec_dict = {"secret_ephemeral": "no", "secret_private": "yes", "description": "sec_desc_auth", "usage": "ceph", "usage_name": "${ceph_usage_name}"}
+            dest_disk_dict = {"type_name":"network", "target":{"dev": "${target_disk}", "bus": "scsi"}, "driver": {"name": "qemu", "type":"raw"}}
+            private_key_password = "EXAMPLE_PWD"
+            secret_pwd = "`printf %s ${private_key_password} | base64`"
+            rbd_image_format = "luks"
+            rbd_image_parameter = "--object secret,id=luks1.img_luks0,data=${secret_pwd},format=base64 -o key-secret=luks1.img_luks0 rbd:{}:id={}:key={}:auth_supported=cephx:mon_host={}"
+            luks_sec_dict = {"secret_ephemeral": "no", "secret_private": "yes", "description": "sec_desc_luks", "usage": "volume", "volume":"%s", "uuid":"198784e8-f977-40ac-8d0d-4d0fcca70588"}
         - nbd_disk:
             dest_disk_type = "nbd"
             nbd_server_port = "10808"

libvirt/tests/cfg/backingchain/blockcopy/blockcopy_with_different_qcow2_properties.cfg

@@ -7,6 +7,7 @@
     snap_extra = " --no-metadata --diskspec vda,snapshot=no"
     copy_image = "/tmp/copy.qcow2"
     image_path = "/var/lib/libvirt/images/test.qcow2"
+    snap_path = "/var/lib/libvirt/images/snap1"
     image_format = "qcow2"
     image_size = "500M"
     variants property:
@@ -16,6 +17,14 @@
             expected_extended_l2 = "true"
             property_command = "cluster_size=${cluster_size},extended_l2=${extended_l2_value}"
             image_extras = "-o ${property_command}"
+            expected_chain_after_snap = ['${snap_path}','${image_path}']
+        - with_datastore:
+            func_supported_since_libvirt_ver = (10, 10, 0)
+            datastore_path = "/var/lib/libvirt/images/datastore"
+            data_file_option = " -o data_file=%s"
+            property_command = "data_file=${datastore_path}"
+            image_extras = "-o ${property_command}"
+            expected_chain_after_snap = ['${snap_path}','${image_path}', '${datastore_path}']
    variants:
         - not_encrypt_disk:
             enable_encrypt_disk = "no"

libvirt/tests/cfg/backingchain/blockjob/blockjob_pivot_after_irregular_operations.cfg

@@ -6,7 +6,7 @@
     abort_option = " --abort"
     variants test_scenario:
         - before_finish:
-            blockcopy_options = "blockcopy %s %s %s --transient-job --bandwidth 2"
+            blockcopy_options = "blockcopy %s %s %s --transient-job --bytes 200"
             err_msg = "not ready for pivot yet"
         - delete_copy_file:
             blockcopy_options = " --transient-job --wait --verbose "

libvirt/tests/cfg/backingchain/virsh_domblk/domblkthreshold_with_backingchain_element.cfg

@@ -1,8 +1,14 @@
 - backingchain.virsh_domblk:
     type = domblkthreshold_with_backingchain_element
     start_vm = 'yes'
-    target_disk = 'vda'
+    target_disk = 'vdb'
     domblk_threshold = '1'
+    actual_threshold = "1"
+    disk_type = "file"
+    disk_image_format = "raw"
+    disk_dict = {"type_name":"${disk_type}", "target":{"dev": "${target_disk}", "bus": "virtio"}, "driver": {"name": "qemu", "type": "raw"}}
+    disk_size = "3G"
+    snap_extra = " -diskspec vda,snapshot=no"
     variants case_name:
         - backing_target:
             domblk_index = 3

libvirt/tests/cfg/backingchain/with_disk_attributes_test/commit_pull_with_disk_source_attributes.cfg

@@ -0,0 +1,18 @@
+- backingchain.with_disk_attributes_test.with_source_attributes:
+    type = commit_pull_with_disk_source_attributes
+    start_vm = no
+    common_options = " --wait --verbose"
+    target_disk = "vdb"
+    disk_type = "file"
+    snap_num = 3
+    disk_dict = {"type_name":"${disk_type}", "target":{"dev": "${target_disk}", "bus": "virtio"}, "driver": {"name": "qemu", "type":"qcow2"}}
+    variants:
+        - with_datastore:
+            func_supported_since_libvirt_ver = (10, 10, 0)
+            data_file_option = " -o data_file=%s"
+    variants block_cmd:
+        - blockcommit:
+            blockcommit_options = " --active --pivot"
+            expected_chain_index = "base"
+        - blockpull:
+            expected_chain_index = "3"

libvirt/tests/cfg/bios/virsh_boot.cfg

@@ -186,6 +186,7 @@
                             uefi_target_dev = "sda"
                             check_prompt = ".*has invalid signature" || "'Verification failed: (0x1A) Security Violation'"
         - by_seabios:
+            no s390-virtio
             boot_type = "seabios"
             loader = "/usr/share/seabios/bios-256k.bin"
             loader_type = "rom"

libvirt/tests/cfg/bios/virsh_boot_sysinfo.cfg

@@ -39,6 +39,7 @@
                                     error_msg = "Firmware entry must have either value or 'file' attribute"
     variants:
         - by_seabios:
+            no s390-virtio
             boot_type = "seabios"
         - by_ovmf:
             only q35

libvirt/tests/cfg/bios/virsh_boot_tseg.cfg

@@ -52,4 +52,5 @@
             loader = "/usr/share/OVMF/OVMF_CODE.secboot.fd"
             loader_type = "pflash"
         - by_seabios:
+            no s390-virtio
             boot_type = "seabios"

libvirt/tests/cfg/controller/controller_functional.cfg

@@ -12,7 +12,7 @@
             controller_type = pci
             variants:
                 - pci_bridge_auto_add:
-                    only i440fx 
+                    only i440fx
                     remove_address = "no"
                     variants:
                         - no_pci_controller:
@@ -36,7 +36,7 @@
                     controller_model = pci-root
                     controller_pcihole64 = 1024
                 - pcie_root:
-                    only q35
+                    only q35, aarch64
                     controller_type = pci
                     controller_model = pcie-root
                 - second_level_bridge:
@@ -50,19 +50,33 @@
                       controller_type = virtio-serial
                       controller_bus = ccw
                 - controller_alias:
-                    only i440fx
-                    add_contrl_list = "[{'model': 'pci-root', 'index': '0', 'alias': 'ua-PCI_ROOT'},{'model': 'pci-bridge', 'alias': 'ua-PCI_BRIDGE'}, {'model': 'pci-expander-bus', 'alias': 'ua-PCI_EXPANDER_BUS'}]"
-                    qemu_patterns = "[('-device', 'pci-bridge.*,.*,.*id.*ua-PCI_BRIDGE'), ('-device', 'pxb.*,.*,.*id.*ua-PCI_EXPANDER_BUS')]"
+                    no s390-virtio, pseries
+                    pcie_root_config = {'model': 'pcie-root', 'index': '0', 'alias': 'ua-ROOT'}
+                    pcie_root_port_config = {'model': 'pcie-root-port', 'alias': 'ua-ROOT_PORT'}
+                    pcie_root_port2_config = {'model': 'pcie-root-port', 'alias': 'ua-ROOT_PORT2'}
+                    pcie_to_pci_bridge_config = {'model': 'pcie-to-pci-bridge', 'alias': 'ua-ROOT_PCIE_PCI'}
+                    pci_bridge_config = {'model': 'pci-bridge', 'alias': 'ua-PCI_BRIDGE'}
+                    pcie_switch_upstream_port = {'model': 'pcie-switch-upstream-port', 'alias': 'ua-UPSTREAM_PORT'}
+                    pcie_switch_downstream_port = {'model': 'pcie-switch-downstream-port', 'alias': 'ua-DOWNSTREAM_PORT'}
+                    pci_expander_bus_config = {'model': 'pcie-expander-bus', 'alias': 'ua-PCIE_EXPANDER_BUS'}
+                    add_contrl_list = "[${pcie_root_config},${pcie_root_port_config}, ${pcie_root_port2_config}, ${pcie_to_pci_bridge_config}, ${pci_bridge_config}, ${pcie_switch_upstream_port}, ${pcie_switch_downstream_port}, ${pci_expander_bus_config}]"
+                    pattern1 = "('-device', 'pcie-root-port.*,.*,.*id.*ua-ROOT_PORT'), ('-device', 'pcie-root-port.*,.*,.*id.*ua-ROOT_PORT2')"
+                    pattern2 = "('-device', 'pcie-pci-bridge.*,.*id.*ua-ROOT_PCIE_PCI'), ('-device', 'pci-bridge.*,.*,.*id.*ua-PCI_BRIDGE')"
+                    pattern3 = "('-device', 'upstream.*,.*id.*ua-UPSTREAM_PORT'),('-device', 'downstream.*,.*id.*ua-DOWNSTREAM_PORT')"
+                    qemu_patterns = "[${pattern1},${pattern2},${pattern3},('-device', 'pxb-pcie.*,.*,.*id.*ua-PCIE_EXPANDER_BUS')]"
+                    i440fx:
+                        add_contrl_list = "[{'model': 'pci-root', 'index': '0', 'alias': 'ua-PCI_ROOT'},{'model': 'pci-bridge', 'alias': 'ua-PCI_BRIDGE'}, {'model': 'pci-expander-bus', 'alias': 'ua-PCI_EXPANDER_BUS'}]"
+                        qemu_patterns = "[('-device', 'pci-bridge.*,.*,.*id.*ua-PCI_BRIDGE'), ('-device', 'pxb.*,.*,.*id.*ua-PCI_EXPANDER_BUS')]"
                     check_contr_addr = "no"
                     check_within_guest = "no"
                 - pcie_root_port_model:
-                    only q35
+                    only q35, aarch64
                     run_vm = "yes"
                     check_contr_addr = "no"
                     remove_contr = "no"
                     new_model = pcie-root-port
                     old_model = ioh3420
-                    auto_index = "yes"
+                    auto_index= "yes"
                     attach_option = "--address pci:0000.%s.00.0"
                     qemu_patterns = "[('-device', 'pcie-root-port.*,.*id.*pci.%s.*,.*bus.*pcie.0.*,.*addr.*0x2')]"
                     guest_patterns = "['00:.* PCI bridge: Red Hat']"
@@ -168,7 +182,7 @@
                     controller_type = virtio-serial
                     controller_vectors = '1'
                 - virtio_serial_0_vectors:
-                    no q35
+                    no q35, aarch64
                     controller_type = virtio-serial
                     controller_vectors = '0'
                 - usb_controller:
@@ -177,18 +191,18 @@
                     variants:
                         # ehci and ich9-ehci1 are USB2.0 controller model
                         - ehci_model:
-                            no pseries
+                            no pseries, aarch64
                             controller_model = ehci
                         - ich9_ehci1_model:
-                            no pseries
+                            no pseries, aarch64
                             controller_model = ich9-ehci1
                             companion_controller_model = ich9-uhci
                             companion_controller_num = 3
                             # companion index value should be equal to master controller
                             controller_index = 0
                         # nec-xhci and qemu-xhci are USB3.0 controller model
                         - nec_xhci_model:
-                            no pseries
+                            no pseries, aarch64
                             controller_model = nec-xhci
                         - qemu_xhci_model:
                             variants:
@@ -217,7 +231,7 @@
                                     only i440fx
                                     controller_model = pci-root
                                 - pcie_root:
-                                    only q35
+                                    only q35, aarch64
                                     controller_model = pcie-root
                         - negative:
                             controller_index = -1
@@ -226,7 +240,7 @@
                                 - pci_bridge:
                                     controller_model = pci-bridge
                                 - pcie_root:
-                                    only q35
+                                    only q35, aarch64
                                     controller_model = pcie-root
                         - zero:
                             controller_index = 0
@@ -300,7 +314,7 @@
                             controller_model = 'pcie-root'
                             err_msg = "The PCI controller.*index='0' must be model='pci-root'"
                         - pci_root_model:
-                            only q35
+                            only q35, aarch64
                             controller_model = 'pci-root'
                             err_msg = "The PCI controller.*index='0' must be model='pcie-root'"
                         - other_model:

libvirt/tests/cfg/controller/pci_controller_memreserve.cfg

@@ -0,0 +1,38 @@
+- pci_controller_memreserve:
+    type = pci_controller_memreserve
+    start_vm = no
+    func_supported_since_libvirt_ver = (10, 3, 0)
+    # Two vms are required for the tests, one for ovmf and the other for seabios
+    vms = "avocado-vt-vm1 vm2"
+    only q35
+    variants:
+        - 8M:
+            memReserve = 8192
+        - 10M:
+            memReserve = 10240
+            ovmf:
+                expect_memReserve = 16384
+        - 16M:
+            memReserve = 16384
+        - 32M:
+            memReserve = 32768
+    variants:
+        - firmware:
+            variants:
+                - ovmf:
+                    firmware_type = "ovmf"
+                    loader_dict = {'os_firmware': 'efi'}
+                - seabios:                    
+                    firmware_type = "seabios"
+    variants:
+        - controller:
+            variants:
+                - pci_bridge:
+                    only q35
+                    contr_model = "pci-bridge"
+                    depend_contr_dict = {"type": "pci", "model": "pcie-to-pci-bridge", "index": "%s"}
+                    contr_pattern = ".*PCI-PCI bridge"
+                - pcie_root_port:
+                    contr_model = "pcie-root-port"
+                    contr_pattern = "%s.*PCIe Root port"
+    contr_dict = {"type": "pci", "model": "${contr_model}", "index": "%s", "target": {"memReserve":"${memReserve}"}}