From bbc1fa62c477e34633b31b9707111cf81a1c1eb2 Mon Sep 17 00:00:00 2001 From: Xueqiang Wei Date: Wed, 28 Sep 2016 19:00:52 +0800 Subject: [PATCH] add cfg for qemu.test migration_multi_host_auto_converge Signed-off-by: Xueqiang Wei --- qemu/tests/cfg/multi_host.cfg | 26 +++++++++++++++++-- .../tests/migration_multi_host_with_xbzrle.py | 12 ++++----- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/qemu/tests/cfg/multi_host.cfg b/qemu/tests/cfg/multi_host.cfg index f0a78d89..216f58dd 100644 --- a/qemu/tests/cfg/multi_host.cfg +++ b/qemu/tests/cfg/multi_host.cfg @@ -211,8 +211,8 @@ kdump_status_cmd = "systemctl status kdump.service" - with_xbzrle: type = migration_multi_host_with_xbzrle - capabilitys = "xbzrle cache_size" - capabilitys_state = "disable disable" + capabilitys = "xbzrle" + capabilitys_state = "disable" cache_size = "67108864 1073741824" max_migration_speed = 1000M not_wait_for_migration = yes @@ -258,6 +258,28 @@ need_stress = yes need_set_speed = no set_cache_size = yes + - auto_converge: + only Linux + type = migration_multi_host_auto_converge + stressapptest_repo = "git clone https://github.com/stressapptest/stressapptest.git" + stressapptest_insatll_cmd = "rm -rf stressapptest && ${stressapptest_repo} && cd stressapptest && ./configure && make && make install" + bg_stress_test = "stressapptest -M 100 -s 600 >/dev/null 2>&1 &" + check_running_cmd = "pgrep stressapptest" + kill_bg_stress_cmd = "killall -9 stressapptest" + capabilitys = "auto-converge" + capabilitys_state = "disable" + parameters = "cpu-throttle-initial cpu-throttle-increment" + parameters_value = "30 20" + max_migration_speed = 100M + migration_timeout = 180 + not_wait_for_migration = yes + need_set_auto_converge = "no yes" + variants: + - dynamic_cpu_throttling: + sub_type = before_migrate_capability + sub_test = "auto-converge enable" + need_stress = yes + need_set_speed = yes - host_mig_offline: only exec host_mig_offline = yes diff --git a/qemu/tests/migration_multi_host_with_xbzrle.py b/qemu/tests/migration_multi_host_with_xbzrle.py index b670fd10..97043316 100644 --- a/qemu/tests/migration_multi_host_with_xbzrle.py +++ b/qemu/tests/migration_multi_host_with_xbzrle.py @@ -2,7 +2,7 @@ import logging from autotest.client.shared import error from virttest import utils_test from virttest import virt_vm -from qemu.tests.MigrationMultiHost import MigrationBase +from virttest.utils_test.qemu import migration @error.context_aware @@ -33,15 +33,15 @@ def run(test, params, env): """ mig_protocol = params.get("mig_protocol", "tcp") - mig_type = utils_test.qemu.MultihostMigration + mig_type = migration.MultihostMigration if mig_protocol == "fd": - mig_type = utils_test.qemu.MultihostMigrationFd + mig_type = migration.MultihostMigrationFd if mig_protocol == "exec": - mig_type = utils_test.qemu.MultihostMigrationExec + mig_type = migration.MultihostMigrationExec if "rdma" in mig_protocol: - mig_type = utils_test.qemu.MultihostMigrationRdma + mig_type = migration.MultihostMigrationRdma - class TestMultihostMigration(mig_type, MigrationBase): + class TestMultihostMigration(mig_type, migration.MigrationBase): """ multihost migration test -- GitLab