X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=940866449f6180be9301920e0f10c98a869374d8;hb=09913dfd259ae81dee6c944db1b92e9722f17667;hp=b7577a019cfd64dc622e5d55368f1ede1170bb9e;hpb=e89e5374bebd6ae00098ce40511a36daa09fc77e;p=sliver-openvswitch.git diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index b7577a019..940866449 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -41,9 +41,9 @@ #include "vswitchd/vswitch-idl.h" #include "timeval.h" #include "util.h" - #include "vlog.h" -#define THIS_MODULE VLM_vsctl + +VLOG_DEFINE_THIS_MODULE(vsctl) /* vsctl_fatal() also logs the error, so it is preferred in this file. */ #define ovs_fatal please_use_vsctl_fatal_instead_of_ovs_fatal @@ -59,6 +59,7 @@ struct vsctl_command_syntax { vsctl_handler_func *run; vsctl_handler_func *postprocess; const char *options; + enum { RO, RW } mode; /* Does this command modify the database? */ }; struct vsctl_command { @@ -85,7 +86,7 @@ static bool dry_run; static bool wait_for_reload = true; /* --timeout: Time to wait for a connection to 'db'. */ -static int timeout = 5; +static int timeout; /* All supported commands. */ static const struct vsctl_command_syntax all_commands[]; @@ -101,10 +102,12 @@ static void vsctl_fatal(const char *, ...) PRINTF_FORMAT(1, 2) NO_RETURN; static char *default_db(void); static void usage(void) NO_RETURN; static void parse_options(int argc, char *argv[]); +static bool might_write_to_db(char **argv); static struct vsctl_command *parse_commands(int argc, char *argv[], size_t *n_commandsp); static void parse_command(int argc, char *argv[], struct vsctl_command *); +static const struct vsctl_command_syntax *find_command(const char *name); static void do_vsctl(const char *args, struct vsctl_command *, size_t n_commands, struct ovsdb_idl *); @@ -114,10 +117,10 @@ static void set_column(const struct vsctl_table_class *, const struct ovsdb_idl_row *, const char *arg, struct ovsdb_symbol_table *); - int main(int argc, char *argv[]) { + extern struct vlog_module VLM_reconnect; struct ovsdb_idl *idl; struct vsctl_command *commands; size_t n_commands; @@ -125,15 +128,13 @@ main(int argc, char *argv[]) set_program_name(argv[0]); signal(SIGPIPE, SIG_IGN); - time_init(); - vlog_init(); - vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_WARN); - vlog_set_levels(VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN); + vlog_set_levels(NULL, VLF_CONSOLE, VLL_WARN); + vlog_set_levels(&VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN); ovsrec_init(); /* Log our arguments. This is often valuable for debugging systems. */ args = process_escape_args(argv); - VLOG_INFO("Called as %s", args); + VLOG(might_write_to_db(argv) ? VLL_INFO : VLL_DBG, "Called as %s", args); /* Parse command line. */ parse_options(argc, argv); @@ -183,12 +184,16 @@ parse_options(int argc, char *argv[]) #endif {0, 0, 0, 0}, }; + char *tmp, *short_options; + tmp = long_options_to_short_options(long_options); + short_options = xasprintf("+%s", tmp); + free(tmp); for (;;) { int c; - c = getopt_long(argc, argv, "+v::hVt:", long_options, NULL); + c = getopt_long(argc, argv, short_options, long_options, NULL); if (c == -1) { break; } @@ -203,7 +208,7 @@ parse_options(int argc, char *argv[]) break; case OPT_NO_SYSLOG: - vlog_set_levels(VLM_vsctl, VLF_SYSLOG, VLL_WARN); + vlog_set_levels(&VLM_vsctl, VLF_SYSLOG, VLL_WARN); break; case OPT_NO_WAIT: @@ -246,6 +251,7 @@ parse_options(int argc, char *argv[]) abort(); } } + free(short_options); if (!db) { db = default_db(); @@ -291,6 +297,8 @@ static void parse_command(int argc, char *argv[], struct vsctl_command *command) { const struct vsctl_command_syntax *p; + struct shash_node *node; + int n_arg; int i; shash_init(&command->options); @@ -321,58 +329,71 @@ parse_command(int argc, char *argv[], struct vsctl_command *command) vsctl_fatal("missing command name"); } - for (p = all_commands; p->name; p++) { - if (!strcmp(p->name, argv[i])) { - struct shash_node *node; - int n_arg; + p = find_command(argv[i]); + if (!p) { + vsctl_fatal("unknown command '%s'; use --help for help", argv[i]); + } - SHASH_FOR_EACH (node, &command->options) { - const char *s = strstr(p->options, node->name); - int end = s ? s[strlen(node->name)] : EOF; + SHASH_FOR_EACH (node, &command->options) { + const char *s = strstr(p->options, node->name); + int end = s ? s[strlen(node->name)] : EOF; - if (end != '=' && end != ',' && end != ' ' && end != '\0') { - vsctl_fatal("'%s' command has no '%s' option", - argv[i], node->name); - } - if ((end == '=') != (node->data != NULL)) { - if (end == '=') { - vsctl_fatal("missing argument to '%s' option on '%s' " - "command", node->name, argv[i]); - } else { - vsctl_fatal("'%s' option on '%s' does not accept an " - "argument", node->name, argv[i]); - } - } + if (end != '=' && end != ',' && end != ' ' && end != '\0') { + vsctl_fatal("'%s' command has no '%s' option", + argv[i], node->name); + } + if ((end == '=') != (node->data != NULL)) { + if (end == '=') { + vsctl_fatal("missing argument to '%s' option on '%s' " + "command", node->name, argv[i]); + } else { + vsctl_fatal("'%s' option on '%s' does not accept an " + "argument", node->name, argv[i]); } + } + } - n_arg = argc - i - 1; - if (n_arg < p->min_args) { - vsctl_fatal("'%s' command requires at least %d arguments", - p->name, p->min_args); - } else if (n_arg > p->max_args) { - int j; - - for (j = i + 1; j < argc; j++) { - if (argv[j][0] == '-') { - vsctl_fatal("'%s' command takes at most %d arguments " - "(note that options must precede command " - "names and follow a \"--\" argument)", - p->name, p->max_args); - } - } + n_arg = argc - i - 1; + if (n_arg < p->min_args) { + vsctl_fatal("'%s' command requires at least %d arguments", + p->name, p->min_args); + } else if (n_arg > p->max_args) { + int j; - vsctl_fatal("'%s' command takes at most %d arguments", + for (j = i + 1; j < argc; j++) { + if (argv[j][0] == '-') { + vsctl_fatal("'%s' command takes at most %d arguments " + "(note that options must precede command " + "names and follow a \"--\" argument)", p->name, p->max_args); - } else { - command->syntax = p; - command->argc = n_arg + 1; - command->argv = &argv[i]; - return; } } + + vsctl_fatal("'%s' command takes at most %d arguments", + p->name, p->max_args); } - vsctl_fatal("unknown command '%s'; use --help for help", argv[i]); + command->syntax = p; + command->argc = n_arg + 1; + command->argv = &argv[i]; +} + +/* Returns the "struct vsctl_command_syntax" for a given command 'name', or a + * null pointer if there is none. */ +static const struct vsctl_command_syntax * +find_command(const char *name) +{ + static struct shash commands = SHASH_INITIALIZER(&commands); + + if (shash_is_empty(&commands)) { + const struct vsctl_command_syntax *p; + + for (p = all_commands; p->name; p++) { + shash_add_assert(&commands, p->name, p); + } + } + + return shash_find_data(&commands, name); } static void @@ -385,7 +406,7 @@ vsctl_fatal(const char *format, ...) message = xvasprintf(format, args); va_end(args); - vlog_set_levels(VLM_vsctl, VLF_CONSOLE, VLL_EMER); + vlog_set_levels(&VLM_vsctl, VLF_CONSOLE, VLL_EMER); VLOG_ERR("%s", message); ovs_error(0, "%s", message); vsctl_exit(EXIT_FAILURE); @@ -441,12 +462,12 @@ Interface commands (a bond consists of multiple interfaces):\n\ iface-to-br IFACE print name of bridge that contains IFACE\n\ \n\ Controller commands:\n\ - get-controller [BRIDGE] print the controller for BRIDGE\n\ - del-controller [BRIDGE] delete the controller for BRIDGE\n\ - set-controller [BRIDGE] TARGET set the controller for BRIDGE to TARGET\n\ - get-fail-mode [BRIDGE] print the fail-mode for BRIDGE\n\ - del-fail-mode [BRIDGE] delete the fail-mode for BRIDGE\n\ - set-fail-mode [BRIDGE] MODE set the fail-mode for BRIDGE to MODE\n\ + get-controller BRIDGE print the controller for BRIDGE\n\ + del-controller BRIDGE delete the controller for BRIDGE\n\ + set-controller BRIDGE TARGET set the controller for BRIDGE to TARGET\n\ + get-fail-mode BRIDGE print the fail-mode for BRIDGE\n\ + del-fail-mode BRIDGE delete the fail-mode for BRIDGE\n\ + set-fail-mode BRIDGE MODE set the fail-mode for BRIDGE to MODE\n\ \n\ SSL commands:\n\ get-ssl print the SSL configuration\n\ @@ -458,13 +479,14 @@ Switch commands:\n\ \n\ Database commands:\n\ list TBL [REC] list RECord (or all records) in TBL\n\ - get TBL REC COL[:KEY] print values of COLumns in RECORD in TBL\n\ + get TBL REC COL[:KEY] print values of COLumns in RECord in TBL\n\ set TBL REC COL[:KEY]=VALUE set COLumn values in RECord in TBL\n\ add TBL REC COL [KEY=]VALUE add (KEY=)VALUE to COLumn in RECord in TBL\n\ remove TBL REC COL [KEY=]VALUE remove (KEY=)VALUE from COLumn\n\ clear TBL REC COL clear values from COLumn in RECord in TBL\n\ create TBL COL[:KEY]=VALUE create and initialize new record\n\ - destroy TBL REC delete REC from TBL\n\ + destroy TBL REC delete RECord from TBL\n\ + wait-until TBL REC [COL[:KEY]=VALUE] wait until condition is true\n\ Potentially unsafe database commands require --force option.\n\ \n\ Options:\n\ @@ -489,6 +511,21 @@ default_db(void) } return def; } + +/* Returns true if it looks like this set of arguments might modify the + * database, otherwise false. (Not very smart, so it's prone to false + * positives.) */ +static bool +might_write_to_db(char **argv) +{ + for (; *argv; argv++) { + const struct vsctl_command_syntax *p = find_command(*argv); + if (p && p->mode == RW) { + return true; + } + } + return false; +} struct vsctl_context { /* Read-only. */ @@ -512,6 +549,7 @@ struct vsctl_bridge { struct ovsrec_bridge *br_cfg; char *name; struct ovsrec_controller **ctrl; + char *fail_mode; size_t n_ctrl; struct vsctl_bridge *parent; int vlan; @@ -531,8 +569,6 @@ struct vsctl_info { struct shash bridges; struct shash ports; struct shash ifaces; - struct ovsrec_controller **ctrl; - size_t n_ctrl; }; static char * @@ -572,9 +608,11 @@ add_bridge(struct vsctl_info *b, if (parent) { br->ctrl = parent->br_cfg->controller; br->n_ctrl = parent->br_cfg->n_controller; + br->fail_mode = parent->br_cfg->fail_mode; } else { br->ctrl = br_cfg->controller; br->n_ctrl = br_cfg->n_controller; + br->fail_mode = br_cfg->fail_mode; } shash_add(&b->bridges, br->name, br); return br; @@ -630,9 +668,6 @@ get_info(const struct ovsrec_open_vswitch *ovs, struct vsctl_info *info) shash_init(&info->ports); shash_init(&info->ifaces); - info->ctrl = ovs->controller; - info->n_ctrl = ovs->n_controller; - shash_init(&bridges); shash_init(&ports); for (i = 0; i < ovs->n_bridges; i++) { @@ -885,7 +920,6 @@ cmd_emer_reset(struct vsctl_context *ctx) /* Reset the Open_vSwitch table. */ ovsrec_open_vswitch_set_managers(ctx->ovs, NULL, 0); - ovsrec_open_vswitch_set_controller(ctx->ovs, NULL, 0); ovsrec_open_vswitch_set_ssl(ctx->ovs, NULL); OVSREC_BRIDGE_FOR_EACH (br, idl) { @@ -1303,12 +1337,11 @@ add_port(struct vsctl_context *ctx, get_info(ctx->ovs, &info); if (may_exist) { - struct vsctl_port *port; + struct vsctl_port *vsctl_port; - port = find_port(&info, port_name, false); - if (port) { + vsctl_port = find_port(&info, port_name, false); + if (vsctl_port) { struct svec want_names, have_names; - size_t i; svec_init(&want_names); for (i = 0; i < n_ifaces; i++) { @@ -1317,15 +1350,16 @@ add_port(struct vsctl_context *ctx, svec_sort(&want_names); svec_init(&have_names); - for (i = 0; i < port->port_cfg->n_interfaces; i++) { - svec_add(&have_names, port->port_cfg->interfaces[i]->name); + for (i = 0; i < vsctl_port->port_cfg->n_interfaces; i++) { + svec_add(&have_names, + vsctl_port->port_cfg->interfaces[i]->name); } svec_sort(&have_names); - if (strcmp(port->bridge->name, br_name)) { + if (strcmp(vsctl_port->bridge->name, br_name)) { char *command = vsctl_context_to_string(ctx); vsctl_fatal("\"%s\" but %s is actually attached to bridge %s", - command, port_name, port->bridge->name); + command, port_name, vsctl_port->bridge->name); } if (!svec_equal(&want_names, &have_names)) { @@ -1541,20 +1575,21 @@ cmd_iface_to_br(struct vsctl_context *ctx) free_info(&info); } -/* Print targets of the 'n_controllers' in 'controllers' on the output for - * 'ctx'. */ static void -print_controllers(struct vsctl_context *ctx, - struct ovsrec_controller **controllers, - size_t n_controllers) +cmd_get_controller(struct vsctl_context *ctx) { - /* Print the targets in sorted order for reproducibility. */ + struct vsctl_info info; + struct vsctl_bridge *br; struct svec targets; size_t i; + get_info(ctx->ovs, &info); + br = find_bridge(&info, ctx->argv[1], true); + + /* Print the targets in sorted order for reproducibility. */ svec_init(&targets); - for (i = 0; i < n_controllers; i++) { - svec_add(&targets, controllers[i]->target); + for (i = 0; i < br->n_ctrl; i++) { + svec_add(&targets, br->ctrl[i]->target); } svec_sort(&targets); @@ -1562,25 +1597,6 @@ print_controllers(struct vsctl_context *ctx, ds_put_format(&ctx->output, "%s\n", targets.names[i]); } svec_destroy(&targets); -} - -static void -cmd_get_controller(struct vsctl_context *ctx) -{ - struct vsctl_info info; - - get_info(ctx->ovs, &info); - - if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) { - print_controllers(ctx, info.ctrl, info.n_ctrl); - } else { - struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true); - if (br->n_ctrl) { - print_controllers(ctx, br->ctrl, br->n_ctrl); - } else { - print_controllers(ctx, info.ctrl, info.n_ctrl); - } - } free_info(&info); } @@ -1600,20 +1616,14 @@ static void cmd_del_controller(struct vsctl_context *ctx) { struct vsctl_info info; + struct vsctl_bridge *br; get_info(ctx->ovs, &info); + br = find_real_bridge(&info, ctx->argv[1], true); - if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) { - if (info.n_ctrl) { - delete_controllers(info.ctrl, info.n_ctrl); - ovsrec_open_vswitch_set_controller(ctx->ovs, NULL, 0); - } - } else { - struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); - if (br->ctrl) { - delete_controllers(br->ctrl, br->n_ctrl); - ovsrec_bridge_set_controller(br->br_cfg, NULL, 0); - } + if (br->ctrl) { + delete_controllers(br->ctrl, br->n_ctrl); + ovsrec_bridge_set_controller(br->br_cfg, NULL, 0); } free_info(&info); @@ -1634,123 +1644,53 @@ insert_controllers(struct ovsdb_idl_txn *txn, char *targets[], size_t n) return controllers; } -static void -set_default_controllers(struct vsctl_context *ctx, char *targets[], size_t n) -{ - struct ovsrec_controller **controllers; - - delete_controllers(ctx->ovs->controller, ctx->ovs->n_controller); - - controllers = insert_controllers(ctx->txn, targets, n); - ovsrec_open_vswitch_set_controller(ctx->ovs, controllers, n); - free(controllers); -} - static void cmd_set_controller(struct vsctl_context *ctx) { struct vsctl_info info; + struct vsctl_bridge *br; + struct ovsrec_controller **controllers; + size_t n; get_info(ctx->ovs, &info); + br = find_real_bridge(&info, ctx->argv[1], true); - if (ctx->argc == 2) { - /* Set one controller in the "Open_vSwitch" table. */ - set_default_controllers(ctx, &ctx->argv[1], 1); - } else if (!strcmp(ctx->argv[1], "default")) { - /* Set one or more controllers in the "Open_vSwitch" table. */ - set_default_controllers(ctx, &ctx->argv[2], ctx->argc - 2); - } else { - /* Set one or more controllers for a particular bridge. */ - struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); - struct ovsrec_controller **controllers; - size_t n; + delete_controllers(br->ctrl, br->n_ctrl); - delete_controllers(br->ctrl, br->n_ctrl); - - n = ctx->argc - 2; - controllers = insert_controllers(ctx->txn, &ctx->argv[2], n); - ovsrec_bridge_set_controller(br->br_cfg, controllers, n); - free(controllers); - } + n = ctx->argc - 2; + controllers = insert_controllers(ctx->txn, &ctx->argv[2], n); + ovsrec_bridge_set_controller(br->br_cfg, controllers, n); + free(controllers); free_info(&info); } -static const char * -get_fail_mode(struct ovsrec_controller **controllers, size_t n_controllers) -{ - const char *fail_mode; - size_t i; - - fail_mode = NULL; - for (i = 0; i < n_controllers; i++) { - const char *s = controllers[i]->fail_mode; - if (s) { - if (!strcmp(s, "secure")) { - return s; - } else { - fail_mode = s; - } - } - } - - return fail_mode; -} - static void cmd_get_fail_mode(struct vsctl_context *ctx) { struct vsctl_info info; - const char *fail_mode = NULL; + struct vsctl_bridge *br; get_info(ctx->ovs, &info); + br = find_bridge(&info, ctx->argv[1], true); - if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) { - /* Return the fail-mode from the "Open_vSwitch" table */ - fail_mode = get_fail_mode(info.ctrl, info.n_ctrl); - } else { - /* Return the fail-mode for a particular bridge. */ - struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true); - - /* If no controller is defined for the requested bridge, fallback to - * the "Open_vSwitch" table's controller. */ - fail_mode = (br->n_ctrl - ? get_fail_mode(br->ctrl, br->n_ctrl) - : get_fail_mode(info.ctrl, info.n_ctrl)); - } - - if (fail_mode && strlen(fail_mode)) { - ds_put_format(&ctx->output, "%s\n", fail_mode); + if (br->fail_mode && strlen(br->fail_mode)) { + ds_put_format(&ctx->output, "%s\n", br->fail_mode); } free_info(&info); } -static void -set_fail_mode(struct ovsrec_controller **controllers, size_t n_controllers, - const char *fail_mode) -{ - size_t i; - - for (i = 0; i < n_controllers; i++) { - ovsrec_controller_set_fail_mode(controllers[i], fail_mode); - } -} - static void cmd_del_fail_mode(struct vsctl_context *ctx) { struct vsctl_info info; + struct vsctl_bridge *br; get_info(ctx->ovs, &info); + br = find_real_bridge(&info, ctx->argv[1], true); - if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) { - set_fail_mode(info.ctrl, info.n_ctrl, NULL); - } else { - struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); - - set_fail_mode(br->ctrl, br->n_ctrl, NULL); - } + ovsrec_bridge_set_fail_mode(br->br_cfg, NULL); free_info(&info); } @@ -1759,37 +1699,17 @@ static void cmd_set_fail_mode(struct vsctl_context *ctx) { struct vsctl_info info; - const char *bridge; - const char *fail_mode; + struct vsctl_bridge *br; + const char *fail_mode = ctx->argv[2]; get_info(ctx->ovs, &info); - - if (ctx->argc == 2) { - bridge = "default"; - fail_mode = ctx->argv[1]; - } else { - bridge = ctx->argv[1]; - fail_mode = ctx->argv[2]; - } + br = find_real_bridge(&info, ctx->argv[1], true); if (strcmp(fail_mode, "standalone") && strcmp(fail_mode, "secure")) { vsctl_fatal("fail-mode must be \"standalone\" or \"secure\""); } - if (!strcmp(bridge, "default")) { - /* Set the fail-mode in the "Open_vSwitch" table. */ - if (!info.ctrl) { - vsctl_fatal("no controller declared"); - } - set_fail_mode(info.ctrl, info.n_ctrl, fail_mode); - } else { - struct vsctl_bridge *br = find_real_bridge(&info, bridge, true); - - if (!br->ctrl) { - vsctl_fatal("no controller declared for %s", br->name); - } - set_fail_mode(br->ctrl, br->n_ctrl, fail_mode); - } + ovsrec_bridge_set_fail_mode(br->br_cfg, fail_mode); free_info(&info); } @@ -1860,10 +1780,7 @@ static const struct vsctl_table_class tables[] = { {&ovsrec_table_controller, {{&ovsrec_table_bridge, &ovsrec_bridge_col_name, - &ovsrec_bridge_col_controller}, - {&ovsrec_table_open_vswitch, - NULL, - &ovsrec_open_vswitch_col_controller}}}, + &ovsrec_bridge_col_controller}}}, {&ovsrec_table_interface, {{&ovsrec_table_interface, &ovsrec_interface_col_name, NULL}, @@ -1985,34 +1902,23 @@ get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, } } else { const struct ovsdb_idl_row *row; - unsigned int best_score = 0; - - /* It might make sense to relax this assertion. */ - assert(id->name_column->type.key.type == OVSDB_TYPE_STRING); referrer = NULL; for (row = ovsdb_idl_first_row(ctx->idl, id->table); - row != NULL && best_score != UINT_MAX; + row != NULL; row = ovsdb_idl_next_row(row)) { - struct ovsdb_datum name; - - ovsdb_idl_txn_read(row, id->name_column, &name); - if (name.n == 1) { - unsigned int score = score_partial_match(name.keys[0].string, - record_id); - if (score > best_score) { - referrer = row; - best_score = score; - } else if (score == best_score) { - referrer = NULL; + const struct ovsdb_datum *name; + + name = ovsdb_idl_get(row, id->name_column, + OVSDB_TYPE_STRING, OVSDB_TYPE_VOID); + if (name->n == 1 && !strcmp(name->keys[0].string, record_id)) { + if (referrer) { + vsctl_fatal("multiple rows in %s match \"%s\"", + table->class->name, record_id); } + referrer = row; } - ovsdb_datum_destroy(&name, &id->name_column->type); - } - if (best_score && !referrer) { - vsctl_fatal("multiple rows in %s match \"%s\"", - table->class->name, record_id); } } if (!referrer) { @@ -2021,17 +1927,14 @@ get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, final = NULL; if (id->uuid_column) { - struct ovsdb_datum uuid; - - assert(id->uuid_column->type.key.type == OVSDB_TYPE_UUID); - assert(id->uuid_column->type.value.type == OVSDB_TYPE_VOID); + const struct ovsdb_datum *uuid; - ovsdb_idl_txn_read(referrer, id->uuid_column, &uuid); - if (uuid.n == 1) { + uuid = ovsdb_idl_get(referrer, id->uuid_column, + OVSDB_TYPE_UUID, OVSDB_TYPE_VOID); + if (uuid->n == 1) { final = ovsdb_idl_get_row_for_uuid(ctx->idl, table->class, - &uuid.keys[0].uuid); + &uuid->keys[0].uuid); } - ovsdb_datum_destroy(&uuid, &id->uuid_column->type); } else { final = referrer; } @@ -2040,8 +1943,8 @@ get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, } static const struct ovsdb_idl_row * -get_row(struct vsctl_context *ctx, - const struct vsctl_table_class *table, const char *record_id) +get_row (struct vsctl_context *ctx, + const struct vsctl_table_class *table, const char *record_id) { const struct ovsdb_idl_row *row; struct uuid uuid; @@ -2104,6 +2007,28 @@ get_column(const struct vsctl_table_class *table, const char *column_name, } } +static struct uuid * +create_symbol(struct ovsdb_symbol_table *symtab, const char *id, bool *newp) +{ + struct ovsdb_symbol *symbol; + + if (id[0] != '@') { + vsctl_fatal("row id \"%s\" does not begin with \"@\"", id); + } + + if (newp) { + *newp = ovsdb_symbol_table_get(symtab, id) == NULL; + } + + symbol = ovsdb_symbol_table_insert(symtab, id); + if (symbol->used) { + vsctl_fatal("row id \"%s\" may only be specified on one --id option", + id); + } + symbol->used = true; + return &symbol->uuid; +} + static char * missing_operator_error(const char *arg, const char **allowed_operators, size_t n_allowed) @@ -2224,7 +2149,7 @@ parse_column_key_value(const char *arg, const char *op = allowed_operators[i]; size_t op_len = strlen(op); - if (op_len > best_len && !strncmp(op, p, op_len)) { + if (op_len > best_len && !strncmp(op, p, op_len) && p[op_len]) { best_len = op_len; best = op; } @@ -2237,13 +2162,7 @@ parse_column_key_value(const char *arg, if (operatorp) { *operatorp = best; } - - p += best_len; - if (p[0] == '\0') { - error = missing_operator_error(arg, allowed_operators, n_allowed); - goto error; - } - *valuep = xstrdup(p); + *valuep = xstrdup(p + best_len); } else { if (valuep) { *valuep = NULL; @@ -2277,6 +2196,7 @@ error: static void cmd_get(struct vsctl_context *ctx) { + const char *id = shash_find_data(&ctx->options, "--id"); bool if_exists = shash_find(&ctx->options, "--if-exists"); const char *table_name = ctx->argv[1]; const char *record_id = ctx->argv[2]; @@ -2287,9 +2207,18 @@ cmd_get(struct vsctl_context *ctx) table = get_table(table_name); row = must_get_row(ctx, table, record_id); + if (id) { + bool new; + + *create_symbol(ctx->symtab, id, &new) = row->uuid; + if (!new) { + vsctl_fatal("row id \"%s\" specified on \"get\" command was used " + "before it was defined", id); + } + } for (i = 3; i < ctx->argc; i++) { const struct ovsdb_idl_column *column; - struct ovsdb_datum datum; + const struct ovsdb_datum *datum; char *key_string; /* Special case for obtaining the UUID of a row. We can't just do this @@ -2305,7 +2234,7 @@ cmd_get(struct vsctl_context *ctx) &column, &key_string, NULL, NULL, 0, NULL)); - ovsdb_idl_txn_read(row, column, &datum); + datum = ovsdb_idl_read(row, column); if (key_string) { union ovsdb_atom key; unsigned int idx; @@ -2319,7 +2248,7 @@ cmd_get(struct vsctl_context *ctx) &column->type.key, key_string, ctx->symtab)); - idx = ovsdb_datum_find_key(&datum, &key, + idx = ovsdb_datum_find_key(datum, &key, column->type.key.type); if (idx == UINT_MAX) { if (!if_exists) { @@ -2328,15 +2257,14 @@ cmd_get(struct vsctl_context *ctx) column->name); } } else { - ovsdb_atom_to_string(&datum.values[idx], + ovsdb_atom_to_string(&datum->values[idx], column->type.value.type, out); } ovsdb_atom_destroy(&key, column->type.key.type); } else { - ovsdb_datum_to_string(&datum, &column->type, out); + ovsdb_datum_to_string(datum, &column->type, out); } ds_put_char(out, '\n'); - ovsdb_datum_destroy(&datum, &column->type); free(key_string); } @@ -2352,15 +2280,13 @@ list_record(const struct vsctl_table_class *table, UUID_ARGS(&row->uuid)); for (i = 0; i < table->class->n_columns; i++) { const struct ovsdb_idl_column *column = &table->class->columns[i]; - struct ovsdb_datum datum; + const struct ovsdb_datum *datum; - ovsdb_idl_txn_read(row, column, &datum); + datum = ovsdb_idl_read(row, column); ds_put_format(out, "%-20s: ", column->name); - ovsdb_datum_to_string(&datum, &column->type, out); + ovsdb_datum_to_string(datum, &column->type, out); ds_put_char(out, '\n'); - - ovsdb_datum_destroy(&datum, &column->type); } } @@ -2413,7 +2339,7 @@ set_column(const struct vsctl_table_class *table, if (key_string) { union ovsdb_atom key, value; - struct ovsdb_datum old, new; + struct ovsdb_datum datum; if (column->type.value.type == OVSDB_TYPE_VOID) { vsctl_fatal("cannot specify key to set for non-map column %s", @@ -2425,17 +2351,15 @@ set_column(const struct vsctl_table_class *table, die_if_error(ovsdb_atom_from_string(&value, &column->type.value, value_string, symtab)); - ovsdb_datum_init_empty(&new); - ovsdb_datum_add_unsafe(&new, &key, &value, &column->type); + ovsdb_datum_init_empty(&datum); + ovsdb_datum_add_unsafe(&datum, &key, &value, &column->type); ovsdb_atom_destroy(&key, column->type.key.type); ovsdb_atom_destroy(&value, column->type.value.type); - ovsdb_idl_txn_read(row, column, &old); - ovsdb_datum_union(&old, &new, &column->type, true); - ovsdb_idl_txn_write(row, column, &old); - - ovsdb_datum_destroy(&new, &column->type); + ovsdb_datum_union(&datum, ovsdb_idl_read(row, column), + &column->type, false); + ovsdb_idl_txn_write(row, column, &datum); } else { struct ovsdb_datum datum; @@ -2482,7 +2406,7 @@ cmd_add(struct vsctl_context *ctx) die_if_error(get_column(table, column_name, &column)); type = &column->type; - ovsdb_idl_txn_read(row, column, &old); + ovsdb_datum_clone(&old, ovsdb_idl_read(row, column), &column->type); for (i = 4; i < ctx->argc; i++) { struct ovsdb_type add_type; struct ovsdb_datum add; @@ -2523,7 +2447,7 @@ cmd_remove(struct vsctl_context *ctx) die_if_error(get_column(table, column_name, &column)); type = &column->type; - ovsdb_idl_txn_read(row, column, &old); + ovsdb_datum_clone(&old, ovsdb_idl_read(row, column), &column->type); for (i = 4; i < ctx->argc; i++) { struct ovsdb_type rm_type; struct ovsdb_datum rm; @@ -2593,24 +2517,7 @@ cmd_create(struct vsctl_context *ctx) const struct uuid *uuid; int i; - if (id) { - struct ovsdb_symbol *symbol; - - if (id[0] != '@') { - vsctl_fatal("row id \"%s\" does not begin with \"@\"", id); - } - - symbol = ovsdb_symbol_table_insert(ctx->symtab, id); - if (symbol->used) { - vsctl_fatal("row id \"%s\" may only be used to insert a single " - "row", id); - } - symbol->used = true; - - uuid = &symbol->uuid; - } else { - uuid = NULL; - } + uuid = id ? create_symbol(ctx->symtab, id, NULL) : NULL; table = get_table(table_name); row = ovsdb_idl_txn_insert(ctx->txn, table->class, uuid); @@ -2662,6 +2569,104 @@ cmd_destroy(struct vsctl_context *ctx) } } } + +static bool +is_condition_satified(const struct vsctl_table_class *table, + const struct ovsdb_idl_row *row, const char *arg, + struct ovsdb_symbol_table *symtab) +{ + static const char *operators[] = { + "=", "!=", "<", ">", "<=", ">=" + }; + + const struct ovsdb_idl_column *column; + const struct ovsdb_datum *have_datum; + char *key_string, *value_string; + const char *operator; + unsigned int idx; + char *error; + int cmp = 0; + + error = parse_column_key_value(arg, table, &column, &key_string, + &operator, operators, ARRAY_SIZE(operators), + &value_string); + die_if_error(error); + if (!value_string) { + vsctl_fatal("%s: missing value", arg); + } + + have_datum = ovsdb_idl_read(row, column); + if (key_string) { + union ovsdb_atom want_key, want_value; + + if (column->type.value.type == OVSDB_TYPE_VOID) { + vsctl_fatal("cannot specify key to check for non-map column %s", + column->name); + } + + die_if_error(ovsdb_atom_from_string(&want_key, &column->type.key, + key_string, symtab)); + die_if_error(ovsdb_atom_from_string(&want_value, &column->type.value, + value_string, symtab)); + + idx = ovsdb_datum_find_key(have_datum, + &want_key, column->type.key.type); + if (idx != UINT_MAX) { + cmp = ovsdb_atom_compare_3way(&have_datum->values[idx], + &want_value, + column->type.value.type); + } + + ovsdb_atom_destroy(&want_key, column->type.key.type); + ovsdb_atom_destroy(&want_value, column->type.value.type); + } else { + struct ovsdb_datum want_datum; + + die_if_error(ovsdb_datum_from_string(&want_datum, &column->type, + value_string, symtab)); + idx = 0; + cmp = ovsdb_datum_compare_3way(have_datum, &want_datum, + &column->type); + ovsdb_datum_destroy(&want_datum, &column->type); + } + + free(key_string); + free(value_string); + + return (idx == UINT_MAX ? false + : !strcmp(operator, "=") ? cmp == 0 + : !strcmp(operator, "!=") ? cmp != 0 + : !strcmp(operator, "<") ? cmp < 0 + : !strcmp(operator, ">") ? cmp > 0 + : !strcmp(operator, "<=") ? cmp <= 0 + : !strcmp(operator, ">=") ? cmp >= 0 + : (abort(), 0)); +} + +static void +cmd_wait_until(struct vsctl_context *ctx) +{ + const char *table_name = ctx->argv[1]; + const char *record_id = ctx->argv[2]; + const struct vsctl_table_class *table; + const struct ovsdb_idl_row *row; + int i; + + table = get_table(table_name); + + row = get_row(ctx, table, record_id); + if (!row) { + ctx->try_again = true; + return; + } + + for (i = 3; i < ctx->argc; i++) { + if (!is_condition_satified(table, row, ctx->argv[i], ctx->symtab)) { + ctx->try_again = true; + return; + } + } +} static struct json * where_uuid_equals(const struct uuid *uuid) @@ -2713,7 +2718,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, const char *unused; struct vsctl_command *c; int64_t next_cfg = 0; - char *error; + char *error = NULL; txn = the_idl_txn = ovsdb_idl_txn_create(idl); if (dry_run) { @@ -2809,8 +2814,8 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, ds_chomp(ds, '\n'); for (j = 0; j < ds->length; j++) { - int c = ds->string[j]; - switch (c) { + int ch = ds->string[j]; + switch (ch) { case '\n': fputs("\\n", stdout); break; @@ -2820,7 +2825,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, break; default: - putchar(c); + putchar(ch); } } putchar('\n'); @@ -2838,8 +2843,6 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, if (wait_for_reload && status != TXN_UNCHANGED) { for (;;) { - const struct ovsrec_open_vswitch *ovs; - ovsdb_idl_run(idl); OVSREC_OPEN_VSWITCH_FOR_EACH (ovs, idl) { if (ovs->cur_cfg >= next_cfg) { @@ -2869,55 +2872,56 @@ try_again: static const struct vsctl_command_syntax all_commands[] = { /* Open vSwitch commands. */ - {"init", 0, 0, cmd_init, NULL, ""}, + {"init", 0, 0, cmd_init, NULL, "", RW}, /* Bridge commands. */ - {"add-br", 1, 3, cmd_add_br, NULL, "--may-exist"}, - {"del-br", 1, 1, cmd_del_br, NULL, "--if-exists"}, - {"list-br", 0, 0, cmd_list_br, NULL, ""}, - {"br-exists", 1, 1, cmd_br_exists, NULL, ""}, - {"br-to-vlan", 1, 1, cmd_br_to_vlan, NULL, ""}, - {"br-to-parent", 1, 1, cmd_br_to_parent, NULL, ""}, - {"br-set-external-id", 2, 3, cmd_br_set_external_id, NULL, ""}, - {"br-get-external-id", 1, 2, cmd_br_get_external_id, NULL, ""}, + {"add-br", 1, 3, cmd_add_br, NULL, "--may-exist", RW}, + {"del-br", 1, 1, cmd_del_br, NULL, "--if-exists", RW}, + {"list-br", 0, 0, cmd_list_br, NULL, "", RO}, + {"br-exists", 1, 1, cmd_br_exists, NULL, "", RO}, + {"br-to-vlan", 1, 1, cmd_br_to_vlan, NULL, "", RO}, + {"br-to-parent", 1, 1, cmd_br_to_parent, NULL, "", RO}, + {"br-set-external-id", 2, 3, cmd_br_set_external_id, NULL, "", RW}, + {"br-get-external-id", 1, 2, cmd_br_get_external_id, NULL, "", RO}, /* Port commands. */ - {"list-ports", 1, 1, cmd_list_ports, NULL, ""}, - {"add-port", 2, INT_MAX, cmd_add_port, NULL, "--may-exist"}, - {"add-bond", 4, INT_MAX, cmd_add_bond, NULL, "--may-exist,--fake-iface"}, - {"del-port", 1, 2, cmd_del_port, NULL, "--if-exists,--with-iface"}, - {"port-to-br", 1, 1, cmd_port_to_br, NULL, ""}, + {"list-ports", 1, 1, cmd_list_ports, NULL, "", RO}, + {"add-port", 2, INT_MAX, cmd_add_port, NULL, "--may-exist", RW}, + {"add-bond", 4, INT_MAX, cmd_add_bond, NULL, "--may-exist,--fake-iface", RW}, + {"del-port", 1, 2, cmd_del_port, NULL, "--if-exists,--with-iface", RW}, + {"port-to-br", 1, 1, cmd_port_to_br, NULL, "", RO}, /* Interface commands. */ - {"list-ifaces", 1, 1, cmd_list_ifaces, NULL, ""}, - {"iface-to-br", 1, 1, cmd_iface_to_br, NULL, ""}, + {"list-ifaces", 1, 1, cmd_list_ifaces, NULL, "", RO}, + {"iface-to-br", 1, 1, cmd_iface_to_br, NULL, "", RO}, /* Controller commands. */ - {"get-controller", 0, 1, cmd_get_controller, NULL, ""}, - {"del-controller", 0, 1, cmd_del_controller, NULL, ""}, - {"set-controller", 1, INT_MAX, cmd_set_controller, NULL, ""}, - {"get-fail-mode", 0, 1, cmd_get_fail_mode, NULL, ""}, - {"del-fail-mode", 0, 1, cmd_del_fail_mode, NULL, ""}, - {"set-fail-mode", 1, 2, cmd_set_fail_mode, NULL, ""}, + {"get-controller", 1, 1, cmd_get_controller, NULL, "", RO}, + {"del-controller", 1, 1, cmd_del_controller, NULL, "", RW}, + {"set-controller", 1, INT_MAX, cmd_set_controller, NULL, "", RW}, + {"get-fail-mode", 1, 1, cmd_get_fail_mode, NULL, "", RO}, + {"del-fail-mode", 1, 1, cmd_del_fail_mode, NULL, "", RW}, + {"set-fail-mode", 2, 2, cmd_set_fail_mode, NULL, "", RW}, /* SSL commands. */ - {"get-ssl", 0, 0, cmd_get_ssl, NULL, ""}, - {"del-ssl", 0, 0, cmd_del_ssl, NULL, ""}, - {"set-ssl", 3, 3, cmd_set_ssl, NULL, "--bootstrap"}, + {"get-ssl", 0, 0, cmd_get_ssl, NULL, "", RO}, + {"del-ssl", 0, 0, cmd_del_ssl, NULL, "", RW}, + {"set-ssl", 3, 3, cmd_set_ssl, NULL, "--bootstrap", RW}, /* Switch commands. */ - {"emer-reset", 0, 0, cmd_emer_reset, NULL, ""}, + {"emer-reset", 0, 0, cmd_emer_reset, NULL, "", RW}, /* Parameter commands. */ - {"get", 3, INT_MAX, cmd_get, NULL, "--if-exists"}, - {"list", 1, INT_MAX, cmd_list, NULL, ""}, - {"set", 3, INT_MAX, cmd_set, NULL, ""}, - {"add", 4, INT_MAX, cmd_add, NULL, ""}, - {"remove", 4, INT_MAX, cmd_remove, NULL, ""}, - {"clear", 3, INT_MAX, cmd_clear, NULL, ""}, - {"create", 2, INT_MAX, cmd_create, post_create, "--id="}, - {"destroy", 1, INT_MAX, cmd_destroy, NULL, "--if-exists"}, - - {NULL, 0, 0, NULL, NULL, NULL}, + {"get", 2, INT_MAX, cmd_get, NULL, "--if-exists,--id=", RO}, + {"list", 1, INT_MAX, cmd_list, NULL, "", RO}, + {"set", 3, INT_MAX, cmd_set, NULL, "", RW}, + {"add", 4, INT_MAX, cmd_add, NULL, "", RW}, + {"remove", 4, INT_MAX, cmd_remove, NULL, "", RW}, + {"clear", 3, INT_MAX, cmd_clear, NULL, "", RW}, + {"create", 2, INT_MAX, cmd_create, post_create, "--id=", RW}, + {"destroy", 1, INT_MAX, cmd_destroy, NULL, "--if-exists", RW}, + {"wait-until", 2, INT_MAX, cmd_wait_until, NULL, "", RO}, + + {NULL, 0, 0, NULL, NULL, NULL, RO}, };