X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=aea317cadb54e4fdf48a1f2c9dda1192d801b876;hb=c1c9c9c4b636ab2acf2f75024c282a9a497ca9a9;hp=60ab0f5b825abf4127c84aaefe58433920772129;hpb=3ef917b5699874c46131c1d8731fafc5246c0dd1;p=sliver-openvswitch.git diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index 60ab0f5b8..aea317cad 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -37,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" @@ -45,6 +45,9 @@ #include "vlog.h" #define THIS_MODULE VLM_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 + struct vsctl_context; typedef void vsctl_handler_func(struct vsctl_context *); @@ -87,6 +90,13 @@ static int timeout = 5; /* All supported commands. */ static const struct vsctl_command_syntax all_commands[]; +/* The IDL we're using and the current transaction, if any. + * This is for use by vsctl_exit() only, to allow it to clean up. + * Other code should use its context arguments. */ +static struct ovsdb_idl *the_idl; +static struct ovsdb_idl_txn *the_idl_txn; + +static void vsctl_exit(int status) NO_RETURN; static void vsctl_fatal(const char *, ...) PRINTF_FORMAT(1, 2) NO_RETURN; static char *default_db(void); static void usage(void) NO_RETURN; @@ -99,6 +109,12 @@ 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[]) { @@ -115,6 +131,7 @@ main(int argc, char *argv[]) vlog_init(); vlog_set_levels(VLM_ANY_MODULE, 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); @@ -128,10 +145,8 @@ main(int argc, char *argv[]) time_alarm(timeout); } - /* Do basic command syntax checking. */ - /* Now execute the commands. */ - idl = ovsdb_idl_create(db, &ovsrec_idl_class); + idl = the_idl = ovsdb_idl_create(db, &ovsrec_idl_class); seqno = ovsdb_idl_get_seqno(idl); trials = 0; for (;;) { @@ -161,6 +176,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[] = { @@ -173,6 +189,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}, }; @@ -216,13 +236,21 @@ parse_options(int argc, char *argv[]) case 't': timeout = strtoul(optarg, NULL, 10); if (timeout < 0) { - ovs_fatal(0, "value %s on -t or --timeout is invalid", - optarg); + vsctl_fatal("value %s on -t or --timeout is invalid", + optarg); } break; 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); @@ -279,12 +307,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"); @@ -298,10 +341,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; @@ -309,6 +362,17 @@ parse_command(int argc, char *argv[], struct vsctl_command *command) 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); + } + } + vsctl_fatal("'%s' command takes at most %d arguments", p->name, p->max_args); } else { @@ -335,7 +399,25 @@ vsctl_fatal(const char *format, ...) vlog_set_levels(VLM_vsctl, VLF_CONSOLE, VLL_EMER); VLOG_ERR("%s", message); - ovs_fatal(0, "%s", message); + ovs_error(0, "%s", message); + vsctl_exit(EXIT_FAILURE); +} + +/* Frees the current transaction and the underlying IDL and then calls + * exit(status). + * + * Freeing the transaction and the IDL is not strictly necessary, but it makes + * for a clean memory leak report from valgrind in the normal case. That makes + * it easier to notice real memory leaks. */ +static void +vsctl_exit(int status) +{ + if (the_idl_txn) { + ovsdb_idl_txn_abort(the_idl_txn); + ovsdb_idl_txn_destroy(the_idl_txn); + } + ovsdb_idl_destroy(the_idl); + exit(status); } static void @@ -383,6 +465,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\ @@ -412,7 +497,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; } @@ -427,13 +512,15 @@ 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; }; 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; }; @@ -452,9 +539,34 @@ 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 * +vsctl_context_to_string(const struct vsctl_context *ctx) +{ + const struct shash_node *node; + struct svec words; + char *s; + int i; + + svec_init(&words); + SHASH_FOR_EACH (node, &ctx->options) { + svec_add(&words, node->name); + } + for (i = 0; i < ctx->argc; i++) { + svec_add(&words, ctx->argv[i]); + } + svec_terminate(&words); + + s = process_escape_args(words.names); + + svec_destroy(&words); + + return s; +} + static struct vsctl_bridge * add_bridge(struct vsctl_info *b, struct ovsrec_bridge *br_cfg, const char *name, @@ -465,7 +577,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; } @@ -530,6 +648,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); @@ -763,24 +882,149 @@ ovs_delete_bridge(const struct ovsrec_open_vswitch *ovs, } static void -cmd_init(struct vsctl_context *ctx UNUSED) +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) { - const char *br_name = ctx->argv[1]; + bool may_exist = shash_find(&ctx->options, "--may-exist") != 0; + const char *br_name, *parent_name; struct vsctl_info info; + int vlan; + + br_name = ctx->argv[1]; + if (ctx->argc == 2) { + parent_name = NULL; + vlan = 0; + } else if (ctx->argc == 4) { + parent_name = ctx->argv[2]; + vlan = atoi(ctx->argv[3]); + if (vlan < 1 || vlan > 4095) { + vsctl_fatal("%s: vlan must be between 1 and 4095", ctx->argv[0]); + } + } else { + vsctl_fatal("'%s' command takes exactly 1 or 3 arguments", + ctx->argv[0]); + } get_info(ctx->ovs, &info); + if (may_exist) { + struct vsctl_bridge *br; + + br = find_bridge(&info, br_name, false); + if (br) { + if (!parent_name) { + if (br->parent) { + vsctl_fatal("\"--may-exist add-br %s\" but %s is " + "a VLAN bridge for VLAN %d", + br_name, br_name, br->vlan); + } + } else { + if (!br->parent) { + vsctl_fatal("\"--may-exist add-br %s %s %d\" but %s " + "is not a VLAN bridge", + br_name, parent_name, vlan, br_name); + } else if (strcmp(br->parent->name, parent_name)) { + vsctl_fatal("\"--may-exist add-br %s %s %d\" but %s " + "has the wrong parent %s", + br_name, parent_name, vlan, + br_name, br->parent->name); + } else if (br->vlan != vlan) { + vsctl_fatal("\"--may-exist add-br %s %s %d\" but %s " + "is a VLAN bridge for the wrong VLAN %d", + br_name, parent_name, vlan, br_name, br->vlan); + } + } + return; + } + } check_conflicts(&info, br_name, xasprintf("cannot create a bridge named %s", br_name)); - if (ctx->argc == 2) { - struct ovsrec_bridge *br; + if (!parent_name) { struct ovsrec_port *port; struct ovsrec_interface *iface; + struct ovsrec_bridge *br; iface = ovsrec_interface_insert(ctx->txn); ovsrec_interface_set_name(iface, br_name); @@ -794,22 +1038,13 @@ cmd_add_br(struct vsctl_context *ctx) ovsrec_bridge_set_ports(br, &port, 1); ovs_insert_bridge(ctx->ovs, br); - } else if (ctx->argc == 3) { - vsctl_fatal("'%s' command takes exactly 1 or 3 arguments", - ctx->argv[0]); - } else if (ctx->argc == 4) { - const char *parent_name = ctx->argv[2]; - int vlan = atoi(ctx->argv[3]); - struct ovsrec_bridge *br; + } else { struct vsctl_bridge *parent; struct ovsrec_port *port; struct ovsrec_interface *iface; + struct ovsrec_bridge *br; int64_t tag = vlan; - if (vlan < 1 || vlan > 4095) { - vsctl_fatal("%s: vlan must be between 1 and 4095", ctx->argv[0]); - } - parent = find_bridge(&info, parent_name, false); if (parent && parent->vlan) { vsctl_fatal("cannot create bridge with fake bridge as parent"); @@ -830,8 +1065,6 @@ cmd_add_br(struct vsctl_context *ctx) ovsrec_port_set_tag(port, &tag, 1); bridge_insert_port(br, port); - } else { - NOT_REACHED(); } free_info(&info); @@ -869,7 +1102,7 @@ cmd_del_br(struct vsctl_context *ctx) SHASH_FOR_EACH (node, &info.ports) { struct vsctl_port *port = node->data; - if (port->bridge == bridge + if (port->bridge == bridge || port->bridge->parent == bridge || !strcmp(port->port_cfg->name, bridge->name)) { del_port(&info, port); } @@ -921,7 +1154,7 @@ cmd_br_exists(struct vsctl_context *ctx) get_info(ctx->ovs, &info); if (!find_bridge(&info, ctx->argv[1], false)) { - exit(2); + vsctl_exit(2); } free_info(&info); } @@ -1074,8 +1307,10 @@ cmd_list_ports(struct vsctl_context *ctx) static void add_port(struct vsctl_context *ctx, - const char *br_name, const char *port_name, bool fake_iface, - char *iface_names[], int n_ifaces) + const char *br_name, const char *port_name, + bool may_exist, bool fake_iface, + char *iface_names[], int n_ifaces, + char *settings[], int n_settings) { struct vsctl_info info; struct vsctl_bridge *bridge; @@ -1084,9 +1319,53 @@ add_port(struct vsctl_context *ctx, size_t i; get_info(ctx->ovs, &info); + if (may_exist) { + struct vsctl_port *port; + + port = find_port(&info, port_name, false); + if (port) { + struct svec want_names, have_names; + size_t i; + + svec_init(&want_names); + for (i = 0; i < n_ifaces; i++) { + svec_add(&want_names, iface_names[i]); + } + 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); + } + svec_sort(&have_names); + + if (strcmp(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); + } + + if (!svec_equal(&want_names, &have_names)) { + char *have_names_string = svec_join(&have_names, ", ", ""); + char *command = vsctl_context_to_string(ctx); + + vsctl_fatal("\"%s\" but %s actually has interface(s) %s", + command, port_name, have_names_string); + } + + svec_destroy(&want_names); + svec_destroy(&have_names); + + return; + } + } check_conflicts(&info, port_name, xasprintf("cannot create a port named %s", port_name)); - /* XXX need to check for conflicts on interfaces too */ + for (i = 0; i < n_ifaces; i++) { + check_conflicts(&info, iface_names[i], + xasprintf("cannot create an interface named %s", + iface_names[i])); + } bridge = find_bridge(&info, br_name, true); ifaces = xmalloc(n_ifaces * sizeof *ifaces); @@ -1106,6 +1385,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); @@ -1115,47 +1399,85 @@ add_port(struct vsctl_context *ctx, static void cmd_add_port(struct vsctl_context *ctx) { - add_port(ctx, ctx->argv[1], ctx->argv[2], false, &ctx->argv[2], 1); + 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[3], ctx->argc - 3); } static void 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], fake_iface, - &ctx->argv[3], ctx->argc - 3); + add_port(ctx, ctx->argv[1], ctx->argv[2], may_exist, fake_iface, + &ctx->argv[3], n_ifaces, + &ctx->argv[n_ifaces + 3], ctx->argc - 3 - n_ifaces); } static void cmd_del_port(struct vsctl_context *ctx) { bool must_exist = !shash_find(&ctx->options, "--if-exists"); + bool with_iface = shash_find(&ctx->options, "--with-iface") != NULL; + struct vsctl_port *port; struct vsctl_info info; get_info(ctx->ovs, &info); - if (ctx->argc == 2) { - struct vsctl_port *port = find_port(&info, ctx->argv[1], must_exist); - if (port) { - del_port(&info, port); + if (!with_iface) { + port = find_port(&info, ctx->argv[ctx->argc - 1], must_exist); + } else { + const char *target = ctx->argv[ctx->argc - 1]; + struct vsctl_iface *iface; + + port = find_port(&info, target, false); + if (!port) { + iface = find_iface(&info, target, false); + if (iface) { + port = iface->port; + } } - } else if (ctx->argc == 3) { - struct vsctl_bridge *bridge = find_bridge(&info, ctx->argv[1], true); - struct vsctl_port *port = find_port(&info, ctx->argv[2], must_exist); + if (must_exist && !port) { + vsctl_fatal("no port or interface named %s", target); + } + } - if (port) { - if (port->bridge == bridge) { - del_port(&info, port); - } else if (port->bridge->parent == bridge) { - vsctl_fatal("bridge %s does not have a port %s (although its " - "parent bridge %s does)", - ctx->argv[1], ctx->argv[2], bridge->parent->name); - } else { - vsctl_fatal("bridge %s does not have a port %s", - ctx->argv[1], ctx->argv[2]); + if (port) { + if (ctx->argc == 3) { + struct vsctl_bridge *bridge; + + bridge = find_bridge(&info, ctx->argv[1], true); + if (port->bridge != bridge) { + if (port->bridge->parent == bridge) { + vsctl_fatal("bridge %s does not have a port %s (although " + "its parent bridge %s does)", + ctx->argv[1], ctx->argv[2], + bridge->parent->name); + } else { + vsctl_fatal("bridge %s does not have a port %s", + ctx->argv[1], ctx->argv[2]); + } } } + + del_port(&info, port); } + free_info(&info); } @@ -1236,6 +1558,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) { @@ -1243,27 +1588,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) { @@ -1271,54 +1620,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) { @@ -1327,23 +1722,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)) { @@ -1353,6 +1743,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) { @@ -1360,16 +1761,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); @@ -1379,29 +1776,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); @@ -1454,142 +1858,6 @@ cmd_set_ssl(struct vsctl_context *ctx) /* Parameter commands. */ -/* POSIX extended regular expression for an 8-bit unsigned decimal integer. */ -#define OCTET_RE "([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])" - -/* POSIX extended regular expression for an IP address. */ -#define IP_RE "("OCTET_RE"\\."OCTET_RE"\\."OCTET_RE"\\."OCTET_RE")" - -/* POSIX extended regular expression for a netmask. */ -#define NETMASK_RE \ - "255.255.255."NETMASK_END_RE"|" \ - "255.255."NETMASK_END_RE".0|" \ - "255."NETMASK_END_RE".0.0|" \ - NETMASK_END_RE".0.0.0" -#define NETMASK_END_RE "(255|254|252|248|240|224|192|128|0)" - -/* POSIX extended regular expression for an Ethernet address. */ -#define XX_RE "[0-9a-fA-F][0-9a-fA-F]" -#define MAC_RE XX_RE":"XX_RE":"XX_RE":"XX_RE":"XX_RE":"XX_RE - -/* POSIX extended regular expression for a TCP or UDP port number. */ -#define PORT_RE \ - "([0-9]|" \ - "[1-9][0-9]|" \ - "[1-9][0-9][0-9]|" \ - "[1-9][0-9][0-9][0-9]|" \ - "[1-5][0-9][0-9][0-9][0-9]|" \ - "6[1-4][0-9][0-9][0-9]|" \ - "65[1-4][0-9][0-9]|" \ - "655[1-2][0-9]|" \ - "6553[1-5])" - -enum { - VSCF_READONLY = 1 << 0, - VSCF_HIDDEN = 1 << 1 -}; - -struct vsctl_column { - struct ovsdb_idl_column *idl; - int flags; - const char *constraint; -}; - -static const struct vsctl_column bridge_columns[] = { - {&ovsrec_bridge_col_datapath_id, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_datapath_type, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_name, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_mirrors, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_other_config, 0, NULL}, - {&ovsrec_bridge_col_flood_vlans, 0, "[1,4095]"}, - {&ovsrec_bridge_col_controller, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_netflow, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_external_ids, 0, NULL}, - {&ovsrec_bridge_col_ports, VSCF_READONLY, NULL}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column controller_columns[] = { - {&ovsrec_controller_col_connection_mode, 0, "in-band|out-of-band"}, - {&ovsrec_controller_col_controller_burst_limit, 0, "[25,]"}, - {&ovsrec_controller_col_controller_rate_limit, 0, "[100,]"}, - {&ovsrec_controller_col_discover_accept_regex, 0, NULL}, - {&ovsrec_controller_col_discover_update_resolv_conf, 0, NULL}, - {&ovsrec_controller_col_fail_mode, 0, "standalone|secure"}, - {&ovsrec_controller_col_inactivity_probe, 0, "[5000,]"}, - {&ovsrec_controller_col_local_gateway, 0, IP_RE}, - {&ovsrec_controller_col_local_ip, 0, IP_RE}, - {&ovsrec_controller_col_local_netmask, 0, NETMASK_RE}, - {&ovsrec_controller_col_max_backoff, 0, "[1000,]"}, - {&ovsrec_controller_col_target, 0, NULL}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column interface_columns[] = { - {&ovsrec_interface_col_external_ids, 0, NULL}, - {&ovsrec_interface_col_ingress_policing_burst, 0, "[10,]"}, - {&ovsrec_interface_col_ingress_policing_rate, 0, "[100,]"}, - {&ovsrec_interface_col_mac, 0, MAC_RE}, - {&ovsrec_interface_col_name, VSCF_READONLY, NULL}, - {&ovsrec_interface_col_ofport, VSCF_READONLY, NULL}, - {&ovsrec_interface_col_options, 0, NULL}, - {&ovsrec_interface_col_type, VSCF_READONLY, NULL}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column mirror_columns[] = { - {&ovsrec_mirror_col_name, VSCF_READONLY, NULL}, - {&ovsrec_mirror_col_output_port, 0, "Port"}, - {&ovsrec_mirror_col_output_vlan, 0, "[1,4095]"}, - {&ovsrec_mirror_col_select_dst_port, 0, "Port"}, - {&ovsrec_mirror_col_select_src_port, 0, "Port"}, - {&ovsrec_mirror_col_select_vlan, 0, "[1,4095]"}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column netflow_columns[] = { - {&ovsrec_netflow_col_active_timeout, 0, "[-1,]"}, - {&ovsrec_netflow_col_add_id_to_interface, 0, NULL}, - {&ovsrec_netflow_col_targets, 0, IP_RE":"PORT_RE}, - {&ovsrec_netflow_col_engine_type, 0, "[0,255]"}, - {&ovsrec_netflow_col_engine_id, 0, "[0,255]"}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column open_vswitch_columns[] = { - {&ovsrec_open_vswitch_col_bridges, VSCF_READONLY, NULL}, - {&ovsrec_open_vswitch_col_controller, VSCF_READONLY, NULL}, - {&ovsrec_open_vswitch_col_cur_cfg, VSCF_HIDDEN, NULL}, - {&ovsrec_open_vswitch_col_management_id, 0, "[0-9a-fA-F]{12}"}, - {&ovsrec_open_vswitch_col_managers, 0, "p?(ssl|tcp|unix):.*"}, - {&ovsrec_open_vswitch_col_next_cfg, VSCF_HIDDEN, NULL}, - {&ovsrec_open_vswitch_col_ssl, VSCF_READONLY, NULL}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column port_columns[] = { - {&ovsrec_port_col_bond_updelay, 0, "[0,]"}, - {&ovsrec_port_col_bond_downdelay, 0, "[0,]"}, - {&ovsrec_port_col_bond_fake_iface, VSCF_READONLY, NULL}, - {&ovsrec_port_col_external_ids, 0, NULL}, - {&ovsrec_port_col_fake_bridge, VSCF_READONLY, NULL}, - {&ovsrec_port_col_interfaces, VSCF_READONLY, NULL}, - {&ovsrec_port_col_mac, 0, MAC_RE}, - {&ovsrec_port_col_name, VSCF_READONLY, NULL}, - {&ovsrec_port_col_other_config, 0, NULL}, - {&ovsrec_port_col_tag, 0, "[0,4095]"}, - {&ovsrec_port_col_trunks, 0, "[0,4095]"}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column ssl_columns[] = { - {&ovsrec_ssl_col_bootstrap_ca_cert, 0, NULL}, - {&ovsrec_ssl_col_ca_cert, 0, NULL}, - {&ovsrec_ssl_col_certificate, 0, NULL}, - {&ovsrec_ssl_col_private_key, 0, NULL}, - {NULL, 0, NULL}, -}; - struct vsctl_row_id { const struct ovsdb_idl_table_class *table; const struct ovsdb_idl_column *name_column; @@ -1598,16 +1866,15 @@ struct vsctl_row_id { struct vsctl_table_class { struct ovsdb_idl_table_class *class; - const struct vsctl_column *columns; struct vsctl_row_id row_ids[2]; }; static const struct vsctl_table_class tables[] = { - {&ovsrec_table_bridge, bridge_columns, + {&ovsrec_table_bridge, {{&ovsrec_table_bridge, &ovsrec_bridge_col_name, NULL}, {NULL, NULL, NULL}}}, - {&ovsrec_table_controller, controller_columns, + {&ovsrec_table_controller, {{&ovsrec_table_bridge, &ovsrec_bridge_col_name, &ovsrec_bridge_col_controller}, @@ -1615,39 +1882,53 @@ static const struct vsctl_table_class tables[] = { NULL, &ovsrec_open_vswitch_col_controller}}}, - {&ovsrec_table_interface, interface_columns, + {&ovsrec_table_interface, {{&ovsrec_table_interface, &ovsrec_interface_col_name, NULL}, {NULL, NULL, NULL}}}, - {&ovsrec_table_mirror, mirror_columns, + {&ovsrec_table_mirror, {{&ovsrec_table_mirror, &ovsrec_mirror_col_name, NULL}, {NULL, NULL, NULL}}}, - {&ovsrec_table_netflow, netflow_columns, + {&ovsrec_table_netflow, {{&ovsrec_table_bridge, &ovsrec_bridge_col_name, &ovsrec_bridge_col_netflow}, {NULL, NULL, NULL}}}, - {&ovsrec_table_open_vswitch, open_vswitch_columns, + {&ovsrec_table_open_vswitch, {{&ovsrec_table_open_vswitch, NULL, NULL}, {NULL, NULL, NULL}}}, - {&ovsrec_table_port, port_columns, + {&ovsrec_table_port, {{&ovsrec_table_port, &ovsrec_port_col_name, NULL}, {NULL, NULL, NULL}}}, - {&ovsrec_table_ssl, ssl_columns, + {&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}}}, - {NULL, NULL, {{NULL, NULL, NULL}, {NULL, NULL, NULL}}} + {&ovsrec_table_sflow, + {{&ovsrec_table_bridge, + &ovsrec_bridge_col_name, + &ovsrec_bridge_col_sflow}, + {NULL, NULL, NULL}}}, + + {NULL, {{NULL, NULL, NULL}, {NULL, NULL, NULL}}} }; static void die_if_error(char *error) { if (error) { - ovs_fatal(0, "%s", error); + vsctl_fatal("%s", error); } } @@ -1695,9 +1976,9 @@ get_table(const char *table_name) if (best_match) { return best_match; } else if (best_score) { - ovs_fatal(0, "multiple table names match \"%s\"", table_name); + vsctl_fatal("multiple table names match \"%s\"", table_name); } else { - ovs_fatal(0, "unknown table \"%s\"", table_name); + vsctl_fatal("unknown table \"%s\"", table_name); } } @@ -1724,7 +2005,7 @@ get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, unsigned int best_score = 0; /* It might make sense to relax this assertion. */ - assert(id->name_column->type.key_type == OVSDB_TYPE_STRING); + assert(id->name_column->type.key.type == OVSDB_TYPE_STRING); referrer = NULL; for (row = ovsdb_idl_first_row(ctx->idl, id->table); @@ -1746,6 +2027,10 @@ get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, } 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) { return NULL; @@ -1755,8 +2040,8 @@ get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, 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); + 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) { @@ -1799,30 +2084,28 @@ must_get_row(struct vsctl_context *ctx, { const struct ovsdb_idl_row *row = get_row(ctx, table, record_id); if (!row) { - ovs_fatal(0, "no row \"%s\" in table %s", - record_id, table->class->name); + vsctl_fatal("no row \"%s\" in table %s", + record_id, table->class->name); } return row; } static char * get_column(const struct vsctl_table_class *table, const char *column_name, - const struct vsctl_column **columnp) + const struct ovsdb_idl_column **columnp) { - const struct vsctl_column *column; - const struct vsctl_column *best_match = NULL; + const struct ovsdb_idl_column *best_match = NULL; unsigned int best_score = 0; + size_t i; - for (column = table->columns; column->idl; column++) { - if (!(column->flags & VSCF_HIDDEN)) { - unsigned int score = score_partial_match(column->idl->name, - column_name); - if (score > best_score) { - best_match = column; - best_score = score; - } else if (score == best_score) { - best_match = NULL; - } + for (i = 0; i < table->class->n_columns; i++) { + const struct ovsdb_idl_column *column = &table->class->columns[i]; + unsigned int score = score_partial_match(column->name, column_name); + if (score > best_score) { + best_match = column; + best_score = score; + } else if (score == best_score) { + best_match = NULL; } } @@ -1840,7 +2123,7 @@ get_column(const struct vsctl_table_class *table, const char *column_name, static char * WARN_UNUSED_RESULT parse_column_key_value(const char *arg, const struct vsctl_table_class *table, - const struct vsctl_column **columnp, + const struct ovsdb_idl_column **columnp, char **keyp, char **valuep) { const char *p = arg; @@ -1868,10 +2151,10 @@ parse_column_key_value(const char *arg, const struct vsctl_table_class *table, goto error; } error = get_column(table, column_name, columnp); + free(column_name); if (error) { goto error; } - free(column_name); } /* Parse key string. */ @@ -1902,8 +2185,8 @@ parse_column_key_value(const char *arg, const struct vsctl_table_class *table, *valuep = NULL; } if (*p != '\0') { - error = xasprintf("%s: trailing garbage in argument at offset %td", - arg, p - arg); + error = xasprintf("%s: trailing garbage \"%s\" in argument", + arg, p); goto error; } } @@ -1927,6 +2210,7 @@ error: static void cmd_get(struct vsctl_context *ctx) { + bool if_exists = shash_find(&ctx->options, "--if-exists"); const char *table_name = ctx->argv[1]; const char *record_id = ctx->argv[2]; const struct vsctl_table_class *table; @@ -1937,44 +2221,45 @@ cmd_get(struct vsctl_context *ctx) table = get_table(table_name); row = must_get_row(ctx, table, record_id); for (i = 3; i < ctx->argc; i++) { - const struct vsctl_column *column; + const struct ovsdb_idl_column *column; struct ovsdb_datum datum; char *key_string; die_if_error(parse_column_key_value(ctx->argv[i], table, &column, &key_string, NULL)); - ovsdb_idl_txn_read(row, column->idl, &datum); + ovsdb_idl_txn_read(row, column, &datum); if (key_string) { union ovsdb_atom key; unsigned int idx; - if (column->idl->type.value_type == OVSDB_TYPE_VOID) { - ovs_fatal(0, "cannot specify key to get for non-map column %s", - column->idl->name); + if (column->type.value.type == OVSDB_TYPE_VOID) { + vsctl_fatal("cannot specify key to get for non-map column %s", + column->name); } die_if_error(ovsdb_atom_from_string(&key, - column->idl->type.key_type, - key_string)); + &column->type.key, + key_string, ctx->symtab)); idx = ovsdb_datum_find_key(&datum, &key, - column->idl->type.key_type); + column->type.key.type); if (idx == UINT_MAX) { - ovs_fatal(0, "no key %s in %s record \"%s\" column %s", - key_string, table_name, record_id, - column->idl->name); - + if (!if_exists) { + vsctl_fatal("no key \"%s\" in %s record \"%s\" column %s", + key_string, table->class->name, record_id, + column->name); + } + } else { + ovsdb_atom_to_string(&datum.values[idx], + column->type.value.type, out); } - ovsdb_atom_to_string(&datum.values[idx], - column->idl->type.value_type, out); - - ovsdb_atom_destroy(&key, column->idl->type.key_type); + ovsdb_atom_destroy(&key, column->type.key.type); } else { - ovsdb_datum_to_string(&datum, &column->idl->type, out); + ovsdb_datum_to_string(&datum, &column->type, out); } ds_put_char(out, '\n'); - ovsdb_datum_destroy(&datum, &column->idl->type); + ovsdb_datum_destroy(&datum, &column->type); free(key_string); } @@ -1984,25 +2269,21 @@ static void list_record(const struct vsctl_table_class *table, const struct ovsdb_idl_row *row, struct ds *out) { - const struct vsctl_column *column; + size_t i; - ds_put_format(out, "%-20s (RO): "UUID_FMT"\n", "_uuid", + ds_put_format(out, "%-20s: "UUID_FMT"\n", "_uuid", UUID_ARGS(&row->uuid)); - for (column = table->columns; column->idl; column++) { + for (i = 0; i < table->class->n_columns; i++) { + const struct ovsdb_idl_column *column = &table->class->columns[i]; struct ovsdb_datum datum; - if (column->flags & VSCF_HIDDEN) { - continue; - } - - ovsdb_idl_txn_read(row, column->idl, &datum); + ovsdb_idl_txn_read(row, column, &datum); - ds_put_format(out, "%-20s (%s): ", column->idl->name, - column->flags & VSCF_READONLY ? "RO" : "RW"); - ovsdb_datum_to_string(&datum, &column->idl->type, out); + ds_put_format(out, "%-20s: ", column->name); + ovsdb_datum_to_string(&datum, &column->type, out); ds_put_char(out, '\n'); - ovsdb_datum_destroy(&datum, &column->idl->type); + ovsdb_datum_destroy(&datum, &column->type); } } @@ -2037,153 +2318,62 @@ cmd_list(struct vsctl_context *ctx) } } -static void -check_string_constraint(const struct ovsdb_datum *datum, - const char *constraint) -{ - unsigned int i; - char *regex; - regex_t re; - int retval; - - regex = xasprintf("^%s$", constraint); - retval = regcomp(&re, regex, REG_NOSUB | REG_EXTENDED); - if (retval) { - size_t length = regerror(retval, &re, NULL, 0); - char *buffer = xmalloc(length); - regerror(retval, &re, buffer, length); - ovs_fatal(0, "internal error compiling regular expression %s: %s", - regex, buffer); - } - - for (i = 0; i < datum->n; i++) { - const char *key = datum->keys[i].string; - if (regexec(&re, key, 0, NULL, 0)) { - ovs_fatal(0, "%s is not valid (it does not match %s)", key, regex); - } - } - free(regex); - regfree(&re); -} - -static void -check_integer_constraint(const struct ovsdb_datum *datum, - const char *constraint) -{ - int64_t min, max; - unsigned int i; - int n = -1; - - sscanf(constraint, "[%"SCNd64",%"SCNd64"]%n", &min, &max, &n); - if (n == -1) { - sscanf(constraint, "[%"SCNd64",]%n", &min, &n); - if (n == -1) { - sscanf(constraint, "[,%"SCNd64"]%n", &max, &n); - if (n == -1) { - VLOG_DBG("internal error: bad integer contraint \"%s\"", - constraint); - return; - } else { - min = INT64_MIN; - } - } else { - max = INT64_MAX; - } - } - - for (i = 0; i < datum->n; i++) { - int64_t value = datum->keys[i].integer; - if (value < min || value > max) { - if (max == INT64_MAX) { - ovs_fatal(0, "%"PRId64" is less than the minimum " - "allowed value %"PRId64, value, min); - } else if (min == INT64_MIN) { - ovs_fatal(0, "%"PRId64" is greater than the maximum " - "allowed value %"PRId64, value, max); - } else { - ovs_fatal(0, "%"PRId64" is outside the valid range %"PRId64" " - "to %"PRId64" (inclusive)", value, min, max); - } - } - } -} - -static void -check_constraint(const struct ovsdb_datum *datum, - const struct ovsdb_type *type, const char *constraint) -{ - if (constraint && datum->n) { - if (type->key_type == OVSDB_TYPE_STRING) { - check_string_constraint(datum, constraint); - } else if (type->key_type == OVSDB_TYPE_INTEGER) { - check_integer_constraint(datum, constraint); - } - } -} - static void set_column(const struct vsctl_table_class *table, - const struct ovsdb_idl_row *row, - const char *arg, bool force) + const struct ovsdb_idl_row *row, const char *arg, + struct ovsdb_symbol_table *symtab) { - const struct vsctl_column *column; + 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); die_if_error(error); - if (column->flags & VSCF_READONLY && !force) { - ovs_fatal(0, "%s: cannot modify read-only column %s in table %s", - arg, column->idl->name, table->class->name); - } if (!value_string) { - ovs_fatal(0, "%s: missing value", arg); + vsctl_fatal("%s: missing value", arg); } if (key_string) { union ovsdb_atom key, value; struct ovsdb_datum old, new; - if (column->idl->type.value_type == OVSDB_TYPE_VOID) { - ovs_fatal(0, "cannot specify key to set for non-map column %s", - column->idl->name); + if (column->type.value.type == OVSDB_TYPE_VOID) { + vsctl_fatal("cannot specify key to set for non-map column %s", + column->name); } - die_if_error(ovsdb_atom_from_string(&key, - column->idl->type.key_type, - key_string)); - die_if_error(ovsdb_atom_from_string(&value, - column->idl->type.value_type, - value_string)); + die_if_error(ovsdb_atom_from_string(&key, &column->type.key, + key_string, symtab)); + 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->idl->type); + ovsdb_datum_add_unsafe(&new, &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->idl, &old); - ovsdb_datum_union(&old, &new, &column->idl->type, true); - ovsdb_idl_txn_write(row, column->idl, &old); + 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->idl->type); + ovsdb_datum_destroy(&new, &column->type); } else { struct ovsdb_datum datum; - die_if_error(ovsdb_datum_from_string(&datum, &column->idl->type, - value_string)); - if (!force) { - check_constraint(&datum, &column->idl->type, - column->constraint); - } - ovsdb_idl_txn_write(row, column->idl, &datum); + die_if_error(ovsdb_datum_from_string(&datum, &column->type, + value_string, symtab)); + ovsdb_idl_txn_write(row, column, &datum); } free(key_string); + free(value_string); } static void cmd_set(struct vsctl_context *ctx) { - bool force = shash_find(&ctx->options, "--force"); const char *table_name = ctx->argv[1]; const char *record_id = ctx->argv[2]; const struct vsctl_table_class *table; @@ -2193,19 +2383,18 @@ 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], force); + set_column(table, row, ctx->argv[i], ctx->symtab); } } static void cmd_add(struct vsctl_context *ctx) { - bool force = shash_find(&ctx->options, "--force"); const char *table_name = ctx->argv[1]; const char *record_id = ctx->argv[2]; const char *column_name = ctx->argv[3]; const struct vsctl_table_class *table; - const struct vsctl_column *column; + const struct ovsdb_idl_column *column; const struct ovsdb_idl_row *row; const struct ovsdb_type *type; struct ovsdb_datum old; @@ -2214,43 +2403,39 @@ cmd_add(struct vsctl_context *ctx) table = get_table(table_name); row = must_get_row(ctx, table, record_id); die_if_error(get_column(table, column_name, &column)); - type = &column->idl->type; - ovsdb_idl_txn_read(row, column->idl, &old); + + type = &column->type; + ovsdb_idl_txn_read(row, column, &old); for (i = 4; i < ctx->argc; i++) { struct ovsdb_type add_type; struct ovsdb_datum add; - if (column->flags & VSCF_READONLY && !force) { - ovs_fatal(0, "%s: cannot modify read-only column %s in table %s", - ctx->argv[i], column->idl->name, table_name); - } - 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); } if (old.n > type->n_max) { - ovs_fatal(0, "\"add\" operation would put %u %s in column %s of " - "table %s but at most %u are allowed", - old.n, - type->value_type == OVSDB_TYPE_VOID ? "values" : "pairs", - column->idl->name, table_name, type->n_max); + vsctl_fatal("\"add\" operation would put %u %s in column %s of " + "table %s but the maximum number is %u", + old.n, + type->value.type == OVSDB_TYPE_VOID ? "values" : "pairs", + column->name, table->class->name, type->n_max); } - ovsdb_idl_txn_write(row, column->idl, &old); + ovsdb_idl_txn_write(row, column, &old); } static void cmd_remove(struct vsctl_context *ctx) { - bool force = shash_find(&ctx->options, "--force"); const char *table_name = ctx->argv[1]; const char *record_id = ctx->argv[2]; const char *column_name = ctx->argv[3]; const struct vsctl_table_class *table; - const struct vsctl_column *column; + const struct ovsdb_idl_column *column; const struct ovsdb_idl_row *row; const struct ovsdb_type *type; struct ovsdb_datum old; @@ -2259,44 +2444,41 @@ cmd_remove(struct vsctl_context *ctx) table = get_table(table_name); row = must_get_row(ctx, table, record_id); die_if_error(get_column(table, column_name, &column)); - type = &column->idl->type; - ovsdb_idl_txn_read(row, column->idl, &old); + + type = &column->type; + ovsdb_idl_txn_read(row, column, &old); for (i = 4; i < ctx->argc; i++) { struct ovsdb_type rm_type; struct ovsdb_datum rm; char *error; - if (column->flags & VSCF_READONLY && !force) { - ovs_fatal(0, "%s: cannot modify read-only column %s in table %s", - ctx->argv[i], column->idl->name, table_name); - } - 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])); + rm_type.value.type = OVSDB_TYPE_VOID; + 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) { - ovs_fatal(0, "\"remove\" operation would put %u %s in column %s of " - "table %s but at least %u are required", - old.n, - type->value_type == OVSDB_TYPE_VOID ? "values" : "pairs", - column->idl->name, table_name, type->n_min); + vsctl_fatal("\"remove\" operation would put %u %s in column %s of " + "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); } - ovsdb_idl_txn_write(row, column->idl, &old); + ovsdb_idl_txn_write(row, column, &old); } static void cmd_clear(struct vsctl_context *ctx) { - bool force = shash_find(&ctx->options, "--force"); const char *table_name = ctx->argv[1]; const char *record_id = ctx->argv[2]; const struct vsctl_table_class *table; @@ -2306,44 +2488,57 @@ cmd_clear(struct vsctl_context *ctx) table = get_table(table_name); row = must_get_row(ctx, table, record_id); for (i = 3; i < ctx->argc; i++) { - const struct vsctl_column *column; + const struct ovsdb_idl_column *column; const struct ovsdb_type *type; struct ovsdb_datum datum; die_if_error(get_column(table, ctx->argv[i], &column)); - type = &column->idl->type; - if (column->flags & VSCF_READONLY && !force) { - ovs_fatal(0, "%s: cannot modify read-only column %s in table %s", - ctx->argv[i], column->idl->name, table_name); - } else if (type->n_min > 0) { - ovs_fatal(0, "\"clear\" operation cannot be applied to column %s " - "of table %s, which is not allowed to be empty", - column->idl->name, table_name); + type = &column->type; + if (type->n_min > 0) { + vsctl_fatal("\"clear\" operation cannot be applied to column %s " + "of table %s, which is not allowed to be empty", + column->name, table->class->name); } ovsdb_datum_init_empty(&datum); - ovsdb_idl_txn_write(row, column->idl, &datum); + ovsdb_idl_txn_write(row, column, &datum); } } static void cmd_create(struct vsctl_context *ctx) { - bool force = shash_find(&ctx->options, "--force"); + 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 (!force) { - ovs_fatal(0, "\"create\" requires --force"); + 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], force); + set_column(table, row, ctx->argv[i], ctx->symtab); } ds_put_format(&ctx->output, UUID_FMT, UUID_ARGS(&row->uuid)); } @@ -2375,16 +2570,11 @@ post_create(struct vsctl_context *ctx) static void cmd_destroy(struct vsctl_context *ctx) { - bool force = shash_find(&ctx->options, "--force"); bool must_exist = !shash_find(&ctx->options, "--if-exists"); const char *table_name = ctx->argv[1]; const struct vsctl_table_class *table; int i; - if (!force) { - ovs_fatal(0, "\"destroy\" requires --force"); - } - table = get_table(table_name); for (i = 2; i < ctx->argc; i++) { const struct ovsdb_idl_row *row; @@ -2413,7 +2603,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; @@ -2423,7 +2614,7 @@ vsctl_context_init(struct vsctl_context *ctx, struct vsctl_command *command, ctx->idl = idl; ctx->txn = txn; ctx->ovs = ovs; - + ctx->symtab = symtab; } static void @@ -2439,18 +2630,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; - txn = ovsdb_idl_txn_create(idl); + 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) { @@ -2464,34 +2655,41 @@ 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++) { 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(); - } + 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); + } + ovsdb_symbol_table_destroy(symtab); switch (status) { case TXN_INCOMPLETE: @@ -2509,17 +2707,21 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, for (c = commands; c < &commands[n_commands]; c++) { ds_destroy(&c->output); } + free(error); return; case TXN_ERROR: - vsctl_fatal("transaction error"); + vsctl_fatal("transaction error: %s", error); default: NOT_REACHED(); } + free(error); for (c = commands; c < &commands[n_commands]; c++) { struct ds *ds = &c->output; + struct shash_node *node; + if (oneline) { size_t j; @@ -2543,7 +2745,14 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, } else { 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 (;;) { @@ -2560,6 +2769,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, } done: ; } + ovsdb_idl_destroy(idl); exit(EXIT_SUCCESS); } @@ -2569,7 +2779,7 @@ static const struct vsctl_command_syntax all_commands[] = { {"init", 0, 0, cmd_init, NULL, ""}, /* Bridge commands. */ - {"add-br", 1, 3, cmd_add_br, NULL, ""}, + {"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, ""}, @@ -2580,9 +2790,9 @@ 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, ""}, - {"add-bond", 4, INT_MAX, cmd_add_bond, NULL, "--fake-iface"}, - {"del-port", 1, 2, cmd_del_port, NULL, "--if-exists"}, + {"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, ""}, /* Interface commands. */ @@ -2592,7 +2802,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, ""}, @@ -2602,15 +2812,18 @@ 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, ""}, + {"get", 3, INT_MAX, cmd_get, NULL, "--if-exists"}, {"list", 1, INT_MAX, cmd_list, NULL, ""}, - {"set", 3, INT_MAX, cmd_set, NULL, "--force"}, - {"add", 4, INT_MAX, cmd_add, NULL, "--force"}, - {"remove", 4, INT_MAX, cmd_remove, NULL, "--force"}, - {"clear", 3, INT_MAX, cmd_clear, NULL, "--force"}, - {"create", 2, INT_MAX, cmd_create, post_create, "--force"}, - {"destroy", 1, INT_MAX, cmd_destroy, NULL, "--force,--if-exists"}, + {"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}, };