X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=b5502fdfb056ba7c57bd9911b76327c8e3331dea;hb=53de028597806812cc2dc69a8f77bcc9bb1f9601;hp=4efb1d0f5851dc9fbd2a97eacffa778662ff824e;hpb=af96ccd24690553a0f8e2dbe9ee72530f18629c6;p=openvswitch diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index 4efb1d0f..b5502fdf 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -36,6 +36,7 @@ #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" @@ -108,15 +109,19 @@ 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[]) { 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); @@ -140,19 +145,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 +164,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,6 +177,10 @@ 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}, }; @@ -231,6 +231,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); @@ -287,12 +295,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 +329,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; @@ -420,6 +453,9 @@ SSL commands:\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\ @@ -449,7 +485,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 +500,19 @@ 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; + size_t n_ctrl; struct vsctl_bridge *parent; int vlan; }; @@ -489,7 +531,8 @@ struct vsctl_info { struct shash bridges; struct shash ports; struct shash ifaces; - struct ovsrec_controller *ctrl; + struct ovsrec_controller **ctrl; + size_t n_ctrl; }; static char * @@ -526,7 +569,13 @@ 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; + } else { + br->ctrl = br_cfg->controller; + br->n_ctrl = br_cfg->n_controller; + } shash_add(&b->bridges, br->name, br); return br; } @@ -567,17 +616,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 @@ -591,6 +631,7 @@ get_info(const struct ovsrec_open_vswitch *ovs, struct vsctl_info *info) shash_init(&info->ifaces); info->ctrl = ovs->controller; + info->n_ctrl = ovs->n_controller; shash_init(&bridges); shash_init(&ports); @@ -828,6 +869,84 @@ 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_controller(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 +1292,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; @@ -1248,6 +1368,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 +1385,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 +1393,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 @@ -1401,6 +1541,29 @@ 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) +{ + /* Print the targets in sorted order for reproducibility. */ + struct svec targets; + size_t i; + + svec_init(&targets); + for (i = 0; i < n_controllers; i++) { + svec_add(&targets, controllers[i]->target); + } + + svec_sort(&targets); + for (i = 0; i < targets.n; i++) { + ds_put_format(&ctx->output, "%s\n", targets.names[i]); + } + svec_destroy(&targets); +} + static void cmd_get_controller(struct vsctl_context *ctx) { @@ -1408,27 +1571,31 @@ cmd_get_controller(struct vsctl_context *ctx) get_info(ctx->ovs, &info); - 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); - } + if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) { + print_controllers(ctx, info.ctrl, info.n_ctrl); } else { - /* Return the controller for a particular bridge. */ struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true); - - /* 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); + if (br->n_ctrl) { + print_controllers(ctx, br->ctrl, br->n_ctrl); + } else { + print_controllers(ctx, info.ctrl, info.n_ctrl); } } 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) { @@ -1436,54 +1603,100 @@ cmd_del_controller(struct vsctl_context *ctx) get_info(ctx->ovs, &info); - if (ctx->argc == 1) { - if (info.ctrl) { - ovsrec_controller_delete(info.ctrl); - ovsrec_open_vswitch_set_controller(ctx->ovs, NULL); + 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) { - ovsrec_controller_delete(br->ctrl); - ovsrec_bridge_set_controller(br->br_cfg, NULL); + 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 +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 ovsrec_controller *ctrl; get_info(ctx->ovs, &info); 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); + /* 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 the controller for a particular bridge. */ + /* 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; - 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); + 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); } 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) { @@ -1492,23 +1705,18 @@ cmd_get_fail_mode(struct vsctl_context *ctx) get_info(ctx->ovs, &info); - if (ctx->argc == 1) { + if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) { /* Return the fail-mode from the "Open_vSwitch" table */ - if (info.ctrl && info.ctrl->fail_mode) { - fail_mode = info.ctrl->fail_mode; - } + 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 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 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)) { @@ -1518,6 +1726,17 @@ cmd_get_fail_mode(struct vsctl_context *ctx) 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) { @@ -1525,16 +1744,12 @@ cmd_del_fail_mode(struct vsctl_context *ctx) get_info(ctx->ovs, &info); - if (ctx->argc == 1) { - if (info.ctrl && info.ctrl->fail_mode) { - ovsrec_controller_set_fail_mode(info.ctrl, NULL); - } + 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); - if (br->ctrl && br->ctrl->fail_mode) { - ovsrec_controller_set_fail_mode(br->ctrl, NULL); - } + set_fail_mode(br->ctrl, br->n_ctrl, NULL); } free_info(&info); @@ -1544,29 +1759,36 @@ static void cmd_set_fail_mode(struct vsctl_context *ctx) { struct vsctl_info info; + const char *bridge; const char *fail_mode; get_info(ctx->ovs, &info); - fail_mode = (ctx->argc == 2) ? ctx->argv[1] : ctx->argv[2]; + if (ctx->argc == 2) { + bridge = "default"; + fail_mode = ctx->argv[1]; + } else { + bridge = ctx->argv[1]; + fail_mode = ctx->argv[2]; + } if (strcmp(fail_mode, "standalone") && strcmp(fail_mode, "secure")) { vsctl_fatal("fail-mode must be \"standalone\" or \"secure\""); } - if (ctx->argc == 2) { + if (!strcmp(bridge, "default")) { /* 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); + set_fail_mode(info.ctrl, info.n_ctrl, fail_mode); } else { - struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + struct vsctl_bridge *br = find_real_bridge(&info, bridge, true); if (!br->ctrl) { vsctl_fatal("no controller declared for %s", br->name); } - ovsrec_controller_set_fail_mode(br->ctrl, fail_mode); + set_fail_mode(br->ctrl, br->n_ctrl, fail_mode); } free_info(&info); @@ -1665,9 +1887,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}}} }; @@ -1731,7 +1967,8 @@ get_table(const char *table_name) static const struct ovsdb_idl_row * get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, - const struct vsctl_row_id *id, const char *record_id) + const struct vsctl_row_id *id, const char *record_id, + bool partial_match_ok) { const struct ovsdb_idl_row *referrer, *final; @@ -1763,8 +2000,11 @@ get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, 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); + unsigned int score; + + score = (partial_match_ok + ? score_partial_match(name.keys[0].string, record_id) + : !strcmp(name.keys[0].string, record_id)); if (score > best_score) { referrer = row; best_score = score; @@ -1804,8 +2044,9 @@ 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, + bool partial_match_ok) { const struct ovsdb_idl_row *row; struct uuid uuid; @@ -1816,7 +2057,8 @@ get_row(struct vsctl_context *ctx, int i; for (i = 0; i < ARRAY_SIZE(table->row_ids); i++) { - row = get_row_by_id(ctx, table, &table->row_ids[i], record_id); + row = get_row_by_id(ctx, table, &table->row_ids[i], record_id, + partial_match_ok); if (row) { break; } @@ -1825,6 +2067,13 @@ get_row(struct vsctl_context *ctx, return row; } +static const struct ovsdb_idl_row * +get_row(struct vsctl_context *ctx, + const struct vsctl_table_class *table, const char *record_id) +{ + return get_row__(ctx, table, record_id, true); +} + static const struct ovsdb_idl_row * must_get_row(struct vsctl_context *ctx, const struct vsctl_table_class *table, const char *record_id) @@ -1868,15 +2117,65 @@ get_column(const struct vsctl_table_class *table, const char *column_name, } } +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 +2220,43 @@ 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)) { + best_len = op_len; + best = op; + } + } + if (!best) { + error = missing_operator_error(arg, allowed_operators, n_allowed); + goto error; + } + + 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 + 1); + *valuep = xstrdup(p); } else { if (valuep) { *valuep = NULL; @@ -1950,6 +2280,9 @@ error: if (valuep) { free(*valuep); *valuep = NULL; + if (operatorp) { + *operatorp = NULL; + } } return error; } @@ -1972,8 +2305,18 @@ cmd_get(struct vsctl_context *ctx) 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); if (key_string) { @@ -1987,7 +2330,7 @@ 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, column->type.key.type); @@ -2067,14 +2410,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); @@ -2090,9 +2434,9 @@ 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); @@ -2109,7 +2453,7 @@ set_column(const struct vsctl_table_class *table, 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 +2473,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); } } @@ -2159,7 +2503,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); } @@ -2200,18 +2545,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 +2599,36 @@ 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; + 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; + } + 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)); } @@ -2325,7 +2693,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 +2704,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,9 +2722,10 @@ 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; txn = the_idl_txn = ovsdb_idl_txn_create(idl); @@ -2361,9 +2733,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, 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,32 +2747,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); + + 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(); @@ -2416,11 +2801,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); @@ -2430,8 +2811,12 @@ 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; @@ -2456,6 +2841,10 @@ 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); @@ -2478,6 +2867,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[] = { @@ -2496,7 +2896,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, ""}, @@ -2508,7 +2908,7 @@ static const struct vsctl_command_syntax all_commands[] = { /* 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, ""}, + {"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, ""}, @@ -2518,6 +2918,9 @@ static const struct vsctl_command_syntax all_commands[] = { {"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"}, {"list", 1, INT_MAX, cmd_list, NULL, ""}, @@ -2525,7 +2928,7 @@ static const struct vsctl_command_syntax all_commands[] = { {"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"}, {NULL, 0, 0, NULL, NULL, NULL},