2009-08-28 22:27:32 +04:00
|
|
|
/*
|
|
|
|
* QDict unit-tests.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2009 Red Hat Inc.
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Luiz Capitulino <lcapitulino@redhat.com>
|
2010-05-12 23:34:42 +04:00
|
|
|
*
|
|
|
|
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
|
|
|
* See the COPYING.LIB file in the top-level directory.
|
2009-08-28 22:27:32 +04:00
|
|
|
*/
|
|
|
|
|
2018-02-01 14:18:38 +03:00
|
|
|
#include "qemu/osdep.h"
|
2012-12-17 21:19:43 +04:00
|
|
|
#include "qapi/qmp/qdict.h"
|
2018-02-01 14:18:38 +03:00
|
|
|
#include "qapi/qmp/qlist.h"
|
2018-02-01 14:18:36 +03:00
|
|
|
#include "qapi/qmp/qnum.h"
|
2012-12-17 21:19:43 +04:00
|
|
|
#include "qapi/qmp/qstring.h"
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
#include "qapi/error.h"
|
2009-08-28 22:27:32 +04:00
|
|
|
#include "qemu-common.h"
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Public Interface test-cases
|
|
|
|
*
|
|
|
|
* (with some violations to access 'private' data)
|
|
|
|
*/
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qdict_new_test(void)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
|
|
|
QDict *qdict;
|
|
|
|
|
|
|
|
qdict = qdict_new();
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(qdict != NULL);
|
|
|
|
g_assert(qdict_size(qdict) == 0);
|
|
|
|
g_assert(qdict->base.refcnt == 1);
|
|
|
|
g_assert(qobject_type(QOBJECT(qdict)) == QTYPE_QDICT);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(qdict);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qdict_put_obj_test(void)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
2017-06-07 19:35:58 +03:00
|
|
|
QNum *qn;
|
2009-08-28 22:27:32 +04:00
|
|
|
QDict *qdict;
|
|
|
|
QDictEntry *ent;
|
|
|
|
const int num = 42;
|
|
|
|
|
|
|
|
qdict = qdict_new();
|
|
|
|
|
|
|
|
// key "" will have tdb hash 12345
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(qdict, "", num);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(qdict_size(qdict) == 1);
|
2010-06-07 22:45:22 +04:00
|
|
|
ent = QLIST_FIRST(&qdict->table[12345 % QDICT_BUCKET_MAX]);
|
2018-02-24 18:40:29 +03:00
|
|
|
qn = qobject_to(QNum, ent->value);
|
2017-06-07 19:35:58 +03:00
|
|
|
g_assert_cmpint(qnum_get_int(qn), ==, num);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(qdict);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qdict_destroy_simple_test(void)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
|
|
|
QDict *qdict;
|
|
|
|
|
|
|
|
qdict = qdict_new();
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(qdict, "num", 0);
|
|
|
|
qdict_put_str(qdict, "str", "foo");
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(qdict);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qdict_get_test(void)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
2017-06-07 19:35:58 +03:00
|
|
|
QNum *qn;
|
2009-08-28 22:27:32 +04:00
|
|
|
QObject *obj;
|
|
|
|
const int value = -42;
|
|
|
|
const char *key = "test";
|
2012-01-10 23:10:44 +04:00
|
|
|
QDict *tests_dict = qdict_new();
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(tests_dict, key, value);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
|
|
|
obj = qdict_get(tests_dict, key);
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(obj != NULL);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2018-02-24 18:40:29 +03:00
|
|
|
qn = qobject_to(QNum, obj);
|
2017-06-07 19:35:58 +03:00
|
|
|
g_assert_cmpint(qnum_get_int(qn), ==, value);
|
2012-01-10 23:10:44 +04:00
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(tests_dict);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qdict_get_int_test(void)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
const int value = 100;
|
|
|
|
const char *key = "int";
|
2012-01-10 23:10:44 +04:00
|
|
|
QDict *tests_dict = qdict_new();
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(tests_dict, key, value);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
|
|
|
ret = qdict_get_int(tests_dict, key);
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(ret == value);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(tests_dict);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qdict_get_try_int_test(void)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
const int value = 100;
|
|
|
|
const char *key = "int";
|
2012-01-10 23:10:44 +04:00
|
|
|
QDict *tests_dict = qdict_new();
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(tests_dict, key, value);
|
2017-06-07 19:36:33 +03:00
|
|
|
qdict_put_str(tests_dict, "string", "test");
|
2009-08-28 22:27:32 +04:00
|
|
|
|
|
|
|
ret = qdict_get_try_int(tests_dict, key, 0);
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(ret == value);
|
|
|
|
|
2017-06-07 19:36:33 +03:00
|
|
|
ret = qdict_get_try_int(tests_dict, "missing", -42);
|
|
|
|
g_assert_cmpuint(ret, ==, -42);
|
|
|
|
|
|
|
|
ret = qdict_get_try_int(tests_dict, "string", -42);
|
|
|
|
g_assert_cmpuint(ret, ==, -42);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(tests_dict);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qdict_get_str_test(void)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
|
|
|
const char *p;
|
|
|
|
const char *key = "key";
|
|
|
|
const char *str = "string";
|
2012-01-10 23:10:44 +04:00
|
|
|
QDict *tests_dict = qdict_new();
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_str(tests_dict, key, str);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
|
|
|
p = qdict_get_str(tests_dict, key);
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(p != NULL);
|
|
|
|
g_assert(strcmp(p, str) == 0);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(tests_dict);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qdict_get_try_str_test(void)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
|
|
|
const char *p;
|
|
|
|
const char *key = "key";
|
|
|
|
const char *str = "string";
|
2012-01-10 23:10:44 +04:00
|
|
|
QDict *tests_dict = qdict_new();
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_str(tests_dict, key, str);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
|
|
|
p = qdict_get_try_str(tests_dict, key);
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(p != NULL);
|
|
|
|
g_assert(strcmp(p, str) == 0);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(tests_dict);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
2015-05-28 18:37:55 +03:00
|
|
|
static void qdict_defaults_test(void)
|
|
|
|
{
|
|
|
|
QDict *dict, *copy;
|
|
|
|
|
|
|
|
dict = qdict_new();
|
|
|
|
copy = qdict_new();
|
|
|
|
|
|
|
|
qdict_set_default_str(dict, "foo", "abc");
|
|
|
|
qdict_set_default_str(dict, "foo", "def");
|
|
|
|
g_assert_cmpstr(qdict_get_str(dict, "foo"), ==, "abc");
|
|
|
|
qdict_set_default_str(dict, "bar", "ghi");
|
|
|
|
|
|
|
|
qdict_copy_default(copy, dict, "foo");
|
|
|
|
g_assert_cmpstr(qdict_get_str(copy, "foo"), ==, "abc");
|
|
|
|
qdict_set_default_str(copy, "bar", "xyz");
|
|
|
|
qdict_copy_default(copy, dict, "bar");
|
|
|
|
g_assert_cmpstr(qdict_get_str(copy, "bar"), ==, "xyz");
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(copy);
|
|
|
|
qobject_unref(dict);
|
2015-05-28 18:37:55 +03:00
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qdict_haskey_not_test(void)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
2012-01-10 23:10:44 +04:00
|
|
|
QDict *tests_dict = qdict_new();
|
|
|
|
g_assert(qdict_haskey(tests_dict, "test") == 0);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(tests_dict);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qdict_haskey_test(void)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
|
|
|
const char *key = "test";
|
2012-01-10 23:10:44 +04:00
|
|
|
QDict *tests_dict = qdict_new();
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(tests_dict, key, 0);
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(qdict_haskey(tests_dict, key) == 1);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(tests_dict);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qdict_del_test(void)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
|
|
|
const char *key = "key test";
|
2012-01-10 23:10:44 +04:00
|
|
|
QDict *tests_dict = qdict_new();
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_str(tests_dict, key, "foo");
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(qdict_size(tests_dict) == 1);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
|
|
|
qdict_del(tests_dict, key);
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(qdict_size(tests_dict) == 0);
|
|
|
|
g_assert(qdict_haskey(tests_dict, key) == 0);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(tests_dict);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qobject_to_qdict_test(void)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
2012-01-10 23:10:44 +04:00
|
|
|
QDict *tests_dict = qdict_new();
|
2018-02-24 18:40:29 +03:00
|
|
|
g_assert(qobject_to(QDict, QOBJECT(tests_dict)) == tests_dict);
|
2012-01-10 23:10:44 +04:00
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(tests_dict);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qdict_iterapi_test(void)
|
2010-06-07 22:29:58 +04:00
|
|
|
{
|
|
|
|
int count;
|
|
|
|
const QDictEntry *ent;
|
2012-01-10 23:10:44 +04:00
|
|
|
QDict *tests_dict = qdict_new();
|
2010-06-07 22:29:58 +04:00
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(qdict_first(tests_dict) == NULL);
|
2010-06-07 22:29:58 +04:00
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(tests_dict, "key1", 1);
|
|
|
|
qdict_put_int(tests_dict, "key2", 2);
|
|
|
|
qdict_put_int(tests_dict, "key3", 3);
|
2010-06-07 22:29:58 +04:00
|
|
|
|
|
|
|
count = 0;
|
|
|
|
for (ent = qdict_first(tests_dict); ent; ent = qdict_next(tests_dict, ent)){
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(qdict_haskey(tests_dict, qdict_entry_key(ent)) == 1);
|
2010-06-07 22:29:58 +04:00
|
|
|
count++;
|
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(count == qdict_size(tests_dict));
|
2010-06-07 22:29:58 +04:00
|
|
|
|
|
|
|
/* Do it again to test restarting */
|
|
|
|
count = 0;
|
|
|
|
for (ent = qdict_first(tests_dict); ent; ent = qdict_next(tests_dict, ent)){
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(qdict_haskey(tests_dict, qdict_entry_key(ent)) == 1);
|
2010-06-07 22:29:58 +04:00
|
|
|
count++;
|
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(count == qdict_size(tests_dict));
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(tests_dict);
|
2010-06-07 22:29:58 +04:00
|
|
|
}
|
|
|
|
|
2013-12-20 22:28:22 +04:00
|
|
|
static void qdict_flatten_test(void)
|
|
|
|
{
|
|
|
|
QList *list1 = qlist_new();
|
|
|
|
QList *list2 = qlist_new();
|
|
|
|
QDict *dict1 = qdict_new();
|
|
|
|
QDict *dict2 = qdict_new();
|
|
|
|
QDict *dict3 = qdict_new();
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Test the flattening of
|
|
|
|
*
|
|
|
|
* {
|
|
|
|
* "e": [
|
|
|
|
* 42,
|
|
|
|
* [
|
|
|
|
* 23,
|
|
|
|
* 66,
|
|
|
|
* {
|
|
|
|
* "a": 0,
|
|
|
|
* "b": 1
|
|
|
|
* }
|
|
|
|
* ]
|
|
|
|
* ],
|
|
|
|
* "f": {
|
|
|
|
* "c": 2,
|
|
|
|
* "d": 3,
|
|
|
|
* },
|
|
|
|
* "g": 4
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* to
|
|
|
|
*
|
|
|
|
* {
|
|
|
|
* "e.0": 42,
|
|
|
|
* "e.1.0": 23,
|
|
|
|
* "e.1.1": 66,
|
|
|
|
* "e.1.2.a": 0,
|
|
|
|
* "e.1.2.b": 1,
|
|
|
|
* "f.c": 2,
|
|
|
|
* "f.d": 3,
|
|
|
|
* "g": 4
|
|
|
|
* }
|
|
|
|
*/
|
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(dict1, "a", 0);
|
|
|
|
qdict_put_int(dict1, "b", 1);
|
2013-12-20 22:28:22 +04:00
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qlist_append_int(list1, 23);
|
|
|
|
qlist_append_int(list1, 66);
|
2017-04-28 00:58:15 +03:00
|
|
|
qlist_append(list1, dict1);
|
2017-04-28 00:58:17 +03:00
|
|
|
qlist_append_int(list2, 42);
|
2017-04-28 00:58:15 +03:00
|
|
|
qlist_append(list2, list1);
|
2013-12-20 22:28:22 +04:00
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(dict2, "c", 2);
|
|
|
|
qdict_put_int(dict2, "d", 3);
|
2017-04-28 00:58:15 +03:00
|
|
|
qdict_put(dict3, "e", list2);
|
|
|
|
qdict_put(dict3, "f", dict2);
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(dict3, "g", 4);
|
2013-12-20 22:28:22 +04:00
|
|
|
|
|
|
|
qdict_flatten(dict3);
|
|
|
|
|
|
|
|
g_assert(qdict_get_int(dict3, "e.0") == 42);
|
|
|
|
g_assert(qdict_get_int(dict3, "e.1.0") == 23);
|
|
|
|
g_assert(qdict_get_int(dict3, "e.1.1") == 66);
|
|
|
|
g_assert(qdict_get_int(dict3, "e.1.2.a") == 0);
|
|
|
|
g_assert(qdict_get_int(dict3, "e.1.2.b") == 1);
|
|
|
|
g_assert(qdict_get_int(dict3, "f.c") == 2);
|
|
|
|
g_assert(qdict_get_int(dict3, "f.d") == 3);
|
|
|
|
g_assert(qdict_get_int(dict3, "g") == 4);
|
|
|
|
|
|
|
|
g_assert(qdict_size(dict3) == 8);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(dict3);
|
2013-12-20 22:28:22 +04:00
|
|
|
}
|
|
|
|
|
2013-12-20 22:28:21 +04:00
|
|
|
static void qdict_array_split_test(void)
|
|
|
|
{
|
|
|
|
QDict *test_dict = qdict_new();
|
|
|
|
QDict *dict1, *dict2;
|
2017-06-07 19:35:58 +03:00
|
|
|
QNum *int1;
|
2013-12-20 22:28:21 +04:00
|
|
|
QList *test_list;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Test the split of
|
|
|
|
*
|
|
|
|
* {
|
|
|
|
* "1.x": 0,
|
2014-02-21 22:11:41 +04:00
|
|
|
* "4.y": 1,
|
2013-12-20 22:28:21 +04:00
|
|
|
* "0.a": 42,
|
|
|
|
* "o.o": 7,
|
2014-02-21 22:11:41 +04:00
|
|
|
* "0.b": 23,
|
|
|
|
* "2": 66
|
2013-12-20 22:28:21 +04:00
|
|
|
* }
|
|
|
|
*
|
|
|
|
* to
|
|
|
|
*
|
|
|
|
* [
|
|
|
|
* {
|
|
|
|
* "a": 42,
|
|
|
|
* "b": 23
|
|
|
|
* },
|
|
|
|
* {
|
|
|
|
* "x": 0
|
2014-02-21 22:11:41 +04:00
|
|
|
* },
|
|
|
|
* 66
|
2013-12-20 22:28:21 +04:00
|
|
|
* ]
|
|
|
|
*
|
|
|
|
* and
|
|
|
|
*
|
|
|
|
* {
|
2014-02-21 22:11:41 +04:00
|
|
|
* "4.y": 1,
|
2013-12-20 22:28:21 +04:00
|
|
|
* "o.o": 7
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* (remaining in the old QDict)
|
|
|
|
*
|
|
|
|
* This example is given in the comment of qdict_array_split().
|
|
|
|
*/
|
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(test_dict, "1.x", 0);
|
|
|
|
qdict_put_int(test_dict, "4.y", 1);
|
|
|
|
qdict_put_int(test_dict, "0.a", 42);
|
|
|
|
qdict_put_int(test_dict, "o.o", 7);
|
|
|
|
qdict_put_int(test_dict, "0.b", 23);
|
|
|
|
qdict_put_int(test_dict, "2", 66);
|
2013-12-20 22:28:21 +04:00
|
|
|
|
|
|
|
qdict_array_split(test_dict, &test_list);
|
|
|
|
|
2018-02-24 18:40:29 +03:00
|
|
|
dict1 = qobject_to(QDict, qlist_pop(test_list));
|
|
|
|
dict2 = qobject_to(QDict, qlist_pop(test_list));
|
|
|
|
int1 = qobject_to(QNum, qlist_pop(test_list));
|
2013-12-20 22:28:21 +04:00
|
|
|
|
|
|
|
g_assert(dict1);
|
|
|
|
g_assert(dict2);
|
2014-02-21 22:11:41 +04:00
|
|
|
g_assert(int1);
|
2013-12-20 22:28:21 +04:00
|
|
|
g_assert(qlist_empty(test_list));
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(test_list);
|
2013-12-20 22:28:21 +04:00
|
|
|
|
|
|
|
g_assert(qdict_get_int(dict1, "a") == 42);
|
|
|
|
g_assert(qdict_get_int(dict1, "b") == 23);
|
|
|
|
|
|
|
|
g_assert(qdict_size(dict1) == 2);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(dict1);
|
2013-12-20 22:28:21 +04:00
|
|
|
|
|
|
|
g_assert(qdict_get_int(dict2, "x") == 0);
|
|
|
|
|
|
|
|
g_assert(qdict_size(dict2) == 1);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(dict2);
|
2013-12-20 22:28:21 +04:00
|
|
|
|
2017-06-07 19:35:58 +03:00
|
|
|
g_assert_cmpint(qnum_get_int(int1), ==, 66);
|
2014-02-21 22:11:41 +04:00
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(int1);
|
2014-02-21 22:11:41 +04:00
|
|
|
|
|
|
|
g_assert(qdict_get_int(test_dict, "4.y") == 1);
|
2013-12-20 22:28:21 +04:00
|
|
|
g_assert(qdict_get_int(test_dict, "o.o") == 7);
|
|
|
|
|
|
|
|
g_assert(qdict_size(test_dict) == 2);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(test_dict);
|
2014-02-22 00:05:13 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Test the split of
|
|
|
|
*
|
|
|
|
* {
|
|
|
|
* "0": 42,
|
|
|
|
* "1": 23,
|
|
|
|
* "1.x": 84
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* to
|
|
|
|
*
|
|
|
|
* [
|
|
|
|
* 42
|
|
|
|
* ]
|
|
|
|
*
|
|
|
|
* and
|
|
|
|
*
|
|
|
|
* {
|
|
|
|
* "1": 23,
|
|
|
|
* "1.x": 84
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* That is, test whether splitting stops if there is both an entry with key
|
|
|
|
* of "%u" and other entries with keys prefixed "%u." for the same index.
|
|
|
|
*/
|
|
|
|
|
|
|
|
test_dict = qdict_new();
|
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(test_dict, "0", 42);
|
|
|
|
qdict_put_int(test_dict, "1", 23);
|
|
|
|
qdict_put_int(test_dict, "1.x", 84);
|
2014-02-22 00:05:13 +04:00
|
|
|
|
|
|
|
qdict_array_split(test_dict, &test_list);
|
|
|
|
|
2018-02-24 18:40:29 +03:00
|
|
|
int1 = qobject_to(QNum, qlist_pop(test_list));
|
2014-02-22 00:05:13 +04:00
|
|
|
|
|
|
|
g_assert(int1);
|
|
|
|
g_assert(qlist_empty(test_list));
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(test_list);
|
2014-02-22 00:05:13 +04:00
|
|
|
|
2017-06-07 19:35:58 +03:00
|
|
|
g_assert_cmpint(qnum_get_int(int1), ==, 42);
|
2014-02-22 00:05:13 +04:00
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(int1);
|
2014-02-22 00:05:13 +04:00
|
|
|
|
|
|
|
g_assert(qdict_get_int(test_dict, "1") == 23);
|
|
|
|
g_assert(qdict_get_int(test_dict, "1.x") == 84);
|
|
|
|
|
|
|
|
g_assert(qdict_size(test_dict) == 2);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(test_dict);
|
2013-12-20 22:28:21 +04:00
|
|
|
}
|
|
|
|
|
2015-05-28 18:37:55 +03:00
|
|
|
static void qdict_array_entries_test(void)
|
|
|
|
{
|
|
|
|
QDict *dict = qdict_new();
|
|
|
|
|
|
|
|
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, 0);
|
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(dict, "bar", 0);
|
|
|
|
qdict_put_int(dict, "baz.0", 0);
|
2015-05-28 18:37:55 +03:00
|
|
|
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, 0);
|
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(dict, "foo.1", 0);
|
2015-05-28 18:37:55 +03:00
|
|
|
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, -EINVAL);
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(dict, "foo.0", 0);
|
2015-05-28 18:37:55 +03:00
|
|
|
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, 2);
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(dict, "foo.bar", 0);
|
2015-05-28 18:37:55 +03:00
|
|
|
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, -EINVAL);
|
|
|
|
qdict_del(dict, "foo.bar");
|
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(dict, "foo.2.a", 0);
|
|
|
|
qdict_put_int(dict, "foo.2.b", 0);
|
|
|
|
qdict_put_int(dict, "foo.2.c", 0);
|
2015-05-28 18:37:55 +03:00
|
|
|
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, 3);
|
|
|
|
g_assert_cmpint(qdict_array_entries(dict, ""), ==, -EINVAL);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(dict);
|
2015-05-28 18:37:55 +03:00
|
|
|
|
|
|
|
dict = qdict_new();
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(dict, "1", 0);
|
2015-05-28 18:37:55 +03:00
|
|
|
g_assert_cmpint(qdict_array_entries(dict, ""), ==, -EINVAL);
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(dict, "0", 0);
|
2015-05-28 18:37:55 +03:00
|
|
|
g_assert_cmpint(qdict_array_entries(dict, ""), ==, 2);
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(dict, "bar", 0);
|
2015-05-28 18:37:55 +03:00
|
|
|
g_assert_cmpint(qdict_array_entries(dict, ""), ==, -EINVAL);
|
|
|
|
qdict_del(dict, "bar");
|
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(dict, "2.a", 0);
|
|
|
|
qdict_put_int(dict, "2.b", 0);
|
|
|
|
qdict_put_int(dict, "2.c", 0);
|
2015-05-28 18:37:55 +03:00
|
|
|
g_assert_cmpint(qdict_array_entries(dict, ""), ==, 3);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(dict);
|
2015-05-28 18:37:55 +03:00
|
|
|
}
|
|
|
|
|
2014-05-08 22:12:40 +04:00
|
|
|
static void qdict_join_test(void)
|
|
|
|
{
|
|
|
|
QDict *dict1, *dict2;
|
|
|
|
bool overwrite = false;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
dict1 = qdict_new();
|
|
|
|
dict2 = qdict_new();
|
|
|
|
|
|
|
|
/* Test everything once without overwrite and once with */
|
|
|
|
do
|
|
|
|
{
|
|
|
|
/* Test empty dicts */
|
|
|
|
qdict_join(dict1, dict2, overwrite);
|
|
|
|
|
|
|
|
g_assert(qdict_size(dict1) == 0);
|
|
|
|
g_assert(qdict_size(dict2) == 0);
|
|
|
|
|
|
|
|
/* First iteration: Test movement */
|
|
|
|
/* Second iteration: Test empty source and non-empty destination */
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(dict2, "foo", 42);
|
2014-05-08 22:12:40 +04:00
|
|
|
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
qdict_join(dict1, dict2, overwrite);
|
|
|
|
|
|
|
|
g_assert(qdict_size(dict1) == 1);
|
|
|
|
g_assert(qdict_size(dict2) == 0);
|
|
|
|
|
|
|
|
g_assert(qdict_get_int(dict1, "foo") == 42);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Test non-empty source and destination without conflict */
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(dict2, "bar", 23);
|
2014-05-08 22:12:40 +04:00
|
|
|
|
|
|
|
qdict_join(dict1, dict2, overwrite);
|
|
|
|
|
|
|
|
g_assert(qdict_size(dict1) == 2);
|
|
|
|
g_assert(qdict_size(dict2) == 0);
|
|
|
|
|
|
|
|
g_assert(qdict_get_int(dict1, "foo") == 42);
|
|
|
|
g_assert(qdict_get_int(dict1, "bar") == 23);
|
|
|
|
|
|
|
|
/* Test conflict */
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(dict2, "foo", 84);
|
2014-05-08 22:12:40 +04:00
|
|
|
|
|
|
|
qdict_join(dict1, dict2, overwrite);
|
|
|
|
|
|
|
|
g_assert(qdict_size(dict1) == 2);
|
|
|
|
g_assert(qdict_size(dict2) == !overwrite);
|
|
|
|
|
2017-04-06 18:41:07 +03:00
|
|
|
g_assert(qdict_get_int(dict1, "foo") == (overwrite ? 84 : 42));
|
2014-05-08 22:12:40 +04:00
|
|
|
g_assert(qdict_get_int(dict1, "bar") == 23);
|
|
|
|
|
|
|
|
if (!overwrite) {
|
|
|
|
g_assert(qdict_get_int(dict2, "foo") == 84);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check the references */
|
2018-04-19 18:01:42 +03:00
|
|
|
g_assert(qdict_get(dict1, "foo")->base.refcnt == 1);
|
|
|
|
g_assert(qdict_get(dict1, "bar")->base.refcnt == 1);
|
2014-05-08 22:12:40 +04:00
|
|
|
|
|
|
|
if (!overwrite) {
|
2018-04-19 18:01:42 +03:00
|
|
|
g_assert(qdict_get(dict2, "foo")->base.refcnt == 1);
|
2014-05-08 22:12:40 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Clean up */
|
|
|
|
qdict_del(dict1, "foo");
|
|
|
|
qdict_del(dict1, "bar");
|
|
|
|
|
|
|
|
if (!overwrite) {
|
|
|
|
qdict_del(dict2, "foo");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (overwrite ^= true);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(dict1);
|
|
|
|
qobject_unref(dict2);
|
2014-05-08 22:12:40 +04:00
|
|
|
}
|
|
|
|
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
static void qdict_crumple_test_recursive(void)
|
|
|
|
{
|
|
|
|
QDict *src, *dst, *rule, *vnc, *acl, *listen;
|
|
|
|
QList *rules;
|
|
|
|
|
|
|
|
src = qdict_new();
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_str(src, "vnc.listen.addr", "127.0.0.1");
|
|
|
|
qdict_put_str(src, "vnc.listen.port", "5901");
|
|
|
|
qdict_put_str(src, "vnc.acl.rules.0.match", "fred");
|
|
|
|
qdict_put_str(src, "vnc.acl.rules.0.policy", "allow");
|
|
|
|
qdict_put_str(src, "vnc.acl.rules.1.match", "bob");
|
|
|
|
qdict_put_str(src, "vnc.acl.rules.1.policy", "deny");
|
|
|
|
qdict_put_str(src, "vnc.acl.default", "deny");
|
|
|
|
qdict_put_str(src, "vnc.acl..name", "acl0");
|
|
|
|
qdict_put_str(src, "vnc.acl.rule..name", "acl0");
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
|
2018-02-24 18:40:29 +03:00
|
|
|
dst = qobject_to(QDict, qdict_crumple(src, &error_abort));
|
2017-02-17 23:38:18 +03:00
|
|
|
g_assert(dst);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
g_assert_cmpint(qdict_size(dst), ==, 1);
|
|
|
|
|
2017-02-17 23:38:13 +03:00
|
|
|
vnc = qdict_get_qdict(dst, "vnc");
|
|
|
|
g_assert(vnc);
|
2017-02-17 23:38:14 +03:00
|
|
|
g_assert_cmpint(qdict_size(vnc), ==, 3);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
|
2017-02-17 23:38:13 +03:00
|
|
|
listen = qdict_get_qdict(vnc, "listen");
|
|
|
|
g_assert(listen);
|
2017-02-17 23:38:14 +03:00
|
|
|
g_assert_cmpint(qdict_size(listen), ==, 2);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
g_assert_cmpstr("127.0.0.1", ==, qdict_get_str(listen, "addr"));
|
|
|
|
g_assert_cmpstr("5901", ==, qdict_get_str(listen, "port"));
|
|
|
|
|
2017-02-17 23:38:13 +03:00
|
|
|
acl = qdict_get_qdict(vnc, "acl");
|
|
|
|
g_assert(acl);
|
2017-02-17 23:38:14 +03:00
|
|
|
g_assert_cmpint(qdict_size(acl), ==, 3);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
|
2017-02-17 23:38:13 +03:00
|
|
|
rules = qdict_get_qlist(acl, "rules");
|
|
|
|
g_assert(rules);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
g_assert_cmpint(qlist_size(rules), ==, 2);
|
|
|
|
|
2018-02-24 18:40:29 +03:00
|
|
|
rule = qobject_to(QDict, qlist_pop(rules));
|
2017-02-17 23:38:14 +03:00
|
|
|
g_assert(rule);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
g_assert_cmpint(qdict_size(rule), ==, 2);
|
|
|
|
g_assert_cmpstr("fred", ==, qdict_get_str(rule, "match"));
|
|
|
|
g_assert_cmpstr("allow", ==, qdict_get_str(rule, "policy"));
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(rule);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
|
2018-02-24 18:40:29 +03:00
|
|
|
rule = qobject_to(QDict, qlist_pop(rules));
|
2017-02-17 23:38:14 +03:00
|
|
|
g_assert(rule);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
g_assert_cmpint(qdict_size(rule), ==, 2);
|
|
|
|
g_assert_cmpstr("bob", ==, qdict_get_str(rule, "match"));
|
|
|
|
g_assert_cmpstr("deny", ==, qdict_get_str(rule, "policy"));
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(rule);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
|
|
|
|
/* With recursive crumpling, we should see all names unescaped */
|
|
|
|
g_assert_cmpstr("acl0", ==, qdict_get_str(vnc, "acl.name"));
|
|
|
|
g_assert_cmpstr("acl0", ==, qdict_get_str(acl, "rule.name"));
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(src);
|
|
|
|
qobject_unref(dst);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void qdict_crumple_test_empty(void)
|
|
|
|
{
|
|
|
|
QDict *src, *dst;
|
|
|
|
|
|
|
|
src = qdict_new();
|
|
|
|
|
2018-04-26 18:28:05 +03:00
|
|
|
dst = qobject_to(QDict, qdict_crumple(src, &error_abort));
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
|
|
|
|
g_assert_cmpint(qdict_size(dst), ==, 0);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(src);
|
|
|
|
qobject_unref(dst);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
}
|
|
|
|
|
2018-02-01 22:00:44 +03:00
|
|
|
static int qdict_count_entries(QDict *dict)
|
|
|
|
{
|
|
|
|
const QDictEntry *e;
|
|
|
|
int count = 0;
|
|
|
|
|
|
|
|
for (e = qdict_first(dict); e; e = qdict_next(dict, e)) {
|
|
|
|
count++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void qdict_rename_keys_test(void)
|
|
|
|
{
|
|
|
|
QDict *dict = qdict_new();
|
|
|
|
QDict *copy;
|
|
|
|
QDictRenames *renames;
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
|
|
|
qdict_put_str(dict, "abc", "foo");
|
|
|
|
qdict_put_str(dict, "abcdef", "bar");
|
|
|
|
qdict_put_int(dict, "number", 42);
|
|
|
|
qdict_put_bool(dict, "flag", true);
|
|
|
|
qdict_put_null(dict, "nothing");
|
|
|
|
|
|
|
|
/* Empty rename list */
|
|
|
|
renames = (QDictRenames[]) {
|
|
|
|
{ NULL, "this can be anything" }
|
|
|
|
};
|
|
|
|
copy = qdict_clone_shallow(dict);
|
|
|
|
qdict_rename_keys(copy, renames, &error_abort);
|
|
|
|
|
|
|
|
g_assert_cmpstr(qdict_get_str(copy, "abc"), ==, "foo");
|
|
|
|
g_assert_cmpstr(qdict_get_str(copy, "abcdef"), ==, "bar");
|
|
|
|
g_assert_cmpint(qdict_get_int(copy, "number"), ==, 42);
|
|
|
|
g_assert_cmpint(qdict_get_bool(copy, "flag"), ==, true);
|
|
|
|
g_assert(qobject_type(qdict_get(copy, "nothing")) == QTYPE_QNULL);
|
|
|
|
g_assert_cmpint(qdict_count_entries(copy), ==, 5);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(copy);
|
2018-02-01 22:00:44 +03:00
|
|
|
|
|
|
|
/* Simple rename of all entries */
|
|
|
|
renames = (QDictRenames[]) {
|
|
|
|
{ "abc", "str1" },
|
|
|
|
{ "abcdef", "str2" },
|
|
|
|
{ "number", "int" },
|
|
|
|
{ "flag", "bool" },
|
|
|
|
{ "nothing", "null" },
|
|
|
|
{ NULL , NULL }
|
|
|
|
};
|
|
|
|
copy = qdict_clone_shallow(dict);
|
|
|
|
qdict_rename_keys(copy, renames, &error_abort);
|
|
|
|
|
|
|
|
g_assert(!qdict_haskey(copy, "abc"));
|
|
|
|
g_assert(!qdict_haskey(copy, "abcdef"));
|
|
|
|
g_assert(!qdict_haskey(copy, "number"));
|
|
|
|
g_assert(!qdict_haskey(copy, "flag"));
|
|
|
|
g_assert(!qdict_haskey(copy, "nothing"));
|
|
|
|
|
|
|
|
g_assert_cmpstr(qdict_get_str(copy, "str1"), ==, "foo");
|
|
|
|
g_assert_cmpstr(qdict_get_str(copy, "str2"), ==, "bar");
|
|
|
|
g_assert_cmpint(qdict_get_int(copy, "int"), ==, 42);
|
|
|
|
g_assert_cmpint(qdict_get_bool(copy, "bool"), ==, true);
|
|
|
|
g_assert(qobject_type(qdict_get(copy, "null")) == QTYPE_QNULL);
|
|
|
|
g_assert_cmpint(qdict_count_entries(copy), ==, 5);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(copy);
|
2018-02-01 22:00:44 +03:00
|
|
|
|
|
|
|
/* Renames are processed top to bottom */
|
|
|
|
renames = (QDictRenames[]) {
|
|
|
|
{ "abc", "tmp" },
|
|
|
|
{ "abcdef", "abc" },
|
|
|
|
{ "number", "abcdef" },
|
|
|
|
{ "flag", "number" },
|
|
|
|
{ "nothing", "flag" },
|
|
|
|
{ "tmp", "nothing" },
|
|
|
|
{ NULL , NULL }
|
|
|
|
};
|
|
|
|
copy = qdict_clone_shallow(dict);
|
|
|
|
qdict_rename_keys(copy, renames, &error_abort);
|
|
|
|
|
|
|
|
g_assert_cmpstr(qdict_get_str(copy, "nothing"), ==, "foo");
|
|
|
|
g_assert_cmpstr(qdict_get_str(copy, "abc"), ==, "bar");
|
|
|
|
g_assert_cmpint(qdict_get_int(copy, "abcdef"), ==, 42);
|
|
|
|
g_assert_cmpint(qdict_get_bool(copy, "number"), ==, true);
|
|
|
|
g_assert(qobject_type(qdict_get(copy, "flag")) == QTYPE_QNULL);
|
|
|
|
g_assert(!qdict_haskey(copy, "tmp"));
|
|
|
|
g_assert_cmpint(qdict_count_entries(copy), ==, 5);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(copy);
|
2018-02-01 22:00:44 +03:00
|
|
|
|
|
|
|
/* Conflicting rename */
|
|
|
|
renames = (QDictRenames[]) {
|
|
|
|
{ "abcdef", "abc" },
|
|
|
|
{ NULL , NULL }
|
|
|
|
};
|
|
|
|
copy = qdict_clone_shallow(dict);
|
|
|
|
qdict_rename_keys(copy, renames, &local_err);
|
|
|
|
|
|
|
|
g_assert(local_err != NULL);
|
|
|
|
error_free(local_err);
|
|
|
|
local_err = NULL;
|
|
|
|
|
|
|
|
g_assert_cmpstr(qdict_get_str(copy, "abc"), ==, "foo");
|
|
|
|
g_assert_cmpstr(qdict_get_str(copy, "abcdef"), ==, "bar");
|
|
|
|
g_assert_cmpint(qdict_get_int(copy, "number"), ==, 42);
|
|
|
|
g_assert_cmpint(qdict_get_bool(copy, "flag"), ==, true);
|
|
|
|
g_assert(qobject_type(qdict_get(copy, "nothing")) == QTYPE_QNULL);
|
|
|
|
g_assert_cmpint(qdict_count_entries(copy), ==, 5);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(copy);
|
2018-02-01 22:00:44 +03:00
|
|
|
|
|
|
|
/* Renames in an empty dict */
|
|
|
|
renames = (QDictRenames[]) {
|
|
|
|
{ "abcdef", "abc" },
|
|
|
|
{ NULL , NULL }
|
|
|
|
};
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(dict);
|
2018-02-01 22:00:44 +03:00
|
|
|
dict = qdict_new();
|
|
|
|
|
|
|
|
qdict_rename_keys(dict, renames, &error_abort);
|
|
|
|
g_assert(qdict_first(dict) == NULL);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(dict);
|
2018-02-01 22:00:44 +03:00
|
|
|
}
|
|
|
|
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
static void qdict_crumple_test_bad_inputs(void)
|
|
|
|
{
|
|
|
|
QDict *src;
|
|
|
|
Error *error = NULL;
|
|
|
|
|
|
|
|
src = qdict_new();
|
|
|
|
/* rule.0 can't be both a string and a dict */
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_str(src, "rule.0", "fred");
|
|
|
|
qdict_put_str(src, "rule.0.policy", "allow");
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
|
|
|
|
g_assert(qdict_crumple(src, &error) == NULL);
|
|
|
|
g_assert(error != NULL);
|
|
|
|
error_free(error);
|
|
|
|
error = NULL;
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(src);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
|
|
|
|
src = qdict_new();
|
|
|
|
/* rule can't be both a list and a dict */
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_str(src, "rule.0", "fred");
|
|
|
|
qdict_put_str(src, "rule.a", "allow");
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
|
|
|
|
g_assert(qdict_crumple(src, &error) == NULL);
|
|
|
|
g_assert(error != NULL);
|
|
|
|
error_free(error);
|
|
|
|
error = NULL;
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(src);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
|
|
|
|
src = qdict_new();
|
|
|
|
/* The input should be flat, ie no dicts or lists */
|
|
|
|
qdict_put(src, "rule.a", qdict_new());
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_str(src, "rule.b", "allow");
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
|
|
|
|
g_assert(qdict_crumple(src, &error) == NULL);
|
|
|
|
g_assert(error != NULL);
|
|
|
|
error_free(error);
|
|
|
|
error = NULL;
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(src);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
|
|
|
|
src = qdict_new();
|
|
|
|
/* List indexes must not have gaps */
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_str(src, "rule.0", "deny");
|
|
|
|
qdict_put_str(src, "rule.3", "allow");
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
|
|
|
|
g_assert(qdict_crumple(src, &error) == NULL);
|
|
|
|
g_assert(error != NULL);
|
|
|
|
error_free(error);
|
|
|
|
error = NULL;
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(src);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
|
|
|
|
src = qdict_new();
|
|
|
|
/* List indexes must be in %zu format */
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_str(src, "rule.0", "deny");
|
|
|
|
qdict_put_str(src, "rule.+1", "allow");
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
|
|
|
|
g_assert(qdict_crumple(src, &error) == NULL);
|
|
|
|
g_assert(error != NULL);
|
|
|
|
error_free(error);
|
|
|
|
error = NULL;
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(src);
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
}
|
|
|
|
|
2009-08-28 22:27:32 +04:00
|
|
|
/*
|
|
|
|
* Errors test-cases
|
|
|
|
*/
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qdict_put_exists_test(void)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
|
|
|
int value;
|
|
|
|
const char *key = "exists";
|
2012-01-10 23:10:44 +04:00
|
|
|
QDict *tests_dict = qdict_new();
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_int(tests_dict, key, 1);
|
|
|
|
qdict_put_int(tests_dict, key, 2);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
|
|
|
value = qdict_get_int(tests_dict, key);
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(value == 2);
|
2009-12-14 23:53:20 +03:00
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(qdict_size(tests_dict) == 1);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(tests_dict);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qdict_get_not_exists_test(void)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
2012-01-10 23:10:44 +04:00
|
|
|
QDict *tests_dict = qdict_new();
|
|
|
|
g_assert(qdict_get(tests_dict, "foo") == NULL);
|
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(tests_dict);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Stress test-case
|
|
|
|
*
|
|
|
|
* This is a lot big for a unit-test, but there is no other place
|
|
|
|
* to have it.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void remove_dots(char *string)
|
|
|
|
{
|
|
|
|
char *p = strchr(string, ':');
|
|
|
|
if (p)
|
|
|
|
*p = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
static QString *read_line(FILE *file, char *key)
|
|
|
|
{
|
|
|
|
char value[128];
|
|
|
|
|
2011-01-22 00:50:30 +03:00
|
|
|
if (fscanf(file, "%127s%127s", key, value) == EOF) {
|
2009-08-28 22:27:32 +04:00
|
|
|
return NULL;
|
2011-01-22 00:50:30 +03:00
|
|
|
}
|
2009-08-28 22:27:32 +04:00
|
|
|
remove_dots(key);
|
|
|
|
return qstring_from_str(value);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define reset_file(file) fseek(file, 0L, SEEK_SET)
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
static void qdict_stress_test(void)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
|
|
|
size_t lines;
|
|
|
|
char key[128];
|
|
|
|
FILE *test_file;
|
|
|
|
QDict *qdict;
|
|
|
|
QString *value;
|
|
|
|
const char *test_file_path = "qdict-test-data.txt";
|
|
|
|
|
|
|
|
test_file = fopen(test_file_path, "r");
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(test_file != NULL);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
|
|
|
// Create the dict
|
|
|
|
qdict = qdict_new();
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(qdict != NULL);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
|
|
|
// Add everything from the test file
|
|
|
|
for (lines = 0;; lines++) {
|
|
|
|
value = read_line(test_file, key);
|
|
|
|
if (!value)
|
|
|
|
break;
|
|
|
|
|
|
|
|
qdict_put(qdict, key, value);
|
|
|
|
}
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(qdict_size(qdict) == lines);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
|
|
|
// Check if everything is really in there
|
|
|
|
reset_file(test_file);
|
|
|
|
for (;;) {
|
|
|
|
const char *str1, *str2;
|
|
|
|
|
|
|
|
value = read_line(test_file, key);
|
|
|
|
if (!value)
|
|
|
|
break;
|
|
|
|
|
|
|
|
str1 = qstring_get_str(value);
|
|
|
|
|
|
|
|
str2 = qdict_get_str(qdict, key);
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(str2 != NULL);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(strcmp(str1, str2) == 0);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(value);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
// Delete everything
|
|
|
|
reset_file(test_file);
|
|
|
|
for (;;) {
|
|
|
|
value = read_line(test_file, key);
|
|
|
|
if (!value)
|
|
|
|
break;
|
|
|
|
|
|
|
|
qdict_del(qdict, key);
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(value);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(qdict_haskey(qdict, key) == 0);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
fclose(test_file);
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
g_assert(qdict_size(qdict) == 0);
|
2018-04-19 18:01:43 +03:00
|
|
|
qobject_unref(qdict);
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
int main(int argc, char **argv)
|
2009-08-28 22:27:32 +04:00
|
|
|
{
|
2012-01-10 23:10:44 +04:00
|
|
|
g_test_init(&argc, &argv, NULL);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
g_test_add_func("/public/new", qdict_new_test);
|
|
|
|
g_test_add_func("/public/put_obj", qdict_put_obj_test);
|
|
|
|
g_test_add_func("/public/destroy_simple", qdict_destroy_simple_test);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
|
|
|
/* Continue, but now with fixtures */
|
2012-01-10 23:10:44 +04:00
|
|
|
g_test_add_func("/public/get", qdict_get_test);
|
|
|
|
g_test_add_func("/public/get_int", qdict_get_int_test);
|
|
|
|
g_test_add_func("/public/get_try_int", qdict_get_try_int_test);
|
|
|
|
g_test_add_func("/public/get_str", qdict_get_str_test);
|
|
|
|
g_test_add_func("/public/get_try_str", qdict_get_try_str_test);
|
2015-05-28 18:37:55 +03:00
|
|
|
g_test_add_func("/public/defaults", qdict_defaults_test);
|
2012-01-10 23:10:44 +04:00
|
|
|
g_test_add_func("/public/haskey_not", qdict_haskey_not_test);
|
|
|
|
g_test_add_func("/public/haskey", qdict_haskey_test);
|
|
|
|
g_test_add_func("/public/del", qdict_del_test);
|
|
|
|
g_test_add_func("/public/to_qdict", qobject_to_qdict_test);
|
|
|
|
g_test_add_func("/public/iterapi", qdict_iterapi_test);
|
2013-12-20 22:28:22 +04:00
|
|
|
g_test_add_func("/public/flatten", qdict_flatten_test);
|
2013-12-20 22:28:21 +04:00
|
|
|
g_test_add_func("/public/array_split", qdict_array_split_test);
|
2015-05-28 18:37:55 +03:00
|
|
|
g_test_add_func("/public/array_entries", qdict_array_entries_test);
|
2014-05-08 22:12:40 +04:00
|
|
|
g_test_add_func("/public/join", qdict_join_test);
|
2012-01-10 23:10:44 +04:00
|
|
|
|
|
|
|
g_test_add_func("/errors/put_exists", qdict_put_exists_test);
|
|
|
|
g_test_add_func("/errors/get_not_exists", qdict_get_not_exists_test);
|
2009-08-28 22:27:32 +04:00
|
|
|
|
qdict: implement a qdict_crumple method for un-flattening a dict
The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.
The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.
If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.
As an example, a flat dict containing
{
'foo.0.bar': 'one',
'foo.0.wizz': '1',
'foo.1.bar': 'two',
'foo.1.wizz': '2'
}
will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.
{
'foo': [
{ 'bar': 'one', 'wizz': '1' },
{ 'bar': 'two', 'wizz': '2' }
],
}
If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict
{
'foo..bar': 'wizz',
'bar.foo..bar': 'eek',
'bar.hello': 'world'
}
Will end up as
{
'foo.bar': 'wizz',
'bar': {
'foo.bar': 'eek',
'hello': 'world'
}
}
The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1475246744-29302-3-git-send-email-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-09-30 17:45:25 +03:00
|
|
|
g_test_add_func("/public/crumple/recursive",
|
|
|
|
qdict_crumple_test_recursive);
|
|
|
|
g_test_add_func("/public/crumple/empty",
|
|
|
|
qdict_crumple_test_empty);
|
|
|
|
g_test_add_func("/public/crumple/bad_inputs",
|
|
|
|
qdict_crumple_test_bad_inputs);
|
|
|
|
|
2018-02-01 22:00:44 +03:00
|
|
|
g_test_add_func("/public/rename_keys", qdict_rename_keys_test);
|
|
|
|
|
2009-08-28 22:27:32 +04:00
|
|
|
/* The Big one */
|
2012-01-10 23:10:44 +04:00
|
|
|
if (g_test_slow()) {
|
|
|
|
g_test_add_func("/stress/test", qdict_stress_test);
|
|
|
|
}
|
2009-08-28 22:27:32 +04:00
|
|
|
|
2012-01-10 23:10:44 +04:00
|
|
|
return g_test_run();
|
2009-08-28 22:27:32 +04:00
|
|
|
}
|