X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=3a73a2321ae27e33dc726e07c517641693a7ddd2;hb=c6782bb0f7c6cf7b09efe1b94d6bf40f89fe7ed6;hp=bff603a451f78b5319d3f85509670b545dc14330;hpb=c75d15113c56e30ea5a1ace777cd3105c7b750d3;p=openvswitch diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index bff603a4..3a73a232 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -29,8 +29,10 @@ #include "compiler.h" #include "dirs.h" #include "dynamic-string.h" +#include "json.h" #include "ovsdb-idl.h" #include "poll-loop.h" +#include "svec.h" #include "vswitchd/vswitch-idl.h" #include "timeval.h" #include "util.h" @@ -44,10 +46,21 @@ static const char *db; /* --oneline: Write each command's output as a single line? */ static bool oneline; +/* --dry-run: Do not commit any changes. */ +static bool dry_run; + +/* --no-wait: Wait for ovs-vswitchd to reload its configuration? */ +static bool wait_for_reload = true; + +/* --timeout: Time to wait for a connection to 'db'. */ +static int timeout = 5; + +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); int @@ -55,14 +68,47 @@ main(int argc, char *argv[]) { struct ovsdb_idl *idl; unsigned int seqno; + struct ds args; + int start, n_commands; int trials; + int i; set_program_name(argv[0]); signal(SIGPIPE, SIG_IGN); time_init(); vlog_init(); + vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_WARN); + vlog_set_levels(VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN); parse_options(argc, argv); + 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); seqno = ovsdb_idl_get_seqno(idl); trials = 0; @@ -73,7 +119,7 @@ main(int argc, char *argv[]) new_seqno = ovsdb_idl_get_seqno(idl); if (new_seqno != seqno) { if (++trials > 5) { - ovs_fatal(0, "too many database inconsistency failures"); + vsctl_fatal("too many database inconsistency failures"); } do_vsctl(argc - optind, argv + optind, idl); seqno = new_seqno; @@ -84,29 +130,51 @@ 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[]) { enum { OPT_DB = UCHAR_MAX + 1, OPT_ONELINE, + OPT_NO_SYSLOG, + OPT_NO_WAIT, + OPT_DRY_RUN, + VLOG_OPTION_ENUMS }; static struct option long_options[] = { {"db", required_argument, 0, OPT_DB}, + {"no-syslog", no_argument, 0, OPT_NO_SYSLOG}, + {"no-wait", no_argument, 0, OPT_NO_WAIT}, + {"dry-run", no_argument, 0, OPT_DRY_RUN}, {"oneline", no_argument, 0, OPT_ONELINE}, - {"verbose", optional_argument, 0, 'v'}, + {"timeout", required_argument, 0, 't'}, {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, + VLOG_LONG_OPTIONS, {0, 0, 0, 0}, }; - char *short_options; - short_options = xasprintf ("+%s", - long_options_to_short_options(long_options)); + for (;;) { + unsigned long int timeout; int c; - c = getopt_long(argc, argv, short_options, long_options, NULL); + c = getopt_long(argc, argv, "+v::hVt:", long_options, NULL); if (c == -1) { break; } @@ -120,6 +188,18 @@ parse_options(int argc, char *argv[]) oneline = true; break; + case OPT_NO_SYSLOG: + vlog_set_levels(VLM_vsctl, VLF_SYSLOG, VLL_WARN); + break; + + case OPT_NO_WAIT: + wait_for_reload = false; + break; + + case OPT_DRY_RUN: + dry_run = true; + break; + case 'h': usage(); @@ -127,10 +207,16 @@ parse_options(int argc, char *argv[]) OVS_PRINT_VERSION(0, 0); exit(EXIT_SUCCESS); - case 'v': - vlog_set_verbosity(optarg); + case 't': + timeout = strtoul(optarg, NULL, 10); + if (timeout < 0) { + ovs_fatal(0, "value %s on -t or --timeout is invalid", + optarg); + } break; + VLOG_OPTION_HANDLERS + case '?': exit(EXIT_FAILURE); @@ -138,7 +224,6 @@ parse_options(int argc, char *argv[]) abort(); } } - free(short_options); if (!db) { db = default_db(); @@ -165,7 +250,16 @@ usage(void) " br-to-vlan BRIDGE " "print the VLAN which BRIDGE is on\n" " br-to-parent BRIDGE " - "print the parent of BRIDGE\n"); + "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" @@ -177,12 +271,52 @@ usage(void) "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"); + " 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"); + "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" @@ -205,14 +339,23 @@ default_db(void) { static char *def; if (!def) { - def = xasprintf("%s/ovsdb-server", ovs_rundir); + def = xasprintf("unix:%s/ovsdb-server", ovs_rundir); } return def; } +struct vsctl_context { + int argc; + char **argv; + const struct ovsrec_open_vswitch *ovs; + struct ds output; + struct shash options; +}; + struct vsctl_bridge { struct ovsrec_bridge *br_cfg; char *name; + struct ovsrec_controller *ctrl; struct vsctl_bridge *parent; int vlan; }; @@ -231,6 +374,7 @@ struct vsctl_info { struct shash bridges; struct shash ports; struct shash ifaces; + struct ovsrec_controller *ctrl; }; static struct ovsdb_idl_txn * @@ -249,6 +393,7 @@ 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; shash_add(&b->bridges, br->name, br); return br; } @@ -312,6 +457,8 @@ get_info(const struct ovsrec_open_vswitch *ovs, struct vsctl_info *info) shash_init(&info->ports); shash_init(&info->ifaces); + info->ctrl = ovs->controller; + shash_init(&bridges); shash_init(&ports); for (i = 0; i < ovs->n_bridges; i++) { @@ -339,7 +486,7 @@ get_info(const struct ovsrec_open_vswitch *ovs, struct vsctl_info *info) } if (port_is_fake_bridge(port_cfg) - && shash_add_once(&bridges, br_cfg->name, NULL)) { + && shash_add_once(&bridges, port_cfg->name, NULL)) { add_bridge(info, NULL, port_cfg->name, br, *port_cfg->tag); } } @@ -368,7 +515,7 @@ get_info(const struct ovsrec_open_vswitch *ovs, struct vsctl_info *info) } if (port_is_fake_bridge(port_cfg) - && !shash_add_once(&bridges, br_cfg->name, NULL)) { + && !shash_add_once(&bridges, port_cfg->name, NULL)) { continue; } @@ -398,6 +545,7 @@ get_info(const struct ovsrec_open_vswitch *ovs, struct vsctl_info *info) iface = xmalloc(sizeof *iface); iface->iface_cfg = iface_cfg; iface->port = port; + shash_add(&info->ifaces, iface_cfg->name, iface); } } } @@ -413,50 +561,67 @@ check_conflicts(struct vsctl_info *info, const char *name, struct vsctl_port *port; if (shash_find(&info->bridges, name)) { - ovs_fatal(0, "%s because a bridge named %s already exists", msg, name); + vsctl_fatal("%s because a bridge named %s already exists", + msg, name); } port = shash_find_data(&info->ports, name); if (port) { - ovs_fatal(0, "%s because a port named %s already exists on bridge %s", - msg, name, port->bridge->name); + vsctl_fatal("%s because a port named %s already exists on " + "bridge %s", msg, name, port->bridge->name); } iface = shash_find_data(&info->ifaces, name); if (iface) { - ovs_fatal(0, "%s because an interface named %s already exists " - "on bridge %s", msg, name, iface->port->bridge->name); + vsctl_fatal("%s because an interface named %s already exists " + "on bridge %s", msg, name, iface->port->bridge->name); } free(msg); } static struct vsctl_bridge * -find_bridge(struct vsctl_info *info, const char *name) +find_bridge(struct vsctl_info *info, const char *name, bool must_exist) { struct vsctl_bridge *br = shash_find_data(&info->bridges, name); - if (!br) { - ovs_fatal(0, "no bridge named %s", name); + if (must_exist && !br) { + vsctl_fatal("no bridge named %s", name); + } + return br; +} + +static struct vsctl_bridge * +find_real_bridge(struct vsctl_info *info, const char *name, bool must_exist) +{ + struct vsctl_bridge *br = find_bridge(info, name, must_exist); + if (br && br->parent) { + vsctl_fatal("%s is a fake bridge", name); } return br; } static struct vsctl_port * -find_port(struct vsctl_info *info, const char *name) +find_port(struct vsctl_info *info, const char *name, bool must_exist) { struct vsctl_port *port = shash_find_data(&info->ports, name); - if (!port || !strcmp(name, port->bridge->name)) { - ovs_fatal(0, "no port named %s", name); + if (port && !strcmp(name, port->bridge->name)) { + port = NULL; + } + if (must_exist && !port) { + vsctl_fatal("no port named %s", name); } return port; } static struct vsctl_iface * -find_iface(struct vsctl_info *info, const char *name) +find_iface(struct vsctl_info *info, const char *name, bool must_exist) { struct vsctl_iface *iface = shash_find_data(&info->ifaces, name); - if (!iface) { - ovs_fatal(0, "no interface named %s", name); + if (iface && !strcmp(name, iface->port->bridge->name)) { + iface = NULL; + } + if (must_exist && !iface) { + vsctl_fatal("no interface named %s", name); } return iface; } @@ -471,7 +636,6 @@ bridge_insert_port(struct ovsrec_bridge *br, struct ovsrec_port *port) for (i = 0; i < br->n_ports; i++) { ports[i] = br->ports[i]; } - printf("bridge has %zu ports, adding 1\n", br->n_ports); ports[br->n_ports] = port; ovsrec_bridge_set_ports(br, ports, br->n_ports + 1); free(ports); @@ -527,38 +691,43 @@ ovs_delete_bridge(const struct ovsrec_open_vswitch *ovs, } static void -cmd_add_br(int argc, char *argv[], const struct ovsrec_open_vswitch *ovs, - struct ds *output UNUSED) +cmd_init(struct vsctl_context *ctx UNUSED) +{ +} + +static void +cmd_add_br(struct vsctl_context *ctx) { - const char *br_name = argv[1]; + const char *br_name = ctx->argv[1]; struct vsctl_info info; - get_info(ovs, &info); + get_info(ctx->ovs, &info); check_conflicts(&info, br_name, xasprintf("cannot create a bridge named %s", br_name)); - if (argc == 2) { + if (ctx->argc == 2) { struct ovsrec_bridge *br; struct ovsrec_port *port; struct ovsrec_interface *iface; - iface = ovsrec_interface_insert(txn_from_openvswitch(ovs)); + iface = ovsrec_interface_insert(txn_from_openvswitch(ctx->ovs)); ovsrec_interface_set_name(iface, br_name); - port = ovsrec_port_insert(txn_from_openvswitch(ovs)); + port = ovsrec_port_insert(txn_from_openvswitch(ctx->ovs)); ovsrec_port_set_name(port, br_name); ovsrec_port_set_interfaces(port, &iface, 1); - br = ovsrec_bridge_insert(txn_from_openvswitch(ovs)); + br = ovsrec_bridge_insert(txn_from_openvswitch(ctx->ovs)); ovsrec_bridge_set_name(br, br_name); ovsrec_bridge_set_ports(br, &port, 1); - ovs_insert_bridge(ovs, br); - } else if (argc == 3) { - ovs_fatal(0, "'%s' comamnd takes exactly 1 or 3 arguments", argv[0]); - } else if (argc >= 4) { - const char *parent_name = argv[2]; - int vlan = atoi(argv[3]); + 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; struct vsctl_bridge *parent; struct ovsrec_port *port; @@ -566,27 +735,29 @@ cmd_add_br(int argc, char *argv[], const struct ovsrec_open_vswitch *ovs, int64_t tag = vlan; if (vlan < 1 || vlan > 4095) { - ovs_fatal(0, "%s: vlan must be between 1 and 4095", argv[0]); + vsctl_fatal("%s: vlan must be between 1 and 4095", ctx->argv[0]); } - parent = shash_find_data(&info.bridges, parent_name); + parent = find_bridge(&info, parent_name, false); if (parent && parent->vlan) { - ovs_fatal(0, "cannot create brdige with fake bridge as parent"); + vsctl_fatal("cannot create bridge with fake bridge as parent"); } if (!parent) { - ovs_fatal(0, "parent bridge %s does not exist", parent_name); + vsctl_fatal("parent bridge %s does not exist", parent_name); } br = parent->br_cfg; - iface = ovsrec_interface_insert(txn_from_openvswitch(ovs)); + iface = ovsrec_interface_insert(txn_from_openvswitch(ctx->ovs)); ovsrec_interface_set_name(iface, br_name); ovsrec_interface_set_type(iface, "internal"); - port = ovsrec_port_insert(txn_from_openvswitch(ovs)); + port = ovsrec_port_insert(txn_from_openvswitch(ctx->ovs)); 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(); } @@ -613,73 +784,219 @@ del_port(struct vsctl_info *info, struct vsctl_port *port) } static void -cmd_del_br(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output UNUSED) +cmd_del_br(struct vsctl_context *ctx) { - struct shash_node *node; - struct vsctl_info info; + bool must_exist = !shash_find(&ctx->options, "--if-exists"); struct vsctl_bridge *bridge; + struct vsctl_info info; - get_info(ovs, &info); - bridge = find_bridge(&info, argv[1]); - SHASH_FOR_EACH (node, &info.ports) { - struct vsctl_port *port = node->data; - if (port->bridge == bridge) { - del_port(&info, port); + get_info(ctx->ovs, &info); + bridge = find_bridge(&info, ctx->argv[1], must_exist); + if (bridge) { + struct shash_node *node; + + SHASH_FOR_EACH (node, &info.ports) { + struct vsctl_port *port = node->data; + if (port->bridge == bridge + || !strcmp(port->port_cfg->name, bridge->name)) { + del_port(&info, port); + } + } + if (bridge->br_cfg) { + ovsrec_bridge_delete(bridge->br_cfg); + ovs_delete_bridge(ctx->ovs, bridge->br_cfg); } - } - if (bridge->br_cfg) { - ovsrec_bridge_delete(bridge->br_cfg); - ovs_delete_bridge(ovs, bridge->br_cfg); } free_info(&info); } static void -cmd_list_br(int argc UNUSED, char *argv[] UNUSED, - const struct ovsrec_open_vswitch *ovs, struct ds *output) +output_sorted(struct svec *svec, struct ds *output) +{ + const char *name; + size_t i; + + svec_sort(svec); + SVEC_FOR_EACH (i, name, svec) { + ds_put_format(output, "%s\n", name); + } +} + +static void +cmd_list_br(struct vsctl_context *ctx) { struct shash_node *node; struct vsctl_info info; + struct svec bridges; - get_info(ovs, &info); + get_info(ctx->ovs, &info); + + svec_init(&bridges); SHASH_FOR_EACH (node, &info.bridges) { struct vsctl_bridge *br = node->data; - ds_put_format(output, "%s\n", br->name); + svec_add(&bridges, br->name); } + output_sorted(&bridges, &ctx->output); + svec_destroy(&bridges); + free_info(&info); } static void -cmd_br_exists(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output UNUSED) +cmd_br_exists(struct vsctl_context *ctx) { struct vsctl_info info; - get_info(ovs, &info); - if (!shash_find_data(&info.bridges, argv[1])) { + get_info(ctx->ovs, &info); + if (!find_bridge(&info, ctx->argv[1], false)) { exit(2); } free_info(&info); } +/* Returns true if 'b_prefix' (of length 'b_prefix_len') concatenated with 'b' + * equals 'a', false otherwise. */ +static bool +key_matches(const char *a, + const char *b_prefix, size_t b_prefix_len, const char *b) +{ + return !strncmp(a, b_prefix, b_prefix_len) && !strcmp(a + b_prefix_len, b); +} + +static void +set_external_id(char **old_keys, char **old_values, size_t old_n, + char *key, char *value, + char ***new_keysp, char ***new_valuesp, size_t *new_np) +{ + char **new_keys; + char **new_values; + size_t new_n; + size_t i; + + new_keys = xmalloc(sizeof *new_keys * (old_n + 1)); + new_values = xmalloc(sizeof *new_values * (old_n + 1)); + new_n = 0; + for (i = 0; i < old_n; i++) { + if (strcmp(key, old_keys[i])) { + new_keys[new_n] = old_keys[i]; + new_values[new_n] = old_values[i]; + new_n++; + } + } + if (value) { + new_keys[new_n] = key; + new_values[new_n] = value; + new_n++; + } + *new_keysp = new_keys; + *new_valuesp = new_values; + *new_np = new_n; +} + +static void +cmd_br_set_external_id(struct vsctl_context *ctx) +{ + struct vsctl_info info; + struct vsctl_bridge *bridge; + char **keys, **values; + size_t n; + + get_info(ctx->ovs, &info); + bridge = find_bridge(&info, ctx->argv[1], true); + if (bridge->br_cfg) { + set_external_id(bridge->br_cfg->key_external_ids, + bridge->br_cfg->value_external_ids, + bridge->br_cfg->n_external_ids, + ctx->argv[2], ctx->argc >= 4 ? ctx->argv[3] : NULL, + &keys, &values, &n); + ovsrec_bridge_set_external_ids(bridge->br_cfg, keys, values, n); + } else { + char *key = xasprintf("fake-bridge-%s", ctx->argv[2]); + struct vsctl_port *port = shash_find_data(&info.ports, ctx->argv[1]); + set_external_id(port->port_cfg->key_external_ids, + port->port_cfg->value_external_ids, + port->port_cfg->n_external_ids, + key, ctx->argc >= 4 ? ctx->argv[3] : NULL, + &keys, &values, &n); + ovsrec_port_set_external_ids(port->port_cfg, keys, values, n); + free(key); + } + free(keys); + free(values); + + free_info(&info); +} + +static void +get_external_id(char **keys, char **values, size_t n, + const char *prefix, const char *key, + struct ds *output) +{ + size_t prefix_len = strlen(prefix); + struct svec svec; + size_t i; + + svec_init(&svec); + for (i = 0; i < n; i++) { + if (!key && !strncmp(keys[i], prefix, prefix_len)) { + svec_add_nocopy(&svec, xasprintf("%s=%s", + keys[i] + prefix_len, values[i])); + } else if (key_matches(keys[i], prefix, prefix_len, key)) { + svec_add(&svec, values[i]); + break; + } + } + output_sorted(&svec, output); + svec_destroy(&svec); +} + +static void +cmd_br_get_external_id(struct vsctl_context *ctx) +{ + struct vsctl_info info; + struct vsctl_bridge *bridge; + + get_info(ctx->ovs, &info); + bridge = find_bridge(&info, ctx->argv[1], true); + if (bridge->br_cfg) { + get_external_id(bridge->br_cfg->key_external_ids, + bridge->br_cfg->value_external_ids, + bridge->br_cfg->n_external_ids, + "", ctx->argc >= 3 ? ctx->argv[2] : NULL, + &ctx->output); + } else { + struct vsctl_port *port = shash_find_data(&info.ports, ctx->argv[1]); + get_external_id(port->port_cfg->key_external_ids, + port->port_cfg->value_external_ids, + port->port_cfg->n_external_ids, + "fake-bridge-", ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output); + } + free_info(&info); +} + + static void -cmd_list_ports(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output) +cmd_list_ports(struct vsctl_context *ctx) { struct vsctl_bridge *br; struct shash_node *node; struct vsctl_info info; + struct svec ports; - get_info(ovs, &info); - br = find_bridge(&info, argv[1]); + get_info(ctx->ovs, &info); + br = find_bridge(&info, ctx->argv[1], true); + + svec_init(&ports); SHASH_FOR_EACH (node, &info.ports) { struct vsctl_port *port = node->data; if (strcmp(port->port_cfg->name, br->name) && br == port->bridge) { - ds_put_format(output, "%s\n", port->port_cfg->name); + svec_add(&ports, port->port_cfg->name); } } + output_sorted(&ports, &ctx->output); + svec_destroy(&ports); + free_info(&info); } @@ -698,7 +1015,7 @@ add_port(const struct ovsrec_open_vswitch *ovs, check_conflicts(&info, port_name, xasprintf("cannot create a port named %s", port_name)); /* XXX need to check for conflicts on interfaces too */ - bridge = find_bridge(&info, br_name); + bridge = find_bridge(&info, br_name, true); ifaces = xmalloc(n_ifaces * sizeof *ifaces); for (i = 0; i < n_ifaces; i++) { @@ -709,6 +1026,8 @@ add_port(const struct ovsrec_open_vswitch *ovs, port = ovsrec_port_insert(txn_from_openvswitch(ovs)); ovsrec_port_set_name(port, port_name); ovsrec_port_set_interfaces(port, ifaces, n_ifaces); + free(ifaces); + if (bridge->vlan) { int64_t tag = bridge->vlan; ovsrec_port_set_tag(port, &tag, 1); @@ -721,157 +1040,485 @@ add_port(const struct ovsrec_open_vswitch *ovs, } static void -cmd_add_port(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output UNUSED) +cmd_add_port(struct vsctl_context *ctx) { - add_port(ovs, argv[1], argv[2], &argv[2], 1); + add_port(ctx->ovs, ctx->argv[1], ctx->argv[2], &ctx->argv[2], 1); } static void -cmd_add_bond(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output UNUSED) +cmd_add_bond(struct vsctl_context *ctx) { - add_port(ovs, argv[1], argv[2], &argv[3], argc - 3); + add_port(ctx->ovs, ctx->argv[1], ctx->argv[2], &ctx->argv[3], ctx->argc - 3); } static void -cmd_del_port(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output UNUSED) +cmd_del_port(struct vsctl_context *ctx) { + bool must_exist = !shash_find(&ctx->options, "--if-exists"); struct vsctl_info info; - get_info(ovs, &info); - if (argc == 2) { - struct vsctl_port *port = find_port(&info, argv[1]); - del_port(&info, port); - } else if (argc == 3) { - struct vsctl_bridge *bridge = find_bridge(&info, argv[1]); - struct vsctl_port *port = find_port(&info, argv[2]); - - if (port->bridge == bridge) { + 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 (port->bridge->parent == bridge) { - ovs_fatal(0, "bridge %s does not have a port %s (although its " - "parent bridge %s does)", - argv[1], argv[2], bridge->parent->name); - } else { - ovs_fatal(0, "bridge %s does not have a port %s", - argv[1], argv[2]); + } + } 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]); + } } } free_info(&info); } static void -cmd_port_to_br(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output) +cmd_port_to_br(struct vsctl_context *ctx) { struct vsctl_port *port; struct vsctl_info info; - get_info(ovs, &info); - port = find_port(&info, argv[1]); - ds_put_format(output, "%s\n", port->bridge->name); + 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; + + 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); + free_info(&info); } static void -cmd_br_to_vlan(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output) +cmd_port_get_external_id(struct vsctl_context *ctx) +{ + struct vsctl_info info; + struct vsctl_port *port; + + 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); + free_info(&info); +} + +static void +cmd_br_to_vlan(struct vsctl_context *ctx) { struct vsctl_bridge *bridge; struct vsctl_info info; - get_info(ovs, &info); - bridge = find_bridge(&info, argv[1]); - ds_put_format(output, "%d\n", bridge->vlan); + get_info(ctx->ovs, &info); + bridge = find_bridge(&info, ctx->argv[1], true); + ds_put_format(&ctx->output, "%d\n", bridge->vlan); free_info(&info); } static void -cmd_br_to_parent(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output) +cmd_br_to_parent(struct vsctl_context *ctx) { struct vsctl_bridge *bridge; struct vsctl_info info; - get_info(ovs, &info); - bridge = find_bridge(&info, argv[1]); + get_info(ctx->ovs, &info); + bridge = find_bridge(&info, ctx->argv[1], true); if (bridge->parent) { bridge = bridge->parent; } - ds_put_format(output, "%s\n", bridge->name); + ds_put_format(&ctx->output, "%s\n", bridge->name); free_info(&info); } static void -cmd_list_ifaces(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output) +cmd_list_ifaces(struct vsctl_context *ctx) { struct vsctl_bridge *br; struct shash_node *node; struct vsctl_info info; + struct svec ifaces; - get_info(ovs, &info); - br = find_bridge(&info, argv[1]); + get_info(ctx->ovs, &info); + br = find_bridge(&info, ctx->argv[1], true); + + svec_init(&ifaces); SHASH_FOR_EACH (node, &info.ifaces) { struct vsctl_iface *iface = node->data; - if (br == iface->port->bridge) { - ds_put_format(output, "%s\n", iface->iface_cfg->name); + if (strcmp(iface->iface_cfg->name, br->name) + && br == iface->port->bridge) { + svec_add(&ifaces, iface->iface_cfg->name); } } + output_sorted(&ifaces, &ctx->output); + svec_destroy(&ifaces); + free_info(&info); } static void -cmd_iface_to_br(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output) +cmd_iface_to_br(struct vsctl_context *ctx) { struct vsctl_iface *iface; struct vsctl_info info; - get_info(ovs, &info); - iface = find_iface(&info, argv[1]); - ds_put_format(output, "%s\n", iface->port->bridge->name); + get_info(ctx->ovs, &info); + iface = find_iface(&info, ctx->argv[1], true); + ds_put_format(&ctx->output, "%s\n", iface->port->bridge->name); + free_info(&info); +} + +static void +cmd_iface_set_external_id(struct vsctl_context *ctx) +{ + 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); +} + +static void +cmd_iface_get_external_id(struct vsctl_context *ctx) +{ + struct vsctl_info info; + struct vsctl_iface *iface; + + 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); +} + +static void +cmd_get_controller(struct vsctl_context *ctx) +{ + struct vsctl_info info; + + 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); + } + } 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); + } + } + + free_info(&info); +} + +static void +cmd_del_controller(struct vsctl_context *ctx) +{ + struct vsctl_info info; + + 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); + } + } 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); + } + } + + free_info(&info); +} + +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); + } else { + /* Set the controller for a particular bridge. */ + struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + + 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); + } + + free_info(&info); +} + +static void +cmd_get_fail_mode(struct vsctl_context *ctx) +{ + struct vsctl_info info; + const char *fail_mode = NULL; + + get_info(ctx->ovs, &info); + + if (ctx->argc == 1) { + /* Return the fail-mode from the "Open_vSwitch" table */ + if (info.ctrl && info.ctrl->fail_mode) { + fail_mode = info.ctrl->fail_mode; + } + } else { + /* Return the fail-mode for a particular bridge. */ + struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true); + + /* If no controller or fail-mode is explicitly defined for the + * requested bridge, fallback to the "Open_vSwitch" table's + * setting. */ + if (br->ctrl && br->ctrl->fail_mode) { + fail_mode = br->ctrl->fail_mode; + } else if (info.ctrl && info.ctrl->fail_mode) { + fail_mode = info.ctrl->fail_mode; + } + } + + if (fail_mode && strlen(fail_mode)) { + ds_put_format(&ctx->output, "%s\n", info.ctrl->fail_mode); + } + + free_info(&info); +} + +static void +cmd_del_fail_mode(struct vsctl_context *ctx) +{ + struct vsctl_info info; + + get_info(ctx->ovs, &info); + + if (ctx->argc == 1) { + if (info.ctrl && info.ctrl->fail_mode) { + ovsrec_controller_set_fail_mode(info.ctrl, NULL); + } + } else { + struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + + if (br->ctrl && br->ctrl->fail_mode) { + ovsrec_controller_set_fail_mode(br->ctrl, NULL); + } + } + + free_info(&info); +} + +static void +cmd_set_fail_mode(struct vsctl_context *ctx) +{ + struct vsctl_info info; + const char *fail_mode; + + get_info(ctx->ovs, &info); + + fail_mode = (ctx->argc == 2) ? ctx->argv[1] : 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) { + /* Set the fail-mode in the "Open_vSwitch" table. */ + if (!info.ctrl) { + vsctl_fatal("no controller declared"); + } + ovsrec_controller_set_fail_mode(info.ctrl, fail_mode); + } else { + struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + + if (!br->ctrl) { + vsctl_fatal("no controller declared for %s", br->name); + } + ovsrec_controller_set_fail_mode(br->ctrl, fail_mode); + } + free_info(&info); } + +static void +cmd_get_ssl(struct vsctl_context *ctx) +{ + struct ovsrec_ssl *ssl = ctx->ovs->ssl; + + if (ssl) { + ds_put_format(&ctx->output, "Private key: %s\n", ssl->private_key); + ds_put_format(&ctx->output, "Certificate: %s\n", ssl->certificate); + ds_put_format(&ctx->output, "CA Certificate: %s\n", ssl->ca_cert); + ds_put_format(&ctx->output, "Bootstrap: %s\n", + ssl->bootstrap_ca_cert ? "true" : "false"); + } +} + +static void +cmd_del_ssl(struct vsctl_context *ctx) +{ + struct ovsrec_ssl *ssl = ctx->ovs->ssl; + + if (ssl) { + ovsrec_ssl_delete(ssl); + ovsrec_open_vswitch_set_ssl(ctx->ovs, NULL); + } +} + +static void +cmd_set_ssl(struct vsctl_context *ctx) +{ + bool bootstrap = shash_find(&ctx->options, "--bootstrap"); + struct ovsrec_ssl *ssl = ctx->ovs->ssl; + + if (ssl) { + ovsrec_ssl_delete(ssl); + } + ssl = ovsrec_ssl_insert(txn_from_openvswitch(ctx->ovs)); + + ovsrec_ssl_set_private_key(ssl, ctx->argv[1]); + ovsrec_ssl_set_certificate(ssl, ctx->argv[2]); + ovsrec_ssl_set_ca_cert(ssl, ctx->argv[3]); + + ovsrec_ssl_set_bootstrap_ca_cert(ssl, bootstrap); + + ovsrec_open_vswitch_set_ssl(ctx->ovs, ssl); +} +typedef void vsctl_handler_func(struct vsctl_context *); + struct vsctl_command { const char *name; int min_args; int max_args; - void (*handler)(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output); + vsctl_handler_func *handler; + const char *options; }; static void run_vsctl_command(int argc, char *argv[], const struct ovsrec_open_vswitch *ovs, struct ds *output); +static struct json * +where_uuid_equals(const struct uuid *uuid) +{ + return + json_array_create_1( + json_array_create_3( + json_string_create("_uuid"), + json_string_create("=="), + json_array_create_2( + json_string_create("uuid"), + json_string_create_nocopy( + xasprintf(UUID_FMT, UUID_ARGS(uuid)))))); +} + static void do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) { struct ovsdb_idl_txn *txn; const struct ovsrec_open_vswitch *ovs; enum ovsdb_idl_txn_status status; - struct ds *output; + struct ds comment, *output; + int64_t next_cfg; int n_output; int i, start; + 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); + ovs = ovsrec_open_vswitch_first(idl); if (!ovs) { - /* XXX it would be more user-friendly to create a record ourselves - * (while verifying that the table is empty before doing so). */ - ovs_fatal(0, "%s: database does not contain any Open vSwitch " - "configuration", db); + /* XXX add verification that table is empty */ + ovs = ovsrec_open_vswitch_insert(txn); + } + + if (wait_for_reload) { + struct json *where = where_uuid_equals(&ovs->header_.uuid); + ovsdb_idl_txn_increment(txn, "Open_vSwitch", "next_cfg", + where); + json_destroy(where); } - txn = ovsdb_idl_txn_create(idl); output = xmalloc(argc * sizeof *output); n_output = 0; - for (start = i = 0; i < argc; i++) { - if (!strcmp(argv[i], "--")) { + 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, @@ -880,16 +1527,16 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) start = i + 1; } } - if (i > start) { - ds_init(&output[n_output]); - run_vsctl_command(i - start, &argv[start], ovs, &output[n_output++]); - } while ((status = ovsdb_idl_txn_commit(txn)) == TXN_INCOMPLETE) { ovsdb_idl_run(idl); ovsdb_idl_wait(idl); + ovsdb_idl_txn_wait(txn); poll_block(); } + if (wait_for_reload && status == TXN_SUCCESS) { + next_cfg = ovsdb_idl_txn_get_increment_new_value(txn); + } ovsdb_idl_txn_destroy(txn); switch (status) { @@ -898,8 +1545,9 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) case TXN_ABORTED: /* Should not happen--we never call ovsdb_idl_txn_abort(). */ - ovs_fatal(0, "transaction aborted"); + vsctl_fatal("transaction aborted"); + case TXN_UNCHANGED: case TXN_SUCCESS: break; @@ -910,7 +1558,7 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) return; case TXN_ERROR: - ovs_fatal(0, "transaction error"); + vsctl_fatal("transaction error"); default: NOT_REACHED(); @@ -942,47 +1590,140 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) fputs(ds_cstr(ds), stdout); } } + + if (wait_for_reload && status != TXN_UNCHANGED) { + for (;;) { + const struct ovsrec_open_vswitch *ovs; + + ovsdb_idl_run(idl); + OVSREC_OPEN_VSWITCH_FOR_EACH (ovs, idl) { + if (ovs->cur_cfg >= next_cfg) { + goto done; + } + } + ovsdb_idl_wait(idl); + poll_block(); + } + done: ; + } + exit(EXIT_SUCCESS); } -static void -run_vsctl_command(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output) +static vsctl_handler_func * +get_vsctl_handler(int argc, char *argv[], struct vsctl_context *ctx) { static const struct vsctl_command all_commands[] = { - {"add-br", 1, 3, cmd_add_br}, - {"del-br", 1, 1, cmd_del_br}, - {"list-br", 0, 0, cmd_list_br}, - {"br-exists", 1, 1, cmd_br_exists}, - {"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}, - {"port-to-br", 1, 1, cmd_port_to_br}, - {"br-to-vlan", 1, 1, cmd_br_to_vlan}, - {"br-to-parent", 1, 1, cmd_br_to_parent}, - {"list-ifaces", 1, 1, cmd_list_ifaces}, - {"iface-to-br", 1, 1, cmd_iface_to_br}, + /* 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; - assert(argc > 0); - for (p = all_commands; p->name != NULL; p++) { - if (!strcmp(p->name, argv[0])) { - int n_arg = argc - 1; + 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) { - ovs_fatal(0, "'%s' command requires at least %d arguments", - p->name, p->min_args); + vsctl_fatal("'%s' command requires at least %d arguments", + p->name, p->min_args); } else if (n_arg > p->max_args) { - ovs_fatal(0, "'%s' command takes at most %d arguments", - p->name, p->max_args); + vsctl_fatal("'%s' command takes at most %d arguments", + p->name, p->max_args); } else { - p->handler(argc, argv, ovs, output); - return; + ctx->argc = n_arg + 1; + ctx->argv = &argv[i]; + return p->handler; } } } - ovs_fatal(0, "unknown command '%s'; use --help for help", argv[0]); + 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; + + function = get_vsctl_handler(argc, argv, &ctx); + ctx.ovs = ovs; + ds_init(&ctx.output); + function(&ctx); + *output = ctx.output; + shash_destroy(&ctx.options); }