External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-05 04:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: storage: Add JSON backing volume parser for 'ssh' protocol

Browse Source
This commit is contained in:
Peter Krempa 2016-07-15 15:12:10 +02:00
parent 29f06ff548
commit bc225b1b5f
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/util/virstoragefile.c
View File

@ -2772,6 +2772,43 @@ virStorageSourceParseBackingJSONSheepdog(virStorageSourcePtr src,
} }
static int
virStorageSourceParseBackingJSONSSH(virStorageSourcePtr src,
virJSONValuePtr json,
int opaque ATTRIBUTE_UNUSED)
{
const char *path = virJSONValueObjectGetString(json, "path");
const char *host = virJSONValueObjectGetString(json, "host");
const char *port = virJSONValueObjectGetString(json, "port");
if (!host || !path) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing host or path of SSH JSON backing "
"volume definition"));
return -1;
}
src->type = VIR_STORAGE_TYPE_NETWORK;
src->protocol = VIR_STORAGE_NET_PROTOCOL_SSH;
if (VIR_STRDUP(src->path, path) < 0)
return -1;
if (VIR_ALLOC_N(src->hosts, 1) < 0)
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;
return 0;
}
struct virStorageSourceJSONDriverParser { struct virStorageSourceJSONDriverParser {
const char *drvname; const char *drvname;
int (*func)(virStorageSourcePtr src, virJSONValuePtr json, int opaque); int (*func)(virStorageSourcePtr src, virJSONValuePtr json, int opaque);
@ -2791,6 +2828,7 @@ static const struct virStorageSourceJSONDriverParser jsonParsers[] = {
{"iscsi", virStorageSourceParseBackingJSONiSCSI, 0}, {"iscsi", virStorageSourceParseBackingJSONiSCSI, 0},
{"nbd", virStorageSourceParseBackingJSONNbd, 0}, {"nbd", virStorageSourceParseBackingJSONNbd, 0},
{"sheepdog", virStorageSourceParseBackingJSONSheepdog, 0}, {"sheepdog", virStorageSourceParseBackingJSONSheepdog, 0},
{"ssh", virStorageSourceParseBackingJSONSSH, 0},
}; };

19
tests/virstoragetest.c
View File

@ -1467,6 +1467,25 @@ mymain(void)
"<source protocol='nbd' name='blah'>\n" "<source protocol='nbd' name='blah'>\n"
" <host name='example.org' port='6000'/>\n" " <host name='example.org' port='6000'/>\n"
"</source>\n"); "</source>\n");
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"ssh\","
"\"host\":\"example.org\","
"\"port\":\"6000\","
"\"path\":\"blah\","
"\"user\":\"user\""
"}"
"}",
"<source protocol='ssh' name='blah'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
TEST_BACKING_PARSE("json:{\"file.driver\":\"ssh\","
"\"file.host\":\"example.org\","
"\"file.port\":\"6000\","
"\"file.path\":\"blah\","
"\"file.user\":\"user\""
"}",
"<source protocol='ssh' name='blah'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
cleanup: cleanup:
/* Final cleanup */ /* Final cleanup */