qemu/tests/cfg: Update multi_host.cfg

1. Update some variants
2. Remove the duplicated config
Signed-off-by: NShuping Cui <scui@redhat.com>

qemu/tests/cfg/multi_host.cfg

@@ -25,6 +25,10 @@
             disk_prepare_timeout = 360
             comm_port = 13234
             regain_ip_cmd = killall dhclient; sleep 10; dhclient;
+            paused_after_start_vm = no
+            need_to_login = yes
+            preprocess_env = no
+
             variants mig_protocol:
                 #Migration protocol.
                 - tcp:
@@ -33,27 +37,6 @@
                 - fd:
                 - exec:
 
-            variants booting_phase:
-                #Time when start migration
-                - after_login_vm:
-                    paused_after_start_vm = no
-                    need_to_login = yes
-                    preprocess_env = no
-                - early_boot_vm:
-                    no measure_migration_speed
-                    login_timeout = 420
-                    paused_after_start_vm = yes
-                    preprocess_env = yes
-                    variants:
-                        - timeout_0:
-                            start_migration_timeout = 0
-                        - timeout_6:
-                            start_migration_timeout = 6
-                        - timeout_random:
-                            start_migration_timeout = random
-                            min_random_timeout = 5
-                            max_random_timeout = 20
-
             variants migraiton_type:
                 - mig_online:
                     mig_offline = no
@@ -76,14 +59,24 @@
 
             variants multihost_mig_tests:
                 # Migration properties
-                - @default:
+                - after_login_vm:
+                    type = migration_multi_host
+                - early_boot_vm:
                     type = migration_multi_host
+                    login_timeout = 420
+                    paused_after_start_vm = yes
+                    need_to_login = no
+                    preprocess_env = yes
+                    enable_random_timeout = yes
+                    min_random_timeout = 5
+                    max_random_timeout = 20
                 - with_reboot:
-                    only early_boot_vm
-                    only mig_online
-                    timeout_random:
-                        min_random_timeout = 1
-                        max_random_timeout = 5
+                    login_timeout = 420
+                    paused_after_start_vm = yes
+                    preprocess_env = yes
+                    enable_random_timeout = yes
+                    min_random_timeout = 1
+                    max_random_timeout = 5
                     reboot_method = system_reset
                     type = migration_multi_host_with_reboot
                 - timedrift:
@@ -96,23 +89,17 @@
                     time_diff_limit = 1.5
                 - cancel_with_delay:
                     type = migration_multi_host_cancel
-                    only after_login_vm
-                    only mig_online
                     cancel_delay = 10
                     stress_cmd = "stress --cpu 4 --io 4 --vm 2 --vm-bytes 128M &"
                     stress_kill_cmd = "killall -9 stress"
                 - measure_speed:
                     only Linux
-                    only after_login_vm
-                    only mig_online
                     not_wait_for_migration = yes
                     mig_speed = 1G
                     type = migration_multi_host_with_speed_measurement
                 - with_file_transfer:
                     only Linux
-                    only after_login_vm
                     type = migration_multi_host_with_file_transfer
-                    only mig_online
                     comm_port = 13234
                     del_file_with_err = yes
                     #path where file is stored on guest.
@@ -133,17 +120,13 @@
                     check_running_cmd = "pgrep stress"
                     need_cleanup = no
                 - downtime:
-                    only after_login_vm
                     sub_type = downtime
-                    only mig_online
                     # downtime in seconds.
                     max_downtime = 10
                     not_wait_for_migration = yes
                     type = migration_multi_host_downtime_and_speed
                 - speed:
-                    only after_login_vm
                     sub_type = speed
-                    only mig_online
                     # speed in Mb
                     min_migration_speed = 10M
                     max_migration_speed = 500M
@@ -155,9 +138,7 @@
                     not_wait_for_migration = yes
                     type = migration_multi_host_downtime_and_speed
                 - mig_stop_during:
-                    only after_login_vm
                     sub_type = stop_during
-                    only mig_online
                     wait_before_stop = 3
                     not_wait_for_migration = no
                     type = migration_multi_host_downtime_and_speed
@@ -165,8 +146,6 @@
                     # amount of memory used for migration stress
                     # amount of memory shouldn't be too high otherwise
                     # migration will never end
-                    only after_login_vm
-                    only mig_online
                     type = migration_multi_host_ping_pong
                     # stress_memory should be less than troughput of
                     # migration
@@ -185,16 +164,14 @@
                             stress_type = all
                 - host_mig_offline:
                     only exec
-                    only mig_offline
                     host_mig_offline = yes
                     type = migration_multi_host
                 - dest-problem-test:
                     variants:
                         - firewall-block:
                             type = migration_multi_host_firewall_block
-                            only mig_online
                             not_wait_for_migration = yes
-                            only after_login_vm..tcp
+                            only tcp
                             variants:
                                 - long_wait:
                                     sub_type = long_wait
@@ -250,7 +227,6 @@
 
                 - cdrom_test:
                     only Linux
-                    only mig_online.after_login_vm
                     type = cdrom
                     cdrom_cd1 = orig.iso
                     kill_vm_on_error = yes
@@ -276,7 +252,6 @@
                             checksum_timeout = 180
 
                 - floppy_test:
-                    only mig_online.after_login_vm
                     type = floppy
                     start_vm = no
                     floppies = "fl"

qemu/tests/migration_multi_host.py

@@ -111,9 +111,9 @@ def run(test, params, env):
             if params.get("check_vm_before_migration", "yes") == "no":
                 params["check_vm_needs_restart"] = "no"
 
-            if params.get("start_migration_timeout") == "random":
-                min_t = int(params.get("min_random_timeout"))
-                max_t = int(params.get("max_random_timeout"))
+            if params.get("enable_random_timeout") == "yes":
+                min_t = int(params.get("min_random_timeout", 1))
+                max_t = int(params.get("max_random_timeout", 5))
                 random_timeout = random.randint(min_t, max_t)
                 params["start_migration_timeout"] = random_timeout
                 error.context("Wait for %d seconds, then do migration."