X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=d09cf7460b0f645f8cd94e50f644962d34ae7fb9;hb=cd0cd65fe3721aa575e5eec081783f8047eda545;hp=1c00f436ef7e4f7bd939879ce0bfbecd78d7e4c3;hpb=7c79588e006eb28e51ca8b715e22abce0c81f5d4;p=sliver-openvswitch.git diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index 1c00f436e..d09cf7460 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -36,13 +36,14 @@ #include "ovsdb-idl.h" #include "poll-loop.h" #include "process.h" +#include "stream-ssl.h" #include "svec.h" #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 @@ -84,7 +85,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[]; @@ -108,22 +109,25 @@ static void do_vsctl(const char *args, struct vsctl_command *, size_t n_commands, struct ovsdb_idl *); +static const struct vsctl_table_class *get_table(const char *table_name); +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; - unsigned int seqno; struct vsctl_command *commands; size_t n_commands; char *args; - int trials; 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. */ @@ -140,19 +144,9 @@ main(int argc, char *argv[]) /* Now execute the commands. */ idl = the_idl = ovsdb_idl_create(db, &ovsrec_idl_class); - seqno = ovsdb_idl_get_seqno(idl); - trials = 0; for (;;) { - unsigned int new_seqno; - - ovsdb_idl_run(idl); - new_seqno = ovsdb_idl_get_seqno(idl); - if (new_seqno != seqno) { - if (++trials > 5) { - vsctl_fatal("too many database inconsistency failures"); - } + if (ovsdb_idl_run(idl)) { do_vsctl(args, commands, n_commands, idl); - seqno = new_seqno; } ovsdb_idl_wait(idl); @@ -169,6 +163,7 @@ parse_options(int argc, char *argv[]) OPT_NO_SYSLOG, OPT_NO_WAIT, OPT_DRY_RUN, + OPT_PEER_CA_CERT, VLOG_OPTION_ENUMS }; static struct option long_options[] = { @@ -181,14 +176,22 @@ parse_options(int argc, char *argv[]) {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, VLOG_LONG_OPTIONS, +#ifdef HAVE_OPENSSL + STREAM_SSL_LONG_OPTIONS + {"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT}, +#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 +206,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: @@ -231,6 +234,14 @@ parse_options(int argc, char *argv[]) VLOG_OPTION_HANDLERS +#ifdef HAVE_OPENSSL + STREAM_SSL_OPTION_HANDLERS + + case OPT_PEER_CA_CERT: + stream_ssl_set_peer_ca_cert_file(optarg); + break; +#endif + case '?': exit(EXIT_FAILURE); @@ -238,6 +249,7 @@ parse_options(int argc, char *argv[]) abort(); } } + free(short_options); if (!db) { db = default_db(); @@ -287,12 +299,27 @@ parse_command(int argc, char *argv[], struct vsctl_command *command) shash_init(&command->options); for (i = 0; i < argc; i++) { - if (argv[i][0] != '-') { + const char *option = argv[i]; + const char *equals; + char *key, *value; + + if (option[0] != '-') { break; } - if (!shash_add_once(&command->options, argv[i], NULL)) { + + equals = strchr(option, '='); + if (equals) { + key = xmemdup0(option, equals - option); + value = xstrdup(equals + 1); + } else { + key = xstrdup(option); + value = NULL; + } + + if (shash_find(&command->options, key)) { vsctl_fatal("'%s' option specified multiple times", argv[i]); } + shash_add_nocopy(&command->options, key, value); } if (i == argc) { vsctl_fatal("missing command name"); @@ -306,10 +333,20 @@ parse_command(int argc, char *argv[], struct vsctl_command *command) 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 != '\0') { + + 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; @@ -352,7 +389,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); @@ -408,27 +445,31 @@ 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\ del-ssl delete the SSL configuration\n\ set-ssl PRIV-KEY CERT CA-CERT set the SSL configuration\n\ \n\ +Switch commands:\n\ + emer-reset reset switch to known good state\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\ @@ -449,7 +490,7 @@ default_db(void) { static char *def; if (!def) { - def = xasprintf("unix:%s/ovsdb-server", ovs_rundir); + def = xasprintf("unix:%s/db.sock", ovs_rundir); } return def; } @@ -464,13 +505,20 @@ struct vsctl_context { struct ds output; struct ovsdb_idl *idl; struct ovsdb_idl_txn *txn; + struct ovsdb_symbol_table *symtab; const struct ovsrec_open_vswitch *ovs; + + /* A command may set this member to true if some prerequisite is not met + * and the caller should wait for something to change and then retry. */ + bool try_again; }; struct vsctl_bridge { struct ovsrec_bridge *br_cfg; char *name; - struct ovsrec_controller *ctrl; + struct ovsrec_controller **ctrl; + char *fail_mode; + size_t n_ctrl; struct vsctl_bridge *parent; int vlan; }; @@ -489,7 +537,6 @@ struct vsctl_info { struct shash bridges; struct shash ports; struct shash ifaces; - struct ovsrec_controller *ctrl; }; static char * @@ -526,7 +573,15 @@ add_bridge(struct vsctl_info *b, br->name = xstrdup(name); br->parent = parent; br->vlan = vlan; - br->ctrl = parent ? parent->br_cfg->controller : br_cfg->controller; + 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; } @@ -567,17 +622,8 @@ free_info(struct vsctl_info *info) } shash_destroy(&info->bridges); - SHASH_FOR_EACH (node, &info->ports) { - struct vsctl_port *port = node->data; - free(port); - } - shash_destroy(&info->ports); - - SHASH_FOR_EACH (node, &info->ifaces) { - struct vsctl_iface *iface = node->data; - free(iface); - } - shash_destroy(&info->ifaces); + shash_destroy_free_data(&info->ports); + shash_destroy_free_data(&info->ifaces); } static void @@ -590,8 +636,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; - shash_init(&bridges); shash_init(&ports); for (i = 0; i < ovs->n_bridges; i++) { @@ -828,6 +872,83 @@ cmd_init(struct vsctl_context *ctx OVS_UNUSED) { } +static void +cmd_emer_reset(struct vsctl_context *ctx) +{ + const struct ovsdb_idl *idl = ctx->idl; + const struct ovsrec_bridge *br; + const struct ovsrec_port *port; + const struct ovsrec_interface *iface; + const struct ovsrec_mirror *mirror, *next_mirror; + const struct ovsrec_controller *ctrl, *next_ctrl; + const struct ovsrec_netflow *nf, *next_nf; + const struct ovsrec_ssl *ssl, *next_ssl; + const struct ovsrec_sflow *sflow, *next_sflow; + + + /* Reset the Open_vSwitch table. */ + ovsrec_open_vswitch_set_managers(ctx->ovs, NULL, 0); + ovsrec_open_vswitch_set_ssl(ctx->ovs, NULL); + + OVSREC_BRIDGE_FOR_EACH (br, idl) { + int i; + char *hw_key = "hwaddr"; + char *hw_val = NULL; + + ovsrec_bridge_set_controller(br, NULL, 0); + ovsrec_bridge_set_mirrors(br, NULL, 0); + ovsrec_bridge_set_netflow(br, NULL); + ovsrec_bridge_set_sflow(br, NULL); + ovsrec_bridge_set_flood_vlans(br, NULL, 0); + + /* We only want to save the "hwaddr" key from other_config. */ + for (i=0; i < br->n_other_config; i++) { + if (!strcmp(br->key_other_config[i], hw_key)) { + hw_val = br->value_other_config[i]; + break; + } + } + if (hw_val) { + char *val = xstrdup(hw_val); + ovsrec_bridge_set_other_config(br, &hw_key, &val, 1); + free(val); + } else { + ovsrec_bridge_set_other_config(br, NULL, NULL, 0); + } + } + + OVSREC_PORT_FOR_EACH (port, idl) { + ovsrec_port_set_other_config(port, NULL, NULL, 0); + } + + OVSREC_INTERFACE_FOR_EACH (iface, idl) { + /* xxx What do we do about gre/patch devices created by mgr? */ + + ovsrec_interface_set_ingress_policing_rate(iface, 0); + ovsrec_interface_set_ingress_policing_burst(iface, 0); + } + + OVSREC_MIRROR_FOR_EACH_SAFE (mirror, next_mirror, idl) { + ovsrec_mirror_delete(mirror); + } + + OVSREC_CONTROLLER_FOR_EACH_SAFE (ctrl, next_ctrl, idl) { + ovsrec_controller_delete(ctrl); + } + + OVSREC_NETFLOW_FOR_EACH_SAFE (nf, next_nf, idl) { + ovsrec_netflow_delete(nf); + } + + OVSREC_SSL_FOR_EACH_SAFE (ssl, next_ssl, idl) { + ovsrec_ssl_delete(ssl); + } + + OVSREC_SFLOW_FOR_EACH_SAFE (sflow, next_sflow, idl) { + ovsrec_sflow_delete(sflow); + } +} + static void cmd_add_br(struct vsctl_context *ctx) { @@ -1173,7 +1294,8 @@ static void add_port(struct vsctl_context *ctx, const char *br_name, const char *port_name, bool may_exist, bool fake_iface, - char *iface_names[], int n_ifaces) + char *iface_names[], int n_ifaces, + char *settings[], int n_settings) { struct vsctl_info info; struct vsctl_bridge *bridge; @@ -1183,12 +1305,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++) { @@ -1197,15 +1318,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)) { @@ -1248,6 +1370,11 @@ add_port(struct vsctl_context *ctx, ovsrec_port_set_tag(port, &tag, 1); } + for (i = 0; i < n_settings; i++) { + set_column(get_table("Port"), &port->header_, settings[i], + ctx->symtab); + } + bridge_insert_port((bridge->parent ? bridge->parent->br_cfg : bridge->br_cfg), port); @@ -1260,7 +1387,7 @@ cmd_add_port(struct vsctl_context *ctx) bool may_exist = shash_find(&ctx->options, "--may-exist") != 0; add_port(ctx, ctx->argv[1], ctx->argv[2], may_exist, false, - &ctx->argv[2], 1); + &ctx->argv[2], 1, &ctx->argv[3], ctx->argc - 3); } static void @@ -1268,9 +1395,24 @@ cmd_add_bond(struct vsctl_context *ctx) { bool may_exist = shash_find(&ctx->options, "--may-exist") != 0; bool fake_iface = shash_find(&ctx->options, "--fake-iface"); + int n_ifaces; + int i; + + n_ifaces = ctx->argc - 3; + for (i = 3; i < ctx->argc; i++) { + if (strchr(ctx->argv[i], '=')) { + n_ifaces = i - 3; + break; + } + } + if (n_ifaces < 2) { + vsctl_fatal("add-bond requires at least 2 interfaces, but only " + "%d were specified", n_ifaces); + } add_port(ctx, ctx->argv[1], ctx->argv[2], may_exist, fake_iface, - &ctx->argv[3], ctx->argc - 3); + &ctx->argv[3], n_ifaces, + &ctx->argv[n_ifaces + 3], ctx->argc - 3 - n_ifaces); } static void @@ -1405,81 +1547,88 @@ static void cmd_get_controller(struct vsctl_context *ctx) { 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); - if (ctx->argc == 1) { - /* Return the controller from the "Open_vSwitch" table */ - if (info.ctrl) { - ds_put_format(&ctx->output, "%s\n", info.ctrl->target); - } - } else { - /* Return the controller for a particular bridge. */ - struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true); + /* Print the targets in sorted order for reproducibility. */ + svec_init(&targets); + for (i = 0; i < br->n_ctrl; i++) { + svec_add(&targets, br->ctrl[i]->target); + } - /* If no controller is explicitly defined for the requested - * bridge, fallback to the "Open_vSwitch" table's controller. */ - if (br->ctrl) { - ds_put_format(&ctx->output, "%s\n", br->ctrl->target); - } else if (info.ctrl) { - ds_put_format(&ctx->output, "%s\n", info.ctrl->target); - } + svec_sort(&targets); + for (i = 0; i < targets.n; i++) { + ds_put_format(&ctx->output, "%s\n", targets.names[i]); } + svec_destroy(&targets); free_info(&info); } +static void +delete_controllers(struct ovsrec_controller **controllers, + size_t n_controllers) +{ + size_t i; + + for (i = 0; i < n_controllers; i++) { + ovsrec_controller_delete(controllers[i]); + } +} + 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) { - if (info.ctrl) { - ovsrec_controller_delete(info.ctrl); - ovsrec_open_vswitch_set_controller(ctx->ovs, NULL); - } - } else { - struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); - - if (br->ctrl) { - ovsrec_controller_delete(br->ctrl); - ovsrec_bridge_set_controller(br->br_cfg, NULL); - } + if (br->ctrl) { + delete_controllers(br->ctrl, br->n_ctrl); + ovsrec_bridge_set_controller(br->br_cfg, NULL, 0); } free_info(&info); } +static struct ovsrec_controller ** +insert_controllers(struct ovsdb_idl_txn *txn, char *targets[], size_t n) +{ + struct ovsrec_controller **controllers; + size_t i; + + controllers = xmalloc(n * sizeof *controllers); + for (i = 0; i < n; i++) { + controllers[i] = ovsrec_controller_insert(txn); + ovsrec_controller_set_target(controllers[i], targets[i]); + } + + return controllers; +} + static void cmd_set_controller(struct vsctl_context *ctx) { struct vsctl_info info; - struct ovsrec_controller *ctrl; + 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 the controller in the "Open_vSwitch" table. */ - if (info.ctrl) { - ovsrec_controller_delete(info.ctrl); - } - ctrl = ovsrec_controller_insert(ctx->txn); - ovsrec_controller_set_target(ctrl, ctx->argv[1]); - ovsrec_open_vswitch_set_controller(ctx->ovs, ctrl); - } else { - /* Set the controller for a particular bridge. */ - struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + delete_controllers(br->ctrl, br->n_ctrl); - if (br->ctrl) { - ovsrec_controller_delete(br->ctrl); - } - ctrl = ovsrec_controller_insert(ctx->txn); - ovsrec_controller_set_target(ctrl, ctx->argv[2]); - ovsrec_bridge_set_controller(br->br_cfg, 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); free_info(&info); } @@ -1488,31 +1637,13 @@ 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) { - /* Return the fail-mode from the "Open_vSwitch" table */ - if (info.ctrl && info.ctrl->fail_mode) { - fail_mode = info.ctrl->fail_mode; - } - } else { - /* Return the fail-mode for a particular bridge. */ - struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true); - - /* If no controller or fail-mode is explicitly defined for the - * requested bridge, fallback to the "Open_vSwitch" table's - * setting. */ - if (br->ctrl && br->ctrl->fail_mode) { - fail_mode = br->ctrl->fail_mode; - } else if (info.ctrl && info.ctrl->fail_mode) { - fail_mode = info.ctrl->fail_mode; - } - } - - 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); @@ -1522,20 +1653,12 @@ 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) { - if (info.ctrl && info.ctrl->fail_mode) { - ovsrec_controller_set_fail_mode(info.ctrl, NULL); - } - } else { - struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); - - if (br->ctrl && br->ctrl->fail_mode) { - ovsrec_controller_set_fail_mode(br->ctrl, NULL); - } - } + ovsrec_bridge_set_fail_mode(br->br_cfg, NULL); free_info(&info); } @@ -1544,30 +1667,17 @@ static void cmd_set_fail_mode(struct vsctl_context *ctx) { struct vsctl_info info; - const char *fail_mode; + struct vsctl_bridge *br; + const char *fail_mode = ctx->argv[2]; get_info(ctx->ovs, &info); - - fail_mode = (ctx->argc == 2) ? ctx->argv[1] : 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 (ctx->argc == 2) { - /* Set the fail-mode in the "Open_vSwitch" table. */ - if (!info.ctrl) { - vsctl_fatal("no controller declared"); - } - ovsrec_controller_set_fail_mode(info.ctrl, fail_mode); - } else { - struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); - - if (!br->ctrl) { - vsctl_fatal("no controller declared for %s", br->name); - } - ovsrec_controller_set_fail_mode(br->ctrl, fail_mode); - } + ovsrec_bridge_set_fail_mode(br->br_cfg, fail_mode); free_info(&info); } @@ -1638,10 +1748,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}, @@ -1665,9 +1772,23 @@ static const struct vsctl_table_class tables[] = { {{&ovsrec_table_port, &ovsrec_port_col_name, NULL}, {NULL, NULL, NULL}}}, + {&ovsrec_table_qos, + {{&ovsrec_table_port, &ovsrec_port_col_name, &ovsrec_port_col_qos}, + {NULL, NULL, NULL}}}, + + {&ovsrec_table_queue, + {{NULL, NULL, NULL}, + {NULL, NULL, NULL}}}, + {&ovsrec_table_ssl, {{&ovsrec_table_open_vswitch, NULL, &ovsrec_open_vswitch_col_ssl}}}, + {&ovsrec_table_sflow, + {{&ovsrec_table_bridge, + &ovsrec_bridge_col_name, + &ovsrec_bridge_col_sflow}, + {NULL, NULL, NULL}}}, + {NULL, {{NULL, NULL, NULL}, {NULL, NULL, NULL}}} }; @@ -1749,34 +1870,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) { @@ -1785,17 +1895,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; + const struct ovsdb_datum *uuid; - assert(id->uuid_column->type.key.type == OVSDB_TYPE_UUID); - assert(id->uuid_column->type.value.type == OVSDB_TYPE_VOID); - - 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; } @@ -1804,8 +1911,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; @@ -1868,15 +1975,87 @@ 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) +{ + struct ds s; + + ds_init(&s); + ds_put_format(&s, "%s: argument does not end in ", arg); + ds_put_format(&s, "\"%s\"", allowed_operators[0]); + if (n_allowed == 2) { + ds_put_format(&s, " or \"%s\"", allowed_operators[1]); + } else if (n_allowed > 2) { + size_t i; + + for (i = 1; i < n_allowed - 1; i++) { + ds_put_format(&s, ", \"%s\"", allowed_operators[i]); + } + ds_put_format(&s, ", or \"%s\"", allowed_operators[i]); + } + ds_put_format(&s, " followed by a value."); + + return ds_steal_cstr(&s); +} + +/* Breaks 'arg' apart into a number of fields in the following order: + * + * - If 'columnp' is nonnull, the name of a column in 'table'. The column + * is stored into '*columnp'. The column name may be abbreviated. + * + * - If 'keyp' is nonnull, optionally a key string. (If both 'columnp' + * and 'keyp' are nonnull, then the column and key names are expected to + * be separated by ':'). The key is stored as a malloc()'d string into + * '*keyp', or NULL if no key is present in 'arg'. + * + * - If 'valuep' is nonnull, an operator followed by a value string. The + * allowed operators are the 'n_allowed' string in 'allowed_operators', + * or just "=" if 'n_allowed' is 0. If 'operatorp' is nonnull, then the + * operator is stored into '*operatorp' (one of the pointers from + * 'allowed_operators' is stored; nothing is malloc()'d). The value is + * stored as a malloc()'d string into '*valuep', or NULL if no value is + * present in 'arg'. + * + * At least 'columnp' or 'keyp' must be nonnull. + * + * On success, returns NULL. On failure, returned a malloc()'d string error + * message and stores NULL into all of the nonnull output arguments. */ static char * WARN_UNUSED_RESULT -parse_column_key_value(const char *arg, const struct vsctl_table_class *table, - const struct ovsdb_idl_column **columnp, - char **keyp, char **valuep) +parse_column_key_value(const char *arg, + const struct vsctl_table_class *table, + const struct ovsdb_idl_column **columnp, char **keyp, + const char **operatorp, + const char **allowed_operators, size_t n_allowed, + char **valuep) { const char *p = arg; char *error; assert(columnp || keyp); + assert(!(operatorp && !valuep)); if (keyp) { *keyp = NULL; } @@ -1921,12 +2100,37 @@ parse_column_key_value(const char *arg, const struct vsctl_table_class *table, } /* Parse value string. */ - if (*p == '=') { - if (!valuep) { - error = xasprintf("%s: value not accepted here", arg); + if (valuep) { + const char *best; + size_t best_len; + size_t i; + + if (!allowed_operators) { + static const char *equals = "="; + allowed_operators = = + n_allowed = 1; + } + + best = NULL; + best_len = 0; + for (i = 0; i < n_allowed; i++) { + const char *op = allowed_operators[i]; + size_t op_len = strlen(op); + + if (op_len > best_len && !strncmp(op, p, op_len) && p[op_len]) { + best_len = op_len; + best = op; + } + } + if (!best) { + error = missing_operator_error(arg, allowed_operators, n_allowed); goto error; } - *valuep = xstrdup(p + 1); + + if (operatorp) { + *operatorp = best; + } + *valuep = xstrdup(p + best_len); } else { if (valuep) { *valuep = NULL; @@ -1950,6 +2154,9 @@ error: if (valuep) { free(*valuep); *valuep = NULL; + if (operatorp) { + *operatorp = NULL; + } } return error; } @@ -1957,6 +2164,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]; @@ -1967,15 +2175,34 @@ 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 + * through parse_column_key_value() below since it returns a "struct + * ovsdb_idl_column" and the UUID column doesn't have one. */ + if (!strcasecmp(ctx->argv[i], "_uuid") + || !strcasecmp(ctx->argv[i], "-uuid")) { + ds_put_format(out, UUID_FMT"\n", UUID_ARGS(&row->uuid)); + continue; + } + die_if_error(parse_column_key_value(ctx->argv[i], table, - &column, &key_string, NULL)); + &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; @@ -1987,9 +2214,9 @@ cmd_get(struct vsctl_context *ctx) die_if_error(ovsdb_atom_from_string(&key, &column->type.key, - key_string)); + 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) { @@ -1998,15 +2225,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); } @@ -2022,15 +2248,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); } } @@ -2067,14 +2291,15 @@ cmd_list(struct vsctl_context *ctx) static void set_column(const struct vsctl_table_class *table, - const struct ovsdb_idl_row *row, const char *arg) + const struct ovsdb_idl_row *row, const char *arg, + struct ovsdb_symbol_table *symtab) { const struct ovsdb_idl_column *column; char *key_string, *value_string; char *error; error = parse_column_key_value(arg, table, &column, &key_string, - &value_string); + NULL, NULL, 0, &value_string); die_if_error(error); if (!value_string) { vsctl_fatal("%s: missing value", arg); @@ -2082,7 +2307,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", @@ -2090,26 +2315,24 @@ set_column(const struct vsctl_table_class *table, } die_if_error(ovsdb_atom_from_string(&key, &column->type.key, - key_string)); + key_string, symtab)); die_if_error(ovsdb_atom_from_string(&value, &column->type.value, - value_string)); + 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; die_if_error(ovsdb_datum_from_string(&datum, &column->type, - value_string)); + value_string, symtab)); ovsdb_idl_txn_write(row, column, &datum); } @@ -2129,7 +2352,7 @@ cmd_set(struct vsctl_context *ctx) table = get_table(table_name); row = must_get_row(ctx, table, record_id); for (i = 3; i < ctx->argc; i++) { - set_column(table, row, ctx->argv[i]); + set_column(table, row, ctx->argv[i], ctx->symtab); } } @@ -2151,7 +2374,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; @@ -2159,7 +2382,8 @@ cmd_add(struct vsctl_context *ctx) add_type = *type; add_type.n_min = 1; add_type.n_max = UINT_MAX; - die_if_error(ovsdb_datum_from_string(&add, &add_type, ctx->argv[i])); + die_if_error(ovsdb_datum_from_string(&add, &add_type, ctx->argv[i], + ctx->symtab)); ovsdb_datum_union(&old, &add, type, false); ovsdb_datum_destroy(&add, type); } @@ -2191,7 +2415,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; @@ -2200,18 +2424,20 @@ cmd_remove(struct vsctl_context *ctx) rm_type = *type; rm_type.n_min = 1; rm_type.n_max = UINT_MAX; - error = ovsdb_datum_from_string(&rm, &rm_type, ctx->argv[i]); + error = ovsdb_datum_from_string(&rm, &rm_type, + ctx->argv[i], ctx->symtab); if (error && ovsdb_type_is_map(&rm_type)) { free(error); rm_type.value.type = OVSDB_TYPE_VOID; - die_if_error(ovsdb_datum_from_string(&rm, &rm_type, ctx->argv[i])); + die_if_error(ovsdb_datum_from_string(&rm, &rm_type, + ctx->argv[i], ctx->symtab)); } ovsdb_datum_subtract(&old, type, &rm, &rm_type); ovsdb_datum_destroy(&rm, &rm_type); } if (old.n < type->n_min) { vsctl_fatal("\"remove\" operation would put %u %s in column %s of " - "table %s but the minimun number is %u", + "table %s but the minimum number is %u", old.n, type->value.type == OVSDB_TYPE_VOID ? "values" : "pairs", column->name, table->class->name, type->n_min); @@ -2252,15 +2478,19 @@ cmd_clear(struct vsctl_context *ctx) static void cmd_create(struct vsctl_context *ctx) { + const char *id = shash_find_data(&ctx->options, "--id"); const char *table_name = ctx->argv[1]; const struct vsctl_table_class *table; const struct ovsdb_idl_row *row; + const struct uuid *uuid; int i; + uuid = id ? create_symbol(ctx->symtab, id, NULL) : NULL; + table = get_table(table_name); - row = ovsdb_idl_txn_insert(ctx->txn, table->class); + row = ovsdb_idl_txn_insert(ctx->txn, table->class, uuid); for (i = 2; i < ctx->argc; i++) { - set_column(table, row, ctx->argv[i]); + set_column(table, row, ctx->argv[i], ctx->symtab); } ds_put_format(&ctx->output, UUID_FMT, UUID_ARGS(&row->uuid)); } @@ -2307,6 +2537,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) @@ -2325,7 +2653,8 @@ where_uuid_equals(const struct uuid *uuid) static void vsctl_context_init(struct vsctl_context *ctx, struct vsctl_command *command, struct ovsdb_idl *idl, struct ovsdb_idl_txn *txn, - const struct ovsrec_open_vswitch *ovs) + const struct ovsrec_open_vswitch *ovs, + struct ovsdb_symbol_table *symtab) { ctx->argc = command->argc; ctx->argv = command->argv; @@ -2335,7 +2664,9 @@ vsctl_context_init(struct vsctl_context *ctx, struct vsctl_command *command, ctx->idl = idl; ctx->txn = txn; ctx->ovs = ovs; + ctx->symtab = symtab; + ctx->try_again = false; } static void @@ -2351,19 +2682,18 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, struct ovsdb_idl_txn *txn; const struct ovsrec_open_vswitch *ovs; enum ovsdb_idl_txn_status status; + struct ovsdb_symbol_table *symtab; + const char *unused; struct vsctl_command *c; int64_t next_cfg = 0; - char *comment; - char *error; + char *error = NULL; txn = the_idl_txn = ovsdb_idl_txn_create(idl); if (dry_run) { ovsdb_idl_txn_set_dry_run(txn); } - comment = xasprintf("ovs-vsctl: %s", args); - ovsdb_idl_txn_add_comment(txn, comment); - free(comment); + ovsdb_idl_txn_add_comment(txn, "ovs-vsctl: %s", args); ovs = ovsrec_open_vswitch_first(idl); if (!ovs) { @@ -2377,37 +2707,47 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, json_destroy(where); } + symtab = ovsdb_symbol_table_create(); + for (c = commands; c < &commands[n_commands]; c++) { + ds_init(&c->output); + } for (c = commands; c < &commands[n_commands]; c++) { struct vsctl_context ctx; - ds_init(&c->output); - vsctl_context_init(&ctx, c, idl, txn, ovs); + vsctl_context_init(&ctx, c, idl, txn, ovs, symtab); (c->syntax->run)(&ctx); vsctl_context_done(&ctx, c); - } - while ((status = ovsdb_idl_txn_commit(txn)) == TXN_INCOMPLETE) { - ovsdb_idl_run(idl); - ovsdb_idl_wait(idl); - ovsdb_idl_txn_wait(txn); - poll_block(); + if (ctx.try_again) { + goto try_again; + } } + + status = ovsdb_idl_txn_commit_block(txn); if (wait_for_reload && status == TXN_SUCCESS) { next_cfg = ovsdb_idl_txn_get_increment_new_value(txn); } - for (c = commands; c < &commands[n_commands]; c++) { - if (c->syntax->postprocess) { - struct vsctl_context ctx; + if (status == TXN_UNCHANGED || status == TXN_SUCCESS) { + for (c = commands; c < &commands[n_commands]; c++) { + if (c->syntax->postprocess) { + struct vsctl_context ctx; - vsctl_context_init(&ctx, c, idl, txn, ovs); - (c->syntax->postprocess)(&ctx); - vsctl_context_done(&ctx, c); + vsctl_context_init(&ctx, c, idl, txn, ovs, symtab); + (c->syntax->postprocess)(&ctx); + vsctl_context_done(&ctx, c); + } } } error = xstrdup(ovsdb_idl_txn_get_error(txn)); ovsdb_idl_txn_destroy(txn); the_idl_txn = NULL; + unused = ovsdb_symbol_table_find_unused(symtab); + if (unused) { + vsctl_fatal("row id \"%s\" is referenced but never created (e.g. " + "with \"-- --id=%s create ...\")", unused, unused); + } + switch (status) { case TXN_INCOMPLETE: NOT_REACHED(); @@ -2421,11 +2761,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, break; case TXN_TRY_AGAIN: - for (c = commands; c < &commands[n_commands]; c++) { - ds_destroy(&c->output); - } - free(error); - return; + goto try_again; case TXN_ERROR: vsctl_fatal("transaction error: %s", error); @@ -2435,15 +2771,19 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, } free(error); + ovsdb_symbol_table_destroy(symtab); + for (c = commands; c < &commands[n_commands]; c++) { struct ds *ds = &c->output; + struct shash_node *node; + if (oneline) { size_t j; 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; @@ -2453,7 +2793,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, break; default: - putchar(c); + putchar(ch); } } putchar('\n'); @@ -2461,14 +2801,16 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, fputs(ds_cstr(ds), stdout); } ds_destroy(&c->output); + + SHASH_FOR_EACH (node, &c->options) { + free(node->data); + } shash_destroy(&c->options); } free(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) { @@ -2483,6 +2825,17 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, ovsdb_idl_destroy(idl); exit(EXIT_SUCCESS); + +try_again: + /* Our transaction needs to be rerun, or a prerequisite was not met. Free + * resources and return so that the caller can try again. */ + ovsdb_idl_txn_abort(txn); + ovsdb_idl_txn_destroy(txn); + ovsdb_symbol_table_destroy(symtab); + for (c = commands; c < &commands[n_commands]; c++) { + ds_destroy(&c->output); + } + free(error); } static const struct vsctl_command_syntax all_commands[] = { @@ -2501,7 +2854,7 @@ static const struct vsctl_command_syntax all_commands[] = { /* Port commands. */ {"list-ports", 1, 1, cmd_list_ports, NULL, ""}, - {"add-port", 2, 2, cmd_add_port, NULL, "--may-exist"}, + {"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, ""}, @@ -2511,27 +2864,31 @@ static const struct vsctl_command_syntax all_commands[] = { {"iface-to-br", 1, 1, cmd_iface_to_br, NULL, ""}, /* Controller commands. */ - {"get-controller", 0, 1, cmd_get_controller, NULL, ""}, - {"del-controller", 0, 1, cmd_del_controller, NULL, ""}, - {"set-controller", 1, 2, 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, ""}, + {"del-controller", 1, 1, cmd_del_controller, NULL, ""}, + {"set-controller", 1, INT_MAX, cmd_set_controller, NULL, ""}, + {"get-fail-mode", 1, 1, cmd_get_fail_mode, NULL, ""}, + {"del-fail-mode", 1, 1, cmd_del_fail_mode, NULL, ""}, + {"set-fail-mode", 2, 2, cmd_set_fail_mode, NULL, ""}, /* 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"}, + /* Switch commands. */ + {"emer-reset", 0, 0, cmd_emer_reset, NULL, ""}, + /* Parameter commands. */ - {"get", 3, INT_MAX, cmd_get, NULL, "--if-exists"}, + {"get", 2, INT_MAX, cmd_get, NULL, "--if-exists,--id="}, {"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, ""}, + {"create", 2, INT_MAX, cmd_create, post_create, "--id="}, {"destroy", 1, INT_MAX, cmd_destroy, NULL, "--if-exists"}, + {"wait-until", 2, INT_MAX, cmd_wait_until, NULL, ""}, {NULL, 0, 0, NULL, NULL, NULL}, };