projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socket-util: Report fd of -1 on error in inet_open_active().
[openvswitch]
/
tests
/
test-ovsdb.c
diff --git
a/tests/test-ovsdb.c
b/tests/test-ovsdb.c
index 4e2e416cf1cd3cc9dda1979d2c04ae2ce63e4948..d448109c424a8254552b539aed96d4f80b57643f 100644
(file)
--- a/
tests/test-ovsdb.c
+++ b/
tests/test-ovsdb.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010, 2011, 2012 Nicira
Networks
.
+ * Copyright (c) 2009, 2010, 2011, 2012 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.
@@
-1294,6
+1294,7
@@
do_trigger(int argc OVS_UNUSED, char *argv[])
{
struct ovsdb_schema *schema;
struct ovsdb_session session;
{
struct ovsdb_schema *schema;
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;
@@
-1306,7
+1307,9
@@
do_trigger(int argc OVS_UNUSED, char *argv[])
json_destroy(json);
db = ovsdb_create(schema);
json_destroy(json);
db = ovsdb_create(schema);
- ovsdb_session_init(&session, db);
+ ovsdb_server_init(&server);
+ ovsdb_server_add_db(&server, db);
+ ovsdb_session_init(&session, &server);
now = 0;
number = 0;
now = 0;
number = 0;
@@
-1321,7
+1324,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(&session, &t->trigger, params, now);
+ ovsdb_trigger_init(&session,
db,
&t->trigger, params, 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");
@@
-1342,6
+1345,7
@@
do_trigger(int argc OVS_UNUSED, char *argv[])
poll_block();
}
poll_block();
}
+ ovsdb_server_destroy(&server);
ovsdb_destroy(db);
}
ovsdb_destroy(db);
}