projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
docs: Make it clear that ovs-openflowd is an alternative to ovs-vswitchd.
[openvswitch]
/
tests
/
test-ovsdb.c
diff --git
a/tests/test-ovsdb.c
b/tests/test-ovsdb.c
index 1c1116e1f8cad95ef23b10ca60009b11904171d4..cdc939bb4dfa777f24eeb8b78cb6a96516c2deaa 100644
(file)
--- a/
tests/test-ovsdb.c
+++ b/
tests/test-ovsdb.c
@@
-59,8
+59,6
@@
int
main(int argc, char *argv[])
{
set_program_name(argv[0]);
main(int argc, char *argv[])
{
set_program_name(argv[0]);
- time_init();
- vlog_init();
parse_options(argc, argv);
run_command(argc - optind, argv + optind, all_commands);
return 0;
parse_options(argc, argv);
run_command(argc - optind, argv + optind, all_commands);
return 0;
@@
-478,7
+476,12
@@
do_parse_atom_strings(int argc, char *argv[])
}
static void
}
static void
-do_parse_data(int argc, char *argv[])
+do_parse_data__(int argc, char *argv[],
+ struct ovsdb_error *
+ (*parse)(struct ovsdb_datum *datum,
+ const struct ovsdb_type *type,
+ const struct json *json,
+ struct ovsdb_symbol_table *symtab))
{
struct ovsdb_type type;
struct json *json;
{
struct ovsdb_type type;
struct json *json;
@@
-492,7
+495,7
@@
do_parse_data(int argc, char *argv[])
struct ovsdb_datum datum;
json = unbox_json(parse_json(argv[i]));
struct ovsdb_datum datum;
json = unbox_json(parse_json(argv[i]));
- check_ovsdb_error(
ovsdb_datum_from_json
(&datum, &type, json, NULL));
+ check_ovsdb_error(
parse
(&datum, &type, json, NULL));
json_destroy(json);
print_and_free_json(ovsdb_datum_to_json(&datum, &type));
json_destroy(json);
print_and_free_json(ovsdb_datum_to_json(&datum, &type));
@@
-502,6
+505,12
@@
do_parse_data(int argc, char *argv[])
ovsdb_type_destroy(&type);
}
ovsdb_type_destroy(&type);
}
+static void
+do_parse_data(int argc, char *argv[])
+{
+ do_parse_data__(argc, argv, ovsdb_datum_from_json);
+}
+
static void
do_parse_data_strings(int argc, char *argv[])
{
static void
do_parse_data_strings(int argc, char *argv[])
{
@@
-1086,7
+1095,7
@@
do_query_distinct(int argc OVS_UNUSED, char *argv[])
size_t n_classes;
struct json *json;
int exit_code = 0;
size_t n_classes;
struct json *json;
int exit_code = 0;
- size_t i
, j, k
;
+ size_t i;
/* Parse table schema, create table. */
json = unbox_json(parse_json(argv[1]));
/* Parse table schema, create table. */
json = unbox_json(parse_json(argv[1]));
@@
-1152,6
+1161,7
@@
do_query_distinct(int argc OVS_UNUSED, char *argv[])
for (i = 0; i < json->u.array.n; i++) {
struct ovsdb_row_set results;
struct ovsdb_condition cnd;
for (i = 0; i < json->u.array.n; i++) {
struct ovsdb_row_set results;
struct ovsdb_condition cnd;
+ size_t j;
check_ovsdb_error(ovsdb_condition_from_json(ts, json->u.array.elems[i],
NULL, &cnd));
check_ovsdb_error(ovsdb_condition_from_json(ts, json->u.array.elems[i],
NULL, &cnd));
@@
-1162,6
+1172,8
@@
do_query_distinct(int argc OVS_UNUSED, char *argv[])
ovsdb_row_set_init(&results);
ovsdb_query_distinct(table, &cnd, &columns, &results);
for (j = 0; j < results.n_rows; j++) {
ovsdb_row_set_init(&results);
ovsdb_query_distinct(table, &cnd, &columns, &results);
for (j = 0; j < results.n_rows; j++) {
+ size_t k;
+
for (k = 0; k < n_rows; k++) {
if (uuid_equals(ovsdb_row_get_uuid(results.rows[j]),
&rows[k].uuid)) {
for (k = 0; k < n_rows; k++) {
if (uuid_equals(ovsdb_row_get_uuid(results.rows[j]),
&rows[k].uuid)) {
@@
-1456,8
+1468,7
@@
do_transact_print(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
n_rows = hmap_count(&do_transact_table->rows);
rows = xmalloc(n_rows * sizeof *rows);
i = 0;
n_rows = hmap_count(&do_transact_table->rows);
rows = xmalloc(n_rows * sizeof *rows);
i = 0;
- HMAP_FOR_EACH (row, struct ovsdb_row, hmap_node,
- &do_transact_table->rows) {
+ HMAP_FOR_EACH (row, hmap_node, &do_transact_table->rows) {
rows[i++] = row;
}
assert(i == n_rows);
rows[i++] = row;
}
assert(i == n_rows);
@@
-1824,7
+1835,6
@@
do_idl(int argc, char *argv[])
for (i = 2; i < argc; i++) {
char *arg = argv[i];
struct jsonrpc_msg *request, *reply;
for (i = 2; i < argc; i++) {
char *arg = argv[i];
struct jsonrpc_msg *request, *reply;
- int error;
if (*arg == '+') {
/* The previous transaction didn't change anything. */
if (*arg == '+') {
/* The previous transaction didn't change anything. */