Merge pull request #4762 from cliping/fix-poweroff-2

migration: Fix parameters issue
autotest · Feb 16, 2023 · 94157ec · 94157ec
2 parents 1ffea6c + d144beb
commit 94157ec
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/...s/cfg/migration/pause_postcopy_migration_and_recover/pause_and_recover_and_disruptive.cfg b/...s/cfg/migration/pause_postcopy_migration_and_recover/pause_and_recover_and_disruptive.cfg
@@ -59,12 +59,11 @@
             migrate_desturi_port = "16509"
             migrate_desturi_type = "tcp"
             virsh_migrate_desturi = "qemu+tcp://${migrate_dest_host}/system"
-            service_name = "libvirtd"
-            service_on_dst = "yes"
-            action_during_mig = '[{"func": "libvirt_network.check_established", "after_event": "iteration: '1'", "func_param": 'params'}, {"func": "virsh.domjobabort", "func_param": "'%s --postcopy' % params.get('migrate_main_vm')", "need_sleep_time": "90"}, {"func": "do_migration", "func_param": "params", "need_sleep_time": "90"}]'
-            action_during_do_mig = '[{"func": "libvirt_network.check_established", "after_event": "iteration: '1'", "func_param": 'params'}, {"func": "libvirt_service.kill_service", "func_param": "params"}, {"func": "poweroff_vm", "func_param": "params"}, {"func": "do_migration", "func_param": "params"}]'
+            action_during_mig = '[{"func": "libvirt_network.check_established", "after_event": "iteration: '1'", "func_param": 'params'}, {"func": "virsh.domjobabort", "func_param": "'%s --postcopy' % params.get('migrate_main_vm')", "need_sleep_time": "90"}, {"func": "do_migration", "func_param": "params", "need_sleep_time": "10"}]'
+            action_during_do_mig = '[{"func": "poweroff_vm", "before_pause": "yes", "func_param": "params", "need_sleep_time": "10"}]'
             status_error_during_mig = "yes"
             poweroff_vm_dest = "yes"
+            status_error = "yes"
         - unattended_mig:
             service_name = "libvirtd"
             service_on_dst = "yes"