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

qemublocktest: Mark gluster cases in XML->json->XML tests as deprecated

Browse Source 
The gluster protocol backend will be deprecated as of qemu-9.2. Allow it
for now in the QMP schema validator and mark them to be dropped once
gluster is removed.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2024-10-10 17:33:46 +02:00
parent b6545bcec1
commit b9e43f882f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/qemublocktest.c
View File

@ -39,7 +39,7 @@ VIR_LOG_INIT("tests.storagetest");
struct testBackingXMLjsonXMLdata { struct testBackingXMLjsonXMLdata {
int type; int type;
const char *xml; const char *xml;
bool legacy; bool deprecated;
GHashTable *schema; GHashTable *schema;
virJSONValue *schemaroot; virJSONValue *schemaroot;
}; };
@ -80,7 +80,7 @@ testBackingXMLjsonXML(const void *args)
} }
if (testQEMUSchemaValidate(backendprops, data->schemaroot, if (testQEMUSchemaValidate(backendprops, data->schemaroot,
data->schema, false, &debug) < 0) { data->schema, data->deprecated, &debug) < 0) {
g_autofree char *debugmsg = virBufferContentAndReset(&debug); g_autofree char *debugmsg = virBufferContentAndReset(&debug);
g_autofree char *debugprops = virJSONValueToString(backendprops, true); g_autofree char *debugprops = virJSONValueToString(backendprops, true);
@ -1053,6 +1053,8 @@ mymain(void)
" <readahead size='1024'/>\n" " <readahead size='1024'/>\n"
" <timeout seconds='1337'/>\n" " <timeout seconds='1337'/>\n"
"</source>\n"); "</source>\n");
/* 'gluster' is deprecated as of qemu-9.2, once removed this tests can be dropped too */
xmljsonxmldata.deprecated = true;
TEST_JSON_FORMAT_NET("<source protocol='gluster' name='vol/file'>\n" TEST_JSON_FORMAT_NET("<source protocol='gluster' name='vol/file'>\n"
" <host name='example.com' port='24007'/>\n" " <host name='example.com' port='24007'/>\n"
"</source>\n"); "</source>\n");
@ -1061,6 +1063,7 @@ mymain(void)
" <host transport='unix' socket='/path/socket'/>\n" " <host transport='unix' socket='/path/socket'/>\n"
" <host name='example.com' port='24007'/>\n" " <host name='example.com' port='24007'/>\n"
"</source>\n"); "</source>\n");
xmljsonxmldata.deprecated = false;
TEST_JSON_FORMAT_NET("<source protocol='nbd'>\n" TEST_JSON_FORMAT_NET("<source protocol='nbd'>\n"
" <host transport='unix' socket='/path/to/socket'/>\n" " <host transport='unix' socket='/path/to/socket'/>\n"
"</source>\n"); "</source>\n");