X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fovsdb-tool.c;h=ecf998b38ff392a15e46ca9020247b24a62c5c42;hb=8a07709cb80462edb32fc11d056bfc08ce90f62d;hp=2754909908cc9f46e96cb9e73bfe35379ce5ebd4;hpb=400eb935f2d781494b13569863ce9637d18ddb1a;p=sliver-openvswitch.git diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c index 275490990..ecf998b38 100644 --- a/ovsdb/ovsdb-tool.c +++ b/ovsdb/ovsdb-tool.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,13 +22,17 @@ #include #include +#include "column.h" #include "command-line.h" #include "compiler.h" +#include "dirs.h" +#include "dynamic-string.h" #include "file.h" #include "lockfile.h" #include "log.h" #include "json.h" #include "ovsdb.h" +#include "ovsdb-data.h" #include "ovsdb-error.h" #include "socket-util.h" #include "table.h" @@ -46,6 +50,9 @@ static const struct command all_commands[]; static void usage(void) NO_RETURN; static void parse_options(int argc, char *argv[]); +static const char *default_db(void); +static const char *default_schema(void); + int main(int argc, char *argv[]) { @@ -60,11 +67,11 @@ static void parse_options(int argc, char *argv[]) { static struct option long_options[] = { - {"more", no_argument, 0, 'm'}, - {"verbose", optional_argument, 0, 'v'}, - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, - {0, 0, 0, 0}, + {"more", no_argument, NULL, 'm'}, + {"verbose", optional_argument, NULL, 'v'}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, + {NULL, 0, NULL, 0}, }; char *short_options = long_options_to_short_options(long_options); @@ -85,7 +92,7 @@ parse_options(int argc, char *argv[]) usage(); case 'V': - OVS_PRINT_VERSION(0, 0); + ovs_print_version(0, 0); exit(EXIT_SUCCESS); case 'v': @@ -107,17 +114,19 @@ usage(void) { printf("%s: Open vSwitch database management utility\n" "usage: %s [OPTIONS] COMMAND [ARG...]\n" - " create DB SCHEMA create DB with the given SCHEMA\n" - " compact DB [DST] compact DB in-place (or to DST)\n" - " convert DB SCHEMA [DST] convert DB to SCHEMA (to DST)\n" - " db-version DB report version of schema used by DB\n" - " db-cksum DB report checksum of schema used by DB\n" - " schema-version SCHEMA report SCHEMA's schema version\n" - " schema-cksum SCHEMA report SCHEMA's checksum\n" - " query DB TRNS execute read-only transaction on DB\n" - " transact DB TRNS execute read/write transaction on DB\n" - " show-log DB prints information about DB's log entries\n", - program_name, program_name); + " create [DB [SCHEMA]] create DB with the given SCHEMA\n" + " compact [DB [DST]] compact DB in-place (or to DST)\n" + " convert [DB [SCHEMA [DST]]] convert DB to SCHEMA (to DST)\n" + " db-version [DB] report version of schema used by DB\n" + " db-cksum [DB] report checksum of schema used by DB\n" + " schema-version [SCHEMA] report SCHEMA's schema version\n" + " schema-cksum [SCHEMA] report SCHEMA's checksum\n" + " query [DB] TRNS execute read-only transaction on DB\n" + " transact [DB] TRNS execute read/write transaction on DB\n" + " [-m]... show-log [DB] print DB's log entries\n" + "The default DB is %s.\n" + "The default SCHEMA is %s.\n", + program_name, program_name, default_db(), default_schema()); vlog_usage(); printf("\nOther options:\n" " -m, --more increase show-log verbosity\n" @@ -125,6 +134,26 @@ usage(void) " -V, --version display version information\n"); exit(EXIT_SUCCESS); } + +static const char * +default_db(void) +{ + static char *db; + if (!db) { + db = xasprintf("%s/conf.db", ovs_sysconfdir()); + } + return db; +} + +static const char * +default_schema(void) +{ + static char *schema; + if (!schema) { + schema = xasprintf("%s/vswitch.ovsschema", ovs_pkgdatadir()); + } + return schema; +} static struct json * parse_json(const char *s) @@ -154,10 +183,10 @@ check_ovsdb_error(struct ovsdb_error *error) } static void -do_create(int argc OVS_UNUSED, char *argv[]) +do_create(int argc, char *argv[]) { - const char *db_file_name = argv[1]; - const char *schema_file_name = argv[2]; + const char *db_file_name = argc >= 2 ? argv[1] : default_db(); + const char *schema_file_name = argc >= 3 ? argv[2] : default_schema(); struct ovsdb_schema *schema; struct ovsdb_log *log; struct json *json; @@ -226,28 +255,33 @@ compact_or_convert(const char *src_name, const char *dst_name, } static void -do_compact(int argc OVS_UNUSED, char *argv[]) +do_compact(int argc, char *argv[]) { - compact_or_convert(argv[1], argv[2], NULL, "compacted by ovsdb-tool"); + const char *db = argc >= 2 ? argv[1] : default_db(); + const char *target = argc >= 3 ? argv[2] : NULL; + + compact_or_convert(db, target, NULL, "compacted by ovsdb-tool "VERSION); } static void -do_convert(int argc OVS_UNUSED, char *argv[]) +do_convert(int argc, char *argv[]) { - const char *schema_file_name = argv[2]; + const char *db = argc >= 2 ? argv[1] : default_db(); + const char *schema = argc >= 3 ? argv[2] : default_schema(); + const char *target = argc >= 4 ? argv[3] : NULL; struct ovsdb_schema *new_schema; - check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &new_schema)); - compact_or_convert(argv[1], argv[3], new_schema, - "converted by ovsdb-tool"); + check_ovsdb_error(ovsdb_schema_from_file(schema, &new_schema)); + compact_or_convert(db, target, new_schema, + "converted by ovsdb-tool "VERSION); ovsdb_schema_destroy(new_schema); } static void -do_needs_conversion(int argc OVS_UNUSED, char *argv[]) +do_needs_conversion(int argc, char *argv[]) { - const char *db_file_name = argv[1]; - const char *schema_file_name = argv[2]; + const char *db_file_name = argc >= 2 ? argv[1] : default_db(); + const char *schema_file_name = argc >= 3 ? argv[2] : default_schema(); struct ovsdb_schema *schema1, *schema2; check_ovsdb_error(ovsdb_file_read_schema(db_file_name, &schema1)); @@ -258,9 +292,9 @@ do_needs_conversion(int argc OVS_UNUSED, char *argv[]) } static void -do_db_version(int argc OVS_UNUSED, char *argv[]) +do_db_version(int argc, char *argv[]) { - const char *db_file_name = argv[1]; + const char *db_file_name = argc >= 2 ? argv[1] : default_db(); struct ovsdb_schema *schema; check_ovsdb_error(ovsdb_file_read_schema(db_file_name, &schema)); @@ -271,7 +305,7 @@ do_db_version(int argc OVS_UNUSED, char *argv[]) static void do_db_cksum(int argc OVS_UNUSED, char *argv[]) { - const char *db_file_name = argv[1]; + const char *db_file_name = argc >= 2 ? argv[1] : default_db(); struct ovsdb_schema *schema; check_ovsdb_error(ovsdb_file_read_schema(db_file_name, &schema)); @@ -280,9 +314,9 @@ do_db_cksum(int argc OVS_UNUSED, char *argv[]) } static void -do_schema_version(int argc OVS_UNUSED, char *argv[]) +do_schema_version(int argc, char *argv[]) { - const char *schema_file_name = argv[1]; + const char *schema_file_name = argc >= 2 ? argv[1] : default_schema(); struct ovsdb_schema *schema; check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &schema)); @@ -291,9 +325,9 @@ do_schema_version(int argc OVS_UNUSED, char *argv[]) } static void -do_schema_cksum(int argc OVS_UNUSED, char *argv[]) +do_schema_cksum(int argc, char *argv[]) { - const char *schema_file_name = argv[1]; + const char *schema_file_name = argc >= 2 ? argv[1] : default_schema(); struct ovsdb_schema *schema; check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &schema)); @@ -302,15 +336,17 @@ do_schema_cksum(int argc OVS_UNUSED, char *argv[]) } static void -transact(bool read_only, const char *db_file_name, const char *transaction) +transact(bool read_only, int argc, char *argv[]) { + const char *db_file_name = argc >= 3 ? argv[1] : default_db(); + const char *transaction = argv[argc - 1]; struct json *request, *result; struct ovsdb *db; check_ovsdb_error(ovsdb_file_open(db_file_name, read_only, &db, NULL)); request = parse_json(transaction); - result = ovsdb_execute(db, request, 0, NULL); + result = ovsdb_execute(db, NULL, request, 0, NULL); json_destroy(request); print_and_free_json(result); @@ -318,24 +354,26 @@ transact(bool read_only, const char *db_file_name, const char *transaction) } static void -do_query(int argc OVS_UNUSED, char *argv[]) +do_query(int argc, char *argv[]) { - transact(true, argv[1], argv[2]); + transact(true, argc, argv); } static void -do_transact(int argc OVS_UNUSED, char *argv[]) +do_transact(int argc, char *argv[]) { - transact(false, argv[1], argv[2]); + transact(false, argc, argv); } static void -print_db_changes(struct shash *tables, struct shash *names) +print_db_changes(struct shash *tables, struct shash *names, + const struct ovsdb_schema *schema) { struct shash_node *n1; SHASH_FOR_EACH (n1, tables) { const char *table = n1->name; + struct ovsdb_table_schema *table_schema; struct json *rows = n1->data; struct shash_node *n2; @@ -343,6 +381,7 @@ print_db_changes(struct shash *tables, struct shash *names) continue; } + table_schema = shash_find_data(&schema->tables, table); SHASH_FOR_EACH (n2, json_object(rows)) { const char *row_uuid = n2->name; struct json *columns = n2->data; @@ -365,22 +404,45 @@ print_db_changes(struct shash *tables, struct shash *names) if (!old_name) { if (new_name) { - printf(" insert row %s:\n", new_name); + printf(" insert row %s (%.8s):\n", new_name, row_uuid); } else { printf(" insert row %.8s:\n", row_uuid); } } else { - printf(" row %s:\n", old_name); + printf(" row %s (%.8s):\n", old_name, row_uuid); } if (columns->type == JSON_OBJECT) { if (show_log_verbosity > 1) { SHASH_FOR_EACH (n3, json_object(columns)) { const char *column = n3->name; + const struct ovsdb_column *column_schema; struct json *value = n3->data; - char *value_string; - - value_string = json_to_string(value, JSSF_SORT); + char *value_string = NULL; + + column_schema = + (table_schema + ? shash_find_data(&table_schema->columns, column) + : NULL); + if (column_schema) { + const struct ovsdb_error *error; + const struct ovsdb_type *type; + struct ovsdb_datum datum; + + type = &column_schema->type; + error = ovsdb_datum_from_json(&datum, type, + value, NULL); + if (!error) { + struct ds s; + + ds_init(&s); + ovsdb_datum_to_string(&datum, type, &s); + value_string = ds_steal_cstr(&s); + } + } + if (!value_string) { + value_string = json_to_string(value, JSSF_SORT); + } printf("\t\t%s=%s\n", column, value_string); free(value_string); } @@ -414,16 +476,18 @@ print_db_changes(struct shash *tables, struct shash *names) } static void -do_show_log(int argc OVS_UNUSED, char *argv[]) +do_show_log(int argc, char *argv[]) { - const char *db_file_name = argv[1]; + const char *db_file_name = argc >= 2 ? argv[1] : default_db(); struct shash names; struct ovsdb_log *log; + struct ovsdb_schema *schema; unsigned int i; check_ovsdb_error(ovsdb_log_open(db_file_name, OVSDB_LOG_READ_ONLY, -1, &log)); shash_init(&names); + schema = NULL; for (i = 0; ; i++) { struct json *json; @@ -433,7 +497,11 @@ do_show_log(int argc OVS_UNUSED, char *argv[]) } printf("record %u:", i); - if (json->type == JSON_OBJECT) { + if (i == 0) { + check_ovsdb_error(ovsdb_schema_from_json(json, &schema)); + printf(" \"%s\" schema, version=\"%s\", cksum=\"%s\"\n", + schema->name, schema->version, schema->cksum); + } else if (json->type == JSON_OBJECT) { struct json *date, *comment; date = shash_find_data(json_object(json), "_date"); @@ -452,7 +520,7 @@ do_show_log(int argc OVS_UNUSED, char *argv[]) if (i > 0 && show_log_verbosity > 0) { putchar('\n'); - print_db_changes(json_object(json), &names); + print_db_changes(json_object(json), &names, schema); } } json_destroy(json); @@ -460,6 +528,7 @@ do_show_log(int argc OVS_UNUSED, char *argv[]) } ovsdb_log_close(log); + ovsdb_schema_destroy(schema); /* XXX free 'names'. */ } @@ -470,17 +539,17 @@ do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) } static const struct command all_commands[] = { - { "create", 2, 2, do_create }, - { "compact", 1, 2, do_compact }, - { "convert", 2, 3, do_convert }, - { "needs-conversion", 2, 2, do_needs_conversion }, - { "db-version", 1, 1, do_db_version }, - { "db-cksum", 1, 1, do_db_cksum }, - { "schema-version", 1, 1, do_schema_version }, - { "schema-cksum", 1, 1, do_schema_cksum }, - { "query", 2, 2, do_query }, - { "transact", 2, 2, do_transact }, - { "show-log", 1, 1, do_show_log }, + { "create", 0, 2, do_create }, + { "compact", 0, 2, do_compact }, + { "convert", 0, 3, do_convert }, + { "needs-conversion", 0, 2, do_needs_conversion }, + { "db-version", 0, 1, do_db_version }, + { "db-cksum", 0, 1, do_db_cksum }, + { "schema-version", 0, 1, do_schema_version }, + { "schema-cksum", 0, 1, do_schema_cksum }, + { "query", 1, 2, do_query }, + { "transact", 1, 2, do_transact }, + { "show-log", 0, 1, do_show_log }, { "help", 0, INT_MAX, do_help }, { NULL, 0, 0, NULL }, };