diff options
author | Liran Schour <lirans@il.ibm.com> | 2016-07-18 11:45:55 +0300 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2016-07-18 22:58:44 -0700 |
commit | c383f3bf81a72856aee76b8680500539378e42d0 (patch) | |
tree | 2523e2b0adc7f508f9c4ddf22d0dcab6369e23f0 /ovsdb/ovsdb-server.c | |
parent | f0d7ae1951d81a4579d732f40cafdcade1e2b587 (diff) | |
download | openvswitch-c383f3bf81a72856aee76b8680500539378e42d0.tar.gz |
ovsdb-client: support monitor-cond method
Add monitor_cond method to ovsdb-client. Enable testing of monitor_cond_change
via unixctl command.Add unit tests for monitor_cond and monitor_cond_change.
See ovsdb-client(1) man page for details.
Replace monitor2 with monitor_cond.
Signed-off-by: Liran Schour <lirans@il.ibm.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ovsdb/ovsdb-server.c')
-rw-r--r-- | ovsdb/ovsdb-server.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index 1b9de19c9..6fb0b2a01 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -76,7 +76,7 @@ static unixctl_cb_func ovsdb_server_compact; static unixctl_cb_func ovsdb_server_reconnect; static unixctl_cb_func ovsdb_server_perf_counters_clear; static unixctl_cb_func ovsdb_server_perf_counters_show; -static unixctl_cb_func ovsdb_server_disable_monitor2; +static unixctl_cb_func ovsdb_server_disable_monitor_cond; struct server_config { struct sset *remotes; @@ -335,9 +335,9 @@ main(int argc, char *argv[]) ovsdb_server_perf_counters_clear, NULL); /* Simulate the behavior of OVS release prior to version 2.5 that - * does not support the monitor2 method. */ - unixctl_command_register("ovsdb-server/disable-monitor2", "", 0, 0, - ovsdb_server_disable_monitor2, jsonrpc); + * does not support the monitor_cond method. */ + unixctl_command_register("ovsdb-server/disable-monitor-cond", "", 0, 0, + ovsdb_server_disable_monitor_cond, jsonrpc); main_loop(jsonrpc, &all_dbs, unixctl, &remotes, run_process, &exiting); @@ -1048,16 +1048,18 @@ ovsdb_server_perf_counters_clear(struct unixctl_conn *conn, int argc OVS_UNUSED, unixctl_command_reply(conn, NULL); } -/* "ovsdb-server/disable-monitor2": makes ovsdb-server drop all of its +/* "ovsdb-server/disable-monitor-cond": makes ovsdb-server drop all of its * JSON-RPC connections and reconnect. New sessions will not recognize - * the 'monitor2' method. */ + * the 'monitor_cond' method. */ static void -ovsdb_server_disable_monitor2(struct unixctl_conn *conn, int argc OVS_UNUSED, - const char *argv[] OVS_UNUSED, void *jsonrpc_) +ovsdb_server_disable_monitor_cond(struct unixctl_conn *conn, + int argc OVS_UNUSED, + const char *argv[] OVS_UNUSED, + void *jsonrpc_) { struct ovsdb_jsonrpc_server *jsonrpc = jsonrpc_; - ovsdb_jsonrpc_disable_monitor2(); + ovsdb_jsonrpc_disable_monitor_cond(); ovsdb_jsonrpc_server_reconnect(jsonrpc); unixctl_command_reply(conn, NULL); } |