NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

util: storage: Add json pseudo protocol support for legacy RBD strings

Browse Source 
RBD in qemu still uses only the legacy 'filename' syntax.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1371758
This commit is contained in:
Peter Krempa 2016-09-05 15:15:22 +02:00
parent b7a650c97c
commit 3de7da9448
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/util/virstoragefile.c
View File

@ -2940,6 +2940,28 @@ virStorageSourceParseBackingJSONSSH(virStorageSourcePtr src,
} }
static int
virStorageSourceParseBackingJSONRBD(virStorageSourcePtr src,
virJSONValuePtr json,
int opaque ATTRIBUTE_UNUSED)
{
const char *filename;
src->type = VIR_STORAGE_TYPE_NETWORK;
src->protocol = VIR_STORAGE_NET_PROTOCOL_RBD;
/* legacy syntax passed via 'filename' option */
if ((filename = virJSONValueObjectGetString(json, "filename")))
return virStorageSourceParseRBDColonString(filename, src);
/* RBD currently supports only URI syntax passed in as filename */
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing RBD filename in JSON backing volume definition"));
return -1;
}
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);
@ -2960,6 +2982,7 @@ static const struct virStorageSourceJSONDriverParser jsonParsers[] = {
{"nbd", virStorageSourceParseBackingJSONNbd, 0}, {"nbd", virStorageSourceParseBackingJSONNbd, 0},
{"sheepdog", virStorageSourceParseBackingJSONSheepdog, 0}, {"sheepdog", virStorageSourceParseBackingJSONSheepdog, 0},
{"ssh", virStorageSourceParseBackingJSONSSH, 0}, {"ssh", virStorageSourceParseBackingJSONSSH, 0},
{"rbd", virStorageSourceParseBackingJSONRBD, 0},
}; };

6
tests/virstoragetest.c
View File

@ -1486,6 +1486,12 @@ mymain(void)
"<source protocol='ssh' name='blah'>\n" "<source protocol='ssh' 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\":\"rbd\","
"\"file.filename\":\"rbd:testshare:id=asdf:mon_host=example.com\""
"}",
"<source protocol='rbd' name='testshare'>\n"
" <host name='example.com'/>\n"
"</source>\n");
cleanup: cleanup:
/* Final cleanup */ /* Final cleanup */