X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=2868c354c2ee6aa87b5b5670a5938fe304a91f4b;hb=975ac5313396fbafe829b862335d90967b4d74f3;hp=c033df9fea98853deb624f6f470972f2ffcb10c3;hpb=a0a9f31ddc4fc213f9550c93478b4f03b948f606;p=openvswitch diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index c033df9f..2868c354 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -29,6 +29,7 @@ #include "compiler.h" #include "dirs.h" #include "dynamic-string.h" +#include "json.h" #include "ovsdb-idl.h" #include "poll-loop.h" #include "svec.h" @@ -45,6 +46,16 @@ static const char *db; /* --oneline: Write each command's output as a single line? */ static bool oneline; +/* --dry-run: Do not commit any changes. */ +static bool dry_run; + +/* --no-wait: Wait for ovs-vswitchd to reload its configuration? */ +static bool wait_for_reload = true; + +/* --timeout: Time to wait for a connection to 'db'. */ +static int timeout = 5; + +static void vsctl_fatal(const char *, ...) PRINTF_FORMAT(1, 2) NO_RETURN; static char *default_db(void); static void usage(void) NO_RETURN; static void parse_options(int argc, char *argv[]); @@ -70,6 +81,10 @@ main(int argc, char *argv[]) vlog_set_levels(VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN); parse_options(argc, argv); + if (timeout) { + time_alarm(timeout); + } + /* Log our arguments. This is often valuable for debugging systems. */ ds_init(&args); for (i = 1; i < argc; i++) { @@ -90,10 +105,10 @@ main(int argc, char *argv[]) } } if (!n_commands) { - ovs_fatal(0, "missing command name (use --help for help)"); + vsctl_fatal("missing command name (use --help for help)"); } - /* Now execut the commands. */ + /* Now execute the commands. */ idl = ovsdb_idl_create(db, &ovsrec_idl_class); seqno = ovsdb_idl_get_seqno(idl); trials = 0; @@ -104,7 +119,7 @@ main(int argc, char *argv[]) new_seqno = ovsdb_idl_get_seqno(idl); if (new_seqno != seqno) { if (++trials > 5) { - ovs_fatal(0, "too many database inconsistency failures"); + vsctl_fatal("too many database inconsistency failures"); } do_vsctl(argc - optind, argv + optind, idl); seqno = new_seqno; @@ -115,28 +130,50 @@ main(int argc, char *argv[]) } } +static void +vsctl_fatal(const char *format, ...) +{ + char *message; + va_list args; + + va_start(args, format); + message = xvasprintf(format, args); + va_end(args); + + vlog_set_levels(VLM_vsctl, VLF_CONSOLE, VLL_EMER); + VLOG_ERR("%s", message); + ovs_fatal(0, "%s", message); +} + static void parse_options(int argc, char *argv[]) { enum { OPT_DB = UCHAR_MAX + 1, OPT_ONELINE, - OPT_NO_SYSLOG + OPT_NO_SYSLOG, + OPT_NO_WAIT, + OPT_DRY_RUN }; static struct option long_options[] = { {"db", required_argument, 0, OPT_DB}, {"no-syslog", no_argument, 0, OPT_NO_SYSLOG}, + {"no-wait", no_argument, 0, OPT_NO_WAIT}, + {"dry-run", no_argument, 0, OPT_DRY_RUN}, {"oneline", no_argument, 0, OPT_ONELINE}, + {"timeout", required_argument, 0, 't'}, {"verbose", optional_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, {0, 0, 0, 0}, }; + for (;;) { + unsigned long int timeout; int c; - c = getopt_long(argc, argv, "+v::hV", long_options, NULL); + c = getopt_long(argc, argv, "+v::hVt:", long_options, NULL); if (c == -1) { break; } @@ -154,6 +191,14 @@ parse_options(int argc, char *argv[]) vlog_set_levels(VLM_vsctl, VLF_SYSLOG, VLL_WARN); break; + case OPT_NO_WAIT: + wait_for_reload = false; + break; + + case OPT_DRY_RUN: + dry_run = true; + break; + case 'h': usage(); @@ -161,6 +206,14 @@ parse_options(int argc, char *argv[]) OVS_PRINT_VERSION(0, 0); exit(EXIT_SUCCESS); + case 't': + timeout = strtoul(optarg, NULL, 10); + if (timeout < 0) { + ovs_fatal(0, "value %s on -t or --timeout is invalid", + optarg); + } + break; + case 'v': vlog_set_verbosity(optarg); break; @@ -198,7 +251,16 @@ usage(void) " br-to-vlan BRIDGE " "print the VLAN which BRIDGE is on\n" " br-to-parent BRIDGE " - "print the parent of BRIDGE\n"); + "print the parent of BRIDGE\n" + " br-set-external-id BRIDGE KEY VALUE" + " set KEY on BRIDGE to VALUE\n" + " br-set-external-id BRIDGE KEY" + " unset KEY on BRIDGE\n" + " br-get-external-id BRIDGE KEY" + " print value of KEY on BRIDGE\n" + " br-get-external-id BRIDGE" + " list key-value pairs on BRIDGE\n" + ); printf("\nPort commands:\n" " list-ports BRIDGE " "print the names of all the ports on BRIDGE\n" @@ -210,12 +272,44 @@ usage(void) "delete PORT (which may be bonded) from BRIDGE\n" " port-to-br PORT " "print name of bridge that contains PORT\n" - "A bond is considered to be a single port.\n"); + " port-set-external-id PORT KEY VALUE" + " set KEY on PORT to VALUE\n" + " port-set-external-id PORT KEY" + " unset KEY on PORT\n" + " port-get-external-id PORT KEY" + " print value of KEY on PORT\n" + " port-get-external-id PORT" + " list key-value pairs on PORT\n" + "A bond is considered to be a single port.\n" + ); printf("\nInterface commands (a bond consists of multiple interfaces):\n" " list-ifaces BRIDGE " "print the names of all the interfaces on BRIDGE\n" " iface-to-br IFACE " - "print name of bridge that contains IFACE\n"); + "print name of bridge that contains IFACE\n" + " iface-set-external-id IFACE KEY VALUE" + " set KEY on IFACE to VALUE\n" + " iface-set-external-id IFACE KEY" + " unset KEY on IFACE\n" + " iface-get-external-id IFACE KEY" + " print value of KEY on IFACE\n" + " iface-get-external-id IFACE" + " list key-value pairs on IFACE\n" + ); + printf("\nController commands:\n" + " get-controller [BRIDGE] " + "print the controller for BRIDGE\n" + " del-controller [BRIDGE] " + "delete the controller for BRIDGE\n" + " set-controller [BRIDGE] TARGET " + "set the controller for BRIDGE to TARGET\n" + " get-fail-mode [BRIDGE] " + "print the fail-mode for BRIDGE\n" + " del-fail-mode [BRIDGE] " + "delete the fail-mode for BRIDGE\n" + " set-fail-mode [BRIDGE] MODE " + "set the fail-mode for BRIDGE to MODE\n" + ); printf("\nOptions:\n" " --db=DATABASE " "connect to DATABASE\n" @@ -243,9 +337,18 @@ default_db(void) return def; } +struct vsctl_context { + int argc; + char **argv; + const struct ovsrec_open_vswitch *ovs; + struct ds output; + struct shash options; +}; + struct vsctl_bridge { struct ovsrec_bridge *br_cfg; char *name; + struct ovsrec_controller *ctrl; struct vsctl_bridge *parent; int vlan; }; @@ -264,6 +367,7 @@ struct vsctl_info { struct shash bridges; struct shash ports; struct shash ifaces; + struct ovsrec_controller *ctrl; }; static struct ovsdb_idl_txn * @@ -282,6 +386,7 @@ add_bridge(struct vsctl_info *b, br->name = xstrdup(name); br->parent = parent; br->vlan = vlan; + br->ctrl = parent ? parent->br_cfg->controller : br_cfg->controller; shash_add(&b->bridges, br->name, br); return br; } @@ -345,6 +450,8 @@ get_info(const struct ovsrec_open_vswitch *ovs, struct vsctl_info *info) shash_init(&info->ports); shash_init(&info->ifaces); + info->ctrl = ovs->controller; + shash_init(&bridges); shash_init(&ports); for (i = 0; i < ovs->n_bridges; i++) { @@ -447,50 +554,67 @@ check_conflicts(struct vsctl_info *info, const char *name, struct vsctl_port *port; if (shash_find(&info->bridges, name)) { - ovs_fatal(0, "%s because a bridge named %s already exists", msg, name); + vsctl_fatal("%s because a bridge named %s already exists", + msg, name); } port = shash_find_data(&info->ports, name); if (port) { - ovs_fatal(0, "%s because a port named %s already exists on bridge %s", - msg, name, port->bridge->name); + vsctl_fatal("%s because a port named %s already exists on " + "bridge %s", msg, name, port->bridge->name); } iface = shash_find_data(&info->ifaces, name); if (iface) { - ovs_fatal(0, "%s because an interface named %s already exists " - "on bridge %s", msg, name, iface->port->bridge->name); + vsctl_fatal("%s because an interface named %s already exists " + "on bridge %s", msg, name, iface->port->bridge->name); } free(msg); } static struct vsctl_bridge * -find_bridge(struct vsctl_info *info, const char *name) +find_bridge(struct vsctl_info *info, const char *name, bool must_exist) { struct vsctl_bridge *br = shash_find_data(&info->bridges, name); - if (!br) { - ovs_fatal(0, "no bridge named %s", name); + if (must_exist && !br) { + vsctl_fatal("no bridge named %s", name); + } + return br; +} + +static struct vsctl_bridge * +find_real_bridge(struct vsctl_info *info, const char *name, bool must_exist) +{ + struct vsctl_bridge *br = find_bridge(info, name, must_exist); + if (br && br->parent) { + vsctl_fatal("%s is a fake bridge", name); } return br; } static struct vsctl_port * -find_port(struct vsctl_info *info, const char *name) +find_port(struct vsctl_info *info, const char *name, bool must_exist) { struct vsctl_port *port = shash_find_data(&info->ports, name); - if (!port || !strcmp(name, port->bridge->name)) { - ovs_fatal(0, "no port named %s", name); + if (port && !strcmp(name, port->bridge->name)) { + port = NULL; + } + if (must_exist && !port) { + vsctl_fatal("no port named %s", name); } return port; } static struct vsctl_iface * -find_iface(struct vsctl_info *info, const char *name) +find_iface(struct vsctl_info *info, const char *name, bool must_exist) { struct vsctl_iface *iface = shash_find_data(&info->ifaces, name); - if (!iface || !strcmp(name, iface->port->bridge->name)) { - ovs_fatal(0, "no interface named %s", name); + if (iface && !strcmp(name, iface->port->bridge->name)) { + iface = NULL; + } + if (must_exist && !iface) { + vsctl_fatal("no interface named %s", name); } return iface; } @@ -560,38 +684,43 @@ ovs_delete_bridge(const struct ovsrec_open_vswitch *ovs, } static void -cmd_add_br(int argc, char *argv[], const struct ovsrec_open_vswitch *ovs, - struct ds *output UNUSED) +cmd_init(struct vsctl_context *ctx UNUSED) +{ +} + +static void +cmd_add_br(struct vsctl_context *ctx) { - const char *br_name = argv[1]; + const char *br_name = ctx->argv[1]; struct vsctl_info info; - get_info(ovs, &info); + get_info(ctx->ovs, &info); check_conflicts(&info, br_name, xasprintf("cannot create a bridge named %s", br_name)); - if (argc == 2) { + if (ctx->argc == 2) { struct ovsrec_bridge *br; struct ovsrec_port *port; struct ovsrec_interface *iface; - iface = ovsrec_interface_insert(txn_from_openvswitch(ovs)); + iface = ovsrec_interface_insert(txn_from_openvswitch(ctx->ovs)); ovsrec_interface_set_name(iface, br_name); - port = ovsrec_port_insert(txn_from_openvswitch(ovs)); + port = ovsrec_port_insert(txn_from_openvswitch(ctx->ovs)); ovsrec_port_set_name(port, br_name); ovsrec_port_set_interfaces(port, &iface, 1); - br = ovsrec_bridge_insert(txn_from_openvswitch(ovs)); + br = ovsrec_bridge_insert(txn_from_openvswitch(ctx->ovs)); ovsrec_bridge_set_name(br, br_name); ovsrec_bridge_set_ports(br, &port, 1); - ovs_insert_bridge(ovs, br); - } else if (argc == 3) { - ovs_fatal(0, "'%s' comamnd takes exactly 1 or 3 arguments", argv[0]); - } else if (argc == 4) { - const char *parent_name = argv[2]; - int vlan = atoi(argv[3]); + ovs_insert_bridge(ctx->ovs, br); + } else if (ctx->argc == 3) { + vsctl_fatal("'%s' command takes exactly 1 or 3 arguments", + ctx->argv[0]); + } else if (ctx->argc == 4) { + const char *parent_name = ctx->argv[2]; + int vlan = atoi(ctx->argv[3]); struct ovsrec_bridge *br; struct vsctl_bridge *parent; struct ovsrec_port *port; @@ -599,23 +728,23 @@ cmd_add_br(int argc, char *argv[], const struct ovsrec_open_vswitch *ovs, int64_t tag = vlan; if (vlan < 1 || vlan > 4095) { - ovs_fatal(0, "%s: vlan must be between 1 and 4095", argv[0]); + vsctl_fatal("%s: vlan must be between 1 and 4095", ctx->argv[0]); } - parent = shash_find_data(&info.bridges, parent_name); + parent = find_bridge(&info, parent_name, false); if (parent && parent->vlan) { - ovs_fatal(0, "cannot create brdige with fake bridge as parent"); + vsctl_fatal("cannot create bridge with fake bridge as parent"); } if (!parent) { - ovs_fatal(0, "parent bridge %s does not exist", parent_name); + vsctl_fatal("parent bridge %s does not exist", parent_name); } br = parent->br_cfg; - iface = ovsrec_interface_insert(txn_from_openvswitch(ovs)); + iface = ovsrec_interface_insert(txn_from_openvswitch(ctx->ovs)); ovsrec_interface_set_name(iface, br_name); ovsrec_interface_set_type(iface, "internal"); - port = ovsrec_port_insert(txn_from_openvswitch(ovs)); + port = ovsrec_port_insert(txn_from_openvswitch(ctx->ovs)); ovsrec_port_set_name(port, br_name); ovsrec_port_set_interfaces(port, &iface, 1); ovsrec_port_set_fake_bridge(port, true); @@ -648,25 +777,28 @@ del_port(struct vsctl_info *info, struct vsctl_port *port) } static void -cmd_del_br(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output UNUSED) +cmd_del_br(struct vsctl_context *ctx) { - struct shash_node *node; - struct vsctl_info info; + bool must_exist = !shash_find(&ctx->options, "--if-exists"); struct vsctl_bridge *bridge; + struct vsctl_info info; - get_info(ovs, &info); - bridge = find_bridge(&info, argv[1]); - SHASH_FOR_EACH (node, &info.ports) { - struct vsctl_port *port = node->data; - if (port->bridge == bridge - || !strcmp(port->port_cfg->name, bridge->name)) { - del_port(&info, port); + get_info(ctx->ovs, &info); + bridge = find_bridge(&info, ctx->argv[1], must_exist); + if (bridge) { + struct shash_node *node; + + SHASH_FOR_EACH (node, &info.ports) { + struct vsctl_port *port = node->data; + if (port->bridge == bridge + || !strcmp(port->port_cfg->name, bridge->name)) { + del_port(&info, port); + } + } + if (bridge->br_cfg) { + ovsrec_bridge_delete(bridge->br_cfg); + ovs_delete_bridge(ctx->ovs, bridge->br_cfg); } - } - if (bridge->br_cfg) { - ovsrec_bridge_delete(bridge->br_cfg); - ovs_delete_bridge(ovs, bridge->br_cfg); } free_info(&info); } @@ -684,34 +816,32 @@ output_sorted(struct svec *svec, struct ds *output) } static void -cmd_list_br(int argc UNUSED, char *argv[] UNUSED, - const struct ovsrec_open_vswitch *ovs, struct ds *output) +cmd_list_br(struct vsctl_context *ctx) { struct shash_node *node; struct vsctl_info info; struct svec bridges; - get_info(ovs, &info); + get_info(ctx->ovs, &info); svec_init(&bridges); SHASH_FOR_EACH (node, &info.bridges) { struct vsctl_bridge *br = node->data; svec_add(&bridges, br->name); } - output_sorted(&bridges, output); + output_sorted(&bridges, &ctx->output); svec_destroy(&bridges); free_info(&info); } static void -cmd_br_exists(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output UNUSED) +cmd_br_exists(struct vsctl_context *ctx) { struct vsctl_info info; - get_info(ovs, &info); - if (!shash_find_data(&info.bridges, argv[1])) { + get_info(ctx->ovs, &info); + if (!find_bridge(&info, ctx->argv[1], false)) { exit(2); } free_info(&info); @@ -757,31 +887,29 @@ set_external_id(char **old_keys, char **old_values, size_t old_n, } static void -cmd_br_set_external_id(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, - struct ds *output UNUSED) +cmd_br_set_external_id(struct vsctl_context *ctx) { struct vsctl_info info; struct vsctl_bridge *bridge; char **keys, **values; size_t n; - get_info(ovs, &info); - bridge = find_bridge(&info, argv[1]); + get_info(ctx->ovs, &info); + bridge = find_bridge(&info, ctx->argv[1], true); if (bridge->br_cfg) { set_external_id(bridge->br_cfg->key_external_ids, bridge->br_cfg->value_external_ids, bridge->br_cfg->n_external_ids, - argv[2], argc >= 4 ? argv[3] : NULL, + ctx->argv[2], ctx->argc >= 4 ? ctx->argv[3] : NULL, &keys, &values, &n); ovsrec_bridge_set_external_ids(bridge->br_cfg, keys, values, n); } else { - char *key = xasprintf("fake-bridge-%s", argv[2]); - struct vsctl_port *port = shash_find_data(&info.ports, argv[1]); + char *key = xasprintf("fake-bridge-%s", ctx->argv[2]); + struct vsctl_port *port = shash_find_data(&info.ports, ctx->argv[1]); set_external_id(port->port_cfg->key_external_ids, port->port_cfg->value_external_ids, port->port_cfg->n_external_ids, - key, argc >= 4 ? argv[3] : NULL, + key, ctx->argc >= 4 ? ctx->argv[3] : NULL, &keys, &values, &n); ovsrec_port_set_external_ids(port->port_cfg, keys, values, n); free(key); @@ -816,42 +944,40 @@ get_external_id(char **keys, char **values, size_t n, } static void -cmd_br_get_external_id(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, - struct ds *output) +cmd_br_get_external_id(struct vsctl_context *ctx) { struct vsctl_info info; struct vsctl_bridge *bridge; - get_info(ovs, &info); - bridge = find_bridge(&info, argv[1]); + get_info(ctx->ovs, &info); + bridge = find_bridge(&info, ctx->argv[1], true); if (bridge->br_cfg) { get_external_id(bridge->br_cfg->key_external_ids, bridge->br_cfg->value_external_ids, bridge->br_cfg->n_external_ids, - "", argc >= 3 ? argv[2] : NULL, output); + "", ctx->argc >= 3 ? ctx->argv[2] : NULL, + &ctx->output); } else { - struct vsctl_port *port = shash_find_data(&info.ports, argv[1]); + struct vsctl_port *port = shash_find_data(&info.ports, ctx->argv[1]); get_external_id(port->port_cfg->key_external_ids, port->port_cfg->value_external_ids, port->port_cfg->n_external_ids, - "fake-bridge-", argc >= 3 ? argv[2] : NULL, output); + "fake-bridge-", ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output); } free_info(&info); } static void -cmd_list_ports(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output) +cmd_list_ports(struct vsctl_context *ctx) { struct vsctl_bridge *br; struct shash_node *node; struct vsctl_info info; struct svec ports; - get_info(ovs, &info); - br = find_bridge(&info, argv[1]); + get_info(ctx->ovs, &info); + br = find_bridge(&info, ctx->argv[1], true); svec_init(&ports); SHASH_FOR_EACH (node, &info.ports) { @@ -861,7 +987,7 @@ cmd_list_ports(int argc UNUSED, char *argv[], svec_add(&ports, port->port_cfg->name); } } - output_sorted(&ports, output); + output_sorted(&ports, &ctx->output); svec_destroy(&ports); free_info(&info); @@ -882,7 +1008,7 @@ add_port(const struct ovsrec_open_vswitch *ovs, check_conflicts(&info, port_name, xasprintf("cannot create a port named %s", port_name)); /* XXX need to check for conflicts on interfaces too */ - bridge = find_bridge(&info, br_name); + bridge = find_bridge(&info, br_name, true); ifaces = xmalloc(n_ifaces * sizeof *ifaces); for (i = 0; i < n_ifaces; i++) { @@ -907,76 +1033,75 @@ add_port(const struct ovsrec_open_vswitch *ovs, } static void -cmd_add_port(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output UNUSED) +cmd_add_port(struct vsctl_context *ctx) { - add_port(ovs, argv[1], argv[2], &argv[2], 1); + add_port(ctx->ovs, ctx->argv[1], ctx->argv[2], &ctx->argv[2], 1); } static void -cmd_add_bond(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output UNUSED) +cmd_add_bond(struct vsctl_context *ctx) { - add_port(ovs, argv[1], argv[2], &argv[3], argc - 3); + add_port(ctx->ovs, ctx->argv[1], ctx->argv[2], &ctx->argv[3], ctx->argc - 3); } static void -cmd_del_port(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output UNUSED) +cmd_del_port(struct vsctl_context *ctx) { + bool must_exist = !shash_find(&ctx->options, "--if-exists"); struct vsctl_info info; - get_info(ovs, &info); - if (argc == 2) { - struct vsctl_port *port = find_port(&info, argv[1]); - del_port(&info, port); - } else if (argc == 3) { - struct vsctl_bridge *bridge = find_bridge(&info, argv[1]); - struct vsctl_port *port = find_port(&info, argv[2]); - - if (port->bridge == bridge) { + get_info(ctx->ovs, &info); + if (ctx->argc == 2) { + struct vsctl_port *port = find_port(&info, ctx->argv[1], must_exist); + if (port) { del_port(&info, port); - } else if (port->bridge->parent == bridge) { - ovs_fatal(0, "bridge %s does not have a port %s (although its " - "parent bridge %s does)", - argv[1], argv[2], bridge->parent->name); - } else { - ovs_fatal(0, "bridge %s does not have a port %s", - argv[1], argv[2]); + } + } else if (ctx->argc == 3) { + struct vsctl_bridge *bridge = find_bridge(&info, ctx->argv[1], true); + struct vsctl_port *port = find_port(&info, ctx->argv[2], must_exist); + + if (port) { + if (port->bridge == bridge) { + del_port(&info, port); + } else if (port->bridge->parent == bridge) { + vsctl_fatal("bridge %s does not have a port %s (although its " + "parent bridge %s does)", + ctx->argv[1], ctx->argv[2], bridge->parent->name); + } else { + vsctl_fatal("bridge %s does not have a port %s", + ctx->argv[1], ctx->argv[2]); + } } } free_info(&info); } static void -cmd_port_to_br(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output) +cmd_port_to_br(struct vsctl_context *ctx) { struct vsctl_port *port; struct vsctl_info info; - get_info(ovs, &info); - port = find_port(&info, argv[1]); - ds_put_format(output, "%s\n", port->bridge->name); + get_info(ctx->ovs, &info); + port = find_port(&info, ctx->argv[1], true); + ds_put_format(&ctx->output, "%s\n", port->bridge->name); free_info(&info); } static void -cmd_port_set_external_id(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, - struct ds *output UNUSED) +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(ovs, &info); - port = find_port(&info, argv[1]); + 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, - argv[2], argc >= 4 ? argv[3] : NULL, + 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); @@ -986,62 +1111,57 @@ cmd_port_set_external_id(int argc, char *argv[], } static void -cmd_port_get_external_id(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, - struct ds *output) +cmd_port_get_external_id(struct vsctl_context *ctx) { struct vsctl_info info; struct vsctl_port *port; - get_info(ovs, &info); - port = find_port(&info, argv[1]); + 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, - "", argc >= 3 ? argv[2] : NULL, output); + "", ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output); free_info(&info); } static void -cmd_br_to_vlan(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output) +cmd_br_to_vlan(struct vsctl_context *ctx) { struct vsctl_bridge *bridge; struct vsctl_info info; - get_info(ovs, &info); - bridge = find_bridge(&info, argv[1]); - ds_put_format(output, "%d\n", bridge->vlan); + get_info(ctx->ovs, &info); + bridge = find_bridge(&info, ctx->argv[1], true); + ds_put_format(&ctx->output, "%d\n", bridge->vlan); free_info(&info); } static void -cmd_br_to_parent(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output) +cmd_br_to_parent(struct vsctl_context *ctx) { struct vsctl_bridge *bridge; struct vsctl_info info; - get_info(ovs, &info); - bridge = find_bridge(&info, argv[1]); + get_info(ctx->ovs, &info); + bridge = find_bridge(&info, ctx->argv[1], true); if (bridge->parent) { bridge = bridge->parent; } - ds_put_format(output, "%s\n", bridge->name); + ds_put_format(&ctx->output, "%s\n", bridge->name); free_info(&info); } static void -cmd_list_ifaces(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output) +cmd_list_ifaces(struct vsctl_context *ctx) { struct vsctl_bridge *br; struct shash_node *node; struct vsctl_info info; struct svec ifaces; - get_info(ovs, &info); - br = find_bridge(&info, argv[1]); + get_info(ctx->ovs, &info); + br = find_bridge(&info, ctx->argv[1], true); svec_init(&ifaces); SHASH_FOR_EACH (node, &info.ifaces) { @@ -1052,41 +1172,38 @@ cmd_list_ifaces(int argc UNUSED, char *argv[], svec_add(&ifaces, iface->iface_cfg->name); } } - output_sorted(&ifaces, output); + output_sorted(&ifaces, &ctx->output); svec_destroy(&ifaces); free_info(&info); } static void -cmd_iface_to_br(int argc UNUSED, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output) +cmd_iface_to_br(struct vsctl_context *ctx) { struct vsctl_iface *iface; struct vsctl_info info; - get_info(ovs, &info); - iface = find_iface(&info, argv[1]); - ds_put_format(output, "%s\n", iface->port->bridge->name); + get_info(ctx->ovs, &info); + iface = find_iface(&info, ctx->argv[1], true); + ds_put_format(&ctx->output, "%s\n", iface->port->bridge->name); free_info(&info); } static void -cmd_iface_set_external_id(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, - struct ds *output UNUSED) +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(ovs, &info); - iface = find_iface(&info, argv[1]); + 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, - argv[2], argc >= 4 ? argv[3] : NULL, + 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); @@ -1096,56 +1213,256 @@ cmd_iface_set_external_id(int argc, char *argv[], } static void -cmd_iface_get_external_id(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, - struct ds *output) +cmd_iface_get_external_id(struct vsctl_context *ctx) { struct vsctl_info info; struct vsctl_iface *iface; - get_info(ovs, &info); - iface = find_iface(&info, argv[1]); + 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, - "", argc >= 3 ? argv[2] : NULL, output); + "", ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output); + free_info(&info); +} + +static void +cmd_get_controller(struct vsctl_context *ctx) +{ + struct vsctl_info info; + + get_info(ctx->ovs, &info); + + if (ctx->argc == 1) { + /* Return the controller from the "Open_vSwitch" table */ + if (info.ctrl) { + ds_put_format(&ctx->output, "%s\n", info.ctrl->target); + } + } else { + /* Return the controller for a particular bridge. */ + struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true); + + /* If no controller is explicitly defined for the requested + * bridge, fallback to the "Open_vSwitch" table's controller. */ + if (br->ctrl) { + ds_put_format(&ctx->output, "%s\n", br->ctrl->target); + } else if (info.ctrl) { + ds_put_format(&ctx->output, "%s\n", info.ctrl->target); + } + } + + free_info(&info); +} + +static void +cmd_del_controller(struct vsctl_context *ctx) +{ + struct vsctl_info info; + + get_info(ctx->ovs, &info); + + if (ctx->argc == 1) { + if (info.ctrl) { + ovsrec_controller_delete(info.ctrl); + ovsrec_open_vswitch_set_controller(ctx->ovs, NULL); + } + } else { + struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + + if (br->ctrl) { + ovsrec_controller_delete(br->ctrl); + ovsrec_bridge_set_controller(br->br_cfg, NULL); + } + } + + free_info(&info); +} + +static void +cmd_set_controller(struct vsctl_context *ctx) +{ + struct vsctl_info info; + struct ovsrec_controller *ctrl; + + get_info(ctx->ovs, &info); + + if (ctx->argc == 2) { + /* Set the controller in the "Open_vSwitch" table. */ + if (info.ctrl) { + ovsrec_controller_delete(info.ctrl); + } + ctrl = ovsrec_controller_insert(txn_from_openvswitch(ctx->ovs)); + ovsrec_controller_set_target(ctrl, ctx->argv[1]); + ovsrec_open_vswitch_set_controller(ctx->ovs, ctrl); + } else { + /* Set the controller for a particular bridge. */ + struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + + if (br->ctrl) { + ovsrec_controller_delete(br->ctrl); + } + ctrl = ovsrec_controller_insert(txn_from_openvswitch(ctx->ovs)); + ovsrec_controller_set_target(ctrl, ctx->argv[2]); + ovsrec_bridge_set_controller(br->br_cfg, ctrl); + } + + free_info(&info); +} + +static void +cmd_get_fail_mode(struct vsctl_context *ctx) +{ + struct vsctl_info info; + const char *fail_mode = NULL; + + get_info(ctx->ovs, &info); + + if (ctx->argc == 1) { + /* Return the fail-mode from the "Open_vSwitch" table */ + if (info.ctrl && info.ctrl->fail_mode) { + fail_mode = info.ctrl->fail_mode; + } + } else { + /* Return the fail-mode for a particular bridge. */ + struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true); + + /* If no controller or fail-mode is explicitly defined for the + * requested bridge, fallback to the "Open_vSwitch" table's + * setting. */ + if (br->ctrl && br->ctrl->fail_mode) { + fail_mode = br->ctrl->fail_mode; + } else if (info.ctrl && info.ctrl->fail_mode) { + fail_mode = info.ctrl->fail_mode; + } + } + + if (fail_mode && strlen(fail_mode)) { + ds_put_format(&ctx->output, "%s\n", info.ctrl->fail_mode); + } + + free_info(&info); +} + +static void +cmd_del_fail_mode(struct vsctl_context *ctx) +{ + struct vsctl_info info; + + get_info(ctx->ovs, &info); + + if (ctx->argc == 1) { + if (info.ctrl && info.ctrl->fail_mode) { + ovsrec_controller_set_fail_mode(info.ctrl, NULL); + } + } else { + struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + + if (br->ctrl && br->ctrl->fail_mode) { + ovsrec_controller_set_fail_mode(br->ctrl, NULL); + } + } + + free_info(&info); +} + +static void +cmd_set_fail_mode(struct vsctl_context *ctx) +{ + struct vsctl_info info; + const char *fail_mode; + + get_info(ctx->ovs, &info); + + fail_mode = (ctx->argc == 2) ? ctx->argv[1] : ctx->argv[2]; + + if (strcmp(fail_mode, "standalone") && strcmp(fail_mode, "secure")) { + vsctl_fatal("fail-mode must be \"standalone\" or \"secure\""); + } + + if (ctx->argc == 2) { + /* Set the fail-mode in the "Open_vSwitch" table. */ + if (!info.ctrl) { + vsctl_fatal("no controller declared"); + } + ovsrec_controller_set_fail_mode(info.ctrl, fail_mode); + } else { + struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + + if (!br->ctrl) { + vsctl_fatal("no controller declared for %s", br->name); + } + ovsrec_controller_set_fail_mode(br->ctrl, fail_mode); + } + free_info(&info); } -typedef void vsctl_handler_func(int argc, char *argv[], - const struct ovsrec_open_vswitch *, - struct ds *output); +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 run_vsctl_command(int argc, char *argv[], const struct ovsrec_open_vswitch *ovs, struct ds *output); +static struct json * +where_uuid_equals(const struct uuid *uuid) +{ + return + json_array_create_1( + json_array_create_3( + json_string_create("_uuid"), + json_string_create("=="), + json_array_create_2( + json_string_create("uuid"), + json_string_create_nocopy( + xasprintf(UUID_FMT, UUID_ARGS(uuid)))))); +} + static void do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) { struct ovsdb_idl_txn *txn; const struct ovsrec_open_vswitch *ovs; enum ovsdb_idl_txn_status status; - struct ds *output; + struct ds comment, *output; + int64_t next_cfg; int n_output; int i, start; + txn = ovsdb_idl_txn_create(idl); + if (dry_run) { + ovsdb_idl_txn_set_dry_run(txn); + } + + ds_init(&comment); + ds_put_cstr(&comment, "ovs-vsctl:"); + for (i = 0; i < argc; i++) { + ds_put_format(&comment, " %s", argv[i]); + } + ovsdb_idl_txn_add_comment(txn, ds_cstr(&comment)); + ds_destroy(&comment); + ovs = ovsrec_open_vswitch_first(idl); if (!ovs) { - /* XXX it would be more user-friendly to create a record ourselves - * (while verifying that the table is empty before doing so). */ - ovs_fatal(0, "%s: database does not contain any Open vSwitch " - "configuration", db); + /* XXX add verification that table is empty */ + ovs = ovsrec_open_vswitch_insert(txn); + } + + if (wait_for_reload) { + struct json *where = where_uuid_equals(&ovs->header_.uuid); + ovsdb_idl_txn_increment(txn, "Open_vSwitch", "next_cfg", + where); + json_destroy(where); } - txn = ovsdb_idl_txn_create(idl); output = xmalloc(argc * sizeof *output); n_output = 0; for (start = i = 0; i <= argc; i++) { @@ -1165,6 +1482,9 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) ovsdb_idl_txn_wait(txn); poll_block(); } + if (wait_for_reload && status == TXN_SUCCESS) { + next_cfg = ovsdb_idl_txn_get_increment_new_value(txn); + } ovsdb_idl_txn_destroy(txn); switch (status) { @@ -1173,8 +1493,9 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) case TXN_ABORTED: /* Should not happen--we never call ovsdb_idl_txn_abort(). */ - ovs_fatal(0, "transaction aborted"); + vsctl_fatal("transaction aborted"); + case TXN_UNCHANGED: case TXN_SUCCESS: break; @@ -1185,7 +1506,7 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) return; case TXN_ERROR: - ovs_fatal(0, "transaction error"); + vsctl_fatal("transaction error"); default: NOT_REACHED(); @@ -1217,69 +1538,135 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) fputs(ds_cstr(ds), stdout); } } + + if (wait_for_reload && status != TXN_UNCHANGED) { + for (;;) { + const struct ovsrec_open_vswitch *ovs; + + ovsdb_idl_run(idl); + OVSREC_OPEN_VSWITCH_FOR_EACH (ovs, idl) { + if (ovs->cur_cfg >= next_cfg) { + goto done; + } + } + ovsdb_idl_wait(idl); + poll_block(); + } + done: ; + } + exit(EXIT_SUCCESS); } static vsctl_handler_func * -get_vsctl_handler(int argc, char *argv[]) +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}, - {"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}, + {"add-br", 1, 3, cmd_add_br, ""}, + {"del-br", 1, 1, cmd_del_br, "--if-exists"}, + {"list-br", 0, 0, cmd_list_br, ""}, + {"br-exists", 1, 1, cmd_br_exists, ""}, + {"br-to-vlan", 1, 1, cmd_br_to_vlan, ""}, + {"br-to-parent", 1, 1, cmd_br_to_parent, ""}, + {"br-set-external-id", 2, 3, cmd_br_set_external_id, ""}, + {"br-get-external-id", 1, 2, cmd_br_get_external_id, ""}, /* Port commands. */ - {"list-ports", 1, 1, cmd_list_ports}, - {"add-port", 2, 2, cmd_add_port}, - {"add-bond", 4, INT_MAX, cmd_add_bond}, - {"del-port", 1, 2, cmd_del_port}, - {"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}, + {"list-ports", 1, 1, cmd_list_ports, ""}, + {"add-port", 2, 2, cmd_add_port, ""}, + {"add-bond", 4, INT_MAX, cmd_add_bond, ""}, + {"del-port", 1, 2, cmd_del_port, "--if-exists"}, + {"port-to-br", 1, 1, cmd_port_to_br, ""}, + {"port-set-external-id", 2, 3, cmd_port_set_external_id, ""}, + {"port-get-external-id", 1, 2, cmd_port_get_external_id, ""}, /* Interface commands. */ - {"list-ifaces", 1, 1, cmd_list_ifaces}, - {"iface-to-br", 1, 1, cmd_iface_to_br}, - {"iface-set-external-id", 2, 3, cmd_iface_set_external_id}, - {"iface-get-external-id", 1, 2, cmd_iface_get_external_id}, + {"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, ""}, }; 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"); + } - assert(argc > 0); for (p = all_commands; p < &all_commands[ARRAY_SIZE(all_commands)]; p++) { - if (!strcmp(p->name, argv[0])) { - int n_arg = argc - 1; + if (!strcmp(p->name, argv[i])) { + struct shash_node *node; + int n_arg; + + SHASH_FOR_EACH (node, &ctx->options) { + const char *s = strstr(p->options, node->name); + int end = s ? s[strlen(node->name)] : EOF; + if (end != ',' && end != ' ' && end != '\0') { + vsctl_fatal("'%s' command has no '%s' option", + argv[i], node->name); + } + } + + n_arg = argc - i - 1; if (n_arg < p->min_args) { - ovs_fatal(0, "'%s' command requires at least %d arguments", - p->name, p->min_args); + vsctl_fatal("'%s' command requires at least %d arguments", + p->name, p->min_args); } else if (n_arg > p->max_args) { - ovs_fatal(0, "'%s' command takes at most %d arguments", - p->name, p->max_args); + vsctl_fatal("'%s' command takes at most %d arguments", + p->name, p->max_args); } else { + ctx->argc = n_arg + 1; + ctx->argv = &argv[i]; return p->handler; } } } - ovs_fatal(0, "unknown command '%s'; use --help for help", argv[0]); + vsctl_fatal("unknown command '%s'; use --help for help", argv[i]); } static void check_vsctl_command(int argc, char *argv[]) { - get_vsctl_handler(argc, argv); + struct vsctl_context ctx; + + get_vsctl_handler(argc, argv, &ctx); + shash_destroy(&ctx.options); } static void run_vsctl_command(int argc, char *argv[], const struct ovsrec_open_vswitch *ovs, struct ds *output) { - get_vsctl_handler(argc, argv)(argc, argv, ovs, output); + vsctl_handler_func *function; + struct vsctl_context ctx; + + function = get_vsctl_handler(argc, argv, &ctx); + ctx.ovs = ovs; + ds_init(&ctx.output); + function(&ctx); + *output = ctx.output; + shash_destroy(&ctx.options); }