X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=091e6bc7b8af2ed9494f305b5bfcf90ddb846640;hb=58bc1a52cb0b88f8f44b175f13f602e650bc9d06;hp=1eb6e0fe346c3a92e7caa9726eb5c035ceba2236;hpb=bd76d25d8b3b7d11c5a326e91d784ad2cdeecd45;p=openvswitch

diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
index 1eb6e0fe..091e6bc7 100644
--- a/utilities/ovs-vsctl.c
+++ b/utilities/ovs-vsctl.c
@@ -36,6 +36,7 @@
 #include "ovsdb-idl.h"
 #include "poll-loop.h"
 #include "process.h"
+#include "stream-ssl.h"
 #include "svec.h"
 #include "vswitchd/vswitch-idl.h"
 #include "timeval.h"
@@ -108,6 +109,11 @@ static void do_vsctl(const char *args,
                      struct vsctl_command *, size_t n_commands,
                      struct ovsdb_idl *);
 
+static const struct vsctl_table_class *get_table(const char *table_name);
+static void set_column(const struct vsctl_table_class *,
+                       const struct ovsdb_idl_row *, const char *arg);
+
+
 int
 main(int argc, char *argv[])
 {
@@ -169,6 +175,7 @@ parse_options(int argc, char *argv[])
         OPT_NO_SYSLOG,
         OPT_NO_WAIT,
         OPT_DRY_RUN,
+        OPT_PEER_CA_CERT,
         VLOG_OPTION_ENUMS
     };
     static struct option long_options[] = {
@@ -181,6 +188,10 @@ parse_options(int argc, char *argv[])
         {"help", no_argument, 0, 'h'},
         {"version", no_argument, 0, 'V'},
         VLOG_LONG_OPTIONS,
+#ifdef HAVE_OPENSSL
+        STREAM_SSL_LONG_OPTIONS
+        {"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
+#endif
         {0, 0, 0, 0},
     };
 
@@ -231,6 +242,14 @@ parse_options(int argc, char *argv[])
 
         VLOG_OPTION_HANDLERS
 
+#ifdef HAVE_OPENSSL
+        STREAM_SSL_OPTION_HANDLERS
+
+        case OPT_PEER_CA_CERT:
+            stream_ssl_set_peer_ca_cert_file(optarg);
+            break;
+#endif
+
         case '?':
             exit(EXIT_FAILURE);
 
@@ -317,6 +336,17 @@ parse_command(int argc, char *argv[], struct vsctl_command *command)
                 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 {
@@ -438,7 +468,7 @@ default_db(void)
 {
     static char *def;
     if (!def) {
-        def = xasprintf("unix:%s/ovsdb-server", ovs_rundir);
+        def = xasprintf("unix:%s/db.sock", ovs_rundir);
     }
     return def;
 }
@@ -459,7 +489,8 @@ struct vsctl_context {
 struct vsctl_bridge {
     struct ovsrec_bridge *br_cfg;
     char *name;
-    struct ovsrec_controller *ctrl;
+    struct ovsrec_controller **ctrl;
+    size_t n_ctrl;
     struct vsctl_bridge *parent;
     int vlan;
 };
@@ -478,9 +509,34 @@ struct vsctl_info {
     struct shash bridges;
     struct shash ports;
     struct shash ifaces;
-    struct ovsrec_controller *ctrl;
+    struct ovsrec_controller **ctrl;
+    size_t n_ctrl;
 };
 
+static char *
+vsctl_context_to_string(const struct vsctl_context *ctx)
+{
+    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 *
 add_bridge(struct vsctl_info *b,
            struct ovsrec_bridge *br_cfg, const char *name,
@@ -491,7 +547,13 @@ add_bridge(struct vsctl_info *b,
     br->name = xstrdup(name);
     br->parent = parent;
     br->vlan = vlan;
-    br->ctrl = parent ? parent->br_cfg->controller : br_cfg->controller;
+    if (parent) {
+        br->ctrl = parent->br_cfg->controller;
+        br->n_ctrl = parent->br_cfg->n_controller;
+    } else {
+        br->ctrl = br_cfg->controller;
+        br->n_ctrl = br_cfg->n_controller;
+    }
     shash_add(&b->bridges, br->name, br);
     return br;
 }
@@ -556,6 +618,7 @@ get_info(const struct ovsrec_open_vswitch *ovs, struct vsctl_info *info)
     shash_init(&info->ifaces);
 
     info->ctrl = ovs->controller;
+    info->n_ctrl = ovs->n_controller;
 
     shash_init(&bridges);
     shash_init(&ports);
@@ -789,24 +852,71 @@ 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(ctx->txn);
         ovsrec_interface_set_name(iface, br_name);
@@ -820,22 +930,13 @@ cmd_add_br(struct vsctl_context *ctx)
         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");
@@ -856,8 +957,6 @@ cmd_add_br(struct vsctl_context *ctx)
         ovsrec_port_set_tag(port, &tag, 1);
 
         bridge_insert_port(br, port);
-    } else {
-        NOT_REACHED();
     }
 
     free_info(&info);
@@ -1100,8 +1199,10 @@ cmd_list_ports(struct vsctl_context *ctx)
 
 static void
 add_port(struct vsctl_context *ctx,
-         const char *br_name, const char *port_name, bool fake_iface,
-         char *iface_names[], int n_ifaces)
+         const char *br_name, const char *port_name,
+         bool may_exist, bool fake_iface,
+         char *iface_names[], int n_ifaces,
+         char *settings[], int n_settings)
 {
     struct vsctl_info info;
     struct vsctl_bridge *bridge;
@@ -1110,9 +1211,53 @@ add_port(struct vsctl_context *ctx,
     size_t i;
 
     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);
@@ -1132,6 +1277,10 @@ add_port(struct vsctl_context *ctx,
         ovsrec_port_set_tag(port, &tag, 1);
     }
 
+    for (i = 0; i < n_settings; i++) {
+        set_column(get_table("Port"), &port->header_, settings[i]);
+    }
+
     bridge_insert_port((bridge->parent ? bridge->parent->br_cfg
                         : bridge->br_cfg), port);
 
@@ -1141,47 +1290,85 @@ add_port(struct vsctl_context *ctx,
 static void
 cmd_add_port(struct vsctl_context *ctx)
 {
-    add_port(ctx, 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, &ctx->argv[3], ctx->argc - 3);
 }
 
 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");
+    int n_ifaces;
+    int i;
+
+    n_ifaces = ctx->argc - 3;
+    for (i = 3; i < ctx->argc; i++) {
+        if (strchr(ctx->argv[i], '=')) {
+            n_ifaces = i - 3;
+            break;
+        }
+    }
+    if (n_ifaces < 2) {
+        vsctl_fatal("add-bond requires at least 2 interfaces, but only "
+                    "%d were specified", n_ifaces);
+    }
 
-    add_port(ctx, ctx->argv[1], ctx->argv[2], fake_iface,
-             &ctx->argv[3], ctx->argc - 3);
+    add_port(ctx, ctx->argv[1], ctx->argv[2], may_exist, fake_iface,
+             &ctx->argv[3], n_ifaces,
+             &ctx->argv[n_ifaces + 3], ctx->argc - 3 - n_ifaces);
 }
 
 static void
 cmd_del_port(struct vsctl_context *ctx)
 {
     bool must_exist = !shash_find(&ctx->options, "--if-exists");
+    bool with_iface = shash_find(&ctx->options, "--with-iface") != NULL;
+    struct vsctl_port *port;
     struct vsctl_info info;
 
     get_info(ctx->ovs, &info);
-    if (ctx->argc == 2) {
-        struct vsctl_port *port = find_port(&info, ctx->argv[1], must_exist);
-        if (port) {
-            del_port(&info, port);
+    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);
 }
 
@@ -1262,6 +1449,29 @@ cmd_iface_to_br(struct vsctl_context *ctx)
     free_info(&info);
 }
 
+/* Print targets of the 'n_controllers' in 'controllers' on the output for
+ * 'ctx'. */
+static void
+print_controllers(struct vsctl_context *ctx,
+                  struct ovsrec_controller **controllers,
+                  size_t n_controllers)
+{
+    /* Print the targets in sorted order for reproducibility. */
+    struct svec targets;
+    size_t i;
+
+    svec_init(&targets);
+    for (i = 0; i < n_controllers; i++) {
+        svec_add(&targets, controllers[i]->target);
+    }
+
+    svec_sort(&targets);
+    for (i = 0; i < targets.n; i++) {
+        ds_put_format(&ctx->output, "%s\n", targets.names[i]);
+    }
+    svec_destroy(&targets);
+}
+
 static void
 cmd_get_controller(struct vsctl_context *ctx)
 {
@@ -1269,27 +1479,31 @@ cmd_get_controller(struct vsctl_context *ctx)
 
     get_info(ctx->ovs, &info);
 
-    if (ctx->argc == 1) {
-        /* Return the controller from the "Open_vSwitch" table */
-        if (info.ctrl) {
-            ds_put_format(&ctx->output, "%s\n", info.ctrl->target);
-        }
+    if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) {
+        print_controllers(ctx, info.ctrl, info.n_ctrl);
     } else {
-        /* Return the controller for a particular bridge. */
         struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true);
-
-        /* If no controller is explicitly defined for the requested
-         * bridge, fallback to the "Open_vSwitch" table's controller. */
-        if (br->ctrl) {
-            ds_put_format(&ctx->output, "%s\n", br->ctrl->target);
-        } else if (info.ctrl) {
-            ds_put_format(&ctx->output, "%s\n", info.ctrl->target);
+        if (br->n_ctrl) {
+            print_controllers(ctx, br->ctrl, br->n_ctrl);
+        } else {
+            print_controllers(ctx, info.ctrl, info.n_ctrl);
         }
     }
 
     free_info(&info);
 }
 
+static void
+delete_controllers(struct ovsrec_controller **controllers,
+                   size_t n_controllers)
+{
+    size_t i;
+
+    for (i = 0; i < n_controllers; i++) {
+        ovsrec_controller_delete(controllers[i]);
+    }
+}
+
 static void
 cmd_del_controller(struct vsctl_context *ctx)
 {
@@ -1297,54 +1511,100 @@ cmd_del_controller(struct vsctl_context *ctx)
 
     get_info(ctx->ovs, &info);
 
-    if (ctx->argc == 1) {
-        if (info.ctrl) {
-            ovsrec_controller_delete(info.ctrl);
-            ovsrec_open_vswitch_set_controller(ctx->ovs, NULL);
+    if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) {
+        if (info.n_ctrl) {
+            delete_controllers(info.ctrl, info.n_ctrl);
+            ovsrec_open_vswitch_set_controller(ctx->ovs, NULL, 0);
         }
     } else {
         struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true);
-
         if (br->ctrl) {
-            ovsrec_controller_delete(br->ctrl);
-            ovsrec_bridge_set_controller(br->br_cfg, NULL);
+            delete_controllers(br->ctrl, br->n_ctrl);
+            ovsrec_bridge_set_controller(br->br_cfg, NULL, 0);
         }
     }
 
     free_info(&info);
 }
 
+static struct ovsrec_controller **
+insert_controllers(struct ovsdb_idl_txn *txn, char *targets[], size_t n)
+{
+    struct ovsrec_controller **controllers;
+    size_t i;
+
+    controllers = xmalloc(n * sizeof *controllers);
+    for (i = 0; i < n; i++) {
+        controllers[i] = ovsrec_controller_insert(txn);
+        ovsrec_controller_set_target(controllers[i], targets[i]);
+    }
+
+    return controllers;
+}
+
+static void
+set_default_controllers(struct vsctl_context *ctx, char *targets[], size_t n)
+{
+    struct ovsrec_controller **controllers;
+
+    delete_controllers(ctx->ovs->controller, ctx->ovs->n_controller);
+
+    controllers = insert_controllers(ctx->txn, targets, n);
+    ovsrec_open_vswitch_set_controller(ctx->ovs, controllers, n);
+    free(controllers);
+}
+
 static void
 cmd_set_controller(struct vsctl_context *ctx)
 {
     struct vsctl_info info;
-    struct ovsrec_controller *ctrl;
 
     get_info(ctx->ovs, &info);
 
     if (ctx->argc == 2) {
-        /* Set the controller in the "Open_vSwitch" table. */
-        if (info.ctrl) {
-            ovsrec_controller_delete(info.ctrl);
-        }
-        ctrl = ovsrec_controller_insert(ctx->txn);
-        ovsrec_controller_set_target(ctrl, ctx->argv[1]);
-        ovsrec_open_vswitch_set_controller(ctx->ovs, ctrl);
+        /* Set one controller in the "Open_vSwitch" table. */
+        set_default_controllers(ctx, &ctx->argv[1], 1);
+    } else if (!strcmp(ctx->argv[1], "default")) {
+        /* Set one or more controllers in the "Open_vSwitch" table. */
+        set_default_controllers(ctx, &ctx->argv[2], ctx->argc - 2);
     } else {
-        /* Set the controller for a particular bridge. */
+        /* Set one or more controllers for a particular bridge. */
         struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true);
+        struct ovsrec_controller **controllers;
+        size_t n;
 
-        if (br->ctrl) {
-            ovsrec_controller_delete(br->ctrl);
-        }
-        ctrl = ovsrec_controller_insert(ctx->txn);
-        ovsrec_controller_set_target(ctrl, ctx->argv[2]);
-        ovsrec_bridge_set_controller(br->br_cfg, ctrl);
+        delete_controllers(br->ctrl, br->n_ctrl);
+
+        n = ctx->argc - 2;
+        controllers = insert_controllers(ctx->txn, &ctx->argv[2], n);
+        ovsrec_bridge_set_controller(br->br_cfg, controllers, n);
+        free(controllers);
     }
 
     free_info(&info);
 }
 
+static const char *
+get_fail_mode(struct ovsrec_controller **controllers, size_t n_controllers)
+{
+    const char *fail_mode;
+    size_t i;
+
+    fail_mode = NULL;
+    for (i = 0; i < n_controllers; i++) {
+        const char *s = controllers[i]->fail_mode;
+        if (s) {
+            if (!strcmp(s, "secure")) {
+                return s;
+            } else {
+                fail_mode = s;
+            }
+        }
+    }
+
+    return fail_mode;
+}
+
 static void
 cmd_get_fail_mode(struct vsctl_context *ctx)
 {
@@ -1353,23 +1613,18 @@ cmd_get_fail_mode(struct vsctl_context *ctx)
 
     get_info(ctx->ovs, &info);
 
-    if (ctx->argc == 1) {
+    if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) {
         /* Return the fail-mode from the "Open_vSwitch" table */
-        if (info.ctrl && info.ctrl->fail_mode) {
-            fail_mode = info.ctrl->fail_mode;
-        }
+        fail_mode = get_fail_mode(info.ctrl, info.n_ctrl);
     } else {
         /* Return the fail-mode for a particular bridge. */
         struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true);
 
-        /* If no controller or fail-mode is explicitly defined for the 
-         * requested bridge, fallback to the "Open_vSwitch" table's 
-         * setting. */
-        if (br->ctrl && br->ctrl->fail_mode) {
-            fail_mode = br->ctrl->fail_mode;
-        } else if (info.ctrl && info.ctrl->fail_mode) {
-            fail_mode = info.ctrl->fail_mode;
-        }
+        /* If no controller is defined for the requested bridge, fallback to
+         * the "Open_vSwitch" table's controller. */
+        fail_mode = (br->n_ctrl
+                     ? get_fail_mode(br->ctrl, br->n_ctrl)
+                     : get_fail_mode(info.ctrl, info.n_ctrl));
     }
 
     if (fail_mode && strlen(fail_mode)) {
@@ -1379,6 +1634,17 @@ cmd_get_fail_mode(struct vsctl_context *ctx)
     free_info(&info);
 }
 
+static void
+set_fail_mode(struct ovsrec_controller **controllers, size_t n_controllers,
+              const char *fail_mode)
+{
+    size_t i;
+
+    for (i = 0; i < n_controllers; i++) {
+        ovsrec_controller_set_fail_mode(controllers[i], fail_mode);
+    }
+}
+
 static void
 cmd_del_fail_mode(struct vsctl_context *ctx)
 {
@@ -1386,16 +1652,12 @@ cmd_del_fail_mode(struct vsctl_context *ctx)
 
     get_info(ctx->ovs, &info);
 
-    if (ctx->argc == 1) {
-        if (info.ctrl && info.ctrl->fail_mode) {
-            ovsrec_controller_set_fail_mode(info.ctrl, NULL);
-        }
+    if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) {
+        set_fail_mode(info.ctrl, info.n_ctrl, NULL);
     } else {
         struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true);
 
-        if (br->ctrl && br->ctrl->fail_mode) {
-            ovsrec_controller_set_fail_mode(br->ctrl, NULL);
-        }
+        set_fail_mode(br->ctrl, br->n_ctrl, NULL);
     }
 
     free_info(&info);
@@ -1405,29 +1667,36 @@ static void
 cmd_set_fail_mode(struct vsctl_context *ctx)
 {
     struct vsctl_info info;
+    const char *bridge;
     const char *fail_mode;
 
     get_info(ctx->ovs, &info);
 
-    fail_mode = (ctx->argc == 2) ? ctx->argv[1] : ctx->argv[2];
+    if (ctx->argc == 2) {
+        bridge = "default";
+        fail_mode = ctx->argv[1];
+    } else {
+        bridge = ctx->argv[1];
+        fail_mode = ctx->argv[2];
+    }
 
     if (strcmp(fail_mode, "standalone") && strcmp(fail_mode, "secure")) {
         vsctl_fatal("fail-mode must be \"standalone\" or \"secure\"");
     }
 
-    if (ctx->argc == 2) {
+    if (!strcmp(bridge, "default")) {
         /* Set the fail-mode in the "Open_vSwitch" table. */
         if (!info.ctrl) {
             vsctl_fatal("no controller declared");
         }
-        ovsrec_controller_set_fail_mode(info.ctrl, fail_mode);
+        set_fail_mode(info.ctrl, info.n_ctrl, fail_mode);
     } else {
-        struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true);
+        struct vsctl_bridge *br = find_real_bridge(&info, bridge, true);
 
         if (!br->ctrl) {
             vsctl_fatal("no controller declared for %s", br->name);
         }
-        ovsrec_controller_set_fail_mode(br->ctrl, fail_mode);
+        set_fail_mode(br->ctrl, br->n_ctrl, fail_mode);
     }
 
     free_info(&info);
@@ -2113,16 +2382,11 @@ cmd_clear(struct vsctl_context *ctx)
 static void
 cmd_create(struct vsctl_context *ctx)
 {
-    bool force = shash_find(&ctx->options, "--force");
     const char *table_name = ctx->argv[1];
     const struct vsctl_table_class *table;
     const struct ovsdb_idl_row *row;
     int i;
 
-    if (!force) {
-        vsctl_fatal("\"create\" requires --force");
-    }
-
     table = get_table(table_name);
     row = ovsdb_idl_txn_insert(ctx->txn, table->class);
     for (i = 2; i < ctx->argc; i++) {
@@ -2158,16 +2422,11 @@ post_create(struct vsctl_context *ctx)
 static void
 cmd_destroy(struct vsctl_context *ctx)
 {
-    bool force = shash_find(&ctx->options, "--force");
     bool must_exist = !shash_find(&ctx->options, "--if-exists");
     const char *table_name = ctx->argv[1];
     const struct vsctl_table_class *table;
     int i;
 
-    if (!force) {
-        vsctl_fatal("\"destroy\" requires --force");
-    }
-
     table = get_table(table_name);
     for (i = 2; i < ctx->argc; i++) {
         const struct ovsdb_idl_row *row;
@@ -2224,7 +2483,6 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands,
     enum ovsdb_idl_txn_status status;
     struct vsctl_command *c;
     int64_t next_cfg = 0;
-    char *comment;
     char *error;
 
     txn = the_idl_txn = ovsdb_idl_txn_create(idl);
@@ -2232,9 +2490,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands,
         ovsdb_idl_txn_set_dry_run(txn);
     }
 
-    comment = xasprintf("ovs-vsctl: %s", args);
-    ovsdb_idl_txn_add_comment(txn, comment);
-    free(comment);
+    ovsdb_idl_txn_add_comment(txn, "ovs-vsctl: %s", args);
 
     ovs = ovsrec_open_vswitch_first(idl);
     if (!ovs) {
@@ -2257,12 +2513,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands,
         vsctl_context_done(&ctx, c);
     }
 
-    while ((status = ovsdb_idl_txn_commit(txn)) == TXN_INCOMPLETE) {
-        ovsdb_idl_run(idl);
-        ovsdb_idl_wait(idl);
-        ovsdb_idl_txn_wait(txn);
-        poll_block();
-    }
+    status = ovsdb_idl_txn_commit_block(txn);
     if (wait_for_reload && status == TXN_SUCCESS) {
         next_cfg = ovsdb_idl_txn_get_increment_new_value(txn);
     }
@@ -2361,7 +2612,7 @@ static const struct vsctl_command_syntax all_commands[] = {
     {"init", 0, 0, cmd_init, NULL, ""},
 
     /* Bridge commands. */
-    {"add-br", 1, 3, cmd_add_br, NULL, ""},
+    {"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, ""},
@@ -2372,9 +2623,9 @@ static const struct vsctl_command_syntax all_commands[] = {
 
     /* Port commands. */
     {"list-ports", 1, 1, cmd_list_ports, NULL, ""},
-    {"add-port", 2, 2, cmd_add_port, NULL, ""},
-    {"add-bond", 4, INT_MAX, cmd_add_bond, NULL, "--fake-iface"},
-    {"del-port", 1, 2, cmd_del_port, NULL, "--if-exists"},
+    {"add-port", 2, INT_MAX, cmd_add_port, NULL, "--may-exist"},
+    {"add-bond", 4, INT_MAX, cmd_add_bond, NULL, "--may-exist,--fake-iface"},
+    {"del-port", 1, 2, cmd_del_port, NULL, "--if-exists,--with-iface"},
     {"port-to-br", 1, 1, cmd_port_to_br, NULL, ""},
 
     /* Interface commands. */
@@ -2384,7 +2635,7 @@ static const struct vsctl_command_syntax all_commands[] = {
     /* 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, ""},
+    {"set-controller", 1, INT_MAX, cmd_set_controller, NULL, ""},
     {"get-fail-mode", 0, 1, cmd_get_fail_mode, NULL, ""},
     {"del-fail-mode", 0, 1, cmd_del_fail_mode, NULL, ""},
     {"set-fail-mode", 1, 2, cmd_set_fail_mode, NULL, ""},
@@ -2397,12 +2648,12 @@ static const struct vsctl_command_syntax all_commands[] = {
     /* Parameter commands. */
     {"get", 3, INT_MAX, cmd_get, NULL, "--if-exists"},
     {"list", 1, INT_MAX, cmd_list, NULL, ""},
-    {"create", 2, INT_MAX, cmd_create, post_create, "--force"},
-    {"destroy", 1, INT_MAX, cmd_destroy, NULL, "--force,--if-exists"},
     {"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},
 };