From nobody Sun Feb 8 16:11:41 2026 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 1532015528030949.9099142408687; Thu, 19 Jul 2018 08:52:08 -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 02746C04AC54; Thu, 19 Jul 2018 15:52:05 +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 8E3382010CDA; Thu, 19 Jul 2018 15:52: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 01B4C18037F0; Thu, 19 Jul 2018 15:52:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpSAo028660 for ; Thu, 19 Jul 2018 11:51:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6E1141C5A6; Thu, 19 Jul 2018 15:51:28 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F6D51C5B0 for ; Thu, 19 Jul 2018 15:51:27 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:05 +0200 Message-Id: <519825220e46429003e7d4ee7a1729d273cd25bd.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 13/24] tests: qemu: Unify iscsi disk source testing 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.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.31]); Thu, 19 Jul 2018 15:52:07 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move various different iSCSI configuration into one test file. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../qemuxml2argvdata/disk-network-iscsi-auth.args | 34 ---------------- tests/qemuxml2argvdata/disk-network-iscsi-auth.xml | 43 ------------------= -- tests/qemuxml2argvdata/disk-network-iscsi-lun.args | 29 ------------- tests/qemuxml2argvdata/disk-network-iscsi-lun.xml | 28 ------------- tests/qemuxml2argvdata/disk-network-iscsi.args | 21 ++++++++-- tests/qemuxml2argvdata/disk-network-iscsi.xml | 28 +++++++++++++ tests/qemuxml2argvtest.c | 6 +-- .../qemuxml2xmloutdata/disk-network-iscsi-auth.xml | 47 ------------------= ---- tests/qemuxml2xmloutdata/disk-network-iscsi.xml | 37 ++++++++++++++++- tests/qemuxml2xmltest.c | 3 +- 10 files changed, 83 insertions(+), 193 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-auth.args delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-auth.xml delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-lun.args delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-lun.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-network-iscsi-auth.xml diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth.args b/tests/qe= muxml2argvdata/disk-network-iscsi-auth.args deleted file mode 100644 index 423b6b2a8f..0000000000 --- a/tests/qemuxml2argvdata/disk-network-iscsi-auth.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/home/test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ -server,nowait \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ -6000/iqn.1992-01.com.example%3Astorage/1,format=3Draw,if=3Dnone,\ -id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,\ -id=3Dvirtio-disk0 \ --drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ -6000/iqn.1992-01.com.example%3Astorage/2,format=3Draw,if=3Dnone,\ -id=3Ddrive-virtio-disk1 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk1,\ -id=3Dvirtio-disk1 diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth.xml b/tests/qem= uxml2argvdata/disk-network-iscsi-auth.xml deleted file mode 100644 index 63919f1000..0000000000 --- a/tests/qemuxml2argvdata/disk-network-iscsi-auth.xml +++ /dev/null @@ -1,43 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-lun.args b/tests/qem= uxml2argvdata/disk-network-iscsi-lun.args deleted file mode 100644 index 96601ae29e..0000000000 --- a/tests/qemuxml2argvdata/disk-network-iscsi-lun.args +++ /dev/null @@ -1,29 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/home/test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ -server,nowait \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot c \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ --usb \ --drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/0,format=3D= raw,\ -if=3Dnone,id=3Ddrive-scsi0-0-0-0 \ --device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ -drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0 diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-lun.xml b/tests/qemu= xml2argvdata/disk-network-iscsi-lun.xml deleted file mode 100644 index 3e8408044b..0000000000 --- a/tests/qemuxml2argvdata/disk-network-iscsi-lun.xml +++ /dev/null @@ -1,28 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - - - - - - - - - diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args b/tests/qemuxml= 2argvdata/disk-network-iscsi.args index 8cf2810b7f..f68296586d 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.args @@ -21,12 +21,27 @@ server,nowait \ -no-shutdown \ -no-acpi \ -boot c \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ -usb \ -drive file=3Discsi://example.org:6000/iqn.1992-01.com.example/0,format=3D= raw,\ if=3Dnone,id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk0,\ id=3Dvirtio-disk0 \ -drive file=3Discsi://example.org:6000/iqn.1992-01.com.example/1,format=3D= raw,\ if=3Dnone,id=3Ddrive-virtio-disk1 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk1,\ -id=3Dvirtio-disk1 +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-virtio-disk1,\ +id=3Dvirtio-disk1 \ +-drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ +6000/iqn.1992-01.com.example%3Astorage/1,format=3Draw,if=3Dnone,\ +id=3Ddrive-virtio-disk2 \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Ddrive-virtio-disk2,\ +id=3Dvirtio-disk2 \ +-drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ +6000/iqn.1992-01.com.example%3Astorage/2,format=3Draw,if=3Dnone,\ +id=3Ddrive-virtio-disk3 \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Ddrive-virtio-disk3,\ +id=3Dvirtio-disk3 \ +-drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/0,format=3D= raw,\ +if=3Dnone,id=3Ddrive-scsi0-0-0-0 \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ +drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0 diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.xml b/tests/qemuxml2= argvdata/disk-network-iscsi.xml index be1b4f9d81..fa2a889b54 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.xml +++ b/tests/qemuxml2argvdata/disk-network-iscsi.xml @@ -28,8 +28,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 03430c2324..31e992b989 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1041,14 +1041,10 @@ mymain(void) DO_TEST("disk-network-nbd-ipv6", NONE); DO_TEST("disk-network-nbd-ipv6-export", NONE); DO_TEST("disk-network-nbd-unix", NONE); - DO_TEST("disk-network-iscsi", NONE); - DO_TEST("disk-network-iscsi-auth", NONE); + DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_BL= OCK); DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid", NONE= ); DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype", NONE); DO_TEST_PARSE_ERROR("disk-network-source-auth-both", NONE); - DO_TEST("disk-network-iscsi-lun", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_BLOCK); DO_TEST("disk-network-gluster", QEMU_CAPS_GLUSTER_DEBUG_LEVEL); DO_TEST("disk-network-rbd", NONE); diff --git a/tests/qemuxml2xmloutdata/disk-network-iscsi-auth.xml b/tests/q= emuxml2xmloutdata/disk-network-iscsi-auth.xml deleted file mode 100644 index 543b26e457..0000000000 --- a/tests/qemuxml2xmloutdata/disk-network-iscsi-auth.xml +++ /dev/null @@ -1,47 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - - - - - - -
- - - - - - - - - - -
- - -
- - - - - - - diff --git a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml b/tests/qemuxm= l2xmloutdata/disk-network-iscsi.xml index 694412b5c7..f1348d583e 100644 --- a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml +++ b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml @@ -20,7 +20,7 @@ -
+
@@ -28,12 +28,45 @@ -
+
+ + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + +
+ +
+ diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2ba55f3a92..edba1ca99d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -363,8 +363,7 @@ mymain(void) DO_TEST("disk-network-nbd-ipv6", NONE); DO_TEST("disk-network-nbd-ipv6-export", NONE); DO_TEST("disk-network-nbd-unix", NONE); - DO_TEST("disk-network-iscsi", NONE); - DO_TEST("disk-network-iscsi-auth", NONE); + DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-network-gluster", NONE); DO_TEST("disk-network-rbd", NONE); DO_TEST("disk-network-rbd-auth", NONE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list