X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ovsdb%2Fovsdb-client.c;h=980cd9a856a1d302cc1990f7b0895efd822fa73f;hb=HEAD;hp=12f34d5168bf17dc60d8f27795ef3598ea8f7307;hpb=9a61462490ca299d6b80e0ced9b2acff8c7e38ad;p=cascardo%2Fovs.git diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c index 12f34d516..980cd9a85 100644 --- a/ovsdb/ovsdb-client.c +++ b/ovsdb/ovsdb-client.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ #include -#include #include #include #include @@ -32,20 +31,24 @@ #include "daemon.h" #include "dirs.h" #include "dynamic-string.h" +#include "fatal-signal.h" #include "json.h" #include "jsonrpc.h" #include "lib/table.h" #include "ovsdb.h" #include "ovsdb-data.h" #include "ovsdb-error.h" +#include "poll-loop.h" #include "sort.h" #include "svec.h" #include "stream.h" #include "stream-ssl.h" #include "table.h" +#include "monitor.h" #include "timeval.h" +#include "unixctl.h" #include "util.h" -#include "vlog.h" +#include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(ovsdb_client); @@ -70,9 +73,9 @@ static bool timestamp; /* Format for table output. */ static struct table_style table_style = TABLE_STYLE_DEFAULT; -static const struct ovsdb_client_command all_commands[]; +static const struct ovsdb_client_command *get_all_commands(void); -static void usage(void) NO_RETURN; +OVS_NO_RETURN static void usage(void); static void parse_options(int argc, char *argv[]); static struct jsonrpc *open_jsonrpc(const char *server); static void fetch_dbs(struct jsonrpc *, struct svec *dbs); @@ -81,19 +84,20 @@ int main(int argc, char *argv[]) { const struct ovsdb_client_command *command; - const char *database; + char *database; struct jsonrpc *rpc; - proctitle_init(argc, argv); + ovs_cmdl_proctitle_init(argc, argv); set_program_name(argv[0]); parse_options(argc, argv); - signal(SIGPIPE, SIG_IGN); + fatal_ignore_sigpipe(); + daemon_become_new_user(false); if (optind >= argc) { ovs_fatal(0, "missing command name; use --help for help"); } - for (command = all_commands; ; command++) { + for (command = get_all_commands(); ; command++) { if (!command->name) { VLOG_FATAL("unknown command '%s'; use --help for help", argv[optind]); @@ -124,12 +128,13 @@ main(int argc, char *argv[]) fetch_dbs(rpc, &dbs); if (argc - optind > command->min_args && svec_contains(&dbs, argv[optind])) { - database = argv[optind++]; + database = xstrdup(argv[optind++]); } else if (dbs.n == 1) { database = xstrdup(dbs.names[0]); } else if (svec_contains(&dbs, "Open_vSwitch")) { - database = "Open_vSwitch"; + database = xstrdup("Open_vSwitch"); } else { + jsonrpc_close(rpc); ovs_fatal(0, "no default database for `%s' command, please " "specify a database name", command->name); } @@ -140,12 +145,14 @@ main(int argc, char *argv[]) if (argc - optind < command->min_args || argc - optind > command->max_args) { + free(database); VLOG_FATAL("invalid syntax for '%s' (use --help for help)", command->name); } command->handler(rpc, database, argc - optind, argv + optind); + free(database); jsonrpc_close(rpc); if (ferror(stdout)) { @@ -164,14 +171,15 @@ parse_options(int argc, char *argv[]) enum { OPT_BOOTSTRAP_CA_CERT = UCHAR_MAX + 1, OPT_TIMESTAMP, + VLOG_OPTION_ENUMS, DAEMON_OPTION_ENUMS, TABLE_OPTION_ENUMS }; - static struct option long_options[] = { - {"verbose", optional_argument, NULL, 'v'}, + static const struct option long_options[] = { {"help", no_argument, NULL, 'h'}, {"version", no_argument, NULL, 'V'}, {"timestamp", no_argument, NULL, OPT_TIMESTAMP}, + VLOG_LONG_OPTIONS, DAEMON_LONG_OPTIONS, #ifdef HAVE_OPENSSL {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT}, @@ -180,7 +188,7 @@ parse_options(int argc, char *argv[]) TABLE_LONG_OPTIONS, {NULL, 0, NULL, 0}, }; - char *short_options = long_options_to_short_options(long_options); + char *short_options = ovs_cmdl_long_options_to_short_options(long_options); for (;;) { int c; @@ -198,14 +206,9 @@ parse_options(int argc, char *argv[]) ovs_print_version(0, 0); exit(EXIT_SUCCESS); - case 'v': - vlog_set_verbosity(optarg); - break; - + VLOG_OPTION_HANDLERS DAEMON_OPTION_HANDLERS - TABLE_OPTION_HANDLERS(&table_style) - STREAM_SSL_OPTION_HANDLERS case OPT_BOOTSTRAP_CA_CERT: @@ -254,6 +257,12 @@ usage(void) " monitor contents of COLUMNs in TABLE in DATABASE on SERVER.\n" " COLUMNs may include !initial, !insert, !delete, !modify\n" " to avoid seeing the specified kinds of changes.\n" + "\n monitor [SERVER] [DATABASE] ALL\n" + " monitor all changes to all columns in all tables\n" + " in DATBASE on SERVER.\n" + "\n monitor2 [SERVER] [DATABASE] ALL\n" + " same usage as monitor, but uses \"monitor2\" method over" + " the wire." "\n dump [SERVER] [DATABASE]\n" " dump contents of DATABASE on SERVER to stdout\n" "\nThe default SERVER is unix:%s/db.sock.\n" @@ -388,11 +397,12 @@ fetch_dbs(struct jsonrpc *rpc, struct svec *dbs) const struct json *name = reply->result->u.array.elems[i]; if (name->type != JSON_STRING) { - ovs_fatal(0, "list_dbs response %zu is not string", i); + ovs_fatal(0, "list_dbs response %"PRIuSIZE" is not string", i); } svec_add(dbs, name->u.string); } jsonrpc_msg_destroy(reply); + svec_sort(dbs); } static void @@ -448,6 +458,7 @@ do_list_tables(struct jsonrpc *rpc, const char *database, } ovsdb_schema_destroy(schema); table_print(&t, &table_style); + table_destroy(&t); } static void @@ -486,6 +497,7 @@ do_list_columns(struct jsonrpc *rpc, const char *database, } ovsdb_schema_destroy(schema); table_print(&t, &table_style); + table_destroy(&t); } static void @@ -503,6 +515,13 @@ do_transact(struct jsonrpc *rpc, const char *database OVS_UNUSED, putchar('\n'); jsonrpc_msg_destroy(reply); } + +/* "monitor" command. */ + +struct monitored_table { + struct ovsdb_table_schema *table; + struct ovsdb_column_set columns; +}; static void monitor_print_row(struct json *row, const char *type, const char *uuid, @@ -533,31 +552,25 @@ monitor_print_row(struct json *row, const char *type, const char *uuid, } static void -monitor_print(struct json *table_updates, - const struct ovsdb_table_schema *table, - const struct ovsdb_column_set *columns, bool initial) +monitor_print_table(struct json *table_update, + const struct monitored_table *mt, char *caption, + bool initial) { - struct json *table_update; + const struct ovsdb_table_schema *table = mt->table; + const struct ovsdb_column_set *columns = &mt->columns; struct shash_node *node; struct table t; size_t i; - table_init(&t); - table_set_timestamp(&t, timestamp); - - if (table_updates->type != JSON_OBJECT) { - ovs_error(0, " is not object"); - return; - } - table_update = shash_find_data(json_object(table_updates), table->name); - if (!table_update) { - return; - } if (table_update->type != JSON_OBJECT) { - ovs_error(0, " is not object"); + ovs_error(0, " for table %s is not object", table->name); return; } + table_init(&t); + table_set_timestamp(&t, timestamp); + table_set_caption(&t, caption); + table_add_column(&t, "row"); table_add_column(&t, "action"); for (i = 0; i < columns->n_columns; i++) { @@ -588,6 +601,125 @@ monitor_print(struct json *table_updates, table_destroy(&t); } +static void +monitor_print(struct json *table_updates, + const struct monitored_table *mts, size_t n_mts, + bool initial) +{ + size_t i; + + if (table_updates->type != JSON_OBJECT) { + ovs_error(0, " is not object"); + return; + } + + for (i = 0; i < n_mts; i++) { + const struct monitored_table *mt = &mts[i]; + struct json *table_update = shash_find_data(json_object(table_updates), + mt->table->name); + if (table_update) { + monitor_print_table(table_update, mt, + n_mts > 1 ? xstrdup(mt->table->name) : NULL, + initial); + } + } +} + +static void +monitor2_print_row(struct json *row, const char *type, const char *uuid, + const struct ovsdb_column_set *columns, struct table *t) +{ + if (!strcmp(type, "delete")) { + if (row->type != JSON_NULL) { + ovs_error(0, "delete method does not expect "); + return; + } + + table_add_row(t); + table_add_cell(t)->text = xstrdup(uuid); + table_add_cell(t)->text = xstrdup(type); + } else { + if (!row || row->type != JSON_OBJECT) { + ovs_error(0, " is not object"); + return; + } + monitor_print_row(row, type, uuid, columns, t); + } +} + +static void +monitor2_print_table(struct json *table_update2, + const struct monitored_table *mt, char *caption) +{ + const struct ovsdb_table_schema *table = mt->table; + const struct ovsdb_column_set *columns = &mt->columns; + struct shash_node *node; + struct table t; + size_t i; + + if (table_update2->type != JSON_OBJECT) { + ovs_error(0, " for table %s is not object", table->name); + return; + } + + table_init(&t); + table_set_timestamp(&t, timestamp); + table_set_caption(&t, caption); + + table_add_column(&t, "row"); + table_add_column(&t, "action"); + for (i = 0; i < columns->n_columns; i++) { + table_add_column(&t, "%s", columns->columns[i]->name); + } + SHASH_FOR_EACH (node, json_object(table_update2)) { + struct json *row_update2 = node->data; + const char *operation; + struct json *row; + const char *ops[] = {"delete", "initial", "modify", "insert"}; + + if (row_update2->type != JSON_OBJECT) { + ovs_error(0, " is not object"); + continue; + } + + /* row_update2 contains one of objects indexed by ops[] */ + for (int i = 0; i < ARRAY_SIZE(ops); i++) { + operation = ops[i]; + row = shash_find_data(json_object(row_update2), operation); + + if (row) { + monitor2_print_row(row, operation, node->name, columns, &t); + break; + } + } + } + table_print(&t, &table_style); + table_destroy(&t); +} + +static void +monitor2_print(struct json *table_updates2, + const struct monitored_table *mts, size_t n_mts) +{ + size_t i; + + if (table_updates2->type != JSON_OBJECT) { + ovs_error(0, " is not object"); + return; + } + + for (i = 0; i < n_mts; i++) { + const struct monitored_table *mt = &mts[i]; + struct json *table_update = shash_find_data( + json_object(table_updates2), + mt->table->name); + if (table_update) { + monitor2_print_table(table_update, mt, + n_mts > 1 ? xstrdup(mt->table->name) : NULL); + } + } +} + static void add_column(const char *server, const struct ovsdb_column *column, struct ovsdb_column_set *columns, struct json *columns_json) @@ -653,7 +785,7 @@ parse_monitor_columns(char *arg, const char *server, const char *database, } free(nodes); - add_column(server, ovsdb_table_schema_get_column(table,"_version"), + add_column(server, ovsdb_table_schema_get_column(table, "_version"), columns, columns_json); } @@ -670,24 +802,59 @@ parse_monitor_columns(char *arg, const char *server, const char *database, } static void -do_monitor(struct jsonrpc *rpc, const char *database, - int argc, char *argv[]) +ovsdb_client_exit(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[] OVS_UNUSED, void *exiting_) { - const char *server = jsonrpc_get_name(rpc); - const char *table_name = argv[0]; - struct ovsdb_column_set columns = OVSDB_COLUMN_SET_INITIALIZER; - struct ovsdb_table_schema *table; - struct ovsdb_schema *schema; - struct jsonrpc_msg *request; - struct json *monitor, *monitor_request_array, - *monitor_requests, *request_id; + bool *exiting = exiting_; + *exiting = true; + unixctl_command_reply(conn, NULL); +} - schema = fetch_schema(rpc, database); - table = shash_find_data(&schema->tables, table_name); - if (!table) { - ovs_fatal(0, "%s: %s does not have a table named \"%s\"", - server, database, table_name); +static void +ovsdb_client_block(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[] OVS_UNUSED, void *blocked_) +{ + bool *blocked = blocked_; + + if (!*blocked) { + *blocked = true; + unixctl_command_reply(conn, NULL); + } else { + unixctl_command_reply(conn, "already blocking"); + } +} + +static void +ovsdb_client_unblock(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[] OVS_UNUSED, void *blocked_) +{ + bool *blocked = blocked_; + + if (*blocked) { + *blocked = false; + unixctl_command_reply(conn, NULL); + } else { + unixctl_command_reply(conn, "already unblocked"); + } +} + +static void +add_monitored_table(int argc, char *argv[], + const char *server, const char *database, + struct ovsdb_table_schema *table, + struct json *monitor_requests, + struct monitored_table **mts, + size_t *n_mts, size_t *allocated_mts) +{ + struct json *monitor_request_array; + struct monitored_table *mt; + + if (*n_mts >= *allocated_mts) { + *mts = x2nrealloc(*mts, allocated_mts, sizeof **mts); } + mt = &(*mts)[(*n_mts)++]; + mt->table = table; + ovsdb_column_set_init(&mt->columns); monitor_request_array = json_array_create_empty(); if (argc > 1) { @@ -697,59 +864,199 @@ do_monitor(struct jsonrpc *rpc, const char *database, json_array_add( monitor_request_array, parse_monitor_columns(argv[i], server, database, table, - &columns)); + &mt->columns)); } } else { - /* Allocate a writable empty string since parse_monitor_columns() is - * going to strtok() it and that's risky with literal "". */ + /* Allocate a writable empty string since parse_monitor_columns() + * is going to strtok() it and that's risky with literal "". */ char empty[] = ""; json_array_add( monitor_request_array, - parse_monitor_columns(empty, server, database, table, &columns)); + parse_monitor_columns(empty, server, database, + table, &mt->columns)); + } + + json_object_put(monitor_requests, table->name, monitor_request_array); +} + +static void +destroy_monitored_table(struct monitored_table *mts, size_t n) +{ + int i; + + for (i = 0; i < n; i++) { + struct monitored_table *mt = &mts[i]; + ovsdb_column_set_destroy(&mt->columns); + } + + free(mts); +} + +static void +do_monitor__(struct jsonrpc *rpc, const char *database, + enum ovsdb_monitor_version version, + int argc, char *argv[]) +{ + const char *server = jsonrpc_get_name(rpc); + const char *table_name = argv[0]; + struct unixctl_server *unixctl; + struct ovsdb_schema *schema; + struct jsonrpc_msg *request; + struct json *monitor, *monitor_requests, *request_id; + bool exiting = false; + bool blocked = false; + + struct monitored_table *mts; + size_t n_mts, allocated_mts; + + ovs_assert(version < OVSDB_MONITOR_VERSION_MAX); + + daemon_save_fd(STDOUT_FILENO); + daemonize_start(false); + if (get_detach()) { + int error; + + error = unixctl_server_create(NULL, &unixctl); + if (error) { + ovs_fatal(error, "failed to create unixctl server"); + } + + unixctl_command_register("exit", "", 0, 0, + ovsdb_client_exit, &exiting); + unixctl_command_register("ovsdb-client/block", "", 0, 0, + ovsdb_client_block, &blocked); + unixctl_command_register("ovsdb-client/unblock", "", 0, 0, + ovsdb_client_unblock, &blocked); + } else { + unixctl = NULL; } + schema = fetch_schema(rpc, database); + monitor_requests = json_object_create(); - json_object_put(monitor_requests, table_name, monitor_request_array); + + mts = NULL; + n_mts = allocated_mts = 0; + if (strcmp(table_name, "ALL")) { + struct ovsdb_table_schema *table; + + table = shash_find_data(&schema->tables, table_name); + if (!table) { + ovs_fatal(0, "%s: %s does not have a table named \"%s\"", + server, database, table_name); + } + + add_monitored_table(argc, argv, server, database, table, + monitor_requests, &mts, &n_mts, &allocated_mts); + } else { + size_t n = shash_count(&schema->tables); + const struct shash_node **nodes = shash_sort(&schema->tables); + size_t i; + + for (i = 0; i < n; i++) { + struct ovsdb_table_schema *table = nodes[i]->data; + + add_monitored_table(argc, argv, server, database, table, + monitor_requests, + &mts, &n_mts, &allocated_mts); + } + free(nodes); + } monitor = json_array_create_3(json_string_create(database), json_null_create(), monitor_requests); - request = jsonrpc_create_request("monitor", monitor, NULL); + const char *method = version == OVSDB_MONITOR_V2 ? "monitor2" + : "monitor"; + + request = jsonrpc_create_request(method, monitor, NULL); request_id = json_clone(request->id); jsonrpc_send(rpc, request); - for (;;) { - struct jsonrpc_msg *msg; - int error; - error = jsonrpc_recv_block(rpc, &msg); - if (error) { - ovsdb_schema_destroy(schema); - ovs_fatal(error, "%s: receive failed", server); - } - - if (msg->type == JSONRPC_REQUEST && !strcmp(msg->method, "echo")) { - jsonrpc_send(rpc, jsonrpc_create_reply(json_clone(msg->params), - msg->id)); - } else if (msg->type == JSONRPC_REPLY - && json_equal(msg->id, request_id)) { - monitor_print(msg->result, table, &columns, true); - fflush(stdout); - if (get_detach()) { - daemon_save_fd(STDOUT_FILENO); - daemonize(); + for (;;) { + unixctl_server_run(unixctl); + while (!blocked) { + struct jsonrpc_msg *msg; + int error; + + error = jsonrpc_recv(rpc, &msg); + if (error == EAGAIN) { + break; + } else if (error) { + ovs_fatal(error, "%s: receive failed", server); } - } else if (msg->type == JSONRPC_NOTIFY - && !strcmp(msg->method, "update")) { - struct json *params = msg->params; - if (params->type == JSON_ARRAY - && params->u.array.n == 2 - && params->u.array.elems[0]->type == JSON_NULL) { - monitor_print(params->u.array.elems[1], - table, &columns, false); + + if (msg->type == JSONRPC_REQUEST && !strcmp(msg->method, "echo")) { + jsonrpc_send(rpc, jsonrpc_create_reply(json_clone(msg->params), + msg->id)); + } else if (msg->type == JSONRPC_REPLY + && json_equal(msg->id, request_id)) { + switch(version) { + case OVSDB_MONITOR_V1: + monitor_print(msg->result, mts, n_mts, true); + break; + case OVSDB_MONITOR_V2: + monitor2_print(msg->result, mts, n_mts); + break; + case OVSDB_MONITOR_VERSION_MAX: + default: + OVS_NOT_REACHED(); + } fflush(stdout); + daemonize_complete(); + } else if (msg->type == JSONRPC_NOTIFY + && !strcmp(msg->method, "update")) { + struct json *params = msg->params; + if (params->type == JSON_ARRAY + && params->u.array.n == 2 + && params->u.array.elems[0]->type == JSON_NULL) { + monitor_print(params->u.array.elems[1], mts, n_mts, false); + fflush(stdout); + } + } else if (msg->type == JSONRPC_NOTIFY + && version == OVSDB_MONITOR_V2 + && !strcmp(msg->method, "update2")) { + struct json *params = msg->params; + if (params->type == JSON_ARRAY + && params->u.array.n == 2 + && params->u.array.elems[0]->type == JSON_NULL) { + monitor2_print(params->u.array.elems[1], mts, n_mts); + fflush(stdout); + } } + jsonrpc_msg_destroy(msg); + } + + if (exiting) { + break; } - jsonrpc_msg_destroy(msg); + + jsonrpc_run(rpc); + jsonrpc_wait(rpc); + if (!blocked) { + jsonrpc_recv_wait(rpc); + } + unixctl_server_wait(unixctl); + poll_block(); } + + json_destroy(request_id); + unixctl_server_destroy(unixctl); + ovsdb_schema_destroy(schema); + destroy_monitored_table(mts, n_mts); +} + +static void +do_monitor(struct jsonrpc *rpc, const char *database, + int argc, char *argv[]) +{ + do_monitor__(rpc, database, OVSDB_MONITOR_V1, argc, argv); +} + +static void +do_monitor2(struct jsonrpc *rpc, const char *database, + int argc, char *argv[]) +{ + do_monitor__(rpc, database, OVSDB_MONITOR_V2, argc, argv); } struct dump_table_aux { @@ -818,7 +1125,8 @@ compare_columns(const void *a_, const void *b_) } static void -dump_table(const struct ovsdb_table_schema *ts, struct json_array *rows) +dump_table(const char *table_name, const struct shash *cols, + struct json_array *rows) { const struct ovsdb_column **columns; size_t n_columns; @@ -831,9 +1139,9 @@ dump_table(const struct ovsdb_table_schema *ts, struct json_array *rows) size_t x, y; /* Sort columns by name, for reproducibility. */ - columns = xmalloc(shash_count(&ts->columns) * sizeof *columns); + columns = xmalloc(shash_count(cols) * sizeof *columns); n_columns = 0; - SHASH_FOR_EACH (node, &ts->columns) { + SHASH_FOR_EACH (node, cols) { struct ovsdb_column *column = node->data; if (strcmp(column->name, "_version")) { columns[n_columns++] = column; @@ -847,8 +1155,8 @@ dump_table(const struct ovsdb_table_schema *ts, struct json_array *rows) struct shash *row; if (rows->elems[y]->type != JSON_OBJECT) { - ovs_fatal(0, "row %zu in table %s response is not a JSON object: " - "%s", y, ts->name, json_to_string(rows->elems[y], 0)); + ovs_fatal(0, "row %"PRIuSIZE" in table %s response is not a JSON object: " + "%s", y, table_name, json_to_string(rows->elems[y], 0)); } row = json_object(rows->elems[y]); @@ -856,8 +1164,8 @@ dump_table(const struct ovsdb_table_schema *ts, struct json_array *rows) for (x = 0; x < n_columns; x++) { const struct json *json = shash_find_data(row, columns[x]->name); if (!json) { - ovs_fatal(0, "row %zu in table %s response lacks %s column", - y, ts->name, columns[x]->name); + ovs_fatal(0, "row %"PRIuSIZE" in table %s response lacks %s column", + y, table_name, columns[x]->name); } check_ovsdb_error(ovsdb_datum_from_json(&data[y][x], @@ -874,7 +1182,7 @@ dump_table(const struct ovsdb_table_schema *ts, struct json_array *rows) /* Add column headings. */ table_init(&t); - table_set_caption(&t, xasprintf("%s table", ts->name)); + table_set_caption(&t, xasprintf("%s table", table_name)); for (x = 0; x < n_columns; x++) { table_add_column(&t, "%s", columns[x]->name); } @@ -899,34 +1207,59 @@ dump_table(const struct ovsdb_table_schema *ts, struct json_array *rows) static void do_dump(struct jsonrpc *rpc, const char *database, - int argc OVS_UNUSED, char *argv[] OVS_UNUSED) + int argc, char *argv[]) { struct jsonrpc_msg *request, *reply; struct ovsdb_schema *schema; struct json *transaction; - const struct shash_node **tables; + const struct shash_node *node, **tables; size_t n_tables; + struct ovsdb_table_schema *tschema; + const struct shash *columns; + struct shash custom_columns; size_t i; + shash_init(&custom_columns); schema = fetch_schema(rpc, database); - tables = shash_sort(&schema->tables); - n_tables = shash_count(&schema->tables); + if (argc) { + node = shash_find(&schema->tables, argv[0]); + if (!node) { + ovs_fatal(0, "No table \"%s\" found.", argv[0]); + } + tables = xmemdup(&node, sizeof(&node)); + n_tables = 1; + tschema = tables[0]->data; + for (i = 1; i < argc; i++) { + node = shash_find(&tschema->columns, argv[i]); + if (!node) { + ovs_fatal(0, "Table \"%s\" has no column %s.", argv[0], argv[1]); + } + shash_add(&custom_columns, argv[1], node->data); + } + } else { + tables = shash_sort(&schema->tables); + n_tables = shash_count(&schema->tables); + } /* Construct transaction to retrieve entire database. */ transaction = json_array_create_1(json_string_create(database)); for (i = 0; i < n_tables; i++) { const struct ovsdb_table_schema *ts = tables[i]->data; - struct json *op, *columns; - struct shash_node *node; + struct json *op, *jcolumns; - columns = json_array_create_empty(); - SHASH_FOR_EACH (node, &ts->columns) { + if (argc > 1) { + columns = &custom_columns; + } else { + columns = &ts->columns; + } + jcolumns = json_array_create_empty(); + SHASH_FOR_EACH (node, columns) { const struct ovsdb_column *column = node->data; if (strcmp(column->name, "_version")) { - json_array_add(columns, json_string_create(column->name)); + json_array_add(jcolumns, json_string_create(column->name)); } } @@ -934,7 +1267,7 @@ do_dump(struct jsonrpc *rpc, const char *database, json_object_put_string(op, "op", "select"); json_object_put_string(op, "table", tables[i]->name); json_object_put(op, "where", json_array_create_empty()); - json_object_put(op, "columns", columns); + json_object_put(op, "columns", jcolumns); json_array_add(transaction, op); } @@ -945,7 +1278,7 @@ do_dump(struct jsonrpc *rpc, const char *database, /* Print database contents. */ if (reply->result->type != JSON_ARRAY || reply->result->u.array.n != n_tables) { - ovs_fatal(0, "reply is not array of %zu elements: %s", + ovs_fatal(0, "reply is not array of %"PRIuSIZE" elements: %s", n_tables, json_to_string(reply->result, 0)); } for (i = 0; i < n_tables; i++) { @@ -961,10 +1294,15 @@ do_dump(struct jsonrpc *rpc, const char *database, ts->name, json_to_string(op_result, 0)); } - dump_table(ts, &rows->u.array); + if (argc > 1) { + dump_table(tables[i]->name, &custom_columns, &rows->u.array); + } else { + dump_table(tables[i]->name, &ts->columns, &rows->u.array); + } } jsonrpc_msg_destroy(reply); + shash_destroy(&custom_columns); free(tables); ovsdb_schema_destroy(schema); } @@ -991,9 +1329,14 @@ static const struct ovsdb_client_command all_commands[] = { { "list-columns", NEED_DATABASE, 0, 1, do_list_columns }, { "transact", NEED_RPC, 1, 1, do_transact }, { "monitor", NEED_DATABASE, 1, INT_MAX, do_monitor }, - { "dump", NEED_DATABASE, 0, 0, do_dump }, - + { "monitor2", NEED_DATABASE, 1, INT_MAX, do_monitor2 }, + { "dump", NEED_DATABASE, 0, INT_MAX, do_dump }, { "help", NEED_NONE, 0, INT_MAX, do_help }, { NULL, 0, 0, 0, NULL }, }; + +static const struct ovsdb_client_command *get_all_commands(void) +{ + return all_commands; +}