fix: Correct cfg files syntax

Fix existing cfg files syntax errors. Signed-off-by: Yihuang Yu <[email protected]>
autotest · Aug 26, 2024 · f3661f7 · f3661f7
1 parent 1de0726
commit f3661f7
Show file tree

Hide file tree

Showing 86 changed files with 601 additions and 651 deletions.
diff --git a/generic/tests/cfg/kdump.cfg b/generic/tests/cfg/kdump.cfg
@@ -60,7 +60,7 @@
             RHEL.9:
                 kernel_param_cmd = "grubby --update-kernel=`grubby --default-kernel` --args='nmi_watchdog=1'"
             crash_cmd = nmi
-            send_nmi_cmd = "echo 1 > /proc/sys/kernel/unknown_nmi_panic" 
+            send_nmi_cmd = "echo 1 > /proc/sys/kernel/unknown_nmi_panic"
             ppc64, ppc64le:
                 send_nmi_cmd = "echo 1 > /proc/sys/kernel/nmi_watchdog"
                 kernel_param_cmd = "grubby --update-kernel=`grubby --default-kernel` --args='crashkernel=512M@64M nmi_watchdog=1'"
@@ -118,5 +118,5 @@
     variants:
         - one_vm:
         - multi_vms:
-              vms += " vm2"
-              image_snapshot = yes
+            vms += " vm2"
+            image_snapshot = yes
diff --git a/multi_host_migration/tests/cfg/multi_host.cfg b/multi_host_migration/tests/cfg/multi_host.cfg
@@ -196,19 +196,19 @@
                     no RHEL.3, RHEL.4
                     crash_timeout = 360
                     RHEL.5:
-                      kdump_config = core_collector makedumpfile -c -d 31
+                        kdump_config = core_collector makedumpfile -c -d 31
                     RHEL.6:
-                      kernel_param_cmd = "grubby --update-kernel=`grubby --default-kernel` --args=crashkernel=128M@16M"
-                      kdump_enable_cmd = "chkconfig kdump on && service kdump restart"
-                      kdump_propagate_cmd = "service kdump propagate"
-                      kdump_restart_cmd = "service kdump restart"
-                      kdump_status_cmd = "service kdump status"
+                        kernel_param_cmd = "grubby --update-kernel=`grubby --default-kernel` --args=crashkernel=128M@16M"
+                        kdump_enable_cmd = "chkconfig kdump on && service kdump restart"
+                        kdump_propagate_cmd = "service kdump propagate"
+                        kdump_restart_cmd = "service kdump restart"
+                        kdump_status_cmd = "service kdump status"
                     RHEL.7:
-                      kernel_param_cmd = "grubby --update-kernel=`grubby --default-kernel` --args=crashkernel=auto"
-                      kdump_enable_cmd = "chkconfig kdump on && systemctl restart kdump.service"
-                      kdump_propagate_cmd = "kdumpctl propagate"
-                      kdump_restart_cmd = "systemctl restart kdump.service"
-                      kdump_status_cmd = "systemctl status kdump.service"
+                        kernel_param_cmd = "grubby --update-kernel=`grubby --default-kernel` --args=crashkernel=auto"
+                        kdump_enable_cmd = "chkconfig kdump on && systemctl restart kdump.service"
+                        kdump_propagate_cmd = "kdumpctl propagate"
+                        kdump_restart_cmd = "systemctl restart kdump.service"
+                        kdump_status_cmd = "systemctl status kdump.service"
                 - with_xbzrle:
                     type = migration_multi_host_with_xbzrle
                     capabilitys = "xbzrle"
@@ -217,27 +217,27 @@
                     max_migration_speed = 1000M
                     not_wait_for_migration = yes
                     Windows:
-                       timeout = 600
-                       autostress = yes
-                       unload_stress_in_the_end = no
-                       sleep_before_migration = 10
-                       bg_stress_test = win_heavyload
-                       backup_image_before_testing = yes
-                       restore_image_after_testing = yes
-                       config_cmd = 'setx -m path "%PATH%;${install_path};"'
-                       install_cmd = "start /wait DRIVE:\HeavyLoadSetup.exe /verysilent"
-                       check_running_cmd = "tasklist | findstr /I  HeavyLoad.exe"
-                       kill_bg_stress_cmd = "taskkill /T /F /IM HeavyLoad.exe"
-                       x86_64:
-                           install_path = "C:\Program Files (x86)\JAM Software\HeavyLoad"
-                       i386, i686:
-                           install_path = "C:\Program Files\JAM Software\HeavyLoad"
+                        timeout = 600
+                        autostress = yes
+                        unload_stress_in_the_end = no
+                        sleep_before_migration = 10
+                        bg_stress_test = win_heavyload
+                        backup_image_before_testing = yes
+                        restore_image_after_testing = yes
+                        config_cmd = 'setx -m path "%PATH%;${install_path};"'
+                        install_cmd = "start /wait DRIVE:\HeavyLoadSetup.exe /verysilent"
+                        check_running_cmd = "tasklist | findstr /I  HeavyLoad.exe"
+                        kill_bg_stress_cmd = "taskkill /T /F /IM HeavyLoad.exe"
+                        x86_64:
+                            install_path = "C:\Program Files (x86)\JAM Software\HeavyLoad"
+                        i386, i686:
+                            install_path = "C:\Program Files\JAM Software\HeavyLoad"
                     Linux:
-                       bg_stress_test = autotest_control
-                       test_control_file = stress.control
-                       control_args = "--cpu 4 --io 4 --vm 2 --vm-bytes 128M --timeout 120s"
-                       check_running_cmd = 'pgrep stress'
-                       kill_bg_stress_cmd = "killall -9 stress"
+                        bg_stress_test = autotest_control
+                        test_control_file = stress.control
+                        control_args = "--cpu 4 --io 4 --vm 2 --vm-bytes 128M --timeout 120s"
+                        check_running_cmd = 'pgrep stress'
+                        kill_bg_stress_cmd = "killall -9 stress"
                     variants:
                         - before_migrate_capability:
                             sub_type = before_migrate_capability
@@ -250,9 +250,9 @@
                             sub_test = "set_xbzrle enable"
                             need_stress = "yes"
                             Linux:
-                               need_set_speed = yes
+                                need_set_speed = yes
                             Windows:
-                               need_set_speed = no
+                                need_set_speed = no
                             set_cache_size = "no yes"
                         - after_migrate_cache_size:
                             sub_type = after_migrate_cache_size
@@ -588,4 +588,3 @@
                 - rhel6.2.0:
                 - rhel6.3.0:
                 - rhel6.4.0:
-
diff --git a/qemu/tests/cfg/bitmap_boundary_test.cfg b/qemu/tests/cfg/bitmap_boundary_test.cfg
@@ -20,15 +20,15 @@
     bitmap_count = 65535
     variants:
         - with_data_plane:
-           only Host_RHEL
-           no Host_RHEL.m5, Host_RHEL.m6
-           only virtio_blk, virtio_scsi
-           iothreads = "iothread0 iothread1"
-           virtio_blk:
-               blk_extra_params_image1 = "iothread=iothread0"
-               blk_extra_params_src1 = "iothread=iothread1"
-           virtio_scsi:
-               no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
-               bus_extra_params_image1 = "iothread=iothread0"
-               bus_extra_params_src1 = "iothread=iothread1"
+            only Host_RHEL
+            no Host_RHEL.m5, Host_RHEL.m6
+            only virtio_blk, virtio_scsi
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+                blk_extra_params_src1 = "iothread=iothread1"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
+                bus_extra_params_src1 = "iothread=iothread1"
         - @defaults:
diff --git a/qemu/tests/cfg/block_discard_hotplug.cfg b/qemu/tests/cfg/block_discard_hotplug.cfg
@@ -16,22 +16,22 @@
     guest_rm_command = "rm -rf ${guest_test_file};sync"
     guest_fstrim_command = "fstrim ${guest_mount_point}"
     variants:
-      - local_file:
-          no luks
-          no RHEL.7
-          force_create_image_stg1 = yes
-          image_size_stg1 = 1G
-          image_name_stg1 = images/stg1
-          # It need set discard=on the virtio-blk device under pc mode
-          virtio_blk..i440fx:
-            blk_extra_params_stg1 += ",discard=on"
-      - scsi_debug:
-          only virtio_scsi
-          scsi_debug = yes
-          force_create_image_stg1 = no
-          pre_command = "modprobe -r scsi_debug; modprobe scsi_debug dev_size_mb=1024 lbpu=1 lbpws=1 lbprz=0"
-          post_command = "modprobe -r scsi_debug"
-          drive_format_stg1 = scsi-block
-          image_format_stg1 = raw
-          image_raw_device_stg1 = yes
-          remove_image_stg1 = no
+        - local_file:
+            no luks
+            no RHEL.7
+            force_create_image_stg1 = yes
+            image_size_stg1 = 1G
+            image_name_stg1 = images/stg1
+            # It need set discard=on the virtio-blk device under pc mode
+            virtio_blk..i440fx:
+                blk_extra_params_stg1 += ",discard=on"
+        - scsi_debug:
+            only virtio_scsi
+            scsi_debug = yes
+            force_create_image_stg1 = no
+            pre_command = "modprobe -r scsi_debug; modprobe scsi_debug dev_size_mb=1024 lbpu=1 lbpws=1 lbprz=0"
+            post_command = "modprobe -r scsi_debug"
+            drive_format_stg1 = scsi-block
+            image_format_stg1 = raw
+            image_raw_device_stg1 = yes
+            remove_image_stg1 = no
diff --git a/qemu/tests/cfg/block_discard_write_same.cfg b/qemu/tests/cfg/block_discard_write_same.cfg
@@ -14,28 +14,28 @@
     drive_format_stg1 = scsi-hd
     variants:
         - local_file:
-          scsi_debug = no
-          tmpdir = /home/tmp
-          loopdev = ${tmpdir}/loopdev
-          backend_base = ${tmpdir}/base.img
-          backend_folder = ${tmpdir}/xfs
-          backend_file = ${backend_folder}/test.img
-          image_name_stg1 = ${backend_file}
-          pre_command += "mkdir -p ${tmpdir} && "
-          pre_command += "qemu-img create -f raw ${backend_base} 2G &&"
-          pre_command += "losetup -f --show ${backend_base} > ${loopdev} &&"
-          pre_command += "mkfs.xfs `cat ${loopdev}` && mkdir -p ${backend_folder} &&"
-          pre_command += "mount `cat ${loopdev}` ${backend_folder} && losetup -l &&"
-          pre_command += "qemu-img create -f raw ${backend_file} 1G"
-          post_command += "umount ${backend_folder};sleep 2;losetup -d `cat ${loopdev}` &&"
-          post_command += "rm -rf ${tmpdir} && losetup -l "
+            scsi_debug = no
+            tmpdir = /home/tmp
+            loopdev = ${tmpdir}/loopdev
+            backend_base = ${tmpdir}/base.img
+            backend_folder = ${tmpdir}/xfs
+            backend_file = ${backend_folder}/test.img
+            image_name_stg1 = ${backend_file}
+            pre_command += "mkdir -p ${tmpdir} && "
+            pre_command += "qemu-img create -f raw ${backend_base} 2G &&"
+            pre_command += "losetup -f --show ${backend_base} > ${loopdev} &&"
+            pre_command += "mkfs.xfs `cat ${loopdev}` && mkdir -p ${backend_folder} &&"
+            pre_command += "mount `cat ${loopdev}` ${backend_folder} && losetup -l &&"
+            pre_command += "qemu-img create -f raw ${backend_file} 1G"
+            post_command += "umount ${backend_folder};sleep 2;losetup -d `cat ${loopdev}` &&"
+            post_command += "rm -rf ${tmpdir} && losetup -l "
         - scsi_debug:
-          start_vm = no
-          scsi_debug = yes
-          pre_command += "modprobe -r scsi_debug;"
-          variants:
-            - unmap:
-                pre_command += "modprobe scsi_debug dev_size_mb=1024 lbpu=1 lbpws=1 lbprz=0"
-            - writesame:
-                pre_command += "modprobe scsi_debug dev_size_mb=1024 lbpu=0 lbpws=1 lbprz=0"
-          post_command += "modprobe -r scsi_debug;"
+            start_vm = no
+            scsi_debug = yes
+            pre_command += "modprobe -r scsi_debug;"
+            variants:
+                - unmap:
+                    pre_command += "modprobe scsi_debug dev_size_mb=1024 lbpu=1 lbpws=1 lbprz=0"
+                - writesame:
+                    pre_command += "modprobe scsi_debug dev_size_mb=1024 lbpu=0 lbpws=1 lbprz=0"
+            post_command += "modprobe -r scsi_debug;"
diff --git a/qemu/tests/cfg/block_iscsi_fault_disk.cfg b/qemu/tests/cfg/block_iscsi_fault_disk.cfg
@@ -26,9 +26,9 @@
     cmd_dmsetup += "160005 80000 linear {1} 160005 '"
     cmd_dmsetup += "| dmsetup create {0} "
     Linux:
-      guest_cmd = "dd of=%s if=/dev/zero oflag=direct bs=1M count=100"
+        guest_cmd = "dd of=%s if=/dev/zero oflag=direct bs=1M count=100"
     Windows:
-      guest_cmd = "WIN_UTILS:\dd.exe of=\\.\physicaldrive%s if=/dev/zero bs=1M count=100"
+        guest_cmd = "WIN_UTILS:\dd.exe of=\\.\physicaldrive%s if=/dev/zero bs=1M count=100"
 
     kill_max_timeout = 240
     kill_min_timeout = 60

diff --git a/qemu/tests/cfg/block_iscsi_format_large_size_disk.cfg b/qemu/tests/cfg/block_iscsi_format_large_size_disk.cfg
@@ -25,15 +25,15 @@
     fstype = ntfs
     variants:
         - with_virtio:
-          serial = large_disk
-          drive_format_stg1 = virtio
-          blk_extra_params_stg1 = "serial=${serial},indirect_desc=off"
+            serial = large_disk
+            drive_format_stg1 = virtio
+            blk_extra_params_stg1 = "serial=${serial},indirect_desc=off"
         - with_scsi_hd:
-          serial = large_disk
-          blk_extra_params_stg1 = "serial=${serial}"
-          drive_format_stg1 = scsi-hd
+            serial = large_disk
+            blk_extra_params_stg1 = "serial=${serial}"
+            drive_format_stg1 = scsi-hd
         - with_scsi_block:
-          set_max_sector = yes
-          set_max_segment = yes
-          drive_bus_stg1 = 1
-          drive_format_stg1 = scsi-block
+            set_max_sector = yes
+            set_max_segment = yes
+            drive_bus_stg1 = 1
+            drive_format_stg1 = scsi-block
diff --git a/qemu/tests/cfg/block_stream.cfg b/qemu/tests/cfg/block_stream.cfg
@@ -52,35 +52,35 @@
             type = block_stream_simple
             variants:
                 - start_stream:
-                     type = block_stream
+                    type = block_stream
                 - set_speed:
-                     default_speed_image1 = 10M
-                     after_finished = "reboot verify_alive"
+                    default_speed_image1 = 10M
+                    after_finished = "reboot verify_alive"
                 - reset_speed:
-                     default_speed_image1 = 1M
-                     when_streaming = "set_speed"
-                     max_speed_image1 = 10M
-                     after_finished = "reboot verify_alive"
-                     variants:
-                         - max_speed:
-                             expected_speed_image1 = 10485760
-                         - min_speed:
-                             wait_timeout = 30000
-                             expected_speed_image1 = 10
+                    default_speed_image1 = 1M
+                    when_streaming = "set_speed"
+                    max_speed_image1 = 10M
+                    after_finished = "reboot verify_alive"
+                    variants:
+                        - max_speed:
+                            expected_speed_image1 = 10485760
+                        - min_speed:
+                            wait_timeout = 30000
+                            expected_speed_image1 = 10
                 - cancel_sync:
-                     wait_finished = no
-                     cancel_timeout_image1 = 3
-                     when_streaming = "cancel"
+                    wait_finished = no
+                    cancel_timeout_image1 = 3
+                    when_streaming = "cancel"
                 - cancel_async:
-                     wait_finished = no
-                     cancel_timeout_image1 = 3
-                     max_speed_image1 = 10M
-                     when_streaming = "set_speed cancel"
+                    wait_finished = no
+                    cancel_timeout_image1 = 3
+                    max_speed_image1 = 10M
+                    when_streaming = "set_speed cancel"
                 - query:
-                     cancel_timeout_image1 = 3
-                     wait_finished = no
-                     default_speed_image1 = 8M
-                     when_streaming = "get_status cancel"
+                    cancel_timeout_image1 = 3
+                    wait_finished = no
+                    default_speed_image1 = 8M
+                    when_streaming = "get_status cancel"
         - when_reboot:
             type = block_stream_reboot
             reboot_method = "system_reset"
@@ -127,9 +127,9 @@
             before_start = "create_files stop"
             after_finished = "resume verify_md5s"
         - with_stop_cont:
-           type = block_stream_simple
-           when_streaming = "stop resume stop resume stop resume"
-           after_finished = "reboot verify_alive"
+            type = block_stream_simple
+            when_streaming = "stop resume stop resume stop resume"
+            after_finished = "reboot verify_alive"
         - with_installation:
             type = block_stream_installation
             wait_timeout = 36000

diff --git a/qemu/tests/cfg/block_stream_negative.cfg b/qemu/tests/cfg/block_stream_negative.cfg
@@ -34,15 +34,15 @@
             type = block_stream_negative
             variants:
                 - reset_speed:
-                     no Host_RHEL.m6
-                     default_speed_image1 = 10M
-                     when_streaming = "set_speed"
-                     after_finished = "reboot verify_alive"
-                     variants:
-                         - minus_speed:
-                             need_convert_to_int = yes
-                             match_str = "Invalid parameter"
-                             expected_speed_image1 = -12345
-                         - string_speed:
-                             match_str = "Invalid parameter type"
-                             expected_speed_image1 = abcdef
+                    no Host_RHEL.m6
+                    default_speed_image1 = 10M
+                    when_streaming = "set_speed"
+                    after_finished = "reboot verify_alive"
+                    variants:
+                        - minus_speed:
+                            need_convert_to_int = yes
+                            match_str = "Invalid parameter"
+                            expected_speed_image1 = -12345
+                        - string_speed:
+                            match_str = "Invalid parameter type"
+                            expected_speed_image1 = abcdef
diff --git a/qemu/tests/cfg/blockdev_commit_throttle.cfg b/qemu/tests/cfg/blockdev_commit_throttle.cfg
@@ -33,7 +33,7 @@
     rebase_mode = unsafe
     qemu_force_use_drive_expression = no
 
-   # For throttling test
+    # For throttling test
     throttle_groups= group1
     image_throttle_group_data = group1
     iscsi_direct: