X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=aea317cadb54e4fdf48a1f2c9dda1192d801b876;hb=c1c9c9c4b636ab2acf2f75024c282a9a497ca9a9;hp=a63970b513ed4b97bbc605691d253abb436ad860;hpb=dd8ac6fe86191a301746f384b25a9873e2e3c443;p=sliver-openvswitch.git diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index a63970b51..aea317cad 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,9 @@ #include #include +#include #include +#include #include #include #include @@ -30,8 +32,11 @@ #include "dirs.h" #include "dynamic-string.h" #include "json.h" +#include "ovsdb-data.h" #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" @@ -40,6 +45,33 @@ #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 *); + +struct vsctl_command_syntax { + const char *name; + int min_args; + int max_args; + vsctl_handler_func *run; + vsctl_handler_func *postprocess; + const char *options; +}; + +struct vsctl_command { + /* Data that remains constant after initialization. */ + const struct vsctl_command_syntax *syntax; + int argc; + char **argv; + struct shash options; + + /* Data modified by commands. */ + struct ds output; +}; + /* --db: The database server to contact. */ static const char *db; @@ -55,23 +87,43 @@ static bool wait_for_reload = true; /* --timeout: Time to wait for a connection to 'db'. */ 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; static void parse_options(int argc, char *argv[]); -static void check_vsctl_command(int argc, char *argv[]); -static void do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl); +static struct vsctl_command *parse_commands(int argc, char *argv[], + size_t *n_commandsp); +static void parse_command(int argc, char *argv[], struct vsctl_command *); +static 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 ds args; - int start, n_commands; + struct vsctl_command *commands; + size_t n_commands; + char *args; int trials; - int i; set_program_name(argv[0]); signal(SIGPIPE, SIG_IGN); @@ -79,37 +131,22 @@ 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); + VLOG_INFO("Called as %s", args); + + /* Parse command line. */ parse_options(argc, argv); + commands = parse_commands(argc - optind, argv + optind, &n_commands); if (timeout) { time_alarm(timeout); } - /* Log our arguments. This is often valuable for debugging systems. */ - ds_init(&args); - for (i = 1; i < argc; i++) { - ds_put_format(&args, " %s", argv[i]); - } - VLOG_INFO("Called as%s", ds_cstr(&args)); - ds_destroy(&args); - - /* Do basic command syntax checking. */ - n_commands = 0; - for (start = i = optind; i <= argc; i++) { - if (i == argc || !strcmp(argv[i], "--")) { - if (i > start) { - check_vsctl_command(i - start, &argv[start]); - n_commands++; - } - start = i + 1; - } - } - if (!n_commands) { - vsctl_fatal("missing command name (use --help for help)"); - } - /* 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 (;;) { @@ -121,7 +158,7 @@ main(int argc, char *argv[]) if (++trials > 5) { vsctl_fatal("too many database inconsistency failures"); } - do_vsctl(argc - optind, argv + optind, idl); + do_vsctl(args, commands, n_commands, idl); seqno = new_seqno; } @@ -130,21 +167,6 @@ main(int argc, char *argv[]) } } -static void -vsctl_fatal(const char *format, ...) -{ - char *message; - va_list args; - - va_start(args, format); - message = xvasprintf(format, args); - va_end(args); - - vlog_set_levels(VLM_vsctl, VLF_CONSOLE, VLL_EMER); - VLOG_ERR("%s", message); - ovs_fatal(0, "%s", message); -} - static void parse_options(int argc, char *argv[]) { @@ -153,7 +175,9 @@ parse_options(int argc, char *argv[]) OPT_ONELINE, OPT_NO_SYSLOG, OPT_NO_WAIT, - OPT_DRY_RUN + OPT_DRY_RUN, + OPT_PEER_CA_CERT, + VLOG_OPTION_ENUMS }; static struct option long_options[] = { {"db", required_argument, 0, OPT_DB}, @@ -162,15 +186,18 @@ parse_options(int argc, char *argv[]) {"dry-run", no_argument, 0, OPT_DRY_RUN}, {"oneline", no_argument, 0, OPT_ONELINE}, {"timeout", required_argument, 0, 't'}, - {"verbose", optional_argument, 0, 'v'}, {"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}, }; for (;;) { - unsigned long int timeout; int c; c = getopt_long(argc, argv, "+v::hVt:", long_options, NULL); @@ -209,14 +236,20 @@ 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; - case 'v': - vlog_set_verbosity(optarg); + 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); @@ -231,107 +264,231 @@ parse_options(int argc, char *argv[]) } } +static struct vsctl_command * +parse_commands(int argc, char *argv[], size_t *n_commandsp) +{ + struct vsctl_command *commands; + size_t n_commands, allocated_commands; + int i, start; + + commands = NULL; + n_commands = allocated_commands = 0; + + for (start = i = 0; i <= argc; i++) { + if (i == argc || !strcmp(argv[i], "--")) { + if (i > start) { + if (n_commands >= allocated_commands) { + struct vsctl_command *c; + + commands = x2nrealloc(commands, &allocated_commands, + sizeof *commands); + for (c = commands; c < &commands[n_commands]; c++) { + shash_moved(&c->options); + } + } + parse_command(i - start, &argv[start], + &commands[n_commands++]); + } + start = i + 1; + } + } + if (!n_commands) { + vsctl_fatal("missing command name (use --help for help)"); + } + *n_commandsp = n_commands; + return commands; +} + +static void +parse_command(int argc, char *argv[], struct vsctl_command *command) +{ + const struct vsctl_command_syntax *p; + int i; + + shash_init(&command->options); + for (i = 0; i < argc; i++) { + const char *option = argv[i]; + const char *equals; + char *key, *value; + + if (option[0] != '-') { + break; + } + + 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"); + } + + for (p = all_commands; p->name; p++) { + if (!strcmp(p->name, argv[i])) { + struct shash_node *node; + int n_arg; + + SHASH_FOR_EACH (node, &command->options) { + const char *s = strstr(p->options, node->name); + int end = s ? s[strlen(node->name)] : EOF; + + if (end != '=' && end != ',' && end != ' ' && end != '\0') { + vsctl_fatal("'%s' command has no '%s' option", + argv[i], node->name); + } + if ((end == '=') != (node->data != NULL)) { + if (end == '=') { + vsctl_fatal("missing argument to '%s' option on '%s' " + "command", node->name, argv[i]); + } else { + vsctl_fatal("'%s' option on '%s' does not accept an " + "argument", node->name, argv[i]); + } + } + } + + n_arg = argc - i - 1; + if (n_arg < p->min_args) { + vsctl_fatal("'%s' command requires at least %d arguments", + p->name, p->min_args); + } else if (n_arg > p->max_args) { + int j; + + for (j = i + 1; j < argc; j++) { + if (argv[j][0] == '-') { + vsctl_fatal("'%s' command takes at most %d arguments " + "(note that options must precede command " + "names and follow a \"--\" argument)", + p->name, p->max_args); + } + } + + vsctl_fatal("'%s' command takes at most %d arguments", + p->name, p->max_args); + } else { + command->syntax = p; + command->argc = n_arg + 1; + command->argv = &argv[i]; + return; + } + } + } + + vsctl_fatal("unknown command '%s'; use --help for help", argv[i]); +} + +static void +vsctl_fatal(const char *format, ...) +{ + char *message; + va_list args; + + va_start(args, format); + message = xvasprintf(format, args); + va_end(args); + + vlog_set_levels(VLM_vsctl, VLF_CONSOLE, VLL_EMER); + VLOG_ERR("%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 usage(void) { - printf("%s: ovs-vswitchd management utility\n" - "usage: %s [OPTIONS] COMMAND [ARG...]\n", - program_name, program_name); - printf("\nBridge commands:\n" - " add-br BRIDGE " - "create a new bridge named BRIDGE\n" - " add-br BRIDGE PARENT VLAN " - "create new fake bridge BRIDGE in PARENT on VLAN\n" - " del-br BRIDGE " - "delete BRIDGE and all of its ports\n" - " list-br " - "print the names of all the bridges\n" - " br-exists BRIDGE " - "test whether BRIDGE exists\n" - " br-to-vlan BRIDGE " - "print the VLAN which BRIDGE is on\n" - " br-to-parent BRIDGE " - "print the parent of BRIDGE\n" - " br-set-external-id BRIDGE KEY VALUE" - " set KEY on BRIDGE to VALUE\n" - " br-set-external-id BRIDGE KEY" - " unset KEY on BRIDGE\n" - " br-get-external-id BRIDGE KEY" - " print value of KEY on BRIDGE\n" - " br-get-external-id BRIDGE" - " list key-value pairs on BRIDGE\n" - ); - printf("\nPort commands:\n" - " list-ports BRIDGE " - "print the names of all the ports on BRIDGE\n" - " add-port BRIDGE PORT " - "add network device PORT to BRIDGE\n" - " add-bond BRIDGE PORT IFACE... " - "add new bonded port PORT in BRIDGE from IFACES\n" - " del-port [BRIDGE] PORT " - "delete PORT (which may be bonded) from BRIDGE\n" - " port-to-br PORT " - "print name of bridge that contains PORT\n" - " port-set-external-id PORT KEY VALUE" - " set KEY on PORT to VALUE\n" - " port-set-external-id PORT KEY" - " unset KEY on PORT\n" - " port-get-external-id PORT KEY" - " print value of KEY on PORT\n" - " port-get-external-id PORT" - " list key-value pairs on PORT\n" - "A bond is considered to be a single port.\n" - ); - printf("\nInterface commands (a bond consists of multiple interfaces):\n" - " list-ifaces BRIDGE " - "print the names of all the interfaces on BRIDGE\n" - " iface-to-br IFACE " - "print name of bridge that contains IFACE\n" - " iface-set-external-id IFACE KEY VALUE" - " set KEY on IFACE to VALUE\n" - " iface-set-external-id IFACE KEY" - " unset KEY on IFACE\n" - " iface-get-external-id IFACE KEY" - " print value of KEY on IFACE\n" - " iface-get-external-id IFACE" - " list key-value pairs on IFACE\n" - ); - printf("\nController commands:\n" - " get-controller [BRIDGE] " - "print the controller for BRIDGE\n" - " del-controller [BRIDGE] " - "delete the controller for BRIDGE\n" - " set-controller [BRIDGE] TARGET " - "set the controller for BRIDGE to TARGET\n" - " get-fail-mode [BRIDGE] " - "print the fail-mode for BRIDGE\n" - " del-fail-mode [BRIDGE] " - "delete the fail-mode for BRIDGE\n" - " set-fail-mode [BRIDGE] MODE " - "set the fail-mode for BRIDGE to MODE\n" - ); - printf("\nSSL commands:\n" - " get-ssl " - "print the SSL configuration\n" - " del-ssl " - "delete the SSL configuration\n" - " set-ssl PRIV-KEY CERT CA-CERT " - "set the SSL configuration\n" - ); - printf("\nOptions:\n" - " --db=DATABASE " - "connect to DATABASE\n" - " " - "(default: %s)\n" - " --oneline " - "print exactly one line of output per command\n", - default_db()); + printf("\ +%s: ovs-vswitchd management utility\n\ +usage: %s [OPTIONS] COMMAND [ARG...]\n\ +\n\ +Bridge commands:\n\ + add-br BRIDGE create a new bridge named BRIDGE\n\ + add-br BRIDGE PARENT VLAN create new fake BRIDGE in PARENT on VLAN\n\ + del-br BRIDGE delete BRIDGE and all of its ports\n\ + list-br print the names of all the bridges\n\ + br-exists BRIDGE test whether BRIDGE exists\n\ + br-to-vlan BRIDGE print the VLAN which BRIDGE is on\n\ + br-to-parent BRIDGE print the parent of BRIDGE\n\ + br-set-external-id BRIDGE KEY VALUE set KEY on BRIDGE to VALUE\n\ + br-set-external-id BRIDGE KEY unset KEY on BRIDGE\n\ + br-get-external-id BRIDGE KEY print value of KEY on BRIDGE\n\ + br-get-external-id BRIDGE list key-value pairs on BRIDGE\n\ +\n\ +Port commands:\n\ + list-ports BRIDGE print the names of all the ports on BRIDGE\n\ + add-port BRIDGE PORT add network device PORT to BRIDGE\n\ + add-bond BRIDGE PORT IFACE... add bonded port PORT in BRIDGE from IFACES\n\ + del-port [BRIDGE] PORT delete PORT (which may be bonded) from BRIDGE\n\ + port-to-br PORT print name of bridge that contains PORT\n\ +A bond is considered to be a single port.\n\ +\n\ +Interface commands (a bond consists of multiple interfaces):\n\ + list-ifaces BRIDGE print the names of all interfaces on BRIDGE\n\ + iface-to-br IFACE print name of bridge that contains IFACE\n\ +\n\ +Controller commands:\n\ + get-controller [BRIDGE] print the controller for BRIDGE\n\ + del-controller [BRIDGE] delete the controller for BRIDGE\n\ + set-controller [BRIDGE] TARGET set the controller for BRIDGE to TARGET\n\ + get-fail-mode [BRIDGE] print the fail-mode for BRIDGE\n\ + del-fail-mode [BRIDGE] delete the fail-mode for BRIDGE\n\ + set-fail-mode [BRIDGE] MODE set the fail-mode for BRIDGE to MODE\n\ +\n\ +SSL commands:\n\ + get-ssl print the SSL configuration\n\ + del-ssl delete the SSL configuration\n\ + set-ssl PRIV-KEY CERT CA-CERT set the SSL configuration\n\ +\n\ +Switch commands:\n\ + emer-reset reset switch to known good state\n\ +\n\ +Database commands:\n\ + list TBL [REC] list RECord (or all records) in TBL\n\ + get TBL REC COL[:KEY] print values of COLumns in RECORD in TBL\n\ + set TBL REC COL[:KEY]=VALUE set COLumn values in RECord in TBL\n\ + add TBL REC COL [KEY=]VALUE add (KEY=)VALUE to COLumn in RECord in TBL\n\ + remove TBL REC COL [KEY=]VALUE remove (KEY=)VALUE from COLumn\n\ + clear TBL REC COL clear values from COLumn in RECord in TBL\n\ + create TBL COL[:KEY]=VALUE create and initialize new record\n\ + destroy TBL REC delete REC from TBL\n\ +Potentially unsafe database commands require --force option.\n\ +\n\ +Options:\n\ + --db=DATABASE connect to DATABASE\n\ + (default: %s)\n\ + --oneline print exactly one line of output per command\n", + program_name, program_name, default_db()); vlog_usage(); - printf("\nOther options:\n" - " -h, --help " - "display this help message\n" - " -V, --version " - "display version information\n"); + printf("\n\ +Other options:\n\ + -h, --help display this help message\n\ + -V, --version display version information\n"); exit(EXIT_SUCCESS); } @@ -340,23 +497,30 @@ 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; } struct vsctl_context { + /* Read-only. */ int argc; char **argv; - const struct ovsrec_open_vswitch *ovs; - struct ds output; struct shash options; + + /* Modifiable state. */ + 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; }; @@ -375,13 +539,32 @@ 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 struct ovsdb_idl_txn * -txn_from_openvswitch(const struct ovsrec_open_vswitch *ovs) +static char * +vsctl_context_to_string(const struct vsctl_context *ctx) { - return ovsdb_idl_txn_get(&ovs->header_); + 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 * @@ -394,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; } @@ -459,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); @@ -692,53 +882,169 @@ 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(txn_from_openvswitch(ctx->ovs)); + iface = ovsrec_interface_insert(ctx->txn); ovsrec_interface_set_name(iface, br_name); - port = ovsrec_port_insert(txn_from_openvswitch(ctx->ovs)); + port = ovsrec_port_insert(ctx->txn); ovsrec_port_set_name(port, br_name); ovsrec_port_set_interfaces(port, &iface, 1); - br = ovsrec_bridge_insert(txn_from_openvswitch(ctx->ovs)); + br = ovsrec_bridge_insert(ctx->txn); ovsrec_bridge_set_name(br, br_name); 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"); @@ -748,19 +1054,17 @@ cmd_add_br(struct vsctl_context *ctx) } br = parent->br_cfg; - iface = ovsrec_interface_insert(txn_from_openvswitch(ctx->ovs)); + iface = ovsrec_interface_insert(ctx->txn); ovsrec_interface_set_name(iface, br_name); ovsrec_interface_set_type(iface, "internal"); - port = ovsrec_port_insert(txn_from_openvswitch(ctx->ovs)); + port = ovsrec_port_insert(ctx->txn); ovsrec_port_set_name(port, br_name); ovsrec_port_set_interfaces(port, &iface, 1); ovsrec_port_set_fake_bridge(port, true); ovsrec_port_set_tag(port, &tag, 1); bridge_insert_port(br, port); - } else { - NOT_REACHED(); } free_info(&info); @@ -798,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); } @@ -850,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); } @@ -1002,9 +1306,11 @@ cmd_list_ports(struct vsctl_context *ctx) } static void -add_port(const struct ovsrec_open_vswitch *ovs, +add_port(struct vsctl_context *ctx, const char *br_name, const char *port_name, - char *iface_names[], int n_ifaces) + 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; @@ -1012,21 +1318,66 @@ add_port(const struct ovsrec_open_vswitch *ovs, struct ovsrec_port *port; size_t i; - get_info(ovs, &info); + 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); for (i = 0; i < n_ifaces; i++) { - ifaces[i] = ovsrec_interface_insert(txn_from_openvswitch(ovs)); + ifaces[i] = ovsrec_interface_insert(ctx->txn); ovsrec_interface_set_name(ifaces[i], iface_names[i]); } - port = ovsrec_port_insert(txn_from_openvswitch(ovs)); + port = ovsrec_port_insert(ctx->txn); ovsrec_port_set_name(port, port_name); ovsrec_port_set_interfaces(port, ifaces, n_ifaces); + ovsrec_port_set_bond_fake_iface(port, fake_iface); free(ifaces); if (bridge->vlan) { @@ -1034,6 +1385,11 @@ add_port(const struct ovsrec_open_vswitch *ovs, 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); @@ -1043,93 +1399,97 @@ add_port(const struct ovsrec_open_vswitch *ovs, static void cmd_add_port(struct vsctl_context *ctx) { - add_port(ctx->ovs, ctx->argv[1], ctx->argv[2], &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) { - add_port(ctx->ovs, ctx->argv[1], ctx->argv[2], &ctx->argv[3], ctx->argc - 3); + 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], 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); - } - } 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 (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 (!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; } } + if (must_exist && !port) { + vsctl_fatal("no port or interface named %s", target); + } } - free_info(&info); -} - -static void -cmd_port_to_br(struct vsctl_context *ctx) -{ - struct vsctl_port *port; - struct vsctl_info info; - get_info(ctx->ovs, &info); - port = find_port(&info, ctx->argv[1], true); - ds_put_format(&ctx->output, "%s\n", port->bridge->name); - free_info(&info); -} - -static void -cmd_port_set_external_id(struct vsctl_context *ctx) -{ - struct vsctl_info info; - struct vsctl_port *port; - char **keys, **values; - size_t n; + 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]); + } + } + } - get_info(ctx->ovs, &info); - port = find_port(&info, ctx->argv[1], true); - set_external_id(port->port_cfg->key_external_ids, - port->port_cfg->value_external_ids, - port->port_cfg->n_external_ids, - ctx->argv[2], ctx->argc >= 4 ? ctx->argv[3] : NULL, - &keys, &values, &n); - ovsrec_port_set_external_ids(port->port_cfg, keys, values, n); - free(keys); - free(values); + del_port(&info, port); + } free_info(&info); } static void -cmd_port_get_external_id(struct vsctl_context *ctx) +cmd_port_to_br(struct vsctl_context *ctx) { - struct vsctl_info info; struct vsctl_port *port; + struct vsctl_info info; get_info(ctx->ovs, &info); port = find_port(&info, ctx->argv[1], true); - get_external_id(port->port_cfg->key_external_ids, - port->port_cfg->value_external_ids, - port->port_cfg->n_external_ids, - "", ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output); + ds_put_format(&ctx->output, "%s\n", port->bridge->name); free_info(&info); } @@ -1198,41 +1558,27 @@ 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 -cmd_iface_set_external_id(struct vsctl_context *ctx) +print_controllers(struct vsctl_context *ctx, + struct ovsrec_controller **controllers, + size_t n_controllers) { - struct vsctl_info info; - struct vsctl_iface *iface; - char **keys, **values; - size_t n; - - get_info(ctx->ovs, &info); - iface = find_iface(&info, ctx->argv[1], true); - set_external_id(iface->iface_cfg->key_external_ids, - iface->iface_cfg->value_external_ids, - iface->iface_cfg->n_external_ids, - ctx->argv[2], ctx->argc >= 4 ? ctx->argv[3] : NULL, - &keys, &values, &n); - ovsrec_interface_set_external_ids(iface->iface_cfg, keys, values, n); - free(keys); - free(values); - - free_info(&info); -} + /* Print the targets in sorted order for reproducibility. */ + struct svec targets; + size_t i; -static void -cmd_iface_get_external_id(struct vsctl_context *ctx) -{ - struct vsctl_info info; - struct vsctl_iface *iface; + svec_init(&targets); + for (i = 0; i < n_controllers; i++) { + svec_add(&targets, controllers[i]->target); + } - get_info(ctx->ovs, &info); - iface = find_iface(&info, ctx->argv[1], true); - get_external_id(iface->iface_cfg->key_external_ids, - iface->iface_cfg->value_external_ids, - iface->iface_cfg->n_external_ids, - "", ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output); - free_info(&info); + 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 @@ -1242,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) { @@ -1270,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(txn_from_openvswitch(ctx->ovs)); - 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(txn_from_openvswitch(ctx->ovs)); - 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) { @@ -1326,32 +1722,38 @@ 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)) { - ds_put_format(&ctx->output, "%s\n", info.ctrl->fail_mode); + ds_put_format(&ctx->output, "%s\n", fail_mode); } free_info(&info); } +static void +set_fail_mode(struct ovsrec_controller **controllers, size_t n_controllers, + const char *fail_mode) +{ + size_t i; + + for (i = 0; i < n_controllers; i++) { + ovsrec_controller_set_fail_mode(controllers[i], fail_mode); + } +} + static void cmd_del_fail_mode(struct vsctl_context *ctx) { @@ -1359,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); @@ -1378,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); @@ -1440,7 +1845,7 @@ cmd_set_ssl(struct vsctl_context *ctx) if (ssl) { ovsrec_ssl_delete(ssl); } - ssl = ovsrec_ssl_insert(txn_from_openvswitch(ctx->ovs)); + ssl = ovsrec_ssl_insert(ctx->txn); ovsrec_ssl_set_private_key(ssl, ctx->argv[1]); ovsrec_ssl_set_certificate(ssl, ctx->argv[2]); @@ -1451,20 +1856,736 @@ cmd_set_ssl(struct vsctl_context *ctx) ovsrec_open_vswitch_set_ssl(ctx->ovs, ssl); } -typedef void vsctl_handler_func(struct vsctl_context *); +/* Parameter commands. */ -struct vsctl_command { - const char *name; - int min_args; - int max_args; - vsctl_handler_func *handler; - const char *options; +struct vsctl_row_id { + const struct ovsdb_idl_table_class *table; + const struct ovsdb_idl_column *name_column; + const struct ovsdb_idl_column *uuid_column; +}; + +struct vsctl_table_class { + struct ovsdb_idl_table_class *class; + struct vsctl_row_id row_ids[2]; }; -static void run_vsctl_command(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, - struct ds *output); +static const struct vsctl_table_class tables[] = { + {&ovsrec_table_bridge, + {{&ovsrec_table_bridge, &ovsrec_bridge_col_name, NULL}, + {NULL, NULL, NULL}}}, + + {&ovsrec_table_controller, + {{&ovsrec_table_bridge, + &ovsrec_bridge_col_name, + &ovsrec_bridge_col_controller}, + {&ovsrec_table_open_vswitch, + NULL, + &ovsrec_open_vswitch_col_controller}}}, + + {&ovsrec_table_interface, + {{&ovsrec_table_interface, &ovsrec_interface_col_name, NULL}, + {NULL, NULL, NULL}}}, + + {&ovsrec_table_mirror, + {{&ovsrec_table_mirror, &ovsrec_mirror_col_name, NULL}, + {NULL, NULL, NULL}}}, + + {&ovsrec_table_netflow, + {{&ovsrec_table_bridge, + &ovsrec_bridge_col_name, + &ovsrec_bridge_col_netflow}, + {NULL, NULL, NULL}}}, + + {&ovsrec_table_open_vswitch, + {{&ovsrec_table_open_vswitch, NULL, NULL}, + {NULL, NULL, NULL}}}, + + {&ovsrec_table_port, + {{&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}}} +}; + +static void +die_if_error(char *error) +{ + if (error) { + vsctl_fatal("%s", error); + } +} + +static int +to_lower_and_underscores(unsigned c) +{ + return c == '-' ? '_' : tolower(c); +} + +static unsigned int +score_partial_match(const char *name, const char *s) +{ + int score; + + if (!strcmp(name, s)) { + return UINT_MAX; + } + for (score = 0; ; score++, name++, s++) { + if (to_lower_and_underscores(*name) != to_lower_and_underscores(*s)) { + break; + } else if (*name == '\0') { + return UINT_MAX - 1; + } + } + return *s == '\0' ? score : 0; +} + +static const struct vsctl_table_class * +get_table(const char *table_name) +{ + const struct vsctl_table_class *table; + const struct vsctl_table_class *best_match = NULL; + unsigned int best_score = 0; + + for (table = tables; table->class; table++) { + unsigned int score = score_partial_match(table->class->name, + table_name); + if (score > best_score) { + best_match = table; + best_score = score; + } else if (score == best_score) { + best_match = NULL; + } + } + if (best_match) { + return best_match; + } else if (best_score) { + vsctl_fatal("multiple table names match \"%s\"", table_name); + } else { + vsctl_fatal("unknown table \"%s\"", 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 ovsdb_idl_row *referrer, *final; + + if (!id->table) { + return NULL; + } + + if (!id->name_column) { + if (strcmp(record_id, ".")) { + return NULL; + } + referrer = ovsdb_idl_first_row(ctx->idl, id->table); + if (!referrer || ovsdb_idl_next_row(referrer)) { + return NULL; + } + } else { + const struct ovsdb_idl_row *row; + unsigned int best_score = 0; + + /* It might make sense to relax this assertion. */ + assert(id->name_column->type.key.type == OVSDB_TYPE_STRING); + + referrer = NULL; + for (row = ovsdb_idl_first_row(ctx->idl, id->table); + row != NULL && best_score != UINT_MAX; + row = ovsdb_idl_next_row(row)) + { + struct ovsdb_datum name; + + ovsdb_idl_txn_read(row, id->name_column, &name); + if (name.n == 1) { + unsigned int score = score_partial_match(name.keys[0].string, + record_id); + if (score > best_score) { + referrer = row; + best_score = score; + } else if (score == best_score) { + referrer = NULL; + } + } + 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; + } + + final = NULL; + if (id->uuid_column) { + struct ovsdb_datum uuid; + + assert(id->uuid_column->type.key.type == OVSDB_TYPE_UUID); + assert(id->uuid_column->type.value.type == OVSDB_TYPE_VOID); + + ovsdb_idl_txn_read(referrer, id->uuid_column, &uuid); + if (uuid.n == 1) { + final = ovsdb_idl_get_row_for_uuid(ctx->idl, table->class, + &uuid.keys[0].uuid); + } + ovsdb_datum_destroy(&uuid, &id->uuid_column->type); + } else { + final = referrer; + } + + return final; +} + +static const struct ovsdb_idl_row * +get_row(struct vsctl_context *ctx, + const struct vsctl_table_class *table, const char *record_id) +{ + const struct ovsdb_idl_row *row; + struct uuid uuid; + + if (uuid_from_string(&uuid, record_id)) { + row = ovsdb_idl_get_row_for_uuid(ctx->idl, table->class, &uuid); + } else { + 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); + if (row) { + break; + } + } + } + return row; +} + +static const struct ovsdb_idl_row * +must_get_row(struct vsctl_context *ctx, + const struct vsctl_table_class *table, const char *record_id) +{ + const struct ovsdb_idl_row *row = get_row(ctx, table, record_id); + if (!row) { + 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 ovsdb_idl_column **columnp) +{ + const struct ovsdb_idl_column *best_match = NULL; + unsigned int best_score = 0; + size_t i; + + 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; + } + } + + *columnp = best_match; + if (best_match) { + return NULL; + } else if (best_score) { + return xasprintf("%s contains more than one column whose name " + "matches \"%s\"", table->class->name, column_name); + } else { + return xasprintf("%s does not contain a column whose name matches " + "\"%s\"", table->class->name, column_name); + } +} + +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) +{ + const char *p = arg; + char *error; + + assert(columnp || keyp); + if (keyp) { + *keyp = NULL; + } + if (valuep) { + *valuep = NULL; + } + + /* Parse column name. */ + if (columnp) { + char *column_name; + + error = ovsdb_token_parse(&p, &column_name); + if (error) { + goto error; + } + if (column_name[0] == '\0') { + free(column_name); + error = xasprintf("%s: missing column name", arg); + goto error; + } + error = get_column(table, column_name, columnp); + free(column_name); + if (error) { + goto error; + } + } + + /* Parse key string. */ + if (*p == ':' || !columnp) { + if (columnp) { + p++; + } else if (!keyp) { + error = xasprintf("%s: key not accepted here", arg); + goto error; + } + error = ovsdb_token_parse(&p, keyp); + if (error) { + goto error; + } + } else if (keyp) { + *keyp = NULL; + } + + /* Parse value string. */ + if (*p == '=') { + if (!valuep) { + error = xasprintf("%s: value not accepted here", arg); + goto error; + } + *valuep = xstrdup(p + 1); + } else { + if (valuep) { + *valuep = NULL; + } + if (*p != '\0') { + error = xasprintf("%s: trailing garbage \"%s\" in argument", + arg, p); + goto error; + } + } + return NULL; + +error: + if (columnp) { + *columnp = NULL; + } + if (keyp) { + free(*keyp); + *keyp = NULL; + } + if (valuep) { + free(*valuep); + *valuep = NULL; + } + return 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; + const struct ovsdb_idl_row *row; + struct ds *out = &ctx->output; + int i; + + table = get_table(table_name); + row = must_get_row(ctx, table, record_id); + for (i = 3; i < ctx->argc; i++) { + 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, &datum); + if (key_string) { + union ovsdb_atom key; + unsigned int idx; + + 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->type.key, + key_string, ctx->symtab)); + + idx = ovsdb_datum_find_key(&datum, &key, + column->type.key.type); + if (idx == UINT_MAX) { + 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_destroy(&key, column->type.key.type); + } else { + ovsdb_datum_to_string(&datum, &column->type, out); + } + ds_put_char(out, '\n'); + ovsdb_datum_destroy(&datum, &column->type); + + free(key_string); + } +} + +static void +list_record(const struct vsctl_table_class *table, + const struct ovsdb_idl_row *row, struct ds *out) +{ + size_t i; + + ds_put_format(out, "%-20s: "UUID_FMT"\n", "_uuid", + UUID_ARGS(&row->uuid)); + for (i = 0; i < table->class->n_columns; i++) { + const struct ovsdb_idl_column *column = &table->class->columns[i]; + struct ovsdb_datum datum; + + ovsdb_idl_txn_read(row, column, &datum); + + 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->type); + } +} + +static void +cmd_list(struct vsctl_context *ctx) +{ + const char *table_name = ctx->argv[1]; + const struct vsctl_table_class *table; + struct ds *out = &ctx->output; + int i; + + table = get_table(table_name); + if (ctx->argc > 2) { + for (i = 2; i < ctx->argc; i++) { + if (i > 2) { + ds_put_char(out, '\n'); + } + list_record(table, must_get_row(ctx, table, ctx->argv[i]), out); + } + } else { + const struct ovsdb_idl_row *row; + bool first; + + for (row = ovsdb_idl_first_row(ctx->idl, table->class), first = true; + row != NULL; + row = ovsdb_idl_next_row(row), first = false) { + if (!first) { + ds_put_char(out, '\n'); + } + list_record(table, row, out); + } + } +} + +static void +set_column(const struct vsctl_table_class *table, + 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); + die_if_error(error); + if (!value_string) { + vsctl_fatal("%s: missing value", arg); + } + + if (key_string) { + union ovsdb_atom key, value; + struct ovsdb_datum old, new; + + 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->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->type); + + ovsdb_atom_destroy(&key, column->type.key.type); + ovsdb_atom_destroy(&value, column->type.value.type); + + ovsdb_idl_txn_read(row, column, &old); + ovsdb_datum_union(&old, &new, &column->type, true); + ovsdb_idl_txn_write(row, column, &old); + + ovsdb_datum_destroy(&new, &column->type); + } else { + struct ovsdb_datum 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) +{ + const char *table_name = ctx->argv[1]; + const char *record_id = ctx->argv[2]; + const struct vsctl_table_class *table; + const struct ovsdb_idl_row *row; + int i; + + table = get_table(table_name); + row = must_get_row(ctx, table, record_id); + for (i = 3; i < ctx->argc; i++) { + set_column(table, row, ctx->argv[i], ctx->symtab); + } +} + +static void +cmd_add(struct vsctl_context *ctx) +{ + 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 ovsdb_idl_column *column; + const struct ovsdb_idl_row *row; + const struct ovsdb_type *type; + struct ovsdb_datum old; + int i; + + table = get_table(table_name); + row = must_get_row(ctx, table, record_id); + die_if_error(get_column(table, column_name, &column)); + + 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; + + 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], + ctx->symtab)); + ovsdb_datum_union(&old, &add, type, false); + ovsdb_datum_destroy(&add, type); + } + if (old.n > 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, &old); +} + +static void +cmd_remove(struct vsctl_context *ctx) +{ + 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 ovsdb_idl_column *column; + const struct ovsdb_idl_row *row; + const struct ovsdb_type *type; + struct ovsdb_datum old; + int i; + + table = get_table(table_name); + row = must_get_row(ctx, table, record_id); + die_if_error(get_column(table, column_name, &column)); + + 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; + + 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], 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], 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 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, &old); +} + +static void +cmd_clear(struct vsctl_context *ctx) +{ + const char *table_name = ctx->argv[1]; + const char *record_id = ctx->argv[2]; + const struct vsctl_table_class *table; + const struct ovsdb_idl_row *row; + int i; + + table = get_table(table_name); + row = must_get_row(ctx, table, record_id); + for (i = 3; i < ctx->argc; i++) { + 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->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, &datum); + } +} + +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, uuid); + for (i = 2; i < ctx->argc; i++) { + set_column(table, row, ctx->argv[i], ctx->symtab); + } + ds_put_format(&ctx->output, UUID_FMT, UUID_ARGS(&row->uuid)); +} + +/* This function may be used as the 'postprocess' function for commands that + * insert new rows into the database. It expects that the command's 'run' + * function prints the UUID reported by ovsdb_idl_txn_insert() as the command's + * sole output. It replaces that output by the row's permanent UUID assigned + * by the database server and appends a new-line. + * + * Currently we use this only for "create", because the higher-level commands + * are supposed to be independent of the actual structure of the vswitch + * configuration. */ +static void +post_create(struct vsctl_context *ctx) +{ + const struct uuid *real; + struct uuid dummy; + + uuid_from_string(&dummy, ds_cstr(&ctx->output)); + real = ovsdb_idl_txn_get_insert_uuid(ctx->txn, &dummy); + if (real) { + ds_clear(&ctx->output); + ds_put_format(&ctx->output, UUID_FMT, UUID_ARGS(real)); + } + ds_put_char(&ctx->output, '\n'); +} +static void +cmd_destroy(struct vsctl_context *ctx) +{ + bool must_exist = !shash_find(&ctx->options, "--if-exists"); + const char *table_name = ctx->argv[1]; + const struct vsctl_table_class *table; + int i; + + table = get_table(table_name); + for (i = 2; i < ctx->argc; i++) { + const struct ovsdb_idl_row *row; + + row = (must_exist ? must_get_row : get_row)(ctx, table, ctx->argv[i]); + if (row) { + ovsdb_idl_txn_delete(row); + } + } +} + static struct json * where_uuid_equals(const struct uuid *uuid) { @@ -1480,28 +2601,47 @@ where_uuid_equals(const struct uuid *uuid) } static void -do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) +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, + struct ovsdb_symbol_table *symtab) +{ + ctx->argc = command->argc; + ctx->argv = command->argv; + ctx->options = command->options; + + ds_swap(&ctx->output, &command->output); + ctx->idl = idl; + ctx->txn = txn; + ctx->ovs = ovs; + ctx->symtab = symtab; +} + +static void +vsctl_context_done(struct vsctl_context *ctx, struct vsctl_command *command) +{ + ds_swap(&ctx->output, &command->output); +} + +static void +do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, + struct ovsdb_idl *idl) { struct ovsdb_idl_txn *txn; const struct ovsrec_open_vswitch *ovs; enum ovsdb_idl_txn_status status; - struct ds comment, *output; - int64_t next_cfg; - int n_output; - int i, start; + struct ovsdb_symbol_table *symtab; + const char *unused; + struct vsctl_command *c; + int64_t next_cfg = 0; + 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); } - ds_init(&comment); - ds_put_cstr(&comment, "ovs-vsctl:"); - for (i = 0; i < argc; i++) { - ds_put_format(&comment, " %s", argv[i]); - } - ovsdb_idl_txn_add_comment(txn, ds_cstr(&comment)); - ds_destroy(&comment); + ovsdb_idl_txn_add_comment(txn, "ovs-vsctl: %s", args); ovs = ovsrec_open_vswitch_first(idl); if (!ovs) { @@ -1511,34 +2651,45 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) if (wait_for_reload) { struct json *where = where_uuid_equals(&ovs->header_.uuid); - ovsdb_idl_txn_increment(txn, "Open_vSwitch", "next_cfg", - where); + ovsdb_idl_txn_increment(txn, "Open_vSwitch", "next_cfg", where); json_destroy(where); } - output = xmalloc(argc * sizeof *output); - n_output = 0; - for (start = i = 0; i <= argc; i++) { - if (i == argc || !strcmp(argv[i], "--")) { - if (i > start) { - ds_init(&output[n_output]); - run_vsctl_command(i - start, &argv[start], ovs, - &output[n_output++]); - } - start = i + 1; - } - } + symtab = ovsdb_symbol_table_create(); + for (c = commands; c < &commands[n_commands]; c++) { + struct vsctl_context ctx; - while ((status = ovsdb_idl_txn_commit(txn)) == TXN_INCOMPLETE) { - ovsdb_idl_run(idl); - ovsdb_idl_wait(idl); - ovsdb_idl_txn_wait(txn); - poll_block(); + ds_init(&c->output); + vsctl_context_init(&ctx, c, idl, txn, ovs, symtab); + (c->syntax->run)(&ctx); + vsctl_context_done(&ctx, c); } + + status = ovsdb_idl_txn_commit_block(txn); if (wait_for_reload && status == TXN_SUCCESS) { next_cfg = ovsdb_idl_txn_get_increment_new_value(txn); } + 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, 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: @@ -1553,20 +2704,24 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) break; case TXN_TRY_AGAIN: - for (i = 0; i < n_output; i++) { - ds_destroy(&output[i]); + 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; - for (i = 0; i < n_output; i++) { - struct ds *ds = &output[i]; if (oneline) { size_t j; @@ -1590,7 +2745,14 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) } 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 (;;) { @@ -1607,124 +2769,62 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) } done: ; } + ovsdb_idl_destroy(idl); exit(EXIT_SUCCESS); } -static vsctl_handler_func * -get_vsctl_handler(int argc, char *argv[], struct vsctl_context *ctx) -{ - static const struct vsctl_command all_commands[] = { - /* Open vSwitch commands. */ - {"init", 0, 0, cmd_init, ""}, - - /* Bridge commands. */ - {"add-br", 1, 3, cmd_add_br, ""}, - {"del-br", 1, 1, cmd_del_br, "--if-exists"}, - {"list-br", 0, 0, cmd_list_br, ""}, - {"br-exists", 1, 1, cmd_br_exists, ""}, - {"br-to-vlan", 1, 1, cmd_br_to_vlan, ""}, - {"br-to-parent", 1, 1, cmd_br_to_parent, ""}, - {"br-set-external-id", 2, 3, cmd_br_set_external_id, ""}, - {"br-get-external-id", 1, 2, cmd_br_get_external_id, ""}, - - /* Port commands. */ - {"list-ports", 1, 1, cmd_list_ports, ""}, - {"add-port", 2, 2, cmd_add_port, ""}, - {"add-bond", 4, INT_MAX, cmd_add_bond, ""}, - {"del-port", 1, 2, cmd_del_port, "--if-exists"}, - {"port-to-br", 1, 1, cmd_port_to_br, ""}, - {"port-set-external-id", 2, 3, cmd_port_set_external_id, ""}, - {"port-get-external-id", 1, 2, cmd_port_get_external_id, ""}, - - /* Interface commands. */ - {"list-ifaces", 1, 1, cmd_list_ifaces, ""}, - {"iface-to-br", 1, 1, cmd_iface_to_br, ""}, - {"iface-set-external-id", 2, 3, cmd_iface_set_external_id, ""}, - {"iface-get-external-id", 1, 2, cmd_iface_get_external_id, ""}, - - /* Controller commands. */ - {"get-controller", 0, 1, cmd_get_controller, ""}, - {"del-controller", 0, 1, cmd_del_controller, ""}, - {"set-controller", 1, 2, cmd_set_controller, ""}, - {"get-fail-mode", 0, 1, cmd_get_fail_mode, ""}, - {"del-fail-mode", 0, 1, cmd_del_fail_mode, ""}, - {"set-fail-mode", 1, 2, cmd_set_fail_mode, ""}, - - /* SSL commands. */ - {"get-ssl", 0, 0, cmd_get_ssl, ""}, - {"del-ssl", 0, 0, cmd_del_ssl, ""}, - {"set-ssl", 3, 3, cmd_set_ssl, "--bootstrap"}, - }; - - const struct vsctl_command *p; - int i; - - shash_init(&ctx->options); - for (i = 0; i < argc; i++) { - if (argv[i][0] != '-') { - break; - } - if (!shash_add_once(&ctx->options, argv[i], NULL)) { - vsctl_fatal("'%s' option specified multiple times", argv[i]); - } - } - if (i == argc) { - vsctl_fatal("missing command name"); - } - - for (p = all_commands; p < &all_commands[ARRAY_SIZE(all_commands)]; p++) { - if (!strcmp(p->name, argv[i])) { - struct shash_node *node; - int n_arg; - - SHASH_FOR_EACH (node, &ctx->options) { - const char *s = strstr(p->options, node->name); - int end = s ? s[strlen(node->name)] : EOF; - if (end != ',' && end != ' ' && end != '\0') { - vsctl_fatal("'%s' command has no '%s' option", - argv[i], node->name); - } - } - - n_arg = argc - i - 1; - if (n_arg < p->min_args) { - vsctl_fatal("'%s' command requires at least %d arguments", - p->name, p->min_args); - } else if (n_arg > p->max_args) { - vsctl_fatal("'%s' command takes at most %d arguments", - p->name, p->max_args); - } else { - ctx->argc = n_arg + 1; - ctx->argv = &argv[i]; - return p->handler; - } - } - } - - vsctl_fatal("unknown command '%s'; use --help for help", argv[i]); -} - -static void -check_vsctl_command(int argc, char *argv[]) -{ - struct vsctl_context ctx; - - get_vsctl_handler(argc, argv, &ctx); - shash_destroy(&ctx.options); -} - -static void -run_vsctl_command(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output) -{ - vsctl_handler_func *function; - struct vsctl_context ctx; +static const struct vsctl_command_syntax all_commands[] = { + /* Open vSwitch commands. */ + {"init", 0, 0, cmd_init, NULL, ""}, + + /* Bridge commands. */ + {"add-br", 1, 3, cmd_add_br, NULL, "--may-exist"}, + {"del-br", 1, 1, cmd_del_br, NULL, "--if-exists"}, + {"list-br", 0, 0, cmd_list_br, NULL, ""}, + {"br-exists", 1, 1, cmd_br_exists, NULL, ""}, + {"br-to-vlan", 1, 1, cmd_br_to_vlan, NULL, ""}, + {"br-to-parent", 1, 1, cmd_br_to_parent, NULL, ""}, + {"br-set-external-id", 2, 3, cmd_br_set_external_id, NULL, ""}, + {"br-get-external-id", 1, 2, cmd_br_get_external_id, NULL, ""}, + + /* Port commands. */ + {"list-ports", 1, 1, cmd_list_ports, NULL, ""}, + {"add-port", 2, INT_MAX, cmd_add_port, NULL, "--may-exist"}, + {"add-bond", 4, INT_MAX, cmd_add_bond, NULL, "--may-exist,--fake-iface"}, + {"del-port", 1, 2, cmd_del_port, NULL, "--if-exists,--with-iface"}, + {"port-to-br", 1, 1, cmd_port_to_br, NULL, ""}, + + /* Interface commands. */ + {"list-ifaces", 1, 1, cmd_list_ifaces, NULL, ""}, + {"iface-to-br", 1, 1, cmd_iface_to_br, NULL, ""}, + + /* Controller commands. */ + {"get-controller", 0, 1, cmd_get_controller, NULL, ""}, + {"del-controller", 0, 1, cmd_del_controller, NULL, ""}, + {"set-controller", 1, 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, ""}, + + /* SSL commands. */ + {"get-ssl", 0, 0, cmd_get_ssl, NULL, ""}, + {"del-ssl", 0, 0, cmd_del_ssl, NULL, ""}, + {"set-ssl", 3, 3, cmd_set_ssl, NULL, "--bootstrap"}, + + /* Switch commands. */ + {"emer-reset", 0, 0, cmd_emer_reset, NULL, ""}, + + /* Parameter commands. */ + {"get", 3, INT_MAX, cmd_get, NULL, "--if-exists"}, + {"list", 1, INT_MAX, cmd_list, NULL, ""}, + {"set", 3, INT_MAX, cmd_set, NULL, ""}, + {"add", 4, INT_MAX, cmd_add, NULL, ""}, + {"remove", 4, INT_MAX, cmd_remove, NULL, ""}, + {"clear", 3, INT_MAX, cmd_clear, NULL, ""}, + {"create", 2, INT_MAX, cmd_create, post_create, "--id="}, + {"destroy", 1, INT_MAX, cmd_destroy, NULL, "--if-exists"}, + + {NULL, 0, 0, NULL, NULL, NULL}, +}; - function = get_vsctl_handler(argc, argv, &ctx); - ctx.ovs = ovs; - ds_init(&ctx.output); - function(&ctx); - *output = ctx.output; - shash_destroy(&ctx.options); -}