From nobody Wed May 14 01:10:22 2025 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