Re: [libvirt] [PATCH v8 10/11] util: Add virstoragetest to parse/format a tls='yes'

[Peter Krempa]

On Thu, Sep 14, 2017 at 08:51:55 -0400, John Ferlan wrote:
> From: Ashish Mittal 
> 
> Add a test case to verify TLS arguments are parsed correctly for
> a VxHS disk. This includes saving off a found tls-creds into the
> storage source @tlsAlias field since that's what's used to link
> the TLS object for the authentication credentials and the disk.
> 
> Test case verifies that XML is generated correctly for a VxHS disk
> having TLS enabled.
> 
> Signed-off-by: Ashish Mittal 
> Signed-off-by: John Ferlan 
> ---
>  src/util/virstoragefile.c |  9 +
>  tests/virstoragetest.c| 12 
>  2 files changed, 21 insertions(+)

It's useless to parse this from the backign store strings. It might be
useful if we'd parse it from qemu, but we don't.

This needs to be setup each time anyways by libvirt and the alias may
become stale.

NACK


signature.asc
Description: PGP signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v8 10/11] util: Add virstoragetest to parse/format a tls='yes'

[John Ferlan]

From: Ashish Mittal 

Add a test case to verify TLS arguments are parsed correctly for
a VxHS disk. This includes saving off a found tls-creds into the
storage source @tlsAlias field since that's what's used to link
the TLS object for the authentication credentials and the disk.

Test case verifies that XML is generated correctly for a VxHS disk
having TLS enabled.

Signed-off-by: Ashish Mittal 
Signed-off-by: John Ferlan 
---
 src/util/virstoragefile.c |  9 +
 tests/virstoragetest.c| 12 
 2 files changed, 21 insertions(+)

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 9cd648d36..1fcd7a028 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -3225,6 +3225,7 @@ virStorageSourceParseBackingJSONVxHS(virStorageSourcePtr 
src,
 {
 const char *vdisk_id = virJSONValueObjectGetString(json, "vdisk-id");
 virJSONValuePtr server = virJSONValueObjectGetObject(json, "server");
+const char *haveTLS = virJSONValueObjectGetString(json, "tls-creds");
 
 if (!vdisk_id || !server) {
 virReportError(VIR_ERR_INVALID_ARG, "%s",
@@ -3243,6 +3244,14 @@ virStorageSourceParseBackingJSONVxHS(virStorageSourcePtr 
src,
 return -1;
 src->nhosts = 1;
 
+if (haveTLS) {
+VIR_FREE(src->tlsAlias);
+if (VIR_STRDUP(src->tlsAlias, haveTLS) < 0)
+return -1;
+
+src->haveTLS = VIR_TRISTATE_BOOL_YES;
+}
+
 if (virStorageSourceParseBackingJSONInetSocketAddress(src->hosts,
   server) < 0)
 return -1;
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index ffebd4dc1..75ad6330b 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -1603,6 +1603,18 @@ mymain(void)
"\n"
"  \n"
"\n");
+TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"vxhs\","
+   
"\"vdisk-id\":\"c6718f6b-0401-441d-a8c3-1f0064d75ee0\","
+   "\"server\": { \"type\":\"tcp\","
+  
"\"host\":\"example.com\","
+  "\"port\":\"\""
+   "},"
+   "\"tls-creds\":\"objvirtio-disk0_tls0\""
+  "}"
+"}",
+   "\n"
+   "  \n"
+   "\n");
 #endif /* WITH_YAJL */
 
  cleanup:
-- 
2.13.5

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