X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=733536894a73295645be10cc4bc085c01b736a3e;hb=898b7f8d4131c9dae8d292bfacd99465fb52b26c;hp=e33d2d1e069f61d1de1a7adcdf59451542a54b8d;hpb=c611c9d011111eeb2767faa1e8f02958fd36aeac;p=openvswitch diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index e33d2d1e..73353689 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -36,6 +36,7 @@ #include "ovsdb-data.h" #include "ovsdb-idl.h" #include "poll-loop.h" +#include "process.h" #include "svec.h" #include "vswitchd/vswitch-idl.h" #include "timeval.h" @@ -44,6 +45,30 @@ #include "vlog.h" #define THIS_MODULE VLM_vsctl +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; @@ -59,23 +84,30 @@ 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[]; + 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 *); 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); @@ -83,34 +115,20 @@ 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); + + /* 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); @@ -125,7 +143,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; } @@ -134,21 +152,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[]) { @@ -233,107 +236,174 @@ 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++) { + if (argv[i][0] != '-') { + break; + } + if (!shash_add_once(&command->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->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 != '\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 { + 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_fatal(0, "%s", message); +} + 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\ +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); } @@ -348,12 +418,16 @@ default_db(void) } struct vsctl_context { + /* Read-only. */ int argc; char **argv; + struct shash options; + + /* Modifiable state. */ + struct ds output; struct ovsdb_idl *idl; + struct ovsdb_idl_txn *txn; const struct ovsrec_open_vswitch *ovs; - struct ds output; - struct shash options; }; struct vsctl_bridge { @@ -381,12 +455,6 @@ struct vsctl_info { struct ovsrec_controller *ctrl; }; -static struct ovsdb_idl_txn * -txn_from_openvswitch(const struct ovsrec_open_vswitch *ovs) -{ - return ovsdb_idl_txn_get(&ovs->header_); -} - static struct vsctl_bridge * add_bridge(struct vsctl_info *b, struct ovsrec_bridge *br_cfg, const char *name, @@ -714,14 +782,14 @@ cmd_add_br(struct vsctl_context *ctx) struct ovsrec_port *port; struct ovsrec_interface *iface; - 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); @@ -751,11 +819,11 @@ 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); @@ -1005,7 +1073,7 @@ 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, bool fake_iface, char *iface_names[], int n_ifaces) { @@ -1015,7 +1083,7 @@ add_port(const struct ovsrec_open_vswitch *ovs, struct ovsrec_port *port; size_t i; - get_info(ovs, &info); + get_info(ctx->ovs, &info); check_conflicts(&info, port_name, xasprintf("cannot create a port named %s", port_name)); /* XXX need to check for conflicts on interfaces too */ @@ -1023,11 +1091,11 @@ add_port(const struct ovsrec_open_vswitch *ovs, 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); @@ -1047,7 +1115,7 @@ 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], false, &ctx->argv[2], 1); + add_port(ctx, ctx->argv[1], ctx->argv[2], false, &ctx->argv[2], 1); } static void @@ -1055,7 +1123,7 @@ cmd_add_bond(struct vsctl_context *ctx) { bool fake_iface = shash_find(&ctx->options, "--fake-iface"); - add_port(ctx->ovs, ctx->argv[1], ctx->argv[2], fake_iface, + add_port(ctx, ctx->argv[1], ctx->argv[2], fake_iface, &ctx->argv[3], ctx->argc - 3); } @@ -1103,43 +1171,6 @@ cmd_port_to_br(struct vsctl_context *ctx) 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_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) { @@ -1205,43 +1236,6 @@ cmd_iface_to_br(struct vsctl_context *ctx) 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) { @@ -1307,7 +1301,7 @@ cmd_set_controller(struct vsctl_context *ctx) if (info.ctrl) { ovsrec_controller_delete(info.ctrl); } - ctrl = ovsrec_controller_insert(txn_from_openvswitch(ctx->ovs)); + ctrl = ovsrec_controller_insert(ctx->txn); ovsrec_controller_set_target(ctrl, ctx->argv[1]); ovsrec_open_vswitch_set_controller(ctx->ovs, ctrl); } else { @@ -1317,7 +1311,7 @@ cmd_set_controller(struct vsctl_context *ctx) if (br->ctrl) { ovsrec_controller_delete(br->ctrl); } - ctrl = ovsrec_controller_insert(txn_from_openvswitch(ctx->ovs)); + ctrl = ovsrec_controller_insert(ctx->txn); ovsrec_controller_set_target(ctrl, ctx->argv[2]); ovsrec_bridge_set_controller(br->br_cfg, ctrl); } @@ -1447,7 +1441,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]); @@ -1502,14 +1496,15 @@ struct vsctl_column { }; static const struct vsctl_column bridge_columns[] = { + {&ovsrec_bridge_col_controller, VSCF_READONLY, NULL}, {&ovsrec_bridge_col_datapath_id, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_name, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_mirrors, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_other_config, 0, NULL}, + {&ovsrec_bridge_col_datapath_type, VSCF_READONLY, NULL}, + {&ovsrec_bridge_col_external_ids, 0, NULL}, {&ovsrec_bridge_col_flood_vlans, 0, "[1,4095]"}, - {&ovsrec_bridge_col_controller, VSCF_READONLY, NULL}, + {&ovsrec_bridge_col_mirrors, VSCF_READONLY, NULL}, + {&ovsrec_bridge_col_name, VSCF_READONLY, NULL}, {&ovsrec_bridge_col_netflow, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_external_ids, 0, NULL}, + {&ovsrec_bridge_col_other_config, 0, NULL}, {&ovsrec_bridge_col_ports, VSCF_READONLY, NULL}, {NULL, 0, NULL}, }; @@ -1555,9 +1550,9 @@ static const struct vsctl_column mirror_columns[] = { static const struct vsctl_column netflow_columns[] = { {&ovsrec_netflow_col_active_timeout, 0, "[-1,]"}, {&ovsrec_netflow_col_add_id_to_interface, 0, NULL}, - {&ovsrec_netflow_col_targets, 0, IP_RE":"PORT_RE}, - {&ovsrec_netflow_col_engine_type, 0, "[0,255]"}, {&ovsrec_netflow_col_engine_id, 0, "[0,255]"}, + {&ovsrec_netflow_col_engine_type, 0, "[0,255]"}, + {&ovsrec_netflow_col_targets, 0, IP_RE":"PORT_RE}, {NULL, 0, NULL}, }; @@ -1565,7 +1560,6 @@ static const struct vsctl_column open_vswitch_columns[] = { {&ovsrec_open_vswitch_col_bridges, VSCF_READONLY, NULL}, {&ovsrec_open_vswitch_col_controller, VSCF_READONLY, NULL}, {&ovsrec_open_vswitch_col_cur_cfg, VSCF_HIDDEN, NULL}, - {&ovsrec_open_vswitch_col_management_id, 0, "[0-9a-fA-F]{12}"}, {&ovsrec_open_vswitch_col_managers, 0, "p?(ssl|tcp|unix):.*"}, {&ovsrec_open_vswitch_col_next_cfg, VSCF_HIDDEN, NULL}, {&ovsrec_open_vswitch_col_ssl, VSCF_READONLY, NULL}, @@ -1573,9 +1567,9 @@ static const struct vsctl_column open_vswitch_columns[] = { }; static const struct vsctl_column port_columns[] = { - {&ovsrec_port_col_bond_updelay, 0, "[0,]"}, {&ovsrec_port_col_bond_downdelay, 0, "[0,]"}, {&ovsrec_port_col_bond_fake_iface, VSCF_READONLY, NULL}, + {&ovsrec_port_col_bond_updelay, 0, "[0,]"}, {&ovsrec_port_col_external_ids, 0, NULL}, {&ovsrec_port_col_fake_bridge, VSCF_READONLY, NULL}, {&ovsrec_port_col_interfaces, VSCF_READONLY, NULL}, @@ -1648,6 +1642,14 @@ static const struct vsctl_table_class tables[] = { {NULL, NULL, {{NULL, NULL, NULL}, {NULL, NULL, NULL}}} }; +static void +die_if_error(char *error) +{ + if (error) { + ovs_fatal(0, "%s", error); + } +} + static int to_lower_and_underscores(unsigned c) { @@ -1743,6 +1745,10 @@ get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, } ovsdb_datum_destroy(&name, &id->name_column->type); } + if (best_score && !referrer) { + ovs_fatal(0, "multiple rows in %s match \"%s\"", + table->class->name, record_id); + } } if (!referrer) { return NULL; @@ -1787,6 +1793,14 @@ get_row(struct vsctl_context *ctx, } } } + 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) { ovs_fatal(0, "no row \"%s\" in table %s", record_id, table->class->name); @@ -1794,8 +1808,9 @@ get_row(struct vsctl_context *ctx, return row; } -static const struct vsctl_column * -get_column(const struct vsctl_table_class *table, const char *column_name) +static char * +get_column(const struct vsctl_table_class *table, const char *column_name, + const struct vsctl_column **columnp) { const struct vsctl_column *column; const struct vsctl_column *best_match = NULL; @@ -1813,44 +1828,52 @@ get_column(const struct vsctl_table_class *table, const char *column_name) } } } + + *columnp = best_match; if (best_match) { - return best_match; + return NULL; } else if (best_score) { - ovs_fatal(0, "%s has more than one column whose name matches \"%s\"", - table->class->name, column_name); + return xasprintf("%s contains more than one column whose name " + "matches \"%s\"", table->class->name, column_name); } else { - ovs_fatal(0, "%s does not have a column \"%s\"", - table->class->name, column_name); + return xasprintf("%s does not contain a column whose name matches " + "\"%s\"", table->class->name, column_name); } } -static void -check_trailer(const char *s, const char *p) -{ - if (*p != '\0') { - ovs_fatal(0, "%s: trailing garbage in argument at offset %td", - s, p - s); - } -} - -static void +static char * WARN_UNUSED_RESULT parse_column_key_value(const char *arg, const struct vsctl_table_class *table, const struct vsctl_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; - p = ovsdb_token_parse(arg, &column_name); + error = ovsdb_token_parse(&p, &column_name); + if (error) { + goto error; + } if (column_name[0] == '\0') { - ovs_fatal(0, "%s: missing column name", arg); + free(column_name); + error = xasprintf("%s: missing column name", arg); + goto error; + } + error = get_column(table, column_name, columnp); + if (error) { + goto error; } - *columnp = get_column(table, column_name); free(column_name); } @@ -1859,9 +1882,13 @@ parse_column_key_value(const char *arg, const struct vsctl_table_class *table, if (columnp) { p++; } else if (!keyp) { - ovs_fatal(0, "%s: key not accepted here", arg); + error = xasprintf("%s: key not accepted here", arg); + goto error; + } + error = ovsdb_token_parse(&p, keyp); + if (error) { + goto error; } - p = ovsdb_token_parse(p, keyp); } else if (keyp) { *keyp = NULL; } @@ -1869,21 +1896,41 @@ parse_column_key_value(const char *arg, const struct vsctl_table_class *table, /* Parse value string. */ if (*p == '=') { if (!valuep) { - ovs_fatal(0, "%s: value not accepted here", arg); + error = xasprintf("%s: value not accepted here", arg); + goto error; } *valuep = xstrdup(p + 1); - return; } else { if (valuep) { *valuep = NULL; } - check_trailer(arg, p); + 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; @@ -1892,14 +1939,14 @@ cmd_get(struct vsctl_context *ctx) int i; table = get_table(table_name); - row = get_row(ctx, table, record_id); + row = must_get_row(ctx, table, record_id); for (i = 3; i < ctx->argc; i++) { const struct vsctl_column *column; struct ovsdb_datum datum; char *key_string; - parse_column_key_value(ctx->argv[i], table, - &column, &key_string, NULL); + die_if_error(parse_column_key_value(ctx->argv[i], table, + &column, &key_string, NULL)); ovsdb_idl_txn_read(row, column->idl, &datum); if (key_string) { @@ -1911,20 +1958,22 @@ cmd_get(struct vsctl_context *ctx) column->idl->name); } - ovsdb_atom_from_string(&key, column->idl->type.key_type, - key_string); + die_if_error(ovsdb_atom_from_string(&key, + column->idl->type.key_type, + key_string)); idx = ovsdb_datum_find_key(&datum, &key, column->idl->type.key_type); if (idx == UINT_MAX) { - ovs_fatal(0, "no key %s in %s record \"%s\" column %s", - key_string, table_name, record_id, - column->idl->name); - + if (!if_exists) { + ovs_fatal(0, "no key \"%s\" in %s record \"%s\" column %s", + key_string, table->class->name, record_id, + column->idl->name); + } + } else { + ovsdb_atom_to_string(&datum.values[idx], + column->idl->type.value_type, out); } - ovsdb_atom_to_string(&datum.values[idx], - column->idl->type.value_type, out); - ovsdb_atom_destroy(&key, column->idl->type.key_type); } else { ovsdb_datum_to_string(&datum, &column->idl->type, out); @@ -1937,8 +1986,8 @@ cmd_get(struct vsctl_context *ctx) } static void -list_record(const struct vsctl_table_class *table, const struct ovsdb_idl_row *row, - struct ds *out) +list_record(const struct vsctl_table_class *table, + const struct ovsdb_idl_row *row, struct ds *out) { const struct vsctl_column *column; @@ -1976,7 +2025,7 @@ cmd_list(struct vsctl_context *ctx) if (i > 2) { ds_put_char(out, '\n'); } - list_record(table, get_row(ctx, table, ctx->argv[i]), out); + list_record(table, must_get_row(ctx, table, ctx->argv[i]), out); } } else { const struct ovsdb_idl_row *row; @@ -2078,69 +2127,85 @@ check_constraint(const struct ovsdb_datum *datum, } static void -cmd_set(struct vsctl_context *ctx) +set_column(const struct vsctl_table_class *table, + const struct ovsdb_idl_row *row, + const char *arg, bool force) { - 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; + const struct vsctl_column *column; + char *key_string, *value_string; + char *error; - table = get_table(table_name); - row = get_row(ctx, table, record_id); - for (i = 3; i < ctx->argc; i++) { - const struct vsctl_column *column; - char *key_string, *value_string; + error = parse_column_key_value(arg, table, &column, &key_string, + &value_string); + die_if_error(error); + if (column->flags & VSCF_READONLY && !force) { + ovs_fatal(0, "%s: cannot modify read-only column %s in table %s", + arg, column->idl->name, table->class->name); + } + if (!value_string) { + ovs_fatal(0, "%s: missing value", arg); + } - parse_column_key_value(ctx->argv[i], table, - &column, &key_string, &value_string); - if (column->flags & VSCF_READONLY) { - ovs_fatal(0, "%s: cannot modify read-only column %s in table %s", - ctx->argv[i], column->idl->name, table_name); - } - if (!value_string) { - ovs_fatal(0, "%s: missing value", ctx->argv[i]); + if (key_string) { + union ovsdb_atom key, value; + struct ovsdb_datum old, new; + + if (column->idl->type.value_type == OVSDB_TYPE_VOID) { + ovs_fatal(0, "cannot specify key to set for non-map column %s", + column->idl->name); } - if (key_string) { - union ovsdb_atom key, value; - struct ovsdb_datum old, new; + die_if_error(ovsdb_atom_from_string(&key, + column->idl->type.key_type, + key_string)); + die_if_error(ovsdb_atom_from_string(&value, + column->idl->type.value_type, + value_string)); - if (column->idl->type.value_type == OVSDB_TYPE_VOID) { - ovs_fatal(0, "cannot specify key to set for non-map column %s", - column->idl->name); - } + ovsdb_datum_init_empty(&new); + ovsdb_datum_add_unsafe(&new, &key, &value, &column->idl->type); - ovsdb_atom_from_string(&key, column->idl->type.key_type, - key_string); - ovsdb_atom_from_string(&value, column->idl->type.value_type, - value_string); + ovsdb_idl_txn_read(row, column->idl, &old); + ovsdb_datum_union(&old, &new, &column->idl->type, true); + ovsdb_idl_txn_write(row, column->idl, &old); - ovsdb_datum_init_empty(&new); - ovsdb_datum_add_unsafe(&new, &key, &value, &column->idl->type); + ovsdb_datum_destroy(&new, &column->idl->type); + } else { + struct ovsdb_datum datum; - ovsdb_idl_txn_read(row, column->idl, &old); - ovsdb_datum_union(&old, &new, &column->idl->type, true); - ovsdb_idl_txn_write(row, column->idl, &old); + die_if_error(ovsdb_datum_from_string(&datum, &column->idl->type, + value_string)); + if (!force) { + check_constraint(&datum, &column->idl->type, + column->constraint); + } + ovsdb_idl_txn_write(row, column->idl, &datum); + } - ovsdb_datum_destroy(&new, &column->idl->type); - } else { - struct ovsdb_datum datum; + free(key_string); +} - ovsdb_datum_from_string(&datum, &column->idl->type, value_string); - check_constraint(&datum, &column->idl->type, column->constraint); - ovsdb_idl_txn_write(row, column->idl, &datum); - } - ds_put_char(out, '\n'); +static void +cmd_set(struct vsctl_context *ctx) +{ + bool force = shash_find(&ctx->options, "--force"); + const char *table_name = ctx->argv[1]; + const char *record_id = ctx->argv[2]; + const struct vsctl_table_class *table; + const struct ovsdb_idl_row *row; + int i; - free(key_string); + table = get_table(table_name); + row = must_get_row(ctx, table, record_id); + for (i = 3; i < ctx->argc; i++) { + set_column(table, row, ctx->argv[i], force); } } static void cmd_add(struct vsctl_context *ctx) { + bool force = shash_find(&ctx->options, "--force"); const char *table_name = ctx->argv[1]; const char *record_id = ctx->argv[2]; const char *column_name = ctx->argv[3]; @@ -2152,50 +2217,190 @@ cmd_add(struct vsctl_context *ctx) int i; table = get_table(table_name); - row = get_row(ctx, table, record_id); - column = get_column(table, column_name); + row = must_get_row(ctx, table, record_id); + die_if_error(get_column(table, column_name, &column)); + if (column->flags & VSCF_READONLY && !force) { + ovs_fatal(0, "cannot modify read-only column %s in table %s", + column->idl->name, table->class->name); + } + type = &column->idl->type; ovsdb_idl_txn_read(row, column->idl, &old); for (i = 4; i < ctx->argc; i++) { struct ovsdb_type add_type; struct ovsdb_datum add; - if (column->flags & VSCF_READONLY) { - ovs_fatal(0, "%s: cannot modify read-only column %s in table %s", - ctx->argv[i], column->idl->name, table_name); - } - add_type = *type; add_type.n_min = 1; add_type.n_max = UINT_MAX; - ovsdb_datum_from_string(&add, &add_type, ctx->argv[i]); + die_if_error(ovsdb_datum_from_string(&add, &add_type, ctx->argv[i])); ovsdb_datum_union(&old, &add, type, false); ovsdb_datum_destroy(&add, type); } if (old.n > type->n_max) { ovs_fatal(0, "\"add\" operation would put %u %s in column %s of " - "table %s but at most %u are allowed", + "table %s but the maximum number is %u", old.n, type->value_type == OVSDB_TYPE_VOID ? "values" : "pairs", - column->idl->name, table_name, type->n_max); + column->idl->name, table->class->name, type->n_max); } ovsdb_idl_txn_write(row, column->idl, &old); } - -typedef void vsctl_handler_func(struct vsctl_context *); -struct vsctl_command { - const char *name; - int min_args; - int max_args; - vsctl_handler_func *handler; - const char *options; -}; +static void +cmd_remove(struct vsctl_context *ctx) +{ + bool force = shash_find(&ctx->options, "--force"); + const char *table_name = ctx->argv[1]; + const char *record_id = ctx->argv[2]; + const char *column_name = ctx->argv[3]; + const struct vsctl_table_class *table; + const struct vsctl_column *column; + const struct ovsdb_idl_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)); + if (column->flags & VSCF_READONLY && !force) { + ovs_fatal(0, "cannot modify read-only column %s in table %s", + column->idl->name, table->class->name); + } -static void run_vsctl_command(int argc, char *argv[], - const struct ovsrec_open_vswitch *, - struct ovsdb_idl *, struct ds *output); + type = &column->idl->type; + ovsdb_idl_txn_read(row, column->idl, &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]); + 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])); + } + ovsdb_datum_subtract(&old, type, &rm, &rm_type); + ovsdb_datum_destroy(&rm, &rm_type); + } + if (old.n < type->n_min) { + ovs_fatal(0, "\"remove\" operation would put %u %s in column %s of " + "table %s but the minimun number is %u", + old.n, + type->value_type == OVSDB_TYPE_VOID ? "values" : "pairs", + column->idl->name, table->class->name, type->n_min); + } + ovsdb_idl_txn_write(row, column->idl, &old); +} + +static void +cmd_clear(struct vsctl_context *ctx) +{ + bool force = shash_find(&ctx->options, "--force"); + const char *table_name = ctx->argv[1]; + const char *record_id = ctx->argv[2]; + const struct vsctl_table_class *table; + 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 vsctl_column *column; + const struct ovsdb_type *type; + struct ovsdb_datum datum; + + die_if_error(get_column(table, ctx->argv[i], &column)); + + type = &column->idl->type; + if (column->flags & VSCF_READONLY && !force) { + ovs_fatal(0, "cannot modify read-only column %s in table %s", + column->idl->name, table->class->name); + } else if (type->n_min > 0) { + ovs_fatal(0, "\"clear\" operation cannot be applied to column %s " + "of table %s, which is not allowed to be empty", + column->idl->name, table->class->name); + } + + ovsdb_datum_init_empty(&datum); + ovsdb_idl_txn_write(row, column->idl, &datum); + } +} +static void +cmd_create(struct vsctl_context *ctx) +{ + bool force = shash_find(&ctx->options, "--force"); + const char *table_name = ctx->argv[1]; + const struct vsctl_table_class *table; + const struct ovsdb_idl_row *row; + int i; + + if (!force) { + ovs_fatal(0, "\"create\" requires --force"); + } + + table = get_table(table_name); + row = ovsdb_idl_txn_insert(ctx->txn, table->class); + for (i = 2; i < ctx->argc; i++) { + set_column(table, row, ctx->argv[i], force); + } + 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 force = shash_find(&ctx->options, "--force"); + bool must_exist = !shash_find(&ctx->options, "--if-exists"); + const char *table_name = ctx->argv[1]; + const struct vsctl_table_class *table; + int i; + + if (!force) { + ovs_fatal(0, "\"destroy\" requires --force"); + } + + table = get_table(table_name); + for (i = 2; i < ctx->argc; i++) { + const struct ovsdb_idl_row *row; + + 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) { @@ -2211,28 +2416,46 @@ 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) +{ + 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; + +} + +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; + struct vsctl_command *c; int64_t next_cfg = 0; - int n_output; - int i, start; + char *comment; 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); + comment = xasprintf("ovs-vsctl: %s", args); + ovsdb_idl_txn_add_comment(txn, comment); + free(comment); ovs = ovsrec_open_vswitch_first(idl); if (!ovs) { @@ -2246,17 +2469,13 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) 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, idl, - &output[n_output++]); - } - start = i + 1; - } + for (c = commands; c < &commands[n_commands]; c++) { + struct vsctl_context ctx; + + ds_init(&c->output); + vsctl_context_init(&ctx, c, idl, txn, ovs); + (c->syntax->run)(&ctx); + vsctl_context_done(&ctx, c); } while ((status = ovsdb_idl_txn_commit(txn)) == TXN_INCOMPLETE) { @@ -2268,6 +2487,15 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) if (wait_for_reload && status == TXN_SUCCESS) { next_cfg = ovsdb_idl_txn_get_increment_new_value(txn); } + for (c = commands; c < &commands[n_commands]; c++) { + if (c->syntax->postprocess) { + struct vsctl_context ctx; + + vsctl_context_init(&ctx, c, idl, txn, ovs); + (c->syntax->postprocess)(&ctx); + vsctl_context_done(&ctx, c); + } + } ovsdb_idl_txn_destroy(txn); switch (status) { @@ -2283,8 +2511,8 @@ 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); } return; @@ -2295,8 +2523,8 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) NOT_REACHED(); } - for (i = 0; i < n_output; i++) { - struct ds *ds = &output[i]; + for (c = commands; c < &commands[n_commands]; c++) { + struct ds *ds = &c->output; if (oneline) { size_t j; @@ -2341,133 +2569,54 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *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, "--fake-iface"}, - {"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"}, - - /* Parameter commands. */ - {"get", 3, INT_MAX, cmd_get, ""}, - {"list", 1, INT_MAX, cmd_list, ""}, - {"set", 3, INT_MAX, cmd_set, ""}, - {"add", 4, INT_MAX, cmd_add, ""}, -#if 0 - /* XXX Not yet implemented. */ - {"remove", 4, INT_MAX, cmd_remove, ""}, - {"clear", 3, INT_MAX, cmd_clear, ""}, -#endif - }; - - 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 ovsdb_idl *idl, 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, ""}, + {"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, 2, cmd_add_port, NULL, ""}, + {"add-bond", 4, INT_MAX, cmd_add_bond, NULL, "--fake-iface"}, + {"del-port", 1, 2, cmd_del_port, NULL, "--if-exists"}, + {"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, 2, cmd_set_controller, NULL, ""}, + {"get-fail-mode", 0, 1, cmd_get_fail_mode, NULL, ""}, + {"del-fail-mode", 0, 1, cmd_del_fail_mode, NULL, ""}, + {"set-fail-mode", 1, 2, cmd_set_fail_mode, NULL, ""}, + + /* 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"}, + + /* 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, "--force"}, + {"add", 4, INT_MAX, cmd_add, NULL, "--force"}, + {"remove", 4, INT_MAX, cmd_remove, NULL, "--force"}, + {"clear", 3, INT_MAX, cmd_clear, NULL, "--force"}, + {"create", 2, INT_MAX, cmd_create, post_create, "--force"}, + {"destroy", 1, INT_MAX, cmd_destroy, NULL, "--force,--if-exists"}, + + {NULL, 0, 0, NULL, NULL, NULL}, +}; - function = get_vsctl_handler(argc, argv, &ctx); - ctx.ovs = ovs; - ctx.idl = idl; - ds_init(&ctx.output); - function(&ctx); - *output = ctx.output; - shash_destroy(&ctx.options); -}