mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-29 20:11:16 +00:00
As of commit 2a00ef6e71
which
was released in v5.2.0, we require YAJL to build the QEMU driver.
Remove the checks from code that requires the QEMU driver
or checks that also check for WITH_QEMU.
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
154 lines
6.3 KiB
C
154 lines
6.3 KiB
C
/*
|
|
* Copyright (C) 2015-2016 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "util/virjson.h"
|
|
#include "util/virqemu.h"
|
|
#include "testutils.h"
|
|
#include "testutilsqemu.h"
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
typedef struct
|
|
{
|
|
const char *props;
|
|
const char *expectprops;
|
|
virQEMUBuildCommandLineJSONArrayFormatFunc arrayfunc;
|
|
} testQemuCommandBuildObjectFromJSONData;
|
|
|
|
static int
|
|
testQemuCommandBuildFromJSON(const void *opaque)
|
|
{
|
|
const testQemuCommandBuildObjectFromJSONData *data = opaque;
|
|
virJSONValuePtr val = NULL;
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
|
char *result = NULL;
|
|
int ret = -1;
|
|
|
|
if (!(val = virJSONValueFromString(data->props))) {
|
|
fprintf(stderr, "Failed to parse JSON string '%s'", data->props);
|
|
return -1;
|
|
}
|
|
|
|
if (virQEMUBuildCommandLineJSON(val, &buf, data->arrayfunc) < 0) {
|
|
fprintf(stderr,
|
|
"\nvirQEMUBuildCommandlineJSON failed process JSON:\n%s\n",
|
|
data->props);
|
|
goto cleanup;
|
|
}
|
|
|
|
result = virBufferContentAndReset(&buf);
|
|
|
|
if (STRNEQ_NULLABLE(data->expectprops, result)) {
|
|
fprintf(stderr, "\nFailed to create object string. "
|
|
"\nExpected:\n'%s'\nGot:\n'%s'",
|
|
NULLSTR(data->expectprops), NULLSTR(result));
|
|
goto cleanup;
|
|
}
|
|
|
|
ret = 0;
|
|
cleanup:
|
|
virJSONValueFree(val);
|
|
VIR_FREE(result);
|
|
return ret;
|
|
}
|
|
|
|
static int
|
|
mymain(void)
|
|
{
|
|
int ret = 0;
|
|
testQemuCommandBuildObjectFromJSONData data1;
|
|
|
|
virTestCounterReset("testQemuCommandBuildFromJSON");
|
|
|
|
#define DO_TEST_COMMAND_FROM_JSON(PROPS, ARRAYFUNC, EXPECT) \
|
|
do { \
|
|
data1.props = PROPS; \
|
|
data1.expectprops = EXPECT; \
|
|
data1.arrayfunc = ARRAYFUNC; \
|
|
if (virTestRun(virTestCounterNext(), \
|
|
testQemuCommandBuildFromJSON, \
|
|
&data1) < 0) \
|
|
ret = -1; \
|
|
} while (0)
|
|
|
|
#define DO_TEST_COMMAND_OBJECT_FROM_JSON(PROPS, EXPECT) \
|
|
DO_TEST_COMMAND_FROM_JSON(PROPS, virQEMUBuildCommandLineJSONArrayBitmap, EXPECT)
|
|
|
|
#define DO_TEST_COMMAND_DRIVE_FROM_JSON(PROPS, EXPECT) \
|
|
DO_TEST_COMMAND_FROM_JSON(PROPS, virQEMUBuildCommandLineJSONArrayNumbered, EXPECT)
|
|
|
|
DO_TEST_COMMAND_OBJECT_FROM_JSON("{}", NULL);
|
|
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"string\":\"qwer\"}", "string=qwer");
|
|
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"string\":\"qw,e,r\"}", "string=qw,,e,,r");
|
|
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"number\":1234}", "number=1234");
|
|
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":true}", "boolean=yes");
|
|
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":false}", "boolean=no");
|
|
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[]}", NULL);
|
|
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[0]}", "bitmap=0");
|
|
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[1,3,5]}",
|
|
"bitmap=1,bitmap=3,bitmap=5");
|
|
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[0,1,2,3]}", "bitmap=0-3");
|
|
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[1,2,3,5]}",
|
|
"bitmap=1-3,bitmap=5");
|
|
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[1,2,3,5,7,8,9]}",
|
|
"bitmap=1-3,bitmap=5,bitmap=7-9");
|
|
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"array\":[\"bleah\",\"qwerty\",1]}",
|
|
"array=bleah,array=qwerty,array=1");
|
|
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":true,\"hyphen-name\":1234,\"some_string\":\"bleah\"}",
|
|
"boolean=yes,hyphen-name=1234,some_string=bleah");
|
|
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"nest\": {\"boolean\":true,"
|
|
"\"hyphen-name\":1234,"
|
|
"\"some_string\":\"bleah\","
|
|
"\"bleah\":\"bl,eah\""
|
|
"}"
|
|
"}",
|
|
"nest.boolean=yes,nest.hyphen-name=1234,"
|
|
"nest.some_string=bleah,nest.bleah=bl,,eah");
|
|
DO_TEST_COMMAND_DRIVE_FROM_JSON("{\"driver\":\"gluster\","
|
|
"\"volume\":\"test\","
|
|
"\"path\":\"img\","
|
|
"\"server\":[ { \"type\":\"tcp\","
|
|
"\"host\":\"example.com\","
|
|
"\"port\":\"1234\""
|
|
"},"
|
|
"{ \"type\":\"unix\","
|
|
"\"socket\":\"/path/socket\""
|
|
"},"
|
|
"{ \"type\":\"tcp\","
|
|
"\"host\":\"example.com\""
|
|
"}"
|
|
"]"
|
|
"}",
|
|
"driver=gluster,volume=test,path=img,"
|
|
"server.0.type=tcp,"
|
|
"server.0.host=example.com,"
|
|
"server.0.port=1234,"
|
|
"server.1.type=unix,"
|
|
"server.1.socket=/path/socket,"
|
|
"server.2.type=tcp,"
|
|
"server.2.host=example.com");
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
VIR_TEST_MAIN(mymain)
|