From patchwork Thu Jan 23 14:09:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oksana Vohchana X-Patchwork-Id: 1228321 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=VjNbWCE1; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 483Szj657fz9sSH for ; Fri, 24 Jan 2020 03:54:25 +1100 (AEDT) Received: from localhost ([::1]:32816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iufkM-0002Rh-RW for incoming@patchwork.ozlabs.org; Thu, 23 Jan 2020 11:54:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57634) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iudCa-0000U8-1Q for qemu-devel@nongnu.org; Thu, 23 Jan 2020 09:11:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iudCY-0001ML-Ey for qemu-devel@nongnu.org; Thu, 23 Jan 2020 09:11:19 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:39795 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iudCY-0001LJ-Bs for qemu-devel@nongnu.org; Thu, 23 Jan 2020 09:11:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579788677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qf+upfgHM9UbJpwPJ/l9fFPz6PQg3yqrvyzMt+T52mA=; b=VjNbWCE1VtLbMrdsW2yeVgtoprQHgZjqeQ+2r+H0yI1ykDZ0onyAcCcgbahT+isarr0HRC LkSkLntuNEBfWSv0LGM/Fb4gkbdEdbOVIkyJP+Uggkv9kbyuJCEUtcyHYW5kYEPK6iyiQC yMmKG7zsDf6v4KJc0eSRp2jaga7fMhg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-200-GG8t7tOKNYWZzwpXuv8j5Q-1; Thu, 23 Jan 2020 09:09:08 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1EB6F8024D6 for ; Thu, 23 Jan 2020 14:09:07 +0000 (UTC) Received: from kh066.redhat.com (ovpn-117-189.ams2.redhat.com [10.36.117.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88D481084382 for ; Thu, 23 Jan 2020 14:09:06 +0000 (UTC) From: Oksana Vohchana To: qemu-devel@nongnu.org Subject: [PATCH] Acceptance test: provides to use different transport for migration Date: Thu, 23 Jan 2020 16:09:05 +0200 Message-Id: <20200123140905.3586-1-ovoshcha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: GG8t7tOKNYWZzwpXuv8j5Q-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Along with VM migration via TCP, we can use migration through EXEC and UNIX transport protocol Signed-off-by: Oksana Vohchana --- tests/acceptance/migration.py | 50 ++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/tests/acceptance/migration.py b/tests/acceptance/migration.py index a44c1ae58f..8bbe28d52d 100644 --- a/tests/acceptance/migration.py +++ b/tests/acceptance/migration.py @@ -10,10 +10,13 @@ # later. See the COPYING file in the top-level directory. +import tempfile from avocado_qemu import Test +from avocado import skipUnless\ from avocado.utils import network from avocado.utils import wait +from avocado.utils.path import find_command, CmdNotFoundError class Migration(Test): @@ -24,6 +27,26 @@ class Migration(Test): def migration_finished(vm): return vm.command('query-migrate')['status'] in ('completed', 'failed') + def do_migrate(self, dest_uri, src_uri=None): + source_vm = self.get_vm() + dest_vm = self.get_vm('-incoming', dest_uri) + dest_vm.launch() + if src_uri is None: + src_uri = dest_uri + source_vm.launch() + source_vm.qmp('migrate', uri=src_uri) + self.assert_migration(source_vm, dest_vm) + + def assert_migration(self, source_vm, dest_vm): + wait.wait_for(self.migration_finished, + timeout=self.timeout, + step=0.1, + args=(source_vm,)) + self.assertEqual(source_vm.command('query-migrate')['status'], 'completed') + self.assertEqual(dest_vm.command('query-migrate')['status'], 'completed') + self.assertEqual(dest_vm.command('query-status')['status'], 'running') + self.assertEqual(source_vm.command('query-status')['status'], 'postmigrate') + def _get_free_port(self): port = network.find_free_port() if port is None: @@ -32,19 +55,16 @@ class Migration(Test): def test_migration_with_tcp_localhost(self): - source_vm = self.get_vm() dest_uri = 'tcp:localhost:%u' % self._get_free_port() - dest_vm = self.get_vm('-incoming', dest_uri) - dest_vm.launch() - source_vm.launch() - source_vm.qmp('migrate', uri=dest_uri) - wait.wait_for( - self.migration_finished, - timeout=self.timeout, - step=0.1, - args=(source_vm,) - ) - self.assertEqual(dest_vm.command('query-migrate')['status'], 'completed') - self.assertEqual(source_vm.command('query-migrate')['status'], 'completed') - self.assertEqual(dest_vm.command('query-status')['status'], 'running') - self.assertEqual(source_vm.command('query-status')['status'], 'postmigrate') + self.do_migrate(dest_uri) + + def test_migration_with_unix(self): + with tempfile.TemporaryDirectory(prefix='socket_') as socket_path: + dest_uri = 'unix:%s/qemu-test.sock' % socket_path + self.do_migrate(dest_uri) + @skipUnless(find_command('nc', default=False), "nc command not found on the system") + def test_migration_with_exec(self): + free_port = self._get_free_port() + dest_uri = 'exec:nc -l localhost %u' % free_port + src_uri = 'exec:nc localhost %u' % free_port + self.do_migrate(dest_uri, src_uri)