git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Inline trivial functions.
[sliver-openvswitch.git]
/
tests
/
test-ovsdb.c
diff --git
a/tests/test-ovsdb.c
b/tests/test-ovsdb.c
index
8fe1727
..
29d7542
100644
(file)
--- a/
tests/test-ovsdb.c
+++ b/
tests/test-ovsdb.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010, 2011
Nicira Networks
.
+ * Copyright (c) 2009, 2010, 2011
, 2012, 2013 Nicira, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-39,6
+39,7
@@
#include "ovsdb/ovsdb.h"
#include "ovsdb/query.h"
#include "ovsdb/row.h"
#include "ovsdb/ovsdb.h"
#include "ovsdb/query.h"
#include "ovsdb/row.h"
+#include "ovsdb/server.h"
#include "ovsdb/table.h"
#include "ovsdb/transaction.h"
#include "ovsdb/trigger.h"
#include "ovsdb/table.h"
#include "ovsdb/transaction.h"
#include "ovsdb/trigger.h"
@@
-50,24
+51,23
@@
#include "util.h"
#include "vlog.h"
#include "util.h"
#include "vlog.h"
-static struct command all_commands[];
-
static void usage(void) NO_RETURN;
static void parse_options(int argc, char *argv[]);
static void usage(void) NO_RETURN;
static void parse_options(int argc, char *argv[]);
+static struct command *get_all_commands(void);
int
main(int argc, char *argv[])
{
set_program_name(argv[0]);
parse_options(argc, argv);
int
main(int argc, char *argv[])
{
set_program_name(argv[0]);
parse_options(argc, argv);
- run_command(argc - optind, argv + optind,
all_commands
);
+ run_command(argc - optind, argv + optind,
get_all_commands()
);
return 0;
}
static void
parse_options(int argc, char *argv[])
{
return 0;
}
static void
parse_options(int argc, char *argv[])
{
- static struct option long_options[] = {
+ static
const
struct option long_options[] = {
{"timeout", required_argument, NULL, 't'},
{"verbose", optional_argument, NULL, 'v'},
{"help", no_argument, NULL, 'h'},
{"timeout", required_argument, NULL, 't'},
{"verbose", optional_argument, NULL, 'v'},
{"help", no_argument, NULL, 'h'},
@@
-822,7
+822,7
@@
do_evaluate_conditions(int argc OVS_UNUSED, char *argv[])
json_destroy(json);
for (i = 0; i < n_conditions; i++) {
json_destroy(json);
for (i = 0; i < n_conditions; i++) {
- printf("condition %2
zu
:", i);
+ printf("condition %2
"PRIuSIZE"
:", i);
for (j = 0; j < n_rows; j++) {
bool result = ovsdb_condition_evaluate(rows[j], &conditions[i]);
if (j % 5 == 0) {
for (j = 0; j < n_rows; j++) {
bool result = ovsdb_condition_evaluate(rows[j], &conditions[i]);
if (j % 5 == 0) {
@@
-928,7
+928,7
@@
do_execute_mutations(int argc OVS_UNUSED, char *argv[])
json_destroy(json);
for (i = 0; i < n_sets; i++) {
json_destroy(json);
for (i = 0; i < n_sets; i++) {
- printf("mutation %2
zu
:\n", i);
+ printf("mutation %2
"PRIuSIZE"
:\n", i);
for (j = 0; j < n_rows; j++) {
struct ovsdb_error *error;
struct ovsdb_row *row;
for (j = 0; j < n_rows; j++) {
struct ovsdb_error *error;
struct ovsdb_row *row;
@@
-936,7
+936,7
@@
do_execute_mutations(int argc OVS_UNUSED, char *argv[])
row = ovsdb_row_clone(rows[j]);
error = ovsdb_mutation_set_execute(row, &sets[i]);
row = ovsdb_row_clone(rows[j]);
error = ovsdb_mutation_set_execute(row, &sets[i]);
- printf("row %
zu
: ", j);
+ printf("row %
"PRIuSIZE"
: ", j);
if (error) {
print_and_free_ovsdb_error(error);
} else {
if (error) {
print_and_free_ovsdb_error(error);
} else {
@@
-975,6
+975,16
@@
do_execute_mutations(int argc OVS_UNUSED, char *argv[])
ovsdb_table_destroy(table); /* Also destroys 'ts'. */
}
ovsdb_table_destroy(table); /* Also destroys 'ts'. */
}
+/* Inserts a row, without bothering to update metadata such as refcounts. */
+static void
+put_row(struct ovsdb_table *table, struct ovsdb_row *row)
+{
+ const struct uuid *uuid = ovsdb_row_get_uuid(row);
+ if (!ovsdb_table_get_row(table, uuid)) {
+ hmap_insert(&table->rows, &row->hmap_node, uuid_hash(uuid));
+ }
+}
+
struct do_query_cbdata {
struct uuid *row_uuids;
int *counts;
struct do_query_cbdata {
struct uuid *row_uuids;
int *counts;
@@
-1031,7
+1041,7
@@
do_query(int argc OVS_UNUSED, char *argv[])
UUID_ARGS(ovsdb_row_get_uuid(row)));
}
cbdata.row_uuids[i] = *ovsdb_row_get_uuid(row);
UUID_ARGS(ovsdb_row_get_uuid(row)));
}
cbdata.row_uuids[i] = *ovsdb_row_get_uuid(row);
-
ovsdb_table_
put_row(table, row);
+ put_row(table, row);
}
json_destroy(json);
}
json_destroy(json);
@@
-1050,7
+1060,7
@@
do_query(int argc OVS_UNUSED, char *argv[])
memset(cbdata.counts, 0, cbdata.n_rows * sizeof *cbdata.counts);
ovsdb_query(table, &cnd, do_query_cb, &cbdata);
memset(cbdata.counts, 0, cbdata.n_rows * sizeof *cbdata.counts);
ovsdb_query(table, &cnd, do_query_cb, &cbdata);
- printf("query %2
zu
:", i);
+ printf("query %2
"PRIuSIZE"
:", i);
for (j = 0; j < cbdata.n_rows; j++) {
if (j % 5 == 0) {
putchar(' ');
for (j = 0; j < cbdata.n_rows; j++) {
if (j % 5 == 0) {
putchar(' ');
@@
-1109,7
+1119,8
@@
do_query_distinct(int argc OVS_UNUSED, char *argv[])
/* Parse column set. */
json = parse_json(argv[4]);
/* Parse column set. */
json = parse_json(argv[4]);
- check_ovsdb_error(ovsdb_column_set_from_json(json, table, &columns));
+ check_ovsdb_error(ovsdb_column_set_from_json(json, table->schema,
+ &columns));
json_destroy(json);
/* Parse rows, add to table. */
json_destroy(json);
/* Parse rows, add to table. */
@@
-1151,7
+1162,7
@@
do_query_distinct(int argc OVS_UNUSED, char *argv[])
ovs_fatal(0, "duplicate UUID "UUID_FMT" in table",
UUID_ARGS(ovsdb_row_get_uuid(row)));
}
ovs_fatal(0, "duplicate UUID "UUID_FMT" in table",
UUID_ARGS(ovsdb_row_get_uuid(row)));
}
-
ovsdb_table_
put_row(table, row);
+ put_row(table, row);
}
json_destroy(json);
}
json_destroy(json);
@@
-1186,7
+1197,7
@@
do_query_distinct(int argc OVS_UNUSED, char *argv[])
}
ovsdb_row_set_destroy(&results);
}
ovsdb_row_set_destroy(&results);
- printf("query %2
zu
:", i);
+ printf("query %2
"PRIuSIZE"
:", i);
for (j = 0; j < n_rows; j++) {
int count = rows[j].class->count;
for (j = 0; j < n_rows; j++) {
int count = rows[j].class->count;
@@
-1246,7
+1257,7
@@
do_execute(int argc OVS_UNUSED, char *argv[])
char *s;
params = parse_json(argv[i]);
char *s;
params = parse_json(argv[i]);
- result = ovsdb_execute(db, params, 0, NULL);
+ result = ovsdb_execute(db,
NULL,
params, 0, NULL);
s = json_to_string(result, JSSF_SORT);
printf("%s\n", s);
free(s);
s = json_to_string(result, JSSF_SORT);
printf("%s\n", s);
free(s);
@@
-1281,7
+1292,8
@@
static void
do_trigger(int argc OVS_UNUSED, char *argv[])
{
struct ovsdb_schema *schema;
do_trigger(int argc OVS_UNUSED, char *argv[])
{
struct ovsdb_schema *schema;
- struct list completions;
+ struct ovsdb_session session;
+ struct ovsdb_server server;
struct json *json;
struct ovsdb *db;
long long int now;
struct json *json;
struct ovsdb *db;
long long int now;
@@
-1294,7
+1306,10
@@
do_trigger(int argc OVS_UNUSED, char *argv[])
json_destroy(json);
db = ovsdb_create(schema);
json_destroy(json);
db = ovsdb_create(schema);
- list_init(&completions);
+ ovsdb_server_init(&server);
+ ovsdb_server_add_db(&server, db);
+ ovsdb_session_init(&session, &server);
+
now = 0;
number = 0;
for (i = 2; i < argc; i++) {
now = 0;
number = 0;
for (i = 2; i < argc; i++) {
@@
-1308,7
+1323,7
@@
do_trigger(int argc OVS_UNUSED, char *argv[])
json_destroy(params);
} else {
struct test_trigger *t = xmalloc(sizeof *t);
json_destroy(params);
} else {
struct test_trigger *t = xmalloc(sizeof *t);
- ovsdb_trigger_init(
db, &t->trigger, params, &completion
s, now);
+ ovsdb_trigger_init(
&session, db, &t->trigger, param
s, now);
t->number = number++;
if (ovsdb_trigger_is_complete(&t->trigger)) {
do_trigger_dump(t, now, "immediate");
t->number = number++;
if (ovsdb_trigger_is_complete(&t->trigger)) {
do_trigger_dump(t, now, "immediate");
@@
-1318,8
+1333,8
@@
do_trigger(int argc OVS_UNUSED, char *argv[])
}
ovsdb_trigger_run(db, now);
}
ovsdb_trigger_run(db, now);
- while (!list_is_empty(&completions)) {
- do_trigger_dump(CONTAINER_OF(list_pop_front(&completions),
+ while (!list_is_empty(&
session.
completions)) {
+ do_trigger_dump(CONTAINER_OF(list_pop_front(&
session.
completions),
struct test_trigger, trigger.node),
now, "delayed");
}
struct test_trigger, trigger.node),
now, "delayed");
}
@@
-1329,6
+1344,7
@@
do_trigger(int argc OVS_UNUSED, char *argv[])
poll_block();
}
poll_block();
}
+ ovsdb_server_destroy(&server);
ovsdb_destroy(db);
}
ovsdb_destroy(db);
}
@@
-1655,7
+1671,7
@@
parse_uuids(const struct json *json, struct ovsdb_symbol_table *symtab,
struct uuid uuid;
if (json->type == JSON_STRING && uuid_from_string(&uuid, json->u.string)) {
struct uuid uuid;
if (json->type == JSON_STRING && uuid_from_string(&uuid, json->u.string)) {
- char *name = xasprintf("#%
zu
#", *n);
+ char *name = xasprintf("#%
"PRIuSIZE"
#", *n);
fprintf(stderr, "%s = "UUID_FMT"\n", name, UUID_ARGS(&uuid));
ovsdb_symbol_table_put(symtab, name, &uuid, false);
free(name);
fprintf(stderr, "%s = "UUID_FMT"\n", name, UUID_ARGS(&uuid));
ovsdb_symbol_table_put(symtab, name, &uuid, false);
free(name);
@@
-1766,7
+1782,7
@@
idl_set(struct ovsdb_idl *idl, char *commands, int step)
struct idltest_simple *s;
if (!arg1 || arg2) {
struct idltest_simple *s;
if (!arg1 || arg2) {
- ovs_fatal(0, "\"
se
t\" command requires 1 argument");
+ ovs_fatal(0, "\"
inser
t\" command requires 1 argument");
}
s = idltest_simple_insert(txn);
}
s = idltest_simple_insert(txn);
@@
-1775,12
+1791,12
@@
idl_set(struct ovsdb_idl *idl, char *commands, int step)
const struct idltest_simple *s;
if (!arg1 || arg2) {
const struct idltest_simple *s;
if (!arg1 || arg2) {
- ovs_fatal(0, "\"
set
\" command requires 1 argument");
+ ovs_fatal(0, "\"
delete
\" command requires 1 argument");
}
s = idltest_find_simple(idl, atoi(arg1));
if (!s) {
}
s = idltest_find_simple(idl, atoi(arg1));
if (!s) {
- ovs_fatal(0, "\"
set
\" command asks for nonexistent "
+ ovs_fatal(0, "\"
delete
\" command asks for nonexistent "
"i=%d", atoi(arg1));
}
idltest_simple_delete(s);
"i=%d", atoi(arg1));
}
idltest_simple_delete(s);
@@
-1812,11
+1828,27
@@
idl_set(struct ovsdb_idl *idl, char *commands, int step)
arg2);
}
} else if (!strcmp(name, "increment")) {
arg2);
}
} else if (!strcmp(name, "increment")) {
- if (!arg2 || arg3) {
- ovs_fatal(0, "\"increment\" command requires 2 arguments");
+ const struct idltest_simple *s;
+
+ if (!arg1 || arg2) {
+ ovs_fatal(0, "\"increment\" command requires 1 argument");
+ }
+
+ s = idltest_find_simple(idl, atoi(arg1));
+ if (!s) {
+ ovs_fatal(0, "\"set\" command asks for nonexistent "
+ "i=%d", atoi(arg1));
}
}
- ovsdb_idl_txn_increment(txn, arg1, arg2, NULL);
+
+ ovsdb_idl_txn_increment(txn, &s->header_, &idltest_simple_col_i);
increment = true;
increment = true;
+ } else if (!strcmp(name, "abort")) {
+ ovsdb_idl_txn_abort(txn);
+ break;
+ } else if (!strcmp(name, "destroy")) {
+ printf("%03d: destroy\n", step);
+ ovsdb_idl_txn_destroy(txn);
+ return;
} else {
ovs_fatal(0, "unknown command %s", name);
}
} else {
ovs_fatal(0, "unknown command %s", name);
}
@@
-1847,12
+1879,12
@@
do_idl(int argc, char *argv[])
idltest_init();
idltest_init();
- idl = ovsdb_idl_create(argv[1], &idltest_idl_class, true);
+ idl = ovsdb_idl_create(argv[1], &idltest_idl_class, true
, true
);
if (argc > 2) {
struct stream *stream;
if (argc > 2) {
struct stream *stream;
- error = stream_open_block(jsonrpc_stream_open(argv[1], &stream
)
,
- &stream);
+ error = stream_open_block(jsonrpc_stream_open(argv[1], &stream,
+
DSCP_DEFAULT),
&stream);
if (error) {
ovs_fatal(error, "failed to connect to \"%s\"", argv[1]);
}
if (error) {
ovs_fatal(error, "failed to connect to \"%s\"", argv[1]);
}
@@
-1873,7
+1905,11
@@
do_idl(int argc, char *argv[])
arg++;
} else {
/* Wait for update. */
arg++;
} else {
/* Wait for update. */
- while (ovsdb_idl_get_seqno(idl) == seqno && !ovsdb_idl_run(idl)) {
+ for (;;) {
+ ovsdb_idl_run(idl);
+ if (ovsdb_idl_get_seqno(idl) != seqno) {
+ break;
+ }
jsonrpc_run(rpc);
ovsdb_idl_wait(idl);
jsonrpc_run(rpc);
ovsdb_idl_wait(idl);
@@
-1896,7
+1932,7
@@
do_idl(int argc, char *argv[])
substitute_uuids(json, symtab);
request = jsonrpc_create_request("transact", json, NULL);
error = jsonrpc_transact_block(rpc, request, &reply);
substitute_uuids(json, symtab);
request = jsonrpc_create_request("transact", json, NULL);
error = jsonrpc_transact_block(rpc, request, &reply);
- if (error) {
+ if (error
|| reply->error
) {
ovs_fatal(error, "jsonrpc transaction failed");
}
printf("%03d: ", step++);
ovs_fatal(error, "jsonrpc transaction failed");
}
printf("%03d: ", step++);
@@
-1913,7
+1949,11
@@
do_idl(int argc, char *argv[])
if (rpc) {
jsonrpc_close(rpc);
}
if (rpc) {
jsonrpc_close(rpc);
}
- while (ovsdb_idl_get_seqno(idl) == seqno && !ovsdb_idl_run(idl)) {
+ for (;;) {
+ ovsdb_idl_run(idl);
+ if (ovsdb_idl_get_seqno(idl) != seqno) {
+ break;
+ }
ovsdb_idl_wait(idl);
poll_block();
}
ovsdb_idl_wait(idl);
poll_block();
}
@@
-1952,3
+1992,9
@@
static struct command all_commands[] = {
{ "help", 0, INT_MAX, do_help },
{ NULL, 0, 0, NULL },
};
{ "help", 0, INT_MAX, do_help },
{ NULL, 0, 0, NULL },
};
+
+static struct command *
+get_all_commands(void)
+{
+ return all_commands;
+}