X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fovsdb-client.c;h=da6a6d6d79f040ebde865a35992760f5e672bce6;hb=8159b984dced44851670bd48e204b4e854941a24;hp=6e0068125fcb03070b3f6862d1074d54690ed8ca;hpb=a8425c53c5785856cabe80295f0cea0135febdb6;p=sliver-openvswitch.git diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c index 6e0068125..da6a6d6d7 100644 --- a/ovsdb/ovsdb-client.c +++ b/ovsdb/ovsdb-client.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ #include +#include #include #include #include @@ -27,32 +28,43 @@ #include "command-line.h" #include "column.h" #include "compiler.h" +#include "daemon.h" #include "dynamic-string.h" #include "json.h" #include "jsonrpc.h" #include "ovsdb.h" +#include "ovsdb-data.h" #include "ovsdb-error.h" +#include "sort.h" #include "stream.h" +#include "stream-ssl.h" #include "table.h" #include "timeval.h" #include "util.h" - #include "vlog.h" -#define THIS_MODULE VLM_ovsdb_client + +VLOG_DEFINE_THIS_MODULE(ovsdb_client); /* --format: Output formatting. */ static enum { FMT_TABLE, /* Textual table. */ FMT_HTML, /* HTML table. */ - FMT_CSV /* Comma-separated lines. */ + FMT_CSV, /* Comma-separated lines. */ + FMT_JSON /* JSON. */ } output_format; -/* --wide: For --format=table, the maximum output width. */ -static int output_width; - /* --no-headings: Whether table output should include headings. */ static int output_headings = true; +/* --pretty: Flags to pass to json_to_string(). */ +static int json_flags = JSSF_SORT; + +/* --data: Format of data in output tables. */ +static enum { + DF_STRING, /* String format. */ + DF_JSON, /* JSON. */ +} data_format; + static const struct command all_commands[]; static void usage(void) NO_RETURN; @@ -61,9 +73,8 @@ static void parse_options(int argc, char *argv[]); int main(int argc, char *argv[]) { + proctitle_init(argc, argv); set_program_name(argv[0]); - time_init(); - vlog_init(); parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); run_command(argc - optind, argv + optind, all_commands); @@ -73,18 +84,26 @@ main(int argc, char *argv[]) static void parse_options(int argc, char *argv[]) { + enum { + OPT_BOOTSTRAP_CA_CERT = UCHAR_MAX + 1 + }; static struct option long_options[] = { - {"wide", no_argument, &output_width, INT_MAX}, {"format", required_argument, 0, 'f'}, - {"no-headings", no_argument, &output_headings, 0}, + {"data", required_argument, 0, 'd'}, + {"no-headings", no_argument, &output_headings, 0}, + {"pretty", no_argument, &json_flags, JSSF_PRETTY | JSSF_SORT}, {"verbose", optional_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, + DAEMON_LONG_OPTIONS, +#ifdef HAVE_OPENSSL + {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT}, + STREAM_SSL_LONG_OPTIONS +#endif {0, 0, 0, 0}, }; char *short_options = long_options_to_short_options(long_options); - output_width = isatty(fileno(stdout)) ? 79 : INT_MAX; for (;;) { int c; @@ -101,13 +120,21 @@ parse_options(int argc, char *argv[]) output_format = FMT_HTML; } else if (!strcmp(optarg, "csv")) { output_format = FMT_CSV; + } else if (!strcmp(optarg, "json")) { + output_format = FMT_JSON; } else { ovs_fatal(0, "unknown output format \"%s\"", optarg); } break; - case 'w': - output_width = INT_MAX; + case 'd': + if (!strcmp(optarg, "string")) { + data_format = DF_STRING; + } else if (!strcmp(optarg, "json")) { + data_format = DF_JSON; + } else { + ovs_fatal(0, "unknown data format \"%s\"", optarg); + } break; case 'h': @@ -121,6 +148,16 @@ parse_options(int argc, char *argv[]) vlog_set_verbosity(optarg); break; + DAEMON_OPTION_HANDLERS + +#ifdef HAVE_OPENSSL + STREAM_SSL_OPTION_HANDLERS + + case OPT_BOOTSTRAP_CA_CERT: + stream_ssl_set_ca_cert_file(optarg, true); + break; +#endif + case '?': exit(EXIT_FAILURE); @@ -141,25 +178,35 @@ usage(void) printf("%s: Open vSwitch database JSON-RPC client\n" "usage: %s [OPTIONS] COMMAND [ARG...]\n" "\nValid commands are:\n" - "\n get-schema SERVER\n" - " retrieve schema from SERVER\n" - "\n list-tables SERVER\n" - " list SERVER's tables\n" - "\n list-columns SERVER [TABLE]\n" - " list columns in TABLE (or all tables) on SERVER\n" + "\n list-dbs SERVER\n" + " list databases available on SERVER\n" + "\n get-schema SERVER DATABASE\n" + " retrieve schema for DATABASE from SERVER\n" + "\n get-schema-version SERVER DATABASE\n" + " retrieve schema for DATABASE from SERVER and report only its\n" + " version number on stdout\n" + "\n list-tables SERVER DATABASE\n" + " list tables for DATABASE on SERVER\n" + "\n list-columns SERVER DATABASE [TABLE]\n" + " list columns in TABLE (or all tables) in DATABASE on SERVER\n" "\n transact SERVER TRANSACTION\n" " run TRANSACTION (a JSON array of operations) on SERVER\n" " and print the results as JSON on stdout\n" - "\n monitor SERVER TABLE [COLUMN,...] [SELECT,...]\n" - " monitor contents of (COLUMNs in) TABLE on SERVER\n" - " Valid SELECTs are: initial, insert, delete, modify\n", + "\n monitor SERVER DATABASE TABLE [COLUMN,...]...\n" + " 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 dump SERVER DATABASE\n" + " dump contents of DATABASE on SERVER to stdout\n", program_name, program_name); - stream_usage("SERVER", true, true); + stream_usage("SERVER", true, true, true); printf("\nOutput formatting options:\n" " -f, --format=FORMAT set output formatting to FORMAT\n" - " (\"table\", \"html\", or \"csv\"\n" - " --wide don't limit TTY lines to 79 bytes\n" - " --no-headings omit table heading row\n"); + " (\"table\", \"html\", \"csv\", " + "or \"json\")\n" + " --no-headings omit table heading row\n" + " --pretty pretty-print JSON in output"); + daemon_usage(); vlog_usage(); printf("\nOther options:\n" " -h, --help display this help message\n" @@ -183,11 +230,11 @@ open_jsonrpc(const char *server) struct stream *stream; int error; - error = stream_open_block(server, &stream); + error = stream_open_block(jsonrpc_stream_open(server, &stream), &stream); if (error == EAFNOSUPPORT) { struct pstream *pstream; - error = pstream_open(server, &pstream); + error = jsonrpc_pstream_open(server, &pstream); if (error) { ovs_fatal(error, "failed to connect or listen to \"%s\"", server); } @@ -209,7 +256,7 @@ open_jsonrpc(const char *server) static void print_json(struct json *json) { - char *string = json_to_string(json, JSSF_SORT); + char *string = json_to_string(json, json_flags); fputs(string, stdout); free(string); } @@ -230,13 +277,16 @@ check_ovsdb_error(struct ovsdb_error *error) } static struct ovsdb_schema * -fetch_schema_from_rpc(struct jsonrpc *rpc) +fetch_schema_from_rpc(struct jsonrpc *rpc, const char *database) { struct jsonrpc_msg *request, *reply; struct ovsdb_schema *schema; int error; - request = jsonrpc_create_request("get_schema", json_array_create_empty()); + request = jsonrpc_create_request("get_schema", + json_array_create_1( + json_string_create(database)), + NULL); error = jsonrpc_transact_block(rpc, request, &reply); if (error) { ovs_fatal(error, "transaction failed"); @@ -248,13 +298,13 @@ fetch_schema_from_rpc(struct jsonrpc *rpc) } static struct ovsdb_schema * -fetch_schema(const char *server) +fetch_schema(const char *server, const char *database) { struct ovsdb_schema *schema; struct jsonrpc *rpc; rpc = open_jsonrpc(server); - schema = fetch_schema_from_rpc(rpc); + schema = fetch_schema_from_rpc(rpc, database); jsonrpc_close(rpc); return schema; @@ -262,15 +312,65 @@ fetch_schema(const char *server) struct column { char *heading; - int width; }; +struct cell { + /* Literal text. */ + char *text; + + /* JSON. */ + struct json *json; + const struct ovsdb_type *type; +}; + +static const char * +cell_to_text(const struct cell *cell_) +{ + struct cell *cell = (struct cell *) cell_; + if (!cell->text) { + if (cell->json) { + if (data_format == DF_JSON || !cell->type) { + cell->text = json_to_string(cell->json, JSSF_SORT); + } else if (data_format == DF_STRING) { + struct ovsdb_datum datum; + struct ovsdb_error *error; + struct ds s; + + error = ovsdb_datum_from_json(&datum, cell->type, cell->json, + NULL); + if (!error) { + ds_init(&s); + ovsdb_datum_to_string(&datum, cell->type, &s); + ovsdb_datum_destroy(&datum, cell->type); + cell->text = ds_steal_cstr(&s); + } else { + cell->text = json_to_string(cell->json, JSSF_SORT); + } + } else { + NOT_REACHED(); + } + } else { + cell->text = xstrdup(""); + } + } + + return cell->text; +} + +static void +cell_destroy(struct cell *cell) +{ + free(cell->text); + json_destroy(cell->json); +} + struct table { - char **cells; + struct cell *cells; struct column *columns; size_t n_columns, allocated_columns; size_t n_rows, allocated_rows; size_t current_column; + char *caption; }; static void @@ -290,9 +390,18 @@ table_destroy(struct table *table) free(table->columns); for (i = 0; i < table->n_columns * table->n_rows; i++) { - free(table->cells[i]); + cell_destroy(&table->cells[i]); } free(table->cells); + + free(table->caption); +} + +static void +table_set_caption(struct table *table, char *caption) +{ + free(table->caption); + table->caption = caption; } static void @@ -314,11 +423,10 @@ table_add_column(struct table *table, const char *heading, ...) va_start(args, heading); column->heading = xvasprintf(heading, args); - column->width = strlen(column->heading); va_end(args); } -static char ** +static struct cell * table_cell__(const struct table *table, size_t row, size_t column) { return &table->cells[column + row * table->n_columns]; @@ -337,43 +445,28 @@ table_add_row(struct table *table) y = table->n_rows++; table->current_column = 0; for (x = 0; x < table->n_columns; x++) { - *table_cell__(table, y, x) = NULL; + struct cell *cell = table_cell__(table, y, x); + memset(cell, 0, sizeof *cell); } } -static void -table_add_cell_nocopy(struct table *table, char *s) +static struct cell * +table_add_cell(struct table *table) { size_t x, y; - int length; assert(table->n_rows > 0); assert(table->current_column < table->n_columns); x = table->current_column++; y = table->n_rows - 1; - *table_cell__(table, y, x) = s; - length = strlen(s); - if (length > table->columns[x].width) { - table->columns[x].width = length; - } + return table_cell__(table, y, x); } static void -table_add_cell(struct table *table, const char *format, ...) +table_print_table_line__(struct ds *line) { - va_list args; - - va_start(args, format); - table_add_cell_nocopy(table, xvasprintf(format, args)); - va_end(args); -} - -static void -table_print_table_line__(struct ds *line, size_t max_width) -{ - ds_truncate(line, max_width); puts(ds_cstr(line)); ds_clear(line); } @@ -381,55 +474,76 @@ table_print_table_line__(struct ds *line, size_t max_width) static void table_print_table__(const struct table *table) { + static int n = 0; struct ds line = DS_EMPTY_INITIALIZER; + int *widths; size_t x, y; + if (n++ > 0) { + putchar('\n'); + } + + if (table->caption) { + puts(table->caption); + } + + widths = xmalloc(table->n_columns * sizeof *widths); + for (x = 0; x < table->n_columns; x++) { + const struct column *column = &table->columns[x]; + + widths[x] = strlen(column->heading); + for (y = 0; y < table->n_rows; y++) { + const char *text = cell_to_text(table_cell__(table, y, x)); + size_t length = strlen(text); + + if (length > widths[x]) + widths[x] = length; + } + } + if (output_headings) { for (x = 0; x < table->n_columns; x++) { const struct column *column = &table->columns[x]; if (x) { ds_put_char(&line, ' '); } - ds_put_format(&line, "%-*s", column->width, column->heading); + ds_put_format(&line, "%-*s", widths[x], column->heading); } - table_print_table_line__(&line, output_width); + table_print_table_line__(&line); for (x = 0; x < table->n_columns; x++) { - const struct column *column = &table->columns[x]; - int i; - if (x) { ds_put_char(&line, ' '); } - for (i = 0; i < column->width; i++) { - ds_put_char(&line, '-'); - } + ds_put_char_multiple(&line, '-', widths[x]); } - table_print_table_line__(&line, output_width); + table_print_table_line__(&line); } for (y = 0; y < table->n_rows; y++) { for (x = 0; x < table->n_columns; x++) { - const char *cell = *table_cell__(table, y, x); + const char *text = cell_to_text(table_cell__(table, y, x)); if (x) { ds_put_char(&line, ' '); } - ds_put_format(&line, "%-*s", table->columns[x].width, cell); + ds_put_format(&line, "%-*s", widths[x], text); } - table_print_table_line__(&line, output_width); + table_print_table_line__(&line); } ds_destroy(&line); + free(widths); } static void -table_print_html_cell__(const char *element, const char *content) +table_escape_html_text__(const char *s, size_t n) { - const char *p; + size_t i; - printf(" <%s>", element); - for (p = content; *p != '\0'; p++) { - switch (*p) { + for (i = 0; i < n; i++) { + char c = s[i]; + + switch (c) { case '&': fputs("&", stdout); break; @@ -439,11 +553,33 @@ table_print_html_cell__(const char *element, const char *content) case '>': fputs(">", stdout); break; + case '"': + fputs(""", stdout); + break; default: - putchar(*p); + putchar(c); break; } } +} + +static void +table_print_html_cell__(const char *element, const char *content) +{ + const char *p; + + printf(" <%s>", element); + for (p = content; *p; ) { + struct uuid uuid; + + if (uuid_from_string_prefix(&uuid, p)) { + printf("%.*s", UUID_LEN, p, 8, p); + p += UUID_LEN; + } else { + table_escape_html_text__(p, 1); + p++; + } + } printf("\n", element); } @@ -452,7 +588,11 @@ table_print_html__(const struct table *table) { size_t x, y; - fputs("\n", stdout); + fputs("
\n", stdout); + + if (table->caption) { + table_print_html_cell__("caption", table->caption); + } if (output_headings) { fputs(" \n", stdout); @@ -466,7 +606,17 @@ table_print_html__(const struct table *table) for (y = 0; y < table->n_rows; y++) { fputs(" \n", stdout); for (x = 0; x < table->n_columns; x++) { - table_print_html_cell__("td", *table_cell__(table, y, x)); + const char *content = cell_to_text(table_cell__(table, y, x)); + + if (!strcmp(table->columns[x].heading, "_uuid")) { + fputs(" \n", stdout); + } else { + table_print_html_cell__("td", content); + } } fputs(" \n", stdout); } @@ -500,8 +650,17 @@ table_print_csv_cell__(const char *content) static void table_print_csv__(const struct table *table) { + static int n = 0; size_t x, y; + if (n++ > 0) { + putchar('\n'); + } + + if (table->caption) { + puts(table->caption); + } + if (output_headings) { for (x = 0; x < table->n_columns; x++) { const struct column *column = &table->columns[x]; @@ -518,12 +677,52 @@ table_print_csv__(const struct table *table) if (x) { putchar(','); } - table_print_csv_cell__(*table_cell__(table, y, x)); + table_print_csv_cell__(cell_to_text(table_cell__(table, y, x))); } putchar('\n'); } } +static void +table_print_json__(const struct table *table) +{ + struct json *json, *headings, *data; + size_t x, y; + char *s; + + json = json_object_create(); + if (table->caption) { + json_object_put_string(json, "caption", table->caption); + } + + headings = json_array_create_empty(); + for (x = 0; x < table->n_columns; x++) { + const struct column *column = &table->columns[x]; + json_array_add(headings, json_string_create(column->heading)); + } + json_object_put(json, "headings", headings); + + data = json_array_create_empty(); + for (y = 0; y < table->n_rows; y++) { + struct json *row = json_array_create_empty(); + for (x = 0; x < table->n_columns; x++) { + const struct cell *cell = table_cell__(table, y, x); + if (cell->text) { + json_array_add(row, json_string_create(cell->text)); + } else { + json_array_add(row, json_clone(cell->json)); + } + } + json_array_add(data, row); + } + json_object_put(json, "data", data); + + s = json_to_string(json, json_flags); + json_destroy(json); + puts(s); + free(s); +} + static void table_print(const struct table *table) { @@ -539,57 +738,95 @@ table_print(const struct table *table) case FMT_CSV: table_print_csv__(table); break; + + case FMT_JSON: + table_print_json__(table); + break; } } static void -do_get_schema(int argc UNUSED, char *argv[]) +do_list_dbs(int argc OVS_UNUSED, char *argv[]) { - struct ovsdb_schema *schema = fetch_schema(argv[1]); + struct jsonrpc_msg *request, *reply; + struct jsonrpc *rpc; + int error; + size_t i; + + rpc = open_jsonrpc(argv[1]); + request = jsonrpc_create_request("list_dbs", json_array_create_empty(), + NULL); + error = jsonrpc_transact_block(rpc, request, &reply); + if (error) { + ovs_fatal(error, "transaction failed"); + } + + if (reply->result->type != JSON_ARRAY) { + ovs_fatal(0, "list_dbs response is not array"); + } + + for (i = 0; i < reply->result->u.array.n; i++) { + 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); + } + puts(name->u.string); + } + jsonrpc_msg_destroy(reply); +} + +static void +do_get_schema(int argc OVS_UNUSED, char *argv[]) +{ + struct ovsdb_schema *schema = fetch_schema(argv[1], argv[2]); print_and_free_json(ovsdb_schema_to_json(schema)); ovsdb_schema_destroy(schema); } static void -do_list_tables(int argc UNUSED, char *argv[]) +do_get_schema_version(int argc OVS_UNUSED, char *argv[]) +{ + struct ovsdb_schema *schema = fetch_schema(argv[1], argv[2]); + puts(schema->version); + ovsdb_schema_destroy(schema); +} + +static void +do_list_tables(int argc OVS_UNUSED, char *argv[]) { struct ovsdb_schema *schema; struct shash_node *node; struct table t; - schema = fetch_schema(argv[1]); + schema = fetch_schema(argv[1], argv[2]); table_init(&t); table_add_column(&t, "Table"); - table_add_column(&t, "Comment"); SHASH_FOR_EACH (node, &schema->tables) { struct ovsdb_table_schema *ts = node->data; table_add_row(&t); - table_add_cell(&t, ts->name); - if (ts->comment) { - table_add_cell(&t, ts->comment); - } + table_add_cell(&t)->text = xstrdup(ts->name); } ovsdb_schema_destroy(schema); table_print(&t); } static void -do_list_columns(int argc UNUSED, char *argv[]) +do_list_columns(int argc OVS_UNUSED, char *argv[]) { - const char *table_name = argv[2]; + const char *table_name = argv[3]; struct ovsdb_schema *schema; struct shash_node *table_node; struct table t; - schema = fetch_schema(argv[1]); + schema = fetch_schema(argv[1], argv[2]); table_init(&t); if (!table_name) { table_add_column(&t, "Table"); } table_add_column(&t, "Column"); table_add_column(&t, "Type"); - table_add_column(&t, "Comment"); SHASH_FOR_EACH (table_node, &schema->tables) { struct ovsdb_table_schema *ts = table_node->data; @@ -597,20 +834,14 @@ do_list_columns(int argc UNUSED, char *argv[]) struct shash_node *column_node; SHASH_FOR_EACH (column_node, &ts->columns) { - struct ovsdb_column *column = column_node->data; - struct json *type = ovsdb_type_to_json(&column->type); + const struct ovsdb_column *column = column_node->data; table_add_row(&t); if (!table_name) { - table_add_cell(&t, ts->name); + table_add_cell(&t)->text = xstrdup(ts->name); } - table_add_cell(&t, column->name); - table_add_cell_nocopy(&t, json_to_string(type, JSSF_SORT)); - if (column->comment) { - table_add_cell(&t, column->comment); - } - - json_destroy(type); + table_add_cell(&t)->text = xstrdup(column->name); + table_add_cell(&t)->json = ovsdb_type_to_json(&column->type); } } } @@ -619,7 +850,7 @@ do_list_columns(int argc UNUSED, char *argv[]) } static void -do_transact(int argc UNUSED, char *argv[]) +do_transact(int argc OVS_UNUSED, char *argv[]) { struct jsonrpc_msg *request, *reply; struct json *transaction; @@ -629,14 +860,14 @@ do_transact(int argc UNUSED, char *argv[]) transaction = parse_json(argv[2]); rpc = open_jsonrpc(argv[1]); - request = jsonrpc_create_request("transact", transaction); + request = jsonrpc_create_request("transact", transaction, NULL); error = jsonrpc_transact_block(rpc, request, &reply); if (error) { ovs_fatal(error, "transaction failed"); } if (reply->error) { ovs_fatal(error, "transaction returned error: %s", - json_to_string(reply->error, JSSF_SORT)); + json_to_string(reply->error, json_flags)); } print_json(reply->result); putchar('\n'); @@ -659,15 +890,15 @@ monitor_print_row(struct json *row, const char *type, const char *uuid, } table_add_row(t); - table_add_cell(t, uuid); - table_add_cell(t, type); + table_add_cell(t)->text = xstrdup(uuid); + table_add_cell(t)->text = xstrdup(type); for (i = 0; i < columns->n_columns; i++) { const struct ovsdb_column *column = columns->columns[i]; struct json *value = shash_find_data(json_object(row), column->name); + struct cell *cell = table_add_cell(t); if (value) { - table_add_cell_nocopy(t, json_to_string(value, JSSF_SORT)); - } else { - table_add_cell(t, ""); + cell->json = json_clone(value); + cell->type = &column->type; } } } @@ -728,74 +959,134 @@ monitor_print(struct json *table_updates, } static void -do_monitor(int argc, char *argv[]) +add_column(const char *server, const struct ovsdb_column *column, + struct ovsdb_column_set *columns, struct json *columns_json) { - struct ovsdb_column_set columns = OVSDB_COLUMN_SET_INITIALIZER; - struct ovsdb_table_schema *table; - struct ovsdb_schema *schema; - struct jsonrpc_msg *request; - struct jsonrpc *rpc; - struct json *select, *monitor, *monitor_request, *monitor_requests, - *request_id; - - rpc = open_jsonrpc(argv[1]); - - schema = fetch_schema_from_rpc(rpc); - table = shash_find_data(&schema->tables, argv[2]); - if (!table) { - ovs_fatal(0, "%s: no table named \"%s\"", argv[1], argv[2]); + if (ovsdb_column_set_contains(columns, column->index)) { + ovs_fatal(0, "%s: column \"%s\" mentioned multiple times", + server, column->name); } + ovsdb_column_set_add(columns, column); + json_array_add(columns_json, json_string_create(column->name)); +} - if (argc >= 4 && *argv[3] != '\0') { - char *save_ptr = NULL; - char *token; - - for (token = strtok_r(argv[3], ",", &save_ptr); token != NULL; - token = strtok_r(NULL, ",", &save_ptr)) { +static struct json * +parse_monitor_columns(char *arg, const char *server, const char *database, + const struct ovsdb_table_schema *table, + struct ovsdb_column_set *columns) +{ + bool initial, insert, delete, modify; + struct json *mr, *columns_json; + char *save_ptr = NULL; + char *token; + + mr = json_object_create(); + columns_json = json_array_create_empty(); + json_object_put(mr, "columns", columns_json); + + initial = insert = delete = modify = true; + for (token = strtok_r(arg, ",", &save_ptr); token != NULL; + token = strtok_r(NULL, ",", &save_ptr)) { + if (!strcmp(token, "!initial")) { + initial = false; + } else if (!strcmp(token, "!insert")) { + insert = false; + } else if (!strcmp(token, "!delete")) { + delete = false; + } else if (!strcmp(token, "!modify")) { + modify = false; + } else { const struct ovsdb_column *column; + column = ovsdb_table_schema_get_column(table, token); if (!column) { - ovs_fatal(0, "%s: table \"%s\" does not have a " - "column named \"%s\"", argv[1], argv[2], token); + ovs_fatal(0, "%s: table \"%s\" in %s does not have a " + "column named \"%s\"", + server, table->name, database, token); } - ovsdb_column_set_add(&columns, column); + add_column(server, column, columns, columns_json); } - } else { - struct shash_node *node; + } - SHASH_FOR_EACH (node, &table->columns) { - const struct ovsdb_column *column = node->data; - if (column->index != OVSDB_COL_UUID) { - ovsdb_column_set_add(&columns, column); + if (columns_json->u.array.n == 0) { + const struct shash_node **nodes; + size_t i, n; + + n = shash_count(&table->columns); + nodes = shash_sort(&table->columns); + for (i = 0; i < n; i++) { + const struct ovsdb_column *column = nodes[i]->data; + if (column->index != OVSDB_COL_UUID + && column->index != OVSDB_COL_VERSION) { + add_column(server, column, columns, columns_json); } } + free(nodes); + + add_column(server, ovsdb_table_schema_get_column(table,"_version"), + columns, columns_json); } - if (argc >= 5 && *argv[4] != '\0') { - char *save_ptr = NULL; - char *token; + if (!initial || !insert || !delete || !modify) { + struct json *select = json_object_create(); + json_object_put(select, "initial", json_boolean_create(initial)); + json_object_put(select, "insert", json_boolean_create(insert)); + json_object_put(select, "delete", json_boolean_create(delete)); + json_object_put(select, "modify", json_boolean_create(modify)); + json_object_put(mr, "select", select); + } - select = json_object_create(); - for (token = strtok_r(argv[4], ",", &save_ptr); token != NULL; - token = strtok_r(NULL, ",", &save_ptr)) { - json_object_put(select, token, json_boolean_create(true)); - } - } else { - select = NULL; + return mr; +} + +static void +do_monitor(int argc, char *argv[]) +{ + const char *server = argv[1]; + const char *database = argv[2]; + const char *table_name = argv[3]; + struct ovsdb_column_set columns = OVSDB_COLUMN_SET_INITIALIZER; + struct ovsdb_table_schema *table; + struct ovsdb_schema *schema; + struct jsonrpc_msg *request; + struct jsonrpc *rpc; + struct json *monitor, *monitor_request_array, + *monitor_requests, *request_id; + + rpc = open_jsonrpc(server); + + schema = fetch_schema_from_rpc(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); } - monitor_request = json_object_create(); - json_object_put(monitor_request, - "columns", ovsdb_column_set_to_json(&columns)); - if (select) { - json_object_put(monitor_request, "select", select); + monitor_request_array = json_array_create_empty(); + if (argc > 4) { + int i; + + for (i = 4; i < argc; i++) { + json_array_add( + monitor_request_array, + parse_monitor_columns(argv[i], server, database, table, + &columns)); + } + } else { + /* 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)); } monitor_requests = json_object_create(); - json_object_put(monitor_requests, argv[2], monitor_request); + json_object_put(monitor_requests, table_name, monitor_request_array); - monitor = json_array_create_2(json_null_create(), monitor_requests); - request = jsonrpc_create_request("monitor", monitor); + monitor = json_array_create_3(json_string_create(database), + json_null_create(), monitor_requests); + request = jsonrpc_create_request("monitor", monitor, NULL); request_id = json_clone(request->id); jsonrpc_send(rpc, request); for (;;) { @@ -804,7 +1095,8 @@ do_monitor(int argc, char *argv[]) error = jsonrpc_recv_block(rpc, &msg); if (error) { - ovs_fatal(error, "%s: receive failed", argv[1]); + ovsdb_schema_destroy(schema); + ovs_fatal(error, "%s: receive failed", server); } if (msg->type == JSONRPC_REQUEST && !strcmp(msg->method, "echo")) { @@ -813,6 +1105,15 @@ do_monitor(int argc, char *argv[]) } else if (msg->type == JSONRPC_REPLY && json_equal(msg->id, request_id)) { monitor_print(msg->result, table, &columns, true); + fflush(stdout); + if (get_detach()) { + /* daemonize() closes the standard file descriptors. We output + * to stdout, so we need to save and restore STDOUT_FILENO. */ + int fd = dup(STDOUT_FILENO); + daemonize(); + dup2(fd, STDOUT_FILENO); + close(fd); + } } else if (msg->type == JSONRPC_NOTIFY && !strcmp(msg->method, "update")) { struct json *params = msg->params; @@ -821,23 +1122,245 @@ do_monitor(int argc, char *argv[]) && params->u.array.elems[0]->type == JSON_NULL) { monitor_print(params->u.array.elems[1], table, &columns, false); + fflush(stdout); + } + } + jsonrpc_msg_destroy(msg); + } +} + +struct dump_table_aux { + struct ovsdb_datum **data; + const struct ovsdb_column **columns; + size_t n_columns; +}; + +static int +compare_data(size_t a_y, size_t b_y, size_t x, + const struct dump_table_aux *aux) +{ + return ovsdb_datum_compare_3way(&aux->data[a_y][x], + &aux->data[b_y][x], + &aux->columns[x]->type); +} + +static int +compare_rows(size_t a_y, size_t b_y, void *aux_) +{ + struct dump_table_aux *aux = aux_; + size_t x; + + /* Skip UUID columns on the first pass, since their values tend to be + * random and make our results less reproducible. */ + for (x = 0; x < aux->n_columns; x++) { + if (aux->columns[x]->type.key.type != OVSDB_TYPE_UUID) { + int cmp = compare_data(a_y, b_y, x, aux); + if (cmp) { + return cmp; + } + } + } + + /* Use UUID columns as tie-breakers. */ + for (x = 0; x < aux->n_columns; x++) { + if (aux->columns[x]->type.key.type == OVSDB_TYPE_UUID) { + int cmp = compare_data(a_y, b_y, x, aux); + if (cmp) { + return cmp; + } + } + } + + return 0; +} + +static void +swap_rows(size_t a_y, size_t b_y, void *aux_) +{ + struct dump_table_aux *aux = aux_; + struct ovsdb_datum *tmp = aux->data[a_y]; + aux->data[a_y] = aux->data[b_y]; + aux->data[b_y] = tmp; +} + +static int +compare_columns(const void *a_, const void *b_) +{ + const struct ovsdb_column *const *ap = a_; + const struct ovsdb_column *const *bp = b_; + const struct ovsdb_column *a = *ap; + const struct ovsdb_column *b = *bp; + + return strcmp(a->name, b->name); +} + +static void +dump_table(const struct ovsdb_table_schema *ts, struct json_array *rows) +{ + const struct ovsdb_column **columns; + size_t n_columns; + + struct ovsdb_datum **data; + + struct dump_table_aux aux; + struct shash_node *node; + struct table t; + size_t x, y; + + /* Sort columns by name, for reproducibility. */ + columns = xmalloc(shash_count(&ts->columns) * sizeof *columns); + n_columns = 0; + SHASH_FOR_EACH (node, &ts->columns) { + struct ovsdb_column *column = node->data; + if (strcmp(column->name, "_version")) { + columns[n_columns++] = column; + } + } + qsort(columns, n_columns, sizeof *columns, compare_columns); + + /* Extract data from table. */ + data = xmalloc(rows->n * sizeof *data); + for (y = 0; y < rows->n; y++) { + 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)); + } + row = json_object(rows->elems[y]); + + data[y] = xmalloc(n_columns * sizeof **data); + 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); } + + check_ovsdb_error(ovsdb_datum_from_json(&data[y][x], + &columns[x]->type, + json, NULL)); } } + + /* Sort rows by column values, for reproducibility. */ + aux.data = data; + aux.columns = columns; + aux.n_columns = n_columns; + sort(rows->n, compare_rows, swap_rows, &aux); + + /* Add column headings. */ + table_init(&t); + table_set_caption(&t, xasprintf("%s table", ts->name)); + for (x = 0; x < n_columns; x++) { + table_add_column(&t, "%s", columns[x]->name); + } + + /* Print rows. */ + for (y = 0; y < rows->n; y++) { + table_add_row(&t); + for (x = 0; x < n_columns; x++) { + struct cell *cell = table_add_cell(&t); + cell->json = ovsdb_datum_to_json(&data[y][x], &columns[x]->type); + cell->type = &columns[x]->type; + } + } + table_print(&t); + table_destroy(&t); +} + +static void +do_dump(int argc OVS_UNUSED, char *argv[]) +{ + const char *server = argv[1]; + const char *database = argv[2]; + + struct jsonrpc_msg *request, *reply; + struct ovsdb_schema *schema; + struct json *transaction; + struct jsonrpc *rpc; + int error; + + const struct shash_node **tables; + size_t n_tables; + + size_t i; + + rpc = open_jsonrpc(server); + + schema = fetch_schema_from_rpc(rpc, database); + 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; + + columns = json_array_create_empty(); + SHASH_FOR_EACH (node, &ts->columns) { + const struct ovsdb_column *column = node->data; + + if (strcmp(column->name, "_version")) { + json_array_add(columns, json_string_create(column->name)); + } + } + + op = json_object_create(); + 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_array_add(transaction, op); + } + + /* Send request, get reply. */ + request = jsonrpc_create_request("transact", transaction, NULL); + error = jsonrpc_transact_block(rpc, request, &reply); + if (error) { + ovs_fatal(error, "transaction failed"); + } + + /* 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", + n_tables, json_to_string(reply->result, 0)); + } + for (i = 0; i < n_tables; i++) { + const struct ovsdb_table_schema *ts = tables[i]->data; + const struct json *op_result = reply->result->u.array.elems[i]; + struct json *rows; + + if (op_result->type != JSON_OBJECT + || !(rows = shash_find_data(json_object(op_result), "rows")) + || rows->type != JSON_ARRAY) { + ovs_fatal(0, "%s table reply is not an object with a \"rows\" " + "member array: %s", + ts->name, json_to_string(op_result, 0)); + } + + dump_table(ts, &rows->u.array); + } } static void -do_help(int argc UNUSED, char *argv[] UNUSED) +do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { usage(); } static const struct command all_commands[] = { - { "get-schema", 1, 1, do_get_schema }, - { "list-tables", 1, 1, do_list_tables }, - { "list-columns", 1, 2, do_list_columns }, + { "list-dbs", 1, 1, do_list_dbs }, + { "get-schema", 2, 2, do_get_schema }, + { "get-schema-version", 2, 2, do_get_schema_version }, + { "list-tables", 2, 2, do_list_tables }, + { "list-columns", 2, 3, do_list_columns }, { "transact", 2, 2, do_transact }, - { "monitor", 2, 4, do_monitor }, + { "monitor", 3, INT_MAX, do_monitor }, + { "dump", 2, 2, do_dump }, { "help", 0, INT_MAX, do_help }, { NULL, 0, 0, NULL }, };
", stdout); + table_escape_html_text__(content, 8); + fputs("