External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-18 10:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Peter Krempa 2016-07-14 08:10:31 +02:00
parent 3236bb2370
commit a1674fd9d9
2 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/util/virstoragefile.c
View File

@ -2702,6 +2702,50 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSourcePtr src,
} }
static int
virStorageSourceParseBackingJSONNbd(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");
const char *export = virJSONValueObjectGetString(json, "export");
if (!path && !host) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing path or host of NBD server in JSON backing "
"volume definition"));
return -1;
}
src->type = VIR_STORAGE_TYPE_NETWORK;
src->protocol = VIR_STORAGE_NET_PROTOCOL_NBD;
if (VIR_STRDUP(src->path, export) < 0)
return -1;
if (VIR_ALLOC_N(src->hosts, 1) < 0)
return -1;
src->nhosts = 1;
if (path) {
src->hosts[0].transport = VIR_STORAGE_NET_HOST_TRANS_UNIX;
if (VIR_STRDUP(src->hosts[0].socket, path) < 0)
return -1;
} else {
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);
@ -2719,6 +2763,7 @@ static const struct virStorageSourceJSONDriverParser jsonParsers[] = {
{"tftp", virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_PROTOCOL_TFTP}, {"tftp", virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_PROTOCOL_TFTP},
{"gluster", virStorageSourceParseBackingJSONGluster, 0}, {"gluster", virStorageSourceParseBackingJSONGluster, 0},
{"iscsi", virStorageSourceParseBackingJSONiSCSI, 0}, {"iscsi", virStorageSourceParseBackingJSONiSCSI, 0},
{"nbd", virStorageSourceParseBackingJSONNbd, 0},
}; };

30
tests/virstoragetest.c
View File

@ -1437,6 +1437,36 @@ mymain(void)
" <host transport='unix' socket='/path/socket'/>\n" " <host transport='unix' socket='/path/socket'/>\n"
" <host name='example.com'/>\n" " <host name='example.com'/>\n"
"</source>\n"); "</source>\n");
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"nbd\","
"\"path\":\"/path/to/socket\""
"}"
"}",
"<source protocol='nbd'>\n"
" <host transport='unix' socket='/path/to/socket'/>\n"
"</source>\n");
TEST_BACKING_PARSE("json:{\"file.driver\":\"nbd\","
"\"file.path\":\"/path/to/socket\""
"}",
"<source protocol='nbd'>\n"
" <host transport='unix' socket='/path/to/socket'/>\n"
"</source>\n");
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"nbd\","
"\"export\":\"blah\","
"\"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\":\"nbd\","
"\"file.export\":\"blah\","
"\"file.host\":\"example.org\","
"\"file.port\":\"6000\""
"}",
"<source protocol='nbd' name='blah'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
cleanup: cleanup:
/* Final cleanup */ /* Final cleanup */