qemu: Refactor secret/TLS setup and add TLS for nbd

[libvirt] [PATCH 37/38] tests: qemu: Rename disk-drive-network-tlsx509-vxhs test

Posted by Peter Krempa 6 years, 11 months ago

Drop the 'vxhs' suffix so other network protocols using TLS can be
put into the same test.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 ...-drive-network-tlsx509-vxhs.args => disk-drive-network-tlsx509.args} | 0
 ...sk-drive-network-tlsx509-vxhs.xml => disk-drive-network-tlsx509.xml} | 0
 tests/qemuxml2argvtest.c                                                | 2 +-
 ...sk-drive-network-tlsx509-vxhs.xml => disk-drive-network-tlsx509.xml} | 0
 tests/qemuxml2xmltest.c                                                 | 2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509-vxhs.args => disk-drive-network-tlsx509.args} (100%)
 rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509-vxhs.xml => disk-drive-network-tlsx509.xml} (100%)
 rename tests/qemuxml2xmloutdata/{disk-drive-network-tlsx509-vxhs.xml => disk-drive-network-tlsx509.xml} (100%)

diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.args b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args
similarity index 100%
rename from tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.args
rename to tests/qemuxml2argvdata/disk-drive-network-tlsx509.args
diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.xml b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.xml
similarity index 100%
rename from tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.xml
rename to tests/qemuxml2argvdata/disk-drive-network-tlsx509.xml
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index ddd2b88c0a..a67d95f471 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1050,7 +1050,7 @@ mymain(void)
     DO_TEST_FAILURE("disk-drive-network-rbd-no-colon", NONE);
     DO_TEST("disk-drive-network-vxhs", QEMU_CAPS_VXHS);
     driver.config->vxhsTLS = 1;
-    DO_TEST("disk-drive-network-tlsx509-vxhs", QEMU_CAPS_VXHS,
+    DO_TEST("disk-drive-network-tlsx509", QEMU_CAPS_VXHS,
             QEMU_CAPS_OBJECT_TLS_CREDS_X509);
     driver.config->vxhsTLS = 0;
     VIR_FREE(driver.config->vxhsTLSx509certdir);
diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-tlsx509-vxhs.xml b/tests/qemuxml2xmloutdata/disk-drive-network-tlsx509.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-drive-network-tlsx509-vxhs.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-tlsx509.xml
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 1c08724c25..89a44ce043 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -381,7 +381,7 @@ mymain(void)
     DO_TEST("disk-drive-network-source-auth", NONE);
     DO_TEST("disk-drive-network-sheepdog", NONE);
     DO_TEST("disk-drive-network-vxhs", NONE);
-    DO_TEST("disk-drive-network-tlsx509-vxhs", NONE);
+    DO_TEST("disk-drive-network-tlsx509", NONE);
     DO_TEST("disk-scsi-device",
             QEMU_CAPS_SCSI_LSI);
     DO_TEST("disk-scsi-vscsi", NONE);
-- 
2.16.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 37/38] tests: qemu: Rename disk-drive-network-tlsx509-vxhs test

Posted by Ján Tomko 6 years, 11 months ago

On Wed, May 30, 2018 at 02:41:33PM +0200, Peter Krempa wrote:
>Drop the 'vxhs' suffix so other network protocols using TLS can be
>put into the same test.
>
>Signed-off-by: Peter Krempa <pkrempa@redhat.com>
>---
> ...-drive-network-tlsx509-vxhs.args => disk-drive-network-tlsx509.args} | 0
> ...sk-drive-network-tlsx509-vxhs.xml => disk-drive-network-tlsx509.xml} | 0
> tests/qemuxml2argvtest.c                                                | 2 +-
> ...sk-drive-network-tlsx509-vxhs.xml => disk-drive-network-tlsx509.xml} | 0
> tests/qemuxml2xmltest.c                                                 | 2 +-
> 5 files changed, 2 insertions(+), 2 deletions(-)
> rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509-vxhs.args => disk-drive-network-tlsx509.args} (100%)
> rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509-vxhs.xml => disk-drive-network-tlsx509.xml} (100%)
> rename tests/qemuxml2xmloutdata/{disk-drive-network-tlsx509-vxhs.xml => disk-drive-network-tlsx509.xml} (100%)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list