External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-31 10:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Since qemu 2.9 the options changed from a monolithic string into fine
grained options for the json pseudo-protocol object.
This commit is contained in:
Peter Krempa 2017-06-15 17:44:18 +02:00
parent 4fac5a1935
commit ea2c418ac3
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/util/virstoragefile.c
View File

@ -3087,10 +3087,11 @@ virStorageSourceParseBackingJSONSSH(virStorageSourcePtr src,
const char *path = virJSONValueObjectGetString(json, "path");
const char *host = virJSONValueObjectGetString(json, "host");
const char *port = virJSONValueObjectGetString(json, "port");
virJSONValuePtr server = virJSONValueObjectGetObject(json, "server");
if (!host || !path) {
if (!(host || server) || !path) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing host or path of SSH JSON backing "
_("missing host/server or path of SSH JSON backing "
"volume definition"));
return -1;
}
@ -3105,12 +3106,16 @@ virStorageSourceParseBackingJSONSSH(virStorageSourcePtr src,
return -1;
src->nhosts = 1;
src->hosts[0].transport = VIR_STORAGE_NET_HOST_TRANS_TCP;
if (VIR_STRDUP(src->hosts[0].name, host) < 0)
return -1;
if (VIR_STRDUP(src->hosts[0].port, port) < 0)
return -1;
if (server) {
if (virStorageSourceParseBackingJSONInetSocketAddress(src->hosts,
server) < 0)
return -1;
} else {
src->hosts[0].transport = VIR_STORAGE_NET_HOST_TRANS_TCP;
if (VIR_STRDUP(src->hosts[0].name, host) < 0 ||
VIR_STRDUP(src->hosts[0].port, port) < 0)
return -1;
}
return 0;
}

11
tests/virstoragetest.c
View File

@ -1501,6 +1501,17 @@ mymain(void)
"<source protocol='ssh' name='blah'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"ssh\","
"\"path\":\"blah\","
"\"server\":{ \"host\":\"example.org\","
"\"port\":\"6000\""
"},"
"\"user\":\"user\""
"}"
"}",
"<source protocol='ssh' name='blah'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
TEST_BACKING_PARSE("json:{\"file.driver\":\"rbd\","
"\"file.filename\":\"rbd:testshare:id=asdf:mon_host=example.com\""
"}",