X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=1c00f436ef7e4f7bd939879ce0bfbecd78d7e4c3;hb=7c79588e006eb28e51ca8b715e22abce0c81f5d4;hp=e33d2d1e069f61d1de1a7adcdf59451542a54b8d;hpb=c611c9d011111eeb2767faa1e8f02958fd36aeac;p=sliver-openvswitch.git diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index e33d2d1e0..1c00f436e 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -36,6 +35,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 +44,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; @@ -59,23 +86,37 @@ 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 *); 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,37 +124,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 (;;) { @@ -125,7 +151,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 +160,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[]) { @@ -213,8 +224,8 @@ 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; @@ -233,107 +244,203 @@ 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) { + 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\ +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 +455,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,10 +492,28 @@ struct vsctl_info { struct ovsrec_controller *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 * @@ -695,53 +824,91 @@ 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_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"); @@ -751,19 +918,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); @@ -801,7 +966,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); } @@ -853,7 +1018,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); } @@ -1005,8 +1170,9 @@ cmd_list_ports(struct vsctl_context *ctx) } static void -add_port(const struct ovsrec_open_vswitch *ovs, - const char *br_name, const char *port_name, bool fake_iface, +add_port(struct vsctl_context *ctx, + const char *br_name, const char *port_name, + bool may_exist, bool fake_iface, char *iface_names[], int n_ifaces) { struct vsctl_info info; @@ -1015,19 +1181,63 @@ 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); @@ -1047,15 +1257,19 @@ 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); + 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); } static void cmd_add_bond(struct vsctl_context *ctx) { + bool may_exist = shash_find(&ctx->options, "--may-exist") != 0; bool fake_iface = shash_find(&ctx->options, "--fake-iface"); - add_port(ctx->ovs, ctx->argv[1], ctx->argv[2], fake_iface, + add_port(ctx, ctx->argv[1], ctx->argv[2], may_exist, fake_iface, &ctx->argv[3], ctx->argc - 3); } @@ -1063,31 +1277,50 @@ static void cmd_del_port(struct vsctl_context *ctx) { bool must_exist = !shash_find(&ctx->options, "--if-exists"); + bool with_iface = shash_find(&ctx->options, "--with-iface") != NULL; + struct vsctl_port *port; struct vsctl_info info; get_info(ctx->ovs, &info); - if (ctx->argc == 2) { - struct vsctl_port *port = find_port(&info, ctx->argv[1], must_exist); - if (port) { - del_port(&info, port); + if (!with_iface) { + port = find_port(&info, ctx->argv[ctx->argc - 1], must_exist); + } else { + const char *target = ctx->argv[ctx->argc - 1]; + struct vsctl_iface *iface; + + port = find_port(&info, target, false); + if (!port) { + iface = find_iface(&info, target, false); + if (iface) { + port = iface->port; + } + } + if (must_exist && !port) { + vsctl_fatal("no port or interface named %s", target); } - } 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 (port) { + if (ctx->argc == 3) { + struct vsctl_bridge *bridge; + + bridge = find_bridge(&info, ctx->argv[1], true); + if (port->bridge != bridge) { + if (port->bridge->parent == bridge) { + vsctl_fatal("bridge %s does not have a port %s (although " + "its parent bridge %s does)", + ctx->argv[1], ctx->argv[2], + bridge->parent->name); + } else { + vsctl_fatal("bridge %s does not have a port %s", + ctx->argv[1], ctx->argv[2]); + } } } + + del_port(&info, port); } + free_info(&info); } @@ -1103,43 +1336,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) { @@ -1206,57 +1402,20 @@ cmd_iface_to_br(struct vsctl_context *ctx) } static void -cmd_iface_set_external_id(struct vsctl_context *ctx) +cmd_get_controller(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 (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. */ @@ -1307,7 +1466,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 +1476,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 +1606,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]); @@ -1460,141 +1619,6 @@ cmd_set_ssl(struct vsctl_context *ctx) /* Parameter commands. */ -/* POSIX extended regular expression for an 8-bit unsigned decimal integer. */ -#define OCTET_RE "([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])" - -/* POSIX extended regular expression for an IP address. */ -#define IP_RE "("OCTET_RE"\\."OCTET_RE"\\."OCTET_RE"\\."OCTET_RE")" - -/* POSIX extended regular expression for a netmask. */ -#define NETMASK_RE \ - "255.255.255."NETMASK_END_RE"|" \ - "255.255."NETMASK_END_RE".0|" \ - "255."NETMASK_END_RE".0.0|" \ - NETMASK_END_RE".0.0.0" -#define NETMASK_END_RE "(255|254|252|248|240|224|192|128|0)" - -/* POSIX extended regular expression for an Ethernet address. */ -#define XX_RE "[0-9a-fA-F][0-9a-fA-F]" -#define MAC_RE XX_RE":"XX_RE":"XX_RE":"XX_RE":"XX_RE":"XX_RE - -/* POSIX extended regular expression for a TCP or UDP port number. */ -#define PORT_RE \ - "([0-9]|" \ - "[1-9][0-9]|" \ - "[1-9][0-9][0-9]|" \ - "[1-9][0-9][0-9][0-9]|" \ - "[1-5][0-9][0-9][0-9][0-9]|" \ - "6[1-4][0-9][0-9][0-9]|" \ - "65[1-4][0-9][0-9]|" \ - "655[1-2][0-9]|" \ - "6553[1-5])" - -enum { - VSCF_READONLY = 1 << 0, - VSCF_HIDDEN = 1 << 1 -}; - -struct vsctl_column { - struct ovsdb_idl_column *idl; - int flags; - const char *constraint; -}; - -static const struct vsctl_column bridge_columns[] = { - {&ovsrec_bridge_col_datapath_id, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_name, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_mirrors, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_other_config, 0, NULL}, - {&ovsrec_bridge_col_flood_vlans, 0, "[1,4095]"}, - {&ovsrec_bridge_col_controller, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_netflow, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_external_ids, 0, NULL}, - {&ovsrec_bridge_col_ports, VSCF_READONLY, NULL}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column controller_columns[] = { - {&ovsrec_controller_col_connection_mode, 0, "in-band|out-of-band"}, - {&ovsrec_controller_col_controller_burst_limit, 0, "[25,]"}, - {&ovsrec_controller_col_controller_rate_limit, 0, "[100,]"}, - {&ovsrec_controller_col_discover_accept_regex, 0, NULL}, - {&ovsrec_controller_col_discover_update_resolv_conf, 0, NULL}, - {&ovsrec_controller_col_fail_mode, 0, "standalone|secure"}, - {&ovsrec_controller_col_inactivity_probe, 0, "[5000,]"}, - {&ovsrec_controller_col_local_gateway, 0, IP_RE}, - {&ovsrec_controller_col_local_ip, 0, IP_RE}, - {&ovsrec_controller_col_local_netmask, 0, NETMASK_RE}, - {&ovsrec_controller_col_max_backoff, 0, "[1000,]"}, - {&ovsrec_controller_col_target, 0, NULL}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column interface_columns[] = { - {&ovsrec_interface_col_external_ids, 0, NULL}, - {&ovsrec_interface_col_ingress_policing_burst, 0, "[10,]"}, - {&ovsrec_interface_col_ingress_policing_rate, 0, "[100,]"}, - {&ovsrec_interface_col_mac, 0, MAC_RE}, - {&ovsrec_interface_col_name, VSCF_READONLY, NULL}, - {&ovsrec_interface_col_ofport, VSCF_READONLY, NULL}, - {&ovsrec_interface_col_options, 0, NULL}, - {&ovsrec_interface_col_type, VSCF_READONLY, NULL}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column mirror_columns[] = { - {&ovsrec_mirror_col_name, VSCF_READONLY, NULL}, - {&ovsrec_mirror_col_output_port, 0, "Port"}, - {&ovsrec_mirror_col_output_vlan, 0, "[1,4095]"}, - {&ovsrec_mirror_col_select_dst_port, 0, "Port"}, - {&ovsrec_mirror_col_select_src_port, 0, "Port"}, - {&ovsrec_mirror_col_select_vlan, 0, "[1,4095]"}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column netflow_columns[] = { - {&ovsrec_netflow_col_active_timeout, 0, "[-1,]"}, - {&ovsrec_netflow_col_add_id_to_interface, 0, NULL}, - {&ovsrec_netflow_col_targets, 0, IP_RE":"PORT_RE}, - {&ovsrec_netflow_col_engine_type, 0, "[0,255]"}, - {&ovsrec_netflow_col_engine_id, 0, "[0,255]"}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column open_vswitch_columns[] = { - {&ovsrec_open_vswitch_col_bridges, VSCF_READONLY, NULL}, - {&ovsrec_open_vswitch_col_controller, VSCF_READONLY, NULL}, - {&ovsrec_open_vswitch_col_cur_cfg, VSCF_HIDDEN, NULL}, - {&ovsrec_open_vswitch_col_management_id, 0, "[0-9a-fA-F]{12}"}, - {&ovsrec_open_vswitch_col_managers, 0, "p?(ssl|tcp|unix):.*"}, - {&ovsrec_open_vswitch_col_next_cfg, VSCF_HIDDEN, NULL}, - {&ovsrec_open_vswitch_col_ssl, VSCF_READONLY, NULL}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column port_columns[] = { - {&ovsrec_port_col_bond_updelay, 0, "[0,]"}, - {&ovsrec_port_col_bond_downdelay, 0, "[0,]"}, - {&ovsrec_port_col_bond_fake_iface, VSCF_READONLY, NULL}, - {&ovsrec_port_col_external_ids, 0, NULL}, - {&ovsrec_port_col_fake_bridge, VSCF_READONLY, NULL}, - {&ovsrec_port_col_interfaces, VSCF_READONLY, NULL}, - {&ovsrec_port_col_mac, 0, MAC_RE}, - {&ovsrec_port_col_name, VSCF_READONLY, NULL}, - {&ovsrec_port_col_other_config, 0, NULL}, - {&ovsrec_port_col_tag, 0, "[0,4095]"}, - {&ovsrec_port_col_trunks, 0, "[0,4095]"}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column ssl_columns[] = { - {&ovsrec_ssl_col_bootstrap_ca_cert, 0, NULL}, - {&ovsrec_ssl_col_ca_cert, 0, NULL}, - {&ovsrec_ssl_col_certificate, 0, NULL}, - {&ovsrec_ssl_col_private_key, 0, NULL}, - {NULL, 0, NULL}, -}; - struct vsctl_row_id { const struct ovsdb_idl_table_class *table; const struct ovsdb_idl_column *name_column; @@ -1603,16 +1627,15 @@ struct vsctl_row_id { struct vsctl_table_class { struct ovsdb_idl_table_class *class; - const struct vsctl_column *columns; struct vsctl_row_id row_ids[2]; }; static const struct vsctl_table_class tables[] = { - {&ovsrec_table_bridge, bridge_columns, + {&ovsrec_table_bridge, {{&ovsrec_table_bridge, &ovsrec_bridge_col_name, NULL}, {NULL, NULL, NULL}}}, - {&ovsrec_table_controller, controller_columns, + {&ovsrec_table_controller, {{&ovsrec_table_bridge, &ovsrec_bridge_col_name, &ovsrec_bridge_col_controller}, @@ -1620,34 +1643,42 @@ static const struct vsctl_table_class tables[] = { NULL, &ovsrec_open_vswitch_col_controller}}}, - {&ovsrec_table_interface, interface_columns, + {&ovsrec_table_interface, {{&ovsrec_table_interface, &ovsrec_interface_col_name, NULL}, {NULL, NULL, NULL}}}, - {&ovsrec_table_mirror, mirror_columns, + {&ovsrec_table_mirror, {{&ovsrec_table_mirror, &ovsrec_mirror_col_name, NULL}, {NULL, NULL, NULL}}}, - {&ovsrec_table_netflow, netflow_columns, + {&ovsrec_table_netflow, {{&ovsrec_table_bridge, &ovsrec_bridge_col_name, &ovsrec_bridge_col_netflow}, {NULL, NULL, NULL}}}, - {&ovsrec_table_open_vswitch, open_vswitch_columns, + {&ovsrec_table_open_vswitch, {{&ovsrec_table_open_vswitch, NULL, NULL}, {NULL, NULL, NULL}}}, - {&ovsrec_table_port, port_columns, + {&ovsrec_table_port, {{&ovsrec_table_port, &ovsrec_port_col_name, NULL}, {NULL, NULL, NULL}}}, - {&ovsrec_table_ssl, ssl_columns, + {&ovsrec_table_ssl, {{&ovsrec_table_open_vswitch, NULL, &ovsrec_open_vswitch_col_ssl}}}, - {NULL, NULL, {{NULL, NULL, NULL}, {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) { @@ -1692,9 +1723,9 @@ get_table(const char *table_name) if (best_match) { return best_match; } else if (best_score) { - ovs_fatal(0, "multiple table names match \"%s\"", table_name); + vsctl_fatal("multiple table names match \"%s\"", table_name); } else { - ovs_fatal(0, "unknown table \"%s\"", table_name); + vsctl_fatal("unknown table \"%s\"", table_name); } } @@ -1721,7 +1752,7 @@ get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, unsigned int best_score = 0; /* It might make sense to relax this assertion. */ - assert(id->name_column->type.key_type == OVSDB_TYPE_STRING); + assert(id->name_column->type.key.type == OVSDB_TYPE_STRING); referrer = NULL; for (row = ovsdb_idl_first_row(ctx->idl, id->table); @@ -1743,6 +1774,10 @@ get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, } ovsdb_datum_destroy(&name, &id->name_column->type); } + if (best_score && !referrer) { + vsctl_fatal("multiple rows in %s match \"%s\"", + table->class->name, record_id); + } } if (!referrer) { return NULL; @@ -1752,8 +1787,8 @@ get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, if (id->uuid_column) { struct ovsdb_datum uuid; - assert(id->uuid_column->type.key_type == OVSDB_TYPE_UUID); - assert(id->uuid_column->type.value_type == OVSDB_TYPE_VOID); + assert(id->uuid_column->type.key.type == OVSDB_TYPE_UUID); + assert(id->uuid_column->type.value.type == OVSDB_TYPE_VOID); ovsdb_idl_txn_read(referrer, id->uuid_column, &uuid); if (uuid.n == 1) { @@ -1787,71 +1822,86 @@ 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); + vsctl_fatal("no row \"%s\" in table %s", + record_id, table->class->name); } 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 ovsdb_idl_column **columnp) { - const struct vsctl_column *column; - const struct vsctl_column *best_match = NULL; + const struct ovsdb_idl_column *best_match = NULL; unsigned int best_score = 0; + size_t i; - for (column = table->columns; column->idl; column++) { - if (!(column->flags & VSCF_HIDDEN)) { - unsigned int score = score_partial_match(column->idl->name, - column_name); - if (score > best_score) { - best_match = column; - best_score = score; - } else if (score == best_score) { - best_match = NULL; - } + for (i = 0; i < table->class->n_columns; i++) { + const struct ovsdb_idl_column *column = &table->class->columns[i]; + unsigned int score = score_partial_match(column->name, column_name); + if (score > best_score) { + best_match = column; + best_score = score; + } else if (score == best_score) { + best_match = NULL; } } + + *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, + 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; - 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; } - *columnp = get_column(table, column_name); + error = get_column(table, column_name, columnp); free(column_name); + if (error) { + goto error; + } } /* Parse key string. */ @@ -1859,9 +1909,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 +1923,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,73 +1966,71 @@ 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; + const struct ovsdb_idl_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); + ovsdb_idl_txn_read(row, column, &datum); if (key_string) { union ovsdb_atom key; unsigned int idx; - if (column->idl->type.value_type == OVSDB_TYPE_VOID) { - ovs_fatal(0, "cannot specify key to get for non-map column %s", - column->idl->name); + if (column->type.value.type == OVSDB_TYPE_VOID) { + vsctl_fatal("cannot specify key to get for non-map column %s", + column->name); } - ovsdb_atom_from_string(&key, column->idl->type.key_type, - key_string); + die_if_error(ovsdb_atom_from_string(&key, + &column->type.key, + key_string)); idx = ovsdb_datum_find_key(&datum, &key, - column->idl->type.key_type); + column->type.key.type); if (idx == UINT_MAX) { - ovs_fatal(0, "no key %s in %s record \"%s\" column %s", - key_string, table_name, record_id, - column->idl->name); - + if (!if_exists) { + vsctl_fatal("no key \"%s\" in %s record \"%s\" column %s", + key_string, table->class->name, record_id, + column->name); + } + } else { + ovsdb_atom_to_string(&datum.values[idx], + column->type.value.type, out); } - ovsdb_atom_to_string(&datum.values[idx], - column->idl->type.value_type, out); - - ovsdb_atom_destroy(&key, column->idl->type.key_type); + ovsdb_atom_destroy(&key, column->type.key.type); } else { - ovsdb_datum_to_string(&datum, &column->idl->type, out); + ovsdb_datum_to_string(&datum, &column->type, out); } ds_put_char(out, '\n'); - ovsdb_datum_destroy(&datum, &column->idl->type); + ovsdb_datum_destroy(&datum, &column->type); free(key_string); } } 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; + size_t i; - ds_put_format(out, "%-20s (RO): "UUID_FMT"\n", "_uuid", + ds_put_format(out, "%-20s: "UUID_FMT"\n", "_uuid", UUID_ARGS(&row->uuid)); - for (column = table->columns; column->idl; column++) { + for (i = 0; i < table->class->n_columns; i++) { + const struct ovsdb_idl_column *column = &table->class->columns[i]; struct ovsdb_datum datum; - if (column->flags & VSCF_HIDDEN) { - continue; - } + ovsdb_idl_txn_read(row, column, &datum); - ovsdb_idl_txn_read(row, column->idl, &datum); - - ds_put_format(out, "%-20s (%s): ", column->idl->name, - column->flags & VSCF_READONLY ? "RO" : "RW"); - ovsdb_datum_to_string(&datum, &column->idl->type, out); + ds_put_format(out, "%-20s: ", column->name); + ovsdb_datum_to_string(&datum, &column->type, out); ds_put_char(out, '\n'); - ovsdb_datum_destroy(&datum, &column->idl->type); + ovsdb_datum_destroy(&datum, &column->type); } } @@ -1976,7 +2048,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; @@ -1994,87 +2066,55 @@ cmd_list(struct vsctl_context *ctx) } static void -check_string_constraint(const struct ovsdb_datum *datum, - const char *constraint) +set_column(const struct vsctl_table_class *table, + const struct ovsdb_idl_row *row, const char *arg) { - unsigned int i; - char *regex; - regex_t re; - int retval; + const struct ovsdb_idl_column *column; + char *key_string, *value_string; + char *error; - regex = xasprintf("^%s$", constraint); - retval = regcomp(&re, regex, REG_NOSUB | REG_EXTENDED); - if (retval) { - size_t length = regerror(retval, &re, NULL, 0); - char *buffer = xmalloc(length); - regerror(retval, &re, buffer, length); - ovs_fatal(0, "internal error compiling regular expression %s: %s", - regex, buffer); + 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); } - for (i = 0; i < datum->n; i++) { - const char *key = datum->keys[i].string; - if (regexec(&re, key, 0, NULL, 0)) { - ovs_fatal(0, "%s is not valid (it does not match %s)", key, regex); - } - } - free(regex); - regfree(&re); -} + if (key_string) { + union ovsdb_atom key, value; + struct ovsdb_datum old, new; -static void -check_integer_constraint(const struct ovsdb_datum *datum, - const char *constraint) -{ - int64_t min, max; - unsigned int i; - int n = -1; - - sscanf(constraint, "[%"SCNd64",%"SCNd64"]%n", &min, &max, &n); - if (n == -1) { - sscanf(constraint, "[%"SCNd64",]%n", &min, &n); - if (n == -1) { - sscanf(constraint, "[,%"SCNd64"]%n", &max, &n); - if (n == -1) { - VLOG_DBG("internal error: bad integer contraint \"%s\"", - constraint); - return; - } else { - min = INT64_MIN; - } - } else { - max = INT64_MAX; + if (column->type.value.type == OVSDB_TYPE_VOID) { + vsctl_fatal("cannot specify key to set for non-map column %s", + column->name); } - } - for (i = 0; i < datum->n; i++) { - int64_t value = datum->keys[i].integer; - if (value < min || value > max) { - if (max == INT64_MAX) { - ovs_fatal(0, "%"PRId64" is less than the minimum " - "allowed value %"PRId64, value, min); - } else if (min == INT64_MIN) { - ovs_fatal(0, "%"PRId64" is greater than the maximum " - "allowed value %"PRId64, value, max); - } else { - ovs_fatal(0, "%"PRId64" is outside the valid range %"PRId64" " - "to %"PRId64" (inclusive)", value, min, max); - } - } - } -} + die_if_error(ovsdb_atom_from_string(&key, &column->type.key, + key_string)); + die_if_error(ovsdb_atom_from_string(&value, &column->type.value, + value_string)); -static void -check_constraint(const struct ovsdb_datum *datum, - const struct ovsdb_type *type, const char *constraint) -{ - if (constraint && datum->n) { - if (type->key_type == OVSDB_TYPE_STRING) { - check_string_constraint(datum, constraint); - } else if (type->key_type == OVSDB_TYPE_INTEGER) { - check_integer_constraint(datum, constraint); - } + 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)); + ovsdb_idl_txn_write(row, column, &datum); } + + free(key_string); + free(value_string); } static void @@ -2084,57 +2124,12 @@ cmd_set(struct vsctl_context *ctx) 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 = 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; - char *key_string, *value_string; - - 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); - } - - 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_datum_init_empty(&new); - ovsdb_datum_add_unsafe(&new, &key, &value, &column->idl->type); - - ovsdb_idl_txn_read(row, column->idl, &old); - ovsdb_datum_union(&old, &new, &column->idl->type, true); - ovsdb_idl_txn_write(row, column->idl, &old); - - ovsdb_datum_destroy(&new, &column->idl->type); - } else { - struct ovsdb_datum datum; - - 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'); - - free(key_string); + set_column(table, row, ctx->argv[i]); } } @@ -2145,57 +2140,174 @@ cmd_add(struct vsctl_context *ctx) const char *record_id = ctx->argv[2]; const char *column_name = ctx->argv[3]; const struct vsctl_table_class *table; - const struct vsctl_column *column; + const struct ovsdb_idl_column *column; const struct ovsdb_idl_row *row; const struct ovsdb_type *type; struct ovsdb_datum old; int i; table = get_table(table_name); - row = get_row(ctx, table, record_id); - column = get_column(table, column_name); - type = &column->idl->type; - ovsdb_idl_txn_read(row, column->idl, &old); + 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; - 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", - old.n, - type->value_type == OVSDB_TYPE_VOID ? "values" : "pairs", - column->idl->name, table_name, type->n_max); + vsctl_fatal("\"add\" operation would put %u %s in column %s of " + "table %s but the maximum number is %u", + old.n, + type->value.type == OVSDB_TYPE_VOID ? "values" : "pairs", + column->name, table->class->name, type->n_max); } - ovsdb_idl_txn_write(row, column->idl, &old); + ovsdb_idl_txn_write(row, column, &old); } - -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) +{ + 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; -static void run_vsctl_command(int argc, char *argv[], - const struct ovsrec_open_vswitch *, - struct ovsdb_idl *, struct ds *output); + 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]); + 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) { + vsctl_fatal("\"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->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 *table_name = ctx->argv[1]; + const struct vsctl_table_class *table; + const struct ovsdb_idl_row *row; + int i; + + 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]); + } + 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) { @@ -2211,28 +2323,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) +{ + 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; + 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); + 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 +2377,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,7 +2395,18 @@ 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); + } + } + error = xstrdup(ovsdb_idl_txn_get_error(txn)); ovsdb_idl_txn_destroy(txn); + the_idl_txn = NULL; switch (status) { case TXN_INCOMPLETE: @@ -2283,20 +2421,22 @@ 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 (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; @@ -2320,7 +2460,10 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) } else { fputs(ds_cstr(ds), stdout); } + ds_destroy(&c->output); + shash_destroy(&c->options); } + free(commands); if (wait_for_reload && status != TXN_UNCHANGED) { for (;;) { @@ -2337,137 +2480,59 @@ 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, "--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, "--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, 2, 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, 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, ""}, + {"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, ""}, + {"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; - ctx.idl = idl; - ds_init(&ctx.output); - function(&ctx); - *output = ctx.output; - shash_destroy(&ctx.options); -}