Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE61EC2D0DB for ; Thu, 23 Jan 2020 15:12:55 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 8798221835 for ; Thu, 23 Jan 2020 15:12:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KaIaVaqf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8798221835 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iueAA-0007rA-5P for qemu-devel@archiver.kernel.org; Thu, 23 Jan 2020 10:12:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50399) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iubdm-0008Ur-9B for qemu-devel@nongnu.org; Thu, 23 Jan 2020 07:31:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iubdk-00016Q-VV for qemu-devel@nongnu.org; Thu, 23 Jan 2020 07:31:18 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:27411 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 1iubdk-00016F-SS for qemu-devel@nongnu.org; Thu, 23 Jan 2020 07:31:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579782676; 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=KaIaVaqfjJ2xV3eEpXDJSZ4VMvG/r7C52cH/UhHISWsXswTj9rybfvZmcf8lRNKYHeHZpp u6rkfGqP1Cx1TNnY82C0J/Z/VmUHFPhTEATKTK+Ke+VT+OHuWWQWO/RB6ArS/DxHSc3ESj 0jUVFOtDJbRQrTTLdQeEiGSN/G2/Om4= 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-355-XgcGiMsnMh29luiXW0S8tQ-1; Thu, 23 Jan 2020 07:30:06 -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 D1ED0DBA9 for ; Thu, 23 Jan 2020 12:30:05 +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 43F3210016E8 for ; Thu, 23 Jan 2020 12:30:05 +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 14:30:04 +0200 Message-Id: <20200123123004.28156-1-ovoshcha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: XgcGiMsnMh29luiXW0S8tQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.120 X-Mailman-Approved-At: Thu, 23 Jan 2020 08:54:05 -0500 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+qemu-devel=archiver.kernel.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. =20 =20 +import tempfile from avocado_qemu import Test +from avocado import skipUnless\ =20 from avocado.utils import network from avocado.utils import wait +from avocado.utils.path import find_command, CmdNotFoundError =20 =20 class Migration(Test): @@ -24,6 +27,26 @@ class Migration(Test): def migration_finished(vm): return vm.command('query-migrate')['status'] in ('completed', 'fai= led') =20 + def do_migrate(self, dest_uri, src_uri=3DNone): + source_vm =3D self.get_vm() + dest_vm =3D self.get_vm('-incoming', dest_uri) + dest_vm.launch() + if src_uri is None: + src_uri =3D dest_uri + source_vm.launch() + source_vm.qmp('migrate', uri=3Dsrc_uri) + self.assert_migration(source_vm, dest_vm) + + def assert_migration(self, source_vm, dest_vm): + wait.wait_for(self.migration_finished, + timeout=3Dself.timeout, + step=3D0.1, + args=3D(source_vm,)) + self.assertEqual(source_vm.command('query-migrate')['status'], 'co= mpleted') + self.assertEqual(dest_vm.command('query-migrate')['status'], 'comp= leted') + self.assertEqual(dest_vm.command('query-status')['status'], 'runni= ng') + self.assertEqual(source_vm.command('query-status')['status'], 'pos= tmigrate') + def _get_free_port(self): port =3D network.find_free_port() if port is None: @@ -32,19 +55,16 @@ class Migration(Test): =20 =20 def test_migration_with_tcp_localhost(self): - source_vm =3D self.get_vm() dest_uri =3D 'tcp:localhost:%u' % self._get_free_port() - dest_vm =3D self.get_vm('-incoming', dest_uri) - dest_vm.launch() - source_vm.launch() - source_vm.qmp('migrate', uri=3Ddest_uri) - wait.wait_for( - self.migration_finished, - timeout=3Dself.timeout, - step=3D0.1, - args=3D(source_vm,) - ) - self.assertEqual(dest_vm.command('query-migrate')['status'], 'comp= leted') - self.assertEqual(source_vm.command('query-migrate')['status'], 'co= mpleted') - self.assertEqual(dest_vm.command('query-status')['status'], 'runni= ng') - self.assertEqual(source_vm.command('query-status')['status'], 'pos= tmigrate') + self.do_migrate(dest_uri) + + def test_migration_with_unix(self): + with tempfile.TemporaryDirectory(prefix=3D'socket_') as socket_pat= h: + dest_uri =3D 'unix:%s/qemu-test.sock' % socket_path + self.do_migrate(dest_uri) + @skipUnless(find_command('nc', default=3DFalse), "nc command not found= on the system") + def test_migration_with_exec(self): + free_port =3D self._get_free_port() + dest_uri =3D 'exec:nc -l localhost %u' % free_port + src_uri =3D 'exec:nc localhost %u' % free_port + self.do_migrate(dest_uri, src_uri) --=20 2.21.1