External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: storage: adapt to changes in JSON format for NBD

Browse Source 
Since 2.9 the host and port for NBD are no longer directly under the
json pseudo-protocol object, but rather belong to a sub-object called
'server'.
This commit is contained in:
Peter Krempa 2017-06-15 17:44:18 +02:00
parent b24bc54080
commit 35d23f90b2
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/virstoragefile.c
View File

@ -3014,11 +3014,12 @@ virStorageSourceParseBackingJSONNbd(virStorageSourcePtr src,
const char *host = virJSONValueObjectGetString(json, "host");
const char *port = virJSONValueObjectGetString(json, "port");
const char *export = virJSONValueObjectGetString(json, "export");
virJSONValuePtr server = virJSONValueObjectGetObject(json, "server");
if (!path && !host) {
if (!path && !host && !server) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing path or host of NBD server in JSON backing "
"volume definition"));
_("missing host specification of NBD server in JSON "
"backing volume definition"));
return -1;
}
@ -3032,6 +3033,10 @@ virStorageSourceParseBackingJSONNbd(virStorageSourcePtr src,
return -1;
src->nhosts = 1;
if (server) {
if (virStorageSourceParseBackingJSONSocketAddress(src->hosts, server) < 0)
return -1;
} else {
if (path) {
src->hosts[0].transport = VIR_STORAGE_NET_HOST_TRANS_UNIX;
if (VIR_STRDUP(src->hosts[0].socket, path) < 0)
@ -3044,6 +3049,7 @@ virStorageSourceParseBackingJSONNbd(virStorageSourcePtr src,
if (VIR_STRDUP(src->hosts[0].port, port) < 0)
return -1;
}
}
return 0;
}

11
tests/virstoragetest.c
View File

@ -1471,6 +1471,17 @@ mymain(void)
"<source protocol='nbd' name='blah'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"nbd\","
"\"export\":\"blah\","
"\"server\": { \"type\":\"inet\","
"\"host\":\"example.org\","
"\"port\":\"6000\""
"}"
"}"
"}",
"<source protocol='nbd' name='blah'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"ssh\","
"\"host\":\"example.org\","
"\"port\":\"6000\","