From nobody Fri May 16 04:56:57 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1501063414526579.413137982056; Wed, 26 Jul 2017 03:03:34 -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 B3938655B; Wed, 26 Jul 2017 10:03:28 +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 5B24268893; Wed, 26 Jul 2017 10:03:28 +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 44AA414B33; Wed, 26 Jul 2017 10:03:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v6QA1Kw9008969 for ; Wed, 26 Jul 2017 06:01:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 165136FB61; Wed, 26 Jul 2017 10:01:20 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6738351C89; Wed, 26 Jul 2017 10:01:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B3938655B Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 26 Jul 2017 12:00:53 +0200 Message-Id: <7dfc7af984da99eb7e1ff577570f720fa74e35c6.1501062802.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 23/24] tests: qemumonitorjson: Test extraction of LUKS node names 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: , MIME-Version: 1.0 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.39]); Wed, 26 Jul 2017 10:03:29 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" --- .../qemumonitorjson-nodename-luks-blockstats.json | 58 +++++++++++ .../qemumonitorjson-nodename-luks-named-nodes.json | 109 +++++++++++++++++= ++++ .../qemumonitorjson-nodename-luks.result | 6 ++ tests/qemumonitorjsontest.c | 1 + 4 files changed, 174 insertions(+) create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks= -blockstats.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks= -named-nodes.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks= .result diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-blocks= tats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-blockst= ats.json new file mode 100644 index 000000000..6f971b2af --- /dev/null +++ b/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-blockstats.js= on @@ -0,0 +1,58 @@ +[ + { + "device": "drive-virtio-disk0", + "parent": { + "stats": { + "flush_total_time_ns": 0, + "wr_highest_offset": 0, + "wr_total_time_ns": 0, + "failed_wr_operations": 0, + "failed_rd_operations": 0, + "wr_merged": 0, + "wr_bytes": 0, + "timed_stats": [ + + ], + "failed_flush_operations": 0, + "account_invalid": false, + "rd_total_time_ns": 0, + "flush_operations": 0, + "wr_operations": 0, + "rd_merged": 0, + "rd_bytes": 0, + "invalid_flush_operations": 0, + "account_failed": false, + "rd_operations": 0, + "invalid_wr_operations": 0, + "invalid_rd_operations": 0 + }, + "node-name": "#block033" + }, + "stats": { + "flush_total_time_ns": 0, + "wr_highest_offset": 0, + "wr_total_time_ns": 0, + "failed_wr_operations": 0, + "failed_rd_operations": 0, + "wr_merged": 0, + "wr_bytes": 0, + "timed_stats": [ + + ], + "failed_flush_operations": 0, + "account_invalid": true, + "rd_total_time_ns": 89560, + "flush_operations": 0, + "wr_operations": 0, + "rd_merged": 0, + "rd_bytes": 512, + "invalid_flush_operations": 0, + "account_failed": true, + "idle_time_ns": 323120536984, + "rd_operations": 1, + "invalid_wr_operations": 0, + "invalid_rd_operations": 0 + }, + "node-name": "#block136" + } +] diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-named-= nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-named-= nodes.json new file mode 100644 index 000000000..8de6d6c6a --- /dev/null +++ b/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-named-nodes.j= son @@ -0,0 +1,109 @@ +[ + { + "iops_rd": 0, + "detect_zeroes": "off", + "image": { + "virtual-size": 10485760, + "filename": "json:{\"driver\": \"luks\", \"file\": {\"driver\": \"= file\", \"filename\": \"/var/lib/libvirt/images/luks\"}, \"key-secret\": \"= virtio-disk0-luks-secret0\"}", + "format": "luks", + "actual-size": 262144, + "format-specific": { + "type": "luks", + "data": { + "ivgen-alg": "plain64", + "hash-alg": "sha256", + "cipher-alg": "aes-256", + "uuid": "687ef639-c687-40d3-a103-7b4bdaa6e74a", + "cipher-mode": "xts", + "slots": [ + { + "active": true, + "iters": 1886334, + "key-offset": 4096, + "stripes": 4000 + }, + { + "active": false, + "key-offset": 262144 + }, + { + "active": false, + "key-offset": 520192 + }, + { + "active": false, + "key-offset": 778240 + }, + { + "active": false, + "key-offset": 1036288 + }, + { + "active": false, + "key-offset": 1294336 + }, + { + "active": false, + "key-offset": 1552384 + }, + { + "active": false, + "key-offset": 1810432 + } + ], + "payload-offset": 2068480, + "master-key-iters": 484865 + } + }, + "encrypted": true, + "dirty-flag": false + }, + "iops_wr": 0, + "ro": false, + "node-name": "#block136", + "backing_file_depth": 0, + "drv": "luks", + "iops": 0, + "bps_wr": 0, + "write_threshold": 0, + "encrypted": true, + "bps": 0, + "bps_rd": 0, + "cache": { + "no-flush": false, + "direct": false, + "writeback": true + }, + "file": "json:{\"driver\": \"luks\", \"file\": {\"driver\": \"file\"= , \"filename\": \"/var/lib/libvirt/images/luks\"}, \"key-secret\": \"virtio= -disk0-luks-secret0\"}", + "encryption_key_missing": false + }, + { + "iops_rd": 0, + "detect_zeroes": "off", + "image": { + "virtual-size": 12554240, + "filename": "/var/lib/libvirt/images/luks", + "format": "file", + "actual-size": 262144, + "dirty-flag": false + }, + "iops_wr": 0, + "ro": false, + "node-name": "#block033", + "backing_file_depth": 0, + "drv": "file", + "iops": 0, + "bps_wr": 0, + "write_threshold": 0, + "encrypted": false, + "bps": 0, + "bps_rd": 0, + "cache": { + "no-flush": false, + "direct": false, + "writeback": true + }, + "file": "/var/lib/libvirt/images/luks", + "encryption_key_missing": false + } +] diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks.result= b/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks.result new file mode 100644 index 000000000..6a6b37519 --- /dev/null +++ b/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks.result @@ -0,0 +1,6 @@ +drive-virtio-disk0 +filename : '/var/lib/libvirt/images/luks' +format node : '#block136' +format drv : 'luks' +storage node: '#block033' +storage drv : 'file' diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 06d97989e..f4169e550 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2936,6 +2936,7 @@ mymain(void) DO_TEST_BLOCK_NODE_DETECT("blockjob"); DO_TEST_BLOCK_NODE_DETECT("old"); DO_TEST_BLOCK_NODE_DETECT("empty"); + DO_TEST_BLOCK_NODE_DETECT("luks"); #undef DO_TEST_BLOCK_NODE_DETECT --=20 2.13.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list