From: Lucas Meneghel Rodrigues Subject: [PATCH 1/4] KVM test: Include the preprocessing param migration_mode Date: Wed, 1 Dec 2010 00:52:54 -0200 Message-ID: <1291171977-14327-1-git-send-email-lmr@redhat.com> Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues To: autotest@test.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:45886 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753938Ab0LACxC (ORCPT ); Tue, 30 Nov 2010 21:53:02 -0500 Sender: kvm-owner@vger.kernel.org List-ID: In order to include multi-host migration, add a pre-processor parameter that will make the test start a VM in incoming migration mode: migration_mode = tcp Will make the preprocessor start the VM in tcp -incoming mode. Signed-off-by: Lucas Meneghel Rodrigues --- client/tests/kvm/kvm_preprocessing.py | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/client/tests/kvm/kvm_preprocessing.py b/client/tests/kvm/kvm_preprocessing.py index 5ec38fb..d2f94cd 100644 --- a/client/tests/kvm/kvm_preprocessing.py +++ b/client/tests/kvm/kvm_preprocessing.py @@ -60,6 +60,8 @@ def preprocess_vm(test, params, env, name): start_vm = False + migration_mode = params.get("migration_mode", None) + if params.get("restart_vm") == "yes": logging.debug("'restart_vm' specified; (re)starting VM...") start_vm = True @@ -72,11 +74,19 @@ def preprocess_vm(test, params, env, name): logging.debug("VM's qemu command differs from requested one; " "restarting it...") start_vm = True + elif migration_mode is not None: + logging.debug("Starting VM on migration incoming mode...") + start_vm = True if start_vm: - # Start the VM (or restart it if it's already up) - if not vm.create(name, params, test.bindir): - raise error.TestError("Could not start VM") + if migration_mode is not None: + if not vm.create(name, params, test.bindir, + migration_mode=migration_mode): + raise error.TestError("Could not start VM for migration") + else: + # Start the VM (or restart it if it's already up) + if not vm.create(name, params, test.bindir): + raise error.TestError("Could not start VM") else: # Don't start the VM, just update its params vm.params = params -- 1.7.2.3