From nobody Fri May 3 05:47:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921219264186.27965318296617; Mon, 21 May 2018 09:46:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C31FD13ABF9; Mon, 21 May 2018 16:46:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8D11D2015881; Mon, 21 May 2018 16:46:57 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 476594CAA7; Mon, 21 May 2018 16:46:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGkYge002654 for ; Mon, 21 May 2018 12:46:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5F5692024505; Mon, 21 May 2018 16:46:34 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2C642024CC7; Mon, 21 May 2018 16:46:33 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:46:19 +0100 Message-Id: <20180521164631.7288-2-berrange@redhat.com> In-Reply-To: <20180521164631.7288-1-berrange@redhat.com> References: <20180521164631.7288-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH v2 01/13] scripts: avoid using multicast MAC addresses X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 21 May 2018 16:46:58 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 The leading digit from the MAC address should be an even number Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- scripts/domain/215-nic-hotplug-many.t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/domain/215-nic-hotplug-many.t b/scripts/domain/215-nic= -hotplug-many.t index 0270054..eaa282a 100644 --- a/scripts/domain/215-nic-hotplug-many.t +++ b/scripts/domain/215-nic-hotplug-many.t @@ -47,9 +47,9 @@ diag "Creating a new transient domain"; my $dom; ok_domain(sub { $dom =3D $conn->create_domain($xml) }, "created transient = domain object"); =20 -my $mac1 =3D "01:11:22:33:44:55"; -my $mac2 =3D "02:11:22:33:44:55"; -my $mac3 =3D "03:11:22:33:44:55"; +my $mac1 =3D "02:11:22:33:44:55"; +my $mac2 =3D "02:12:22:33:44:55"; +my $mac3 =3D "02:13:22:33:44:55"; my $model =3D "virtio"; =20 my $netxml1 =3D < Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921202221518.2949680040505; Mon, 21 May 2018 09:46:42 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 70BBE30C8D4C; Mon, 21 May 2018 16:46:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9758B30012C8; Mon, 21 May 2018 16:46:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C7E381801254; Mon, 21 May 2018 16:46:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGkZdM002664 for ; Mon, 21 May 2018 12:46:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 96CF12024506; Mon, 21 May 2018 16:46:35 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id C24152024505; Mon, 21 May 2018 16:46:34 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:46:20 +0100 Message-Id: <20180521164631.7288-3-berrange@redhat.com> In-Reply-To: <20180521164631.7288-1-berrange@redhat.com> References: <20180521164631.7288-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH v2 02/13] scripts: strip quotes from URI before checking it X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 21 May 2018 16:46:41 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 The config file may have the URI listed with or without quotes, and the nwfilter tests didn't strip quotes before checking against the whitelisted URI. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- scripts/networks/networkApplyTest.sh | 2 +- scripts/nwfilter/nwfilter2vmtest.sh | 2 +- scripts/nwfilter/nwfilter_concurrent.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/networks/networkApplyTest.sh b/scripts/networks/networ= kApplyTest.sh index da48eef..2a6431e 100644 --- a/scripts/networks/networkApplyTest.sh +++ b/scripts/networks/networkApplyTest.sh @@ -12,7 +12,7 @@ uri=3D$(sed -n '/^uri[ ]*=3D[ ]*/ { $ { x p -}' < "$LIBVIRT_TCK_CONFIG") +}' < "$LIBVIRT_TCK_CONFIG" | sed -e 's/"//g') : "${uri:=3Dqemu:///system}" =20 LIBVIRT_URI=3D${uri} diff --git a/scripts/nwfilter/nwfilter2vmtest.sh b/scripts/nwfilter/nwfilte= r2vmtest.sh index 90a5255..ae28b73 100644 --- a/scripts/nwfilter/nwfilter2vmtest.sh +++ b/scripts/nwfilter/nwfilter2vmtest.sh @@ -16,7 +16,7 @@ VIRSH=3Dvirsh $ { x p -}' < "$LIBVIRT_TCK_CONFIG") +}' < "$LIBVIRT_TCK_CONFIG" | sed -e 's/"//g') : "${uri:=3Dqemu:///system}" =20 LIBVIRT_URI=3D${uri} diff --git a/scripts/nwfilter/nwfilter_concurrent.sh b/scripts/nwfilter/nwf= ilter_concurrent.sh index 4c9b878..c42dd78 100644 --- a/scripts/nwfilter/nwfilter_concurrent.sh +++ b/scripts/nwfilter/nwfilter_concurrent.sh @@ -12,7 +12,7 @@ uri=3D$(sed -n '/^uri[ ]*=3D[ ]*/ { $ { x p -}' < "$LIBVIRT_TCK_CONFIG") +}' < "$LIBVIRT_TCK_CONFIG" | sed -e 's/"//g') : "${uri:=3Dqemu:///system}" =20 LIBVIRT_URI=3D${uri} --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 05:47:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921220784153.26908788405012; Mon, 21 May 2018 09:47:00 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8C7E930E6E7C; Mon, 21 May 2018 16:46:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 42F8D5D759; Mon, 21 May 2018 16:46:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E6E614CAA7; Mon, 21 May 2018 16:46:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGkajc002669 for ; Mon, 21 May 2018 12:46:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id A23FD200BCCB; Mon, 21 May 2018 16:46:36 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id 054A22026DFD; Mon, 21 May 2018 16:46:35 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:46:21 +0100 Message-Id: <20180521164631.7288-4-berrange@redhat.com> In-Reply-To: <20180521164631.7288-1-berrange@redhat.com> References: <20180521164631.7288-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH v2 03/13] scripts: fix block info test conditions X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 21 May 2018 16:46:59 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 The semantics of the "physical" field were fixed to not duplicate the info of the "allocation" field. The use of block_peek on non-raw volumes now raises an error since we cannot peek inside volumes. Signed-off-by: Daniel P. Berrang=C3=A9 --- scripts/domain/121-block-info.t | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/domain/121-block-info.t b/scripts/domain/121-block-inf= o.t index 6fa7780..bfff48c 100644 --- a/scripts/domain/121-block-info.t +++ b/scripts/domain/121-block-info.t @@ -99,7 +99,7 @@ $xml =3D $dom->get_xml_description(); =20 is($dom->get_block_info($dst2,0)->{capacity}, 1024*1024*50, "Get disk capa= city info"); is($dom->get_block_info($dst2,0)->{allocation}, 1024*1024, "Get disk alloc= ation info"); -is($dom->get_block_info($dst2,0)->{physical}, 1024*1024, "Get disk physica= l info"); +is($dom->get_block_info($dst2,0)->{physical}, 1024*1024*50, "Get disk phys= ical info"); =20 =20 is($dom->get_block_info($dst,0)->{capacity}, 1024*1024*50, "Get disk capac= ity info"); @@ -124,8 +124,7 @@ my $date =3D "test"; system("echo $date > $path"); is($dom->block_peek($path,0,4,0), $date, "Get date from raw image"); =20 -#qcow2 file start with hexadecimal:0x51 0x46 0x49 (ASCII: "QFI") -is($dom->block_peek($path3,0,3,0), "QFI", "Get date from qcow2 image"); +dies_ok(sub { $dom->block_peek($path3,0,3,0) }, "Get date from qcow2 image= "); =20 lives_ok(sub { $vol->delete(0) }, "deleted volume"); =20 --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 05:47:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921225981674.073957811016; Mon, 21 May 2018 09:47:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6BED3154B9F; Mon, 21 May 2018 16:47:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 31D182D026; Mon, 21 May 2018 16:47:04 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C01A04CAA0; Mon, 21 May 2018 16:47:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGkcNN002677 for ; Mon, 21 May 2018 12:46:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id BB3092024CC7; Mon, 21 May 2018 16:46:37 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B2C52024CCD; Mon, 21 May 2018 16:46:36 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:46:22 +0100 Message-Id: <20180521164631.7288-5-berrange@redhat.com> In-Reply-To: <20180521164631.7288-1-berrange@redhat.com> References: <20180521164631.7288-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH v2 04/13] scripts: remove testing of 'cow' format X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 21 May 2018 16:47:05 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Support for the 'cow' format was delete from QEMU so will always throw an error if tried in libvirt with modern QEMU commit 550830f9351291c585c963204ad9127998b1c1ce Author: Stefan Hajnoczi Date: Tue Sep 16 15:24:24 2014 +0100 block: delete cow block driver Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- scripts/storage/100-create-vol-dir.t | 19 +------------------ scripts/storage/200-clone-vol-dir.t | 4 ++-- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/scripts/storage/100-create-vol-dir.t b/scripts/storage/100-cre= ate-vol-dir.t index 574e61a..952012c 100644 --- a/scripts/storage/100-create-vol-dir.t +++ b/scripts/storage/100-create-vol-dir.t @@ -28,7 +28,7 @@ with a filesystem pool. use strict; use warnings; =20 -use Test::More tests =3D> 33; +use Test::More tests =3D> 29; =20 use Sys::Virt::TCK; use Test::Exception; @@ -56,7 +56,6 @@ lives_ok(sub { $pool->create }, "started storage pool"); =20 my $volsparsexml =3D $tck->generic_volume("tck1", "raw", 1024*1024*50)->al= location(0)->as_xml; my $volallocxml =3D $tck->generic_volume("tck2", "raw", 1024*1024*50)->all= ocation(1024*1024*50)->as_xml; -my $volcowxml =3D $tck->generic_volume("tck3", "cow", 1024*1024*50)->as_xm= l; my $volqcow1xml =3D $tck->generic_volume("tck4", "qcow", 1024*1024*50)->as= _xml; my $volqcow2xml =3D $tck->generic_volume("tck5", "qcow2", 1024*1024*50)->a= s_xml; my $volvmdkxml =3D $tck->generic_volume("tck6", "vmdk", 1024*1024*50)->as_= xml; @@ -100,22 +99,6 @@ lives_ok(sub { $vol->delete(0) }, "deleted volume"); =20 =20 =20 -ok_volume { $vol =3D $pool->create_volume($volcowxml) } "create cow volume= "; - -$path =3D xpath($vol, "string(/volume/target/path)"); -$st =3D stat($path); - -ok($st, "path $path exists"); - -# Don't know exactly how large a cow empty file is, but it -# should be quite small :-) -ok($st->size < 1024*1024, "basic cow header is allocated"); - -lives_ok(sub { $vol->delete(0) }, "deleted volume"); - - - - ok_volume(sub { $vol =3D $pool->create_volume($volqcow1xml) }, "create qco= w volume"); =20 $path =3D xpath($vol, "string(/volume/target/path)"); diff --git a/scripts/storage/200-clone-vol-dir.t b/scripts/storage/200-clon= e-vol-dir.t index 28043fb..cc0daba 100644 --- a/scripts/storage/200-clone-vol-dir.t +++ b/scripts/storage/200-clone-vol-dir.t @@ -31,7 +31,7 @@ checksummed and validated use strict; use warnings; =20 -use Test::More tests =3D> 61; +use Test::More tests =3D> 52; =20 use Sys::Virt::TCK; use Test::Exception; @@ -103,7 +103,7 @@ my $srcdigest =3D &digest($path); =20 diag "Now testing cloning of various formats"; =20 -my @formats =3D qw(raw cow qcow qcow2 vmdk vpc); +my @formats =3D qw(raw qcow qcow2 vmdk vpc); =20 foreach my $format (@formats) { diag "Cloning source volume to $format format"; --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 05:47:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921231676396.58829621882865; Mon, 21 May 2018 09:47:11 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BB669315B162; Mon, 21 May 2018 16:47:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 69A5D5DD7A; Mon, 21 May 2018 16:47:09 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EDB234A469; Mon, 21 May 2018 16:47:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGkccd002684 for ; Mon, 21 May 2018 12:46:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id DA8212024506; Mon, 21 May 2018 16:46:38 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A0A52024505; Mon, 21 May 2018 16:46:37 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:46:23 +0100 Message-Id: <20180521164631.7288-6-berrange@redhat.com> In-Reply-To: <20180521164631.7288-1-berrange@redhat.com> References: <20180521164631.7288-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH v2 05/13] scripts: portability fixes in checking command output X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 21 May 2018 16:47:10 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Some versions of libvirt/dnsmasq will spawn a child process, so we must trim output from ps to only show the first (main) process. With IPv6 networking we might also get a link local address, which we should skip because it will be different each time, derived from the random MAC address. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- scripts/networks/networkxml2hostout/tck-testnet-1.dat | 2 +- scripts/networks/networkxml2hostout/tck-testnet-2.dat | 2 +- scripts/networks/networkxml2hostout/tck-testnet-3.dat | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/networks/networkxml2hostout/tck-testnet-1.dat b/script= s/networks/networkxml2hostout/tck-testnet-1.dat index fff6ca3..59cda2f 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-1.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-1.dat @@ -9,7 +9,7 @@ ACCEPT all -- 0.0.0.0/0 10.1.2.0/24 = state RELATED,ESTAB ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 =20 #ip -o route show dev tck-testbr | gawk '{print $1" "$7}' 10.1.2.0/24 10.1.2.1 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(\/dnsmasq\/tck-testnet.con= f\).*|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(\/dnsmasq\/tck-testnet.con= f\).*|\1|p' | head -1 /dnsmasq/tck-testnet.conf #grep bind-dynamic `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ s|.*--conf-= file=3D\(.*tck-testnet.conf\).*|\1|p'` bind-dynamic diff --git a/scripts/networks/networkxml2hostout/tck-testnet-2.dat b/script= s/networks/networkxml2hostout/tck-testnet-2.dat index 7f8c86c..4f3d135 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-2.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-2.dat @@ -4,7 +4,7 @@ ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 #iptables -t nat -L -n | grep ' 10\.1\.2\.' #ip -o route show dev tck-testbr | gawk '{print $1" "$7}' 10.1.2.0/24 10.1.2.1 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(\/dnsmasq\/tck-testnet.con= f\).*|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(\/dnsmasq\/tck-testnet.con= f\).*|\1|p' | head -1 /dnsmasq/tck-testnet.conf #grep bind-dynamic `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ s|.*--conf-= file=3D\(.*tck-testnet.conf\).*|\1|p'` bind-dynamic diff --git a/scripts/networks/networkxml2hostout/tck-testnet-3.dat b/script= s/networks/networkxml2hostout/tck-testnet-3.dat index 5fbf742..535a9c7 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-3.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-3.dat @@ -12,7 +12,7 @@ ACCEPT all ::/0 2001:db8:ac10:fd= 01::/64 ACCEPT all 2001:db8:ac10:fd01::/64 ::/0 =20 ACCEPT all ::/0 2001:db8:ac10:fe01::/64=20 ACCEPT all 2001:db8:ac10:fe01::/64 ::/0 =20 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(\/dnsmasq\/tck-testnet.con= f\).*|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(\/dnsmasq\/tck-testnet.con= f\).*|\1|p' | head -1 /dnsmasq/tck-testnet.conf #grep bind-dynamic `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ s|.*--conf-= file=3D\(.*tck-testnet.conf\).*|\1|p'` bind-dynamic @@ -22,7 +22,7 @@ dhcp-range=3D2001:db8:ac10:fe01::1,ra-only dhcp-range=3D2001:db8:ac10:fd01::1,ra-only #brctl show | grep tck-testbr | gawk '{print $1" "$3}' tck-testbr yes -#ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' +#ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' | grep -v link 10.1.2.1/24 10.1.2.255 192.168.123.1/24 192.168.123.255 172.28.255.241/28 172.28.255.255 --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 05:47:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921225329554.7490153403463; Mon, 21 May 2018 09:47:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9A0C8C8F6B; Mon, 21 May 2018 16:47:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 56873601A3; Mon, 21 May 2018 16:47:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EB250180B536; Mon, 21 May 2018 16:47:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGkerX002695 for ; Mon, 21 May 2018 12:46:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id E08A52023585; Mon, 21 May 2018 16:46:39 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48E2F2023583; Mon, 21 May 2018 16:46:39 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:46:24 +0100 Message-Id: <20180521164631.7288-7-berrange@redhat.com> In-Reply-To: <20180521164631.7288-1-berrange@redhat.com> References: <20180521164631.7288-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH v2 06/13] scripts: cope with multiple seclabels in live XML X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 21 May 2018 16:47:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Libvirt may report two seclabels, one for SELinux and one for DAC. Make sure we grab the right one from the XML. Also fix the number of tests. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- scripts/selinux/100-static-relabel-no.t | 4 ++-- scripts/selinux/110-static-relabel-yes.t | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/selinux/100-static-relabel-no.t b/scripts/selinux/100-= static-relabel-no.t index 8d9fda8..ab52534 100644 --- a/scripts/selinux/100-static-relabel-no.t +++ b/scripts/selinux/100-static-relabel-no.t @@ -62,9 +62,9 @@ SKIP: { my $dom; ok_domain(sub { $dom =3D $conn->create_domain($xml) }, "created transi= ent domain object"); =20 - my $domainlabel =3D xpath($dom, "string(/domain/seclabel/label)"); + my $domainlabel =3D xpath($dom, "string(/domain/seclabel[\@model=3D'se= linux']/label)"); diag "domainlabel $domainlabel"; - my $imagelabel =3D xpath($dom, "string(/domain/seclabel/imagelabel)"); + my $imagelabel =3D xpath($dom, "string(/domain/seclabel[\@model=3D'sel= inux']/imagelabel)"); diag "imagelabel $imagelabel"; =20 is($origdomainlabel, $domainlabel, "static label is $domainlabel"); diff --git a/scripts/selinux/110-static-relabel-yes.t b/scripts/selinux/110= -static-relabel-yes.t index 76781ca..18350cf 100644 --- a/scripts/selinux/110-static-relabel-yes.t +++ b/scripts/selinux/110-static-relabel-yes.t @@ -28,7 +28,7 @@ and files can be relabelled use strict; use warnings; =20 -use Test::More tests =3D> 5; +use Test::More tests =3D> 6; =20 use Sys::Virt::TCK; use Sys::Virt::TCK::SELinux; @@ -62,9 +62,9 @@ SKIP: { ok_domain(sub { $dom =3D $conn->create_domain($xml) }, "created transi= ent domain object"); =20 diag $dom->get_xml_description(); - my $domainlabel =3D xpath($dom, "string(/domain/seclabel/label)"); + my $domainlabel =3D xpath($dom, "string(/domain/seclabel[\@model=3D'se= linux']/label)"); diag "domainlabel $domainlabel"; - my $imagelabel =3D xpath($dom, "string(/domain/seclabel/imagelabel)"); + my $imagelabel =3D xpath($dom, "string(/domain/seclabel[\@model=3D'sel= inux']/imagelabel)"); diag "imagelabel $imagelabel"; my $imagetype =3D selinux_get_type($imagelabel); my $imagemcs =3D selinux_get_mcs($imagelabel); --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 05:47:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921237284721.0007821405195; Mon, 21 May 2018 09:47:17 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ABDDCC143E74; Mon, 21 May 2018 16:47:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6530D6178F; Mon, 21 May 2018 16:47:15 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 01B56180B5B6; Mon, 21 May 2018 16:47:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGkfSQ002704 for ; Mon, 21 May 2018 12:46:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 23D0D2024CC7; Mon, 21 May 2018 16:46:41 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4EC182026DFD; Mon, 21 May 2018 16:46:40 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:46:25 +0100 Message-Id: <20180521164631.7288-8-berrange@redhat.com> In-Reply-To: <20180521164631.7288-1-berrange@redhat.com> References: <20180521164631.7288-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH v2 07/13] scripts: switch to using luks encryption with QEMU X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 21 May 2018 16:47:16 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 The ability to use qcow legacy encryption is disabled with QEMU for a long time. Switch to using luks encryption, although this is not yet fully wired up in libvirt so the tests still (temporarily) fail. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- lib/Sys/Virt/TCK/DomainBuilder.pm | 4 ++-- lib/Sys/Virt/TCK/StorageVolBuilder.pm | 18 +++++++++++++----- scripts/qemu/100-disk-encryption.t | 2 ++ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/lib/Sys/Virt/TCK/DomainBuilder.pm b/lib/Sys/Virt/TCK/DomainBui= lder.pm index 83cea15..b6adbd3 100644 --- a/lib/Sys/Virt/TCK/DomainBuilder.pm +++ b/lib/Sys/Virt/TCK/DomainBuilder.pm @@ -412,8 +412,8 @@ sub as_xml { $w->emptyTag("target", dev =3D> $disk->{dst}, $disk->{bus} ? (bus =3D> $disk->{bus}) : ()); - if ($disk->{secret}) { - $w->startTag("encryption", format =3D> "qcow"); + if ($disk->{encformat}) { + $w->startTag("encryption", format =3D> $self->{encryption_form= at}); $w->emptyTag("secret", type =3D> "passphrase", uuid =3D> $disk= ->{secret}); $w->endTag("encryption"); } diff --git a/lib/Sys/Virt/TCK/StorageVolBuilder.pm b/lib/Sys/Virt/TCK/Stora= geVolBuilder.pm index 7208f75..ad950ed 100644 --- a/lib/Sys/Virt/TCK/StorageVolBuilder.pm +++ b/lib/Sys/Virt/TCK/StorageVolBuilder.pm @@ -60,6 +60,14 @@ sub format { return $self; } =20 +sub encryption_format { + my $self =3D shift; + + $self->{encformat} =3D shift; + + return $self; +} + sub secret { my $self =3D shift; =20 @@ -95,13 +103,13 @@ sub as_xml { $w->dataElement("capacity", $self->{capacity}); $w->dataElement("allocation", $self->{allocation}); =20 - if ($self->{format} || $self->{secret}) { + if ($self->{format} || $self->{encformat}) { $w->startTag("target"); if ($self->{format}) { $w->emptyTag("format", type =3D> $self->{format}); } - if ($self->{secret}) { - $w->startTag("encryption", format =3D> "qcow"); + if ($self->{encformat}) { + $w->startTag("encryption", format =3D> $self->{encformat}); $w->emptyTag("secret", type =3D> "passphrase", uuid =3D> $self= ->{secret}); $w->endTag("encryption"); } @@ -114,8 +122,8 @@ sub as_xml { if ($self->{backingFormat}) { $w->emptyTag("format", type =3D> $self->{backingFormat}); } - if ($self->{secret}) { - $w->startTag("encryption", format =3D> "qcow"); + if ($self->{encformat}) { + $w->startTag("encryption", format =3D> $self->{encformat}); $w->emptyTag("secret", type =3D> "passphrase", uuid =3D> $self= ->{secret}); $w->endTag("encryption"); } diff --git a/scripts/qemu/100-disk-encryption.t b/scripts/qemu/100-disk-enc= ryption.t index 8a0fd5e..3b1651a 100644 --- a/scripts/qemu/100-disk-encryption.t +++ b/scripts/qemu/100-disk-encryption.t @@ -76,6 +76,7 @@ lives_ok(sub { $pool =3D $conn->create_storage_pool($pool= XML) }, "pool created"); my $volXML =3D Sys::Virt::TCK::StorageVolBuilder->new(name =3D> "demo.qcow= 2") ->capacity(1024*1024*1024) ->format("qcow2") + ->encryption_format("luks") ->secret($secretUUID) ->as_xml(); =20 @@ -86,6 +87,7 @@ lives_ok(sub { $vol =3D $pool->create_volume($volXML) }, = "volume created"); =20 my $xml =3D $tck->generic_domain(name =3D> "tck") ->disk(format =3D> { name =3D> "qemu", type =3D> "qcow2" }, + encryption_format =3D> "luks", secret =3D> $secretUUID, type =3D> "file", src =3D> $disk, --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 05:47:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921232092934.4023730509779; Mon, 21 May 2018 09:47:12 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2AF04300630B; Mon, 21 May 2018 16:47:10 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A7EFD601A3; Mon, 21 May 2018 16:47:09 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2AF2E180B536; Mon, 21 May 2018 16:47:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGkgLE002714 for ; Mon, 21 May 2018 12:46:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 447382024505; Mon, 21 May 2018 16:46:42 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id 865E52024CCD; Mon, 21 May 2018 16:46:41 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:46:26 +0100 Message-Id: <20180521164631.7288-9-berrange@redhat.com> In-Reply-To: <20180521164631.7288-1-berrange@redhat.com> References: <20180521164631.7288-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH v2 08/13] scripts: skip luks test entirely for now X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 21 May 2018 16:47:11 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Libvirt support for luks-inside-qcow2 is not quite ready yet. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- scripts/qemu/100-disk-encryption.t | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/qemu/100-disk-encryption.t b/scripts/qemu/100-disk-enc= ryption.t index 3b1651a..32e2adf 100644 --- a/scripts/qemu/100-disk-encryption.t +++ b/scripts/qemu/100-disk-encryption.t @@ -42,6 +42,7 @@ END { $tck->cleanup if $tck; } =20 SKIP: { skip "Only relevant to QEMU driver", 8 unless $conn->get_type() eq "QE= MU"; + skip "Libvirt LUKS support isn't ready", 8; =20 my $dir =3D $tck->bucket_dir("300-disk-encryption"); my $disk =3D catfile($dir, "demo.qcow2"); --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 05:47:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921238708852.0920882626712; Mon, 21 May 2018 09:47:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CC8E319D2B1; Mon, 21 May 2018 16:47:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7F7BF30001D7; Mon, 21 May 2018 16:47:16 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 06D95180BACD; Mon, 21 May 2018 16:47:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGkh2D002724 for ; Mon, 21 May 2018 12:46:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 484362023582; Mon, 21 May 2018 16:46:43 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8FE2B2024506; Mon, 21 May 2018 16:46:42 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:46:27 +0100 Message-Id: <20180521164631.7288-10-berrange@redhat.com> In-Reply-To: <20180521164631.7288-1-berrange@redhat.com> References: <20180521164631.7288-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH v2 09/13] scripts: fix the various hotplug tests X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 21 May 2018 16:47:17 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 PCI device hotunplug requires a running guest OS that cooperates with the ACPI unplug request. We must thus boot a real guest and wait for it to be ready before running the tests. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- scripts/domain/200-disk-hotplug.t | 4 +++- scripts/domain/205-disk-hotplug-ordering.t | 5 ++++- scripts/domain/210-nic-hotplug.t | 5 ++++- scripts/domain/215-nic-hotplug-many.t | 5 ++++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/scripts/domain/200-disk-hotplug.t b/scripts/domain/200-disk-ho= tplug.t index 4c54b6b..87c0e53 100644 --- a/scripts/domain/200-disk-hotplug.t +++ b/scripts/domain/200-disk-hotplug.t @@ -41,12 +41,14 @@ END { } =20 =20 -my $xml =3D $tck->generic_domain(name =3D> "tck")->as_xml; +my $xml =3D $tck->generic_domain(name =3D> "tck", fullos =3D> 1)->as_xml; =20 diag "Creating a new transient domain"; my $dom; ok_domain(sub { $dom =3D $conn->create_domain($xml) }, "created transient = domain object"); =20 +diag "Waiting 30 seconds for guest to finish booting"; +sleep(30); =20 my $path =3D $tck->create_sparse_disk("200-disk-hotplug", "extra.img", 100= ); =20 diff --git a/scripts/domain/205-disk-hotplug-ordering.t b/scripts/domain/20= 5-disk-hotplug-ordering.t index bc4990f..b76cd54 100644 --- a/scripts/domain/205-disk-hotplug-ordering.t +++ b/scripts/domain/205-disk-hotplug-ordering.t @@ -41,12 +41,15 @@ END { } =20 =20 -my $xml =3D $tck->generic_domain(name =3D> "tck")->as_xml; +my $xml =3D $tck->generic_domain(name =3D> "tck", fullos =3D> 1)->as_xml; =20 diag "Creating a new transient domain"; my $dom; ok_domain(sub { $dom =3D $conn->create_domain($xml) }, "created transient = domain object"); =20 +diag "Waiting 30 seconds for guest to finish booting"; +sleep(30); + my $supported =3D 1; foreach my $dev (qw/vdb sdb/) { my $path =3D $tck->create_sparse_disk("200-disk-hotplug", "extra-$dev.= img", 100); diff --git a/scripts/domain/210-nic-hotplug.t b/scripts/domain/210-nic-hotp= lug.t index ac9048e..7106fd0 100644 --- a/scripts/domain/210-nic-hotplug.t +++ b/scripts/domain/210-nic-hotplug.t @@ -41,12 +41,15 @@ END { } =20 =20 -my $xml =3D $tck->generic_domain(name =3D> "tck")->as_xml; +my $xml =3D $tck->generic_domain(name =3D> "tck", fullos =3D> 1)->as_xml; =20 diag "Creating a new transient domain"; my $dom; ok_domain(sub { $dom =3D $conn->create_domain($xml) }, "created transient = domain object"); =20 +diag "Waiting 30 seconds for guest to finish booting"; +sleep(30); + my $mac =3D "00:11:22:33:44:55"; my $model =3D "virtio"; =20 diff --git a/scripts/domain/215-nic-hotplug-many.t b/scripts/domain/215-nic= -hotplug-many.t index eaa282a..558e6e7 100644 --- a/scripts/domain/215-nic-hotplug-many.t +++ b/scripts/domain/215-nic-hotplug-many.t @@ -41,12 +41,15 @@ END { } =20 =20 -my $xml =3D $tck->generic_domain(name =3D> "tck")->as_xml; +my $xml =3D $tck->generic_domain(name =3D> "tck", fullos =3D> 1)->as_xml; =20 diag "Creating a new transient domain"; my $dom; ok_domain(sub { $dom =3D $conn->create_domain($xml) }, "created transient = domain object"); =20 +diag "Waiting 30 seconds for guest to finish booting"; +sleep(30); + my $mac1 =3D "02:11:22:33:44:55"; my $mac2 =3D "02:12:22:33:44:55"; my $mac3 =3D "02:13:22:33:44:55"; --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 05:47:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921209563108.06047232938863; Mon, 21 May 2018 09:46:49 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A5F7A3145192; Mon, 21 May 2018 16:46:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6D87E5C541; Mon, 21 May 2018 16:46:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D3F1C1801255; Mon, 21 May 2018 16:46:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGkiCQ002734 for ; Mon, 21 May 2018 12:46:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 69ACF2023585; Mon, 21 May 2018 16:46:44 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id 961A12023583; Mon, 21 May 2018 16:46:43 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:46:28 +0100 Message-Id: <20180521164631.7288-11-berrange@redhat.com> In-Reply-To: <20180521164631.7288-1-berrange@redhat.com> References: <20180521164631.7288-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH v2 10/13] scripts: don't abort the entire test harness when libvirtd isn't running X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 21 May 2018 16:46:48 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 It is reasonable to run TCK against a manually started libvirtd, so we should not abort the entire test suite. Just mark the hook scripts as skipped. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- scripts/hooks/051-daemon-hook.t | 2 +- scripts/hooks/052-domain-hook.t | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/hooks/051-daemon-hook.t b/scripts/hooks/051-daemon-hoo= k.t index aa7668b..82cedee 100644 --- a/scripts/hooks/051-daemon-hook.t +++ b/scripts/hooks/051-daemon-hook.t @@ -51,7 +51,7 @@ SKIP: { log_name =3D> '/tmp/daemon.log'); =20 $hook->libvirtd_status(); - BAIL_OUT "libvirtd is not running, Exit..." + skip "libvirtd is not running, Exit...", 12 if ($hook->{libvirtd_status} eq 'stopped'); =20 eval { $hook->prepare(); }; diff --git a/scripts/hooks/052-domain-hook.t b/scripts/hooks/052-domain-hoo= k.t index 07e4b23..c3a0b3f 100644 --- a/scripts/hooks/052-domain-hook.t +++ b/scripts/hooks/052-domain-hook.t @@ -49,17 +49,21 @@ SKIP: { skip "NOT using QEMU/LXC driver", 12 unless $uri eq "qemu:///system" or $uri eq "lxc:///"; =20 + my $hook_type =3D $uri eq "qemu:///system" ? 'qemu' : 'lxc'; + + my $hook =3D Sys::Virt::TCK::Hooks->new(type =3D> $hook_type, + conf_dir =3D> '/etc/libvirt/hook= s', + expect_result =3D> 0); + $hook->libvirtd_status(); + skip "libvirtd is not running, Exit...", 12 + if ($hook->{libvirtd_status} eq 'stopped'); + my $xml =3D $tck->generic_domain(name =3D> "tck")->as_xml; =20 diag "Creating a new persistent domain"; my $dom; ok_domain(sub { $dom =3D $conn->define_domain($xml) }, "created persis= tent domain object"); =20 - my $hook_type =3D $uri eq "qemu:///system" ? 'qemu' : 'lxc'; - - my $hook =3D Sys::Virt::TCK::Hooks->new(type =3D> $hook_type, - conf_dir =3D> '/etc/libvirt/hook= s', - expect_result =3D> 0); eval { $hook->prepare(); }; BAIL_OUT "failed to setup hooks testing ENV: $@" if $@; =20 --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 05:47:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921243739714.5697266140212; Mon, 21 May 2018 09:47:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5229C30C3A81; Mon, 21 May 2018 16:47:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1F96D30001D7; Mon, 21 May 2018 16:47:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C45573FCFB; Mon, 21 May 2018 16:47:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGkjjl002742 for ; Mon, 21 May 2018 12:46:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6D7A0200BCCB; Mon, 21 May 2018 16:46:45 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id A51632026DFD; Mon, 21 May 2018 16:46:44 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:46:29 +0100 Message-Id: <20180521164631.7288-12-berrange@redhat.com> In-Reply-To: <20180521164631.7288-1-berrange@redhat.com> References: <20180521164631.7288-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH v2 11/13] scripts: re-enable save/restore test X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 21 May 2018 16:47:22 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 The referenced QEMU bug is long since fixed Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- scripts/domain/102-broken-save-restore.t | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/domain/102-broken-save-restore.t b/scripts/domain/102-= broken-save-restore.t index 4a05705..fea93f3 100644 --- a/scripts/domain/102-broken-save-restore.t +++ b/scripts/domain/102-broken-save-restore.t @@ -28,8 +28,7 @@ transient domains to/from a file. use strict; use warnings; =20 -use Test::More skip_all =3D> "Until RHBZ 518032 is fixed"; -#use Test::More tests =3D> 5; +use Test::More tests =3D> 5; =20 use Sys::Virt::TCK; use Test::Exception; --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 05:47:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1527328002755236.07304305851642; Sat, 26 May 2018 02:46:42 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 78DD7C13F3C3; Mon, 21 May 2018 16:47:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2D3DF1057FA3; Mon, 21 May 2018 16:47:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C134B180005A; Mon, 21 May 2018 16:47:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGkkRR002747 for ; Mon, 21 May 2018 12:46:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id A51012024505; Mon, 21 May 2018 16:46:46 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id CFE712024CC7; Mon, 21 May 2018 16:46:45 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:46:30 +0100 Message-Id: <20180521164631.7288-13-berrange@redhat.com> In-Reply-To: <20180521164631.7288-1-berrange@redhat.com> References: <20180521164631.7288-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH v2 12/13] lib: don't re-assign $_ X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 21 May 2018 16:47:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Perl has started to forbid code from declaring "my $_", because $_ is implicitly always a local scope. Rewrite the code to avoid tickling this warning. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- lib/Sys/Virt/TCK/Hooks.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/Sys/Virt/TCK/Hooks.pm b/lib/Sys/Virt/TCK/Hooks.pm index e7a8f76..7d35072 100644 --- a/lib/Sys/Virt/TCK/Hooks.pm +++ b/lib/Sys/Virt/TCK/Hooks.pm @@ -71,11 +71,10 @@ sub expect_result { sub libvirtd_status { my $self =3D shift; my $status =3D `service libvirtd status`; - my $_ =3D $status; =20 - if (/stopped|unused|inactive/) { + if ($status =3D~ /stopped|unused|inactive/) { $self->{libvirtd_status} =3D 'stopped'; - } elsif (/running|active/) { + } elsif ($status =3D~ /running|active/) { $self->{libvirtd_status} =3D 'running'; } =20 --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 05:47:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921231711657.2082004759653; Mon, 21 May 2018 09:47:11 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9BC30124A00; Mon, 21 May 2018 16:47:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5288D5D756; Mon, 21 May 2018 16:47:09 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E3F854BB78; Mon, 21 May 2018 16:47:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGkmdd002756 for ; Mon, 21 May 2018 12:46:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id DC6BD2024506; Mon, 21 May 2018 16:46:47 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id 13B292024505; Mon, 21 May 2018 16:46:46 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:46:31 +0100 Message-Id: <20180521164631.7288-14-berrange@redhat.com> In-Reply-To: <20180521164631.7288-1-berrange@redhat.com> References: <20180521164631.7288-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH v2 13/13] lib: allow marking the scratch disk as shareable X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 21 May 2018 16:47:10 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 One of the tests checks the ability to boot multiple guests at once, and it is using the same (empty) disk image for all. Modern QEMU rejects this sharing, but it is harmless in context of this test case, so we mark the disk as shareable to allow it. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- lib/Sys/Virt/TCK.pm | 6 +++++- lib/Sys/Virt/TCK/DomainBuilder.pm | 3 +++ scripts/domain/081-unique-id-create.t | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index e7ff71b..ac9c125 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -782,6 +782,7 @@ sub generic_machine_domain { my $caps =3D exists $params{caps} ? $params{caps} : die "caps paramete= r is required"; my $ostype =3D exists $params{ostype} ? $params{ostype} : "hvm"; my $fullos =3D exists $params{fullos} ? $params{fullos} : 0; + my $shareddisk =3D exists $params{shareddisk} ? $params{shareddisk} : = 0; my $filterref =3D exists $params{filterref} ? $params{filterref} : und= ef; my %filterparams =3D exists $params{filterparams} ? %{$params{filterpa= rams}} : (); =20 @@ -857,7 +858,8 @@ sub generic_machine_domain { =20 $b->disk(src =3D> $config{root}, dst =3D> $config{dev}, - type =3D> "file"); + type =3D> "file", + shareable =3D> $shareddisk); return $b; } } @@ -915,6 +917,7 @@ sub generic_domain { my $ostype =3D exists $params{ostype} ? $params{ostype} : "hvm"; my $fullos =3D exists $params{fullos} ? $params{fullos} : 0; my $netmode =3D exists $params{netmode} ? $params{netmode} : undef; + my $shareddisk =3D exists $params{shareddisk} ? $params{shareddisk} : = 0; my $filterref =3D exists $params{filterref} ? $params{filterref} : und= ef; my %filterparams =3D exists $params{filterparams} ? %{$params{filterpa= rams}} : (); =20 @@ -936,6 +939,7 @@ sub generic_domain { $b =3D $self->generic_machine_domain(name =3D> $name, caps =3D> $caps, ostype =3D> $ostype, + shareddisk =3D> $shareddisk, fullos =3D> $fullos, filterref =3D> $filterref, filterparams =3D> \%filterparam= s); diff --git a/lib/Sys/Virt/TCK/DomainBuilder.pm b/lib/Sys/Virt/TCK/DomainBui= lder.pm index b6adbd3..5ca2a07 100644 --- a/lib/Sys/Virt/TCK/DomainBuilder.pm +++ b/lib/Sys/Virt/TCK/DomainBuilder.pm @@ -409,6 +409,9 @@ sub as_xml { $w->emptyTag("source", file =3D> $disk->{src}); } + if ($disk->{shareable}) { + $w->emptyTag("shareable"); + } $w->emptyTag("target", dev =3D> $disk->{dst}, $disk->{bus} ? (bus =3D> $disk->{bus}) : ()); diff --git a/scripts/domain/081-unique-id-create.t b/scripts/domain/081-uni= que-id-create.t index 07143a5..0d53599 100644 --- a/scripts/domain/081-unique-id-create.t +++ b/scripts/domain/081-unique-id-create.t @@ -54,13 +54,13 @@ my $uuid1 =3D "11111111-1111-1111-1111-111111111111"; my $uuid2 =3D "22222222-1111-1111-1111-111111111111"; =20 # The initial config -my $xml =3D $tck->generic_domain(name =3D> $name1)->uuid($uuid1)->as_xml; +my $xml =3D $tck->generic_domain(name =3D> $name1, shareddisk =3D> 1)->uui= d($uuid1)->as_xml; # One with a different UUID, matching name my $xml_diffuuid =3D $tck->generic_domain(name =3D> $name1)->uuid($uuid2)-= >as_xml; # One with a matching UUID, different name my $xml_diffname =3D $tck->generic_domain(name =3D> $name2)->uuid($uuid1)-= >as_xml; # One with a different UUID, different name -my $xml_diffboth =3D $tck->generic_domain(name =3D> $name2)->uuid($uuid2)-= >as_xml; +my $xml_diffboth =3D $tck->generic_domain(name =3D> $name2, shareddisk =3D= > 1)->uuid($uuid2)->as_xml; =20 diag "Defining persistent domain config"; my ($dom, $dom1); --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list