X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=fda3a89db25dc09c5a24545ce8946a22750f8d99;hb=2315e6b5bc8da2aa690cd977fdd89543bb435488;hp=8a914ca57f7403dca09204f2d0b86eb9a3b7184a;hpb=753cb20f032998c664d32b1932fb922db3a8a77f;p=openvswitch

diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
index 8a914ca5..fda3a89d 100644
--- a/utilities/ovs-vsctl.c
+++ b/utilities/ovs-vsctl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 #include "compiler.h"
 #include "dirs.h"
 #include "dynamic-string.h"
+#include "hash.h"
 #include "json.h"
 #include "ovsdb-data.h"
 #include "ovsdb-idl.h"
@@ -39,6 +40,7 @@
 #include "process.h"
 #include "stream.h"
 #include "stream-ssl.h"
+#include "smap.h"
 #include "sset.h"
 #include "svec.h"
 #include "lib/vswitch-idl.h"
@@ -629,23 +631,27 @@ struct vsctl_context {
 struct vsctl_bridge {
     struct ovsrec_bridge *br_cfg;
     char *name;
-    struct ovsrec_controller **ctrl;
-    size_t n_ctrl;
+    struct list ports;          /* Contains "struct vsctl_port"s. */
 
     /* VLAN ("fake") bridge support.
      *
      * Use 'parent != NULL' to detect a fake bridge, because 'vlan' can be 0
      * in either case. */
+    struct hmap children;        /* VLAN bridges indexed by 'vlan'. */
+    struct hmap_node children_node; /* Node in parent's 'children' hmap. */
     struct vsctl_bridge *parent; /* Real bridge, or NULL. */
     int vlan;                    /* VLAN VID (0...4095), or 0. */
 };
 
 struct vsctl_port {
+    struct list ports_node;     /* In struct vsctl_bridge's 'ports' list. */
+    struct list ifaces;         /* Contains "struct vsctl_iface"s. */
     struct ovsrec_port *port_cfg;
     struct vsctl_bridge *bridge;
 };
 
 struct vsctl_iface {
+    struct list ifaces_node;     /* In struct vsctl_port's 'ifaces' list. */
     struct ovsrec_interface *iface_cfg;
     struct vsctl_port *port;
 };
@@ -694,26 +700,59 @@ verify_ports(struct vsctl_context *ctx)
 }
 
 static struct vsctl_bridge *
-add_bridge(struct vsctl_context *ctx,
-           struct ovsrec_bridge *br_cfg, const char *name,
-           struct vsctl_bridge *parent, int vlan)
+add_bridge_to_cache(struct vsctl_context *ctx,
+                    struct ovsrec_bridge *br_cfg, const char *name,
+                    struct vsctl_bridge *parent, int vlan)
 {
     struct vsctl_bridge *br = xmalloc(sizeof *br);
     br->br_cfg = br_cfg;
     br->name = xstrdup(name);
+    list_init(&br->ports);
     br->parent = parent;
     br->vlan = vlan;
+    hmap_init(&br->children);
     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;
+        hmap_insert(&parent->children, &br->children_node, hash_int(vlan, 0));
     }
     shash_add(&ctx->bridges, br->name, br);
     return br;
 }
 
+static void
+ovs_delete_bridge(const struct ovsrec_open_vswitch *ovs,
+                  struct ovsrec_bridge *bridge)
+{
+    struct ovsrec_bridge **bridges;
+    size_t i, n;
+
+    bridges = xmalloc(sizeof *ovs->bridges * ovs->n_bridges);
+    for (i = n = 0; i < ovs->n_bridges; i++) {
+        if (ovs->bridges[i] != bridge) {
+            bridges[n++] = ovs->bridges[i];
+        }
+    }
+    ovsrec_open_vswitch_set_bridges(ovs, bridges, n);
+    free(bridges);
+}
+
+static void
+del_cached_bridge(struct vsctl_context *ctx, struct vsctl_bridge *br)
+{
+    assert(list_is_empty(&br->ports));
+    assert(hmap_is_empty(&br->children));
+    if (br->parent) {
+        hmap_remove(&br->parent->children, &br->children_node);
+    }
+    if (br->br_cfg) {
+        ovsrec_bridge_delete(br->br_cfg);
+        ovs_delete_bridge(ctx->ovs, br->br_cfg);
+    }
+    shash_find_and_delete(&ctx->bridges, br->name);
+    hmap_destroy(&br->children);
+    free(br->name);
+    free(br);
+}
+
 static bool
 port_is_fake_bridge(const struct ovsrec_port *port_cfg)
 {
@@ -723,21 +762,80 @@ port_is_fake_bridge(const struct ovsrec_port *port_cfg)
 }
 
 static struct vsctl_bridge *
-find_vlan_bridge(struct vsctl_context *ctx,
-                 struct vsctl_bridge *parent, int vlan)
+find_vlan_bridge(struct vsctl_bridge *parent, int vlan)
 {
-    struct shash_node *node;
+    struct vsctl_bridge *child;
 
-    SHASH_FOR_EACH (node, &ctx->bridges) {
-        struct vsctl_bridge *br = node->data;
-        if (br->parent == parent && br->vlan == vlan) {
-            return br;
+    HMAP_FOR_EACH_IN_BUCKET (child, children_node, hash_int(vlan, 0),
+                             &parent->children) {
+        if (child->vlan == vlan) {
+            return child;
         }
     }
 
     return NULL;
 }
 
+static struct vsctl_port *
+add_port_to_cache(struct vsctl_context *ctx, struct vsctl_bridge *parent,
+                  struct ovsrec_port *port_cfg)
+{
+    struct vsctl_port *port;
+
+    if (port_cfg->tag
+        && *port_cfg->tag >= 0 && *port_cfg->tag <= 4095) {
+        struct vsctl_bridge *vlan_bridge;
+
+        vlan_bridge = find_vlan_bridge(parent, *port_cfg->tag);
+        if (vlan_bridge) {
+            parent = vlan_bridge;
+        }
+    }
+
+    port = xmalloc(sizeof *port);
+    list_push_back(&parent->ports, &port->ports_node);
+    list_init(&port->ifaces);
+    port->port_cfg = port_cfg;
+    port->bridge = parent;
+    shash_add(&ctx->ports, port_cfg->name, port);
+
+    return port;
+}
+
+static void
+del_cached_port(struct vsctl_context *ctx, struct vsctl_port *port)
+{
+    assert(list_is_empty(&port->ifaces));
+    list_remove(&port->ports_node);
+    shash_find_and_delete(&ctx->ports, port->port_cfg->name);
+    ovsrec_port_delete(port->port_cfg);
+    free(port);
+}
+
+static struct vsctl_iface *
+add_iface_to_cache(struct vsctl_context *ctx, struct vsctl_port *parent,
+                   struct ovsrec_interface *iface_cfg)
+{
+    struct vsctl_iface *iface;
+
+    iface = xmalloc(sizeof *iface);
+    list_push_back(&parent->ifaces, &iface->ifaces_node);
+    iface->iface_cfg = iface_cfg;
+    iface->port = parent;
+    shash_add(&ctx->ifaces, iface_cfg->name, iface);
+
+    return iface;
+}
+
+static void
+del_cached_iface(struct vsctl_context *ctx, struct vsctl_iface *iface)
+{
+    list_remove(&iface->ifaces_node);
+    shash_find_and_delete(&ctx->ifaces, iface->iface_cfg->name);
+    ovsrec_interface_delete(iface->iface_cfg);
+    free(iface);
+}
+
 static void
 vsctl_context_invalidate_cache(struct vsctl_context *ctx)
 {
@@ -750,6 +848,7 @@ vsctl_context_invalidate_cache(struct vsctl_context *ctx)
 
     SHASH_FOR_EACH (node, &ctx->bridges) {
         struct vsctl_bridge *bridge = node->data;
+        hmap_destroy(&bridge->children);
         free(bridge->name);
         free(bridge);
     }
@@ -805,7 +904,7 @@ vsctl_context_populate_cache(struct vsctl_context *ctx)
                       br_cfg->name);
             continue;
         }
-        br = add_bridge(ctx, br_cfg, br_cfg->name, NULL, 0);
+        br = add_bridge_to_cache(ctx, br_cfg, br_cfg->name, NULL, 0);
         if (!br) {
             continue;
         }
@@ -820,7 +919,8 @@ vsctl_context_populate_cache(struct vsctl_context *ctx)
 
             if (port_is_fake_bridge(port_cfg)
                 && sset_add(&bridges, port_cfg->name)) {
-                add_bridge(ctx, NULL, port_cfg->name, br, *port_cfg->tag);
+                add_bridge_to_cache(ctx, NULL, port_cfg->name, br,
+                                    *port_cfg->tag);
             }
         }
     }
@@ -862,19 +962,7 @@ vsctl_context_populate_cache(struct vsctl_context *ctx)
                 continue;
             }
 
-            port = xmalloc(sizeof *port);
-            port->port_cfg = port_cfg;
-            if (port_cfg->tag
-                && *port_cfg->tag >= 0 && *port_cfg->tag <= 4095) {
-                port->bridge = find_vlan_bridge(ctx, br, *port_cfg->tag);
-                if (!port->bridge) {
-                    port->bridge = br;
-                }
-            } else {
-                port->bridge = br;
-            }
-            shash_add(&ctx->ports, port_cfg->name, port);
-
+            port = add_port_to_cache(ctx, br, port_cfg);
             for (k = 0; k < port_cfg->n_interfaces; k++) {
                 struct ovsrec_interface *iface_cfg = port_cfg->interfaces[k];
                 struct vsctl_iface *iface;
@@ -897,10 +985,7 @@ vsctl_context_populate_cache(struct vsctl_context *ctx)
                     continue;
                 }
 
-                iface = xmalloc(sizeof *iface);
-                iface->iface_cfg = iface_cfg;
-                iface->port = port;
-                shash_add(&ctx->ifaces, iface_cfg->name, iface);
+                add_iface_to_cache(ctx, port, iface_cfg);
             }
         }
     }
@@ -1044,23 +1129,6 @@ ovs_insert_bridge(const struct ovsrec_open_vswitch *ovs,
     free(bridges);
 }
 
-static void
-ovs_delete_bridge(const struct ovsrec_open_vswitch *ovs,
-                  struct ovsrec_bridge *bridge)
-{
-    struct ovsrec_bridge **bridges;
-    size_t i, n;
-
-    bridges = xmalloc(sizeof *ovs->bridges * ovs->n_bridges);
-    for (i = n = 0; i < ovs->n_bridges; i++) {
-        if (ovs->bridges[i] != bridge) {
-            bridges[n++] = ovs->bridges[i];
-        }
-    }
-    ovsrec_open_vswitch_set_bridges(ovs, bridges, n);
-    free(bridges);
-}
-
 static void
 cmd_init(struct vsctl_context *ctx OVS_UNUSED)
 {
@@ -1287,9 +1355,7 @@ cmd_emer_reset(struct vsctl_context *ctx)
     ovsrec_open_vswitch_set_ssl(ctx->ovs, NULL);
 
     OVSREC_BRIDGE_FOR_EACH (br, idl) {
-        int i;
-        char *hw_key = "hwaddr";
-        char *hw_val = NULL;
+        const char *hwaddr;
 
         ovsrec_bridge_set_controller(br, NULL, 0);
         ovsrec_bridge_set_fail_mode(br, NULL);
@@ -1299,23 +1365,19 @@ cmd_emer_reset(struct vsctl_context *ctx)
         ovsrec_bridge_set_flood_vlans(br, NULL, 0);
 
         /* We only want to save the "hwaddr" key from other_config. */
-        for (i=0; i < br->n_other_config; i++) {
-            if (!strcmp(br->key_other_config[i], hw_key)) {
-                hw_val = br->value_other_config[i];
-                break;
-            }
-        }
-        if (hw_val) {
-            char *val = xstrdup(hw_val);
-            ovsrec_bridge_set_other_config(br, &hw_key, &val, 1);
-            free(val);
+        hwaddr = smap_get(&br->other_config, "hwaddr");
+        if (hwaddr) {
+            struct smap smap = SMAP_INITIALIZER(&smap);
+            smap_add(&smap, "hwaddr", hwaddr);
+            ovsrec_bridge_set_other_config(br, &smap);
+            smap_destroy(&smap);
         } else {
-            ovsrec_bridge_set_other_config(br, NULL, NULL, 0);
+            ovsrec_bridge_set_other_config(br, NULL);
         }
     }
 
     OVSREC_PORT_FOR_EACH (port, idl) {
-        ovsrec_port_set_other_config(port, NULL, NULL, 0);
+        ovsrec_port_set_other_config(port, NULL);
     }
 
     OVSREC_INTERFACE_FOR_EACH (iface, idl) {
@@ -1461,19 +1523,33 @@ cmd_add_br(struct vsctl_context *ctx)
 static void
 del_port(struct vsctl_context *ctx, struct vsctl_port *port)
 {
-    struct shash_node *node;
-
-    SHASH_FOR_EACH (node, &ctx->ifaces) {
-        struct vsctl_iface *iface = node->data;
-        if (iface->port == port) {
-            ovsrec_interface_delete(iface->iface_cfg);
-        }
-    }
-    ovsrec_port_delete(port->port_cfg);
+    struct vsctl_iface *iface, *next_iface;
 
     bridge_delete_port((port->bridge->parent
                         ? port->bridge->parent->br_cfg
                         : port->bridge->br_cfg), port->port_cfg);
+
+    LIST_FOR_EACH_SAFE (iface, next_iface, ifaces_node, &port->ifaces) {
+        del_cached_iface(ctx, iface);
+    }
+    del_cached_port(ctx, port);
+}
+
+static void
+del_bridge(struct vsctl_context *ctx, struct vsctl_bridge *br)
+{
+    struct vsctl_bridge *child, *next_child;
+    struct vsctl_port *port, *next_port;
+
+    HMAP_FOR_EACH_SAFE (child, next_child, children_node, &br->children) {
+        del_bridge(ctx, child);
+    }
+
+    LIST_FOR_EACH_SAFE (port, next_port, ports_node, &br->ports) {
+        del_port(ctx, port);
+    }
+
+    del_cached_bridge(ctx, br);
 }
 
 static void
@@ -1485,20 +1561,7 @@ cmd_del_br(struct vsctl_context *ctx)
     vsctl_context_populate_cache(ctx);
     bridge = find_bridge(ctx, ctx->argv[1], must_exist);
     if (bridge) {
-        struct shash_node *node;
-
-        SHASH_FOR_EACH (node, &ctx->ports) {
-            struct vsctl_port *port = node->data;
-            if (port->bridge == bridge || port->bridge->parent == bridge
-                || !strcmp(port->port_cfg->name, bridge->name)) {
-                del_port(ctx, port);
-            }
-        }
-        if (bridge->br_cfg) {
-            ovsrec_bridge_delete(bridge->br_cfg);
-            ovs_delete_bridge(ctx->ovs, bridge->br_cfg);
-        }
-        vsctl_context_invalidate_cache(ctx);
+        del_bridge(ctx, bridge);
     }
 }
 
@@ -1540,43 +1603,17 @@ cmd_br_exists(struct vsctl_context *ctx)
     }
 }
 
-/* Returns true if 'b_prefix' (of length 'b_prefix_len') concatenated with 'b'
- * equals 'a', false otherwise. */
-static bool
-key_matches(const char *a,
-            const char *b_prefix, size_t b_prefix_len, const char *b)
-{
-    return !strncmp(a, b_prefix, b_prefix_len) && !strcmp(a + b_prefix_len, b);
-}
-
 static void
-set_external_id(char **old_keys, char **old_values, size_t old_n,
-                char *key, char *value,
-                char ***new_keysp, char ***new_valuesp, size_t *new_np)
+set_external_id(struct smap *old, struct smap *new,
+                char *key, char *value)
 {
-    char **new_keys;
-    char **new_values;
-    size_t new_n;
-    size_t i;
+    smap_clone(new, old);
 
-    new_keys = xmalloc(sizeof *new_keys * (old_n + 1));
-    new_values = xmalloc(sizeof *new_values * (old_n + 1));
-    new_n = 0;
-    for (i = 0; i < old_n; i++) {
-        if (strcmp(key, old_keys[i])) {
-            new_keys[new_n] = old_keys[i];
-            new_values[new_n] = old_values[i];
-            new_n++;
-        }
-    }
     if (value) {
-        new_keys[new_n] = key;
-        new_values[new_n] = value;
-        new_n++;
+        smap_replace(new, key, value);
+    } else {
+        smap_remove(new, key);
     }
-    *new_keysp = new_keys;
-    *new_valuesp = new_values;
-    *new_np = new_n;
 }
 
 static void
@@ -1591,56 +1628,54 @@ static void
 cmd_br_set_external_id(struct vsctl_context *ctx)
 {
     struct vsctl_bridge *bridge;
-    char **keys, **values;
-    size_t n;
+    struct smap new;
 
     vsctl_context_populate_cache(ctx);
     bridge = find_bridge(ctx, ctx->argv[1], true);
     if (bridge->br_cfg) {
-        set_external_id(bridge->br_cfg->key_external_ids,
-                        bridge->br_cfg->value_external_ids,
-                        bridge->br_cfg->n_external_ids,
-                        ctx->argv[2], ctx->argc >= 4 ? ctx->argv[3] : NULL,
-                        &keys, &values, &n);
+
+        set_external_id(&bridge->br_cfg->external_ids, &new, ctx->argv[2],
+                        ctx->argc >= 4 ? ctx->argv[3] : NULL);
         ovsrec_bridge_verify_external_ids(bridge->br_cfg);
-        ovsrec_bridge_set_external_ids(bridge->br_cfg, keys, values, n);
+        ovsrec_bridge_set_external_ids(bridge->br_cfg, &new);
     } else {
         char *key = xasprintf("fake-bridge-%s", ctx->argv[2]);
         struct vsctl_port *port = shash_find_data(&ctx->ports, ctx->argv[1]);
-        set_external_id(port->port_cfg->key_external_ids,
-                        port->port_cfg->value_external_ids,
-                        port->port_cfg->n_external_ids,
-                        key, ctx->argc >= 4 ? ctx->argv[3] : NULL,
-                        &keys, &values, &n);
+        set_external_id(&port->port_cfg->external_ids, &new,
+                        key, ctx->argc >= 4 ? ctx->argv[3] : NULL);
         ovsrec_port_verify_external_ids(port->port_cfg);
-        ovsrec_port_set_external_ids(port->port_cfg, keys, values, n);
+        ovsrec_port_set_external_ids(port->port_cfg, &new);
         free(key);
     }
-    free(keys);
-    free(values);
+    smap_destroy(&new);
 }
 
 static void
-get_external_id(char **keys, char **values, size_t n,
-                const char *prefix, const char *key,
+get_external_id(struct smap *smap, const char *prefix, const char *key,
                 struct ds *output)
 {
-    size_t prefix_len = strlen(prefix);
-    struct svec svec;
-    size_t i;
+    if (key) {
+        char *prefix_key = xasprintf("%s%s", prefix, key);
+        const char *value = smap_get(smap, prefix_key);
 
-    svec_init(&svec);
-    for (i = 0; i < n; i++) {
-        if (!key && !strncmp(keys[i], prefix, prefix_len)) {
-            svec_add_nocopy(&svec, xasprintf("%s=%s",
-                                             keys[i] + prefix_len, values[i]));
-        } else if (key && key_matches(keys[i], prefix, prefix_len, key)) {
-            svec_add(&svec, values[i]);
-            break;
+        if (value) {
+            ds_put_format(output, "%s\n", value);
         }
+        free(prefix_key);
+    } else {
+        const struct smap_node **sorted = smap_sort(smap);
+        size_t prefix_len = strlen(prefix);
+        size_t i;
+
+        for (i = 0; i < smap_count(smap); i++) {
+            const struct smap_node *node = sorted[i];
+            if (!strncmp(node->key, prefix, prefix_len)) {
+                ds_put_format(output, "%s=%s\n", node->key + prefix_len,
+                              node->value);
+            }
+        }
+        free(sorted);
     }
-    output_sorted(&svec, output);
-    svec_destroy(&svec);
 }
 
 static void
@@ -1659,18 +1694,13 @@ cmd_br_get_external_id(struct vsctl_context *ctx)
     bridge = find_bridge(ctx, ctx->argv[1], true);
     if (bridge->br_cfg) {
         ovsrec_bridge_verify_external_ids(bridge->br_cfg);
-        get_external_id(bridge->br_cfg->key_external_ids,
-                        bridge->br_cfg->value_external_ids,
-                        bridge->br_cfg->n_external_ids,
-                        "", ctx->argc >= 3 ? ctx->argv[2] : NULL,
-                        &ctx->output);
+        get_external_id(&bridge->br_cfg->external_ids, "",
+                        ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output);
     } else {
         struct vsctl_port *port = shash_find_data(&ctx->ports, ctx->argv[1]);
         ovsrec_port_verify_external_ids(port->port_cfg);
-        get_external_id(port->port_cfg->key_external_ids,
-                        port->port_cfg->value_external_ids,
-                        port->port_cfg->n_external_ids,
-                        "fake-bridge-", ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output);
+        get_external_id(&port->port_cfg->external_ids, "fake-bridge-",
+                        ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output);
     }
 }
 
@@ -1678,7 +1708,7 @@ static void
 cmd_list_ports(struct vsctl_context *ctx)
 {
     struct vsctl_bridge *br;
-    struct shash_node *node;
+    struct vsctl_port *port;
     struct svec ports;
 
     vsctl_context_populate_cache(ctx);
@@ -1686,10 +1716,8 @@ cmd_list_ports(struct vsctl_context *ctx)
     ovsrec_bridge_verify_ports(br->br_cfg ? br->br_cfg : br->parent->br_cfg);
 
     svec_init(&ports);
-    SHASH_FOR_EACH (node, &ctx->ports) {
-        struct vsctl_port *port = node->data;
-
-        if (strcmp(port->port_cfg->name, br->name) && br == port->bridge) {
+    LIST_FOR_EACH (port, ports_node, &br->ports) {
+        if (strcmp(port->port_cfg->name, br->name)) {
             svec_add(&ports, port->port_cfg->name);
         }
     }
@@ -1704,6 +1732,7 @@ add_port(struct vsctl_context *ctx,
          char *iface_names[], int n_ifaces,
          char *settings[], int n_settings)
 {
+    struct vsctl_port *vsctl_port;
     struct vsctl_bridge *bridge;
     struct ovsrec_interface **ifaces;
     struct ovsrec_port *port;
@@ -1769,7 +1798,6 @@ add_port(struct vsctl_context *ctx,
     ovsrec_port_set_name(port, port_name);
     ovsrec_port_set_interfaces(port, ifaces, n_ifaces);
     ovsrec_port_set_bond_fake_iface(port, fake_iface);
-    free(ifaces);
 
     if (bridge->parent) {
         int64_t tag = bridge->vlan;
@@ -1784,7 +1812,11 @@ add_port(struct vsctl_context *ctx,
     bridge_insert_port((bridge->parent ? bridge->parent->br_cfg
                         : bridge->br_cfg), port);
 
-    vsctl_context_invalidate_cache(ctx);
+    vsctl_port = add_port_to_cache(ctx, bridge, port);
+    for (i = 0; i < n_ifaces; i++) {
+        add_iface_to_cache(ctx, vsctl_port, ifaces[i]);
+    }
+    free(ifaces);
 }
 
 static void
@@ -1866,7 +1898,6 @@ cmd_del_port(struct vsctl_context *ctx)
         }
 
         del_port(ctx, port);
-        vsctl_context_invalidate_cache(ctx);
     }
 }
 
@@ -1910,7 +1941,7 @@ static void
 cmd_list_ifaces(struct vsctl_context *ctx)
 {
     struct vsctl_bridge *br;
-    struct shash_node *node;
+    struct vsctl_port *port;
     struct svec ifaces;
 
     vsctl_context_populate_cache(ctx);
@@ -1919,12 +1950,13 @@ cmd_list_ifaces(struct vsctl_context *ctx)
     verify_ports(ctx);
 
     svec_init(&ifaces);
-    SHASH_FOR_EACH (node, &ctx->ifaces) {
-        struct vsctl_iface *iface = node->data;
+    LIST_FOR_EACH (port, ports_node, &br->ports) {
+        struct vsctl_iface *iface;
 
-        if (strcmp(iface->iface_cfg->name, br->name)
-            && br == iface->port->bridge) {
-            svec_add(&ifaces, iface->iface_cfg->name);
+        LIST_FOR_EACH (iface, ifaces_node, &port->ifaces) {
+            if (strcmp(iface->iface_cfg->name, br->name)) {
+                svec_add(&ifaces, iface->iface_cfg->name);
+            }
         }
     }
     output_sorted(&ifaces, &ctx->output);
@@ -1978,8 +2010,8 @@ cmd_get_controller(struct vsctl_context *ctx)
 
     /* Print the targets in sorted order for reproducibility. */
     svec_init(&targets);
-    for (i = 0; i < br->n_ctrl; i++) {
-        svec_add(&targets, br->ctrl[i]->target);
+    for (i = 0; i < br->br_cfg->n_controller; i++) {
+        svec_add(&targets, br->br_cfg->controller[i]->target);
     }
 
     svec_sort(&targets);
@@ -2003,18 +2035,16 @@ delete_controllers(struct ovsrec_controller **controllers,
 static void
 cmd_del_controller(struct vsctl_context *ctx)
 {
-    struct vsctl_bridge *br;
+    struct ovsrec_bridge *br;
 
     vsctl_context_populate_cache(ctx);
 
-    br = find_real_bridge(ctx, ctx->argv[1], true);
-    verify_controllers(br->br_cfg);
-
-    if (br->ctrl) {
-        delete_controllers(br->ctrl, br->n_ctrl);
-        ovsrec_bridge_set_controller(br->br_cfg, NULL, 0);
+    br = find_real_bridge(ctx, ctx->argv[1], true)->br_cfg;
+    verify_controllers(br);
 
-        vsctl_context_invalidate_cache(ctx);
+    if (br->controller) {
+        delete_controllers(br->controller, br->n_controller);
+        ovsrec_bridge_set_controller(br, NULL, 0);
     }
 }
 
@@ -2039,23 +2069,21 @@ insert_controllers(struct ovsdb_idl_txn *txn, char *targets[], size_t n)
 static void
 cmd_set_controller(struct vsctl_context *ctx)
 {
-    struct vsctl_bridge *br;
     struct ovsrec_controller **controllers;
+    struct ovsrec_bridge *br;
     size_t n;
 
     vsctl_context_populate_cache(ctx);
 
-    br = find_real_bridge(ctx, ctx->argv[1], true);
-    verify_controllers(br->br_cfg);
+    br = find_real_bridge(ctx, ctx->argv[1], true)->br_cfg;
+    verify_controllers(br);
 
-    delete_controllers(br->ctrl, br->n_ctrl);
+    delete_controllers(br->controller, br->n_controller);
 
     n = ctx->argc - 2;
     controllers = insert_controllers(ctx->txn, &ctx->argv[2], n);
-    ovsrec_bridge_set_controller(br->br_cfg, controllers, n);
+    ovsrec_bridge_set_controller(br, controllers, n);
     free(controllers);
-
-    vsctl_context_invalidate_cache(ctx);
 }
 
 static void
@@ -2735,7 +2763,7 @@ error:
     return error;
 }
 
-static void
+static const struct ovsdb_idl_column *
 pre_parse_column_key_value(struct vsctl_context *ctx,
                            const char *arg,
                            const struct vsctl_table_class *table)
@@ -2752,6 +2780,18 @@ pre_parse_column_key_value(struct vsctl_context *ctx,
 
     pre_get_column(ctx, table, column_name, &column);
     free(column_name);
+
+    return column;
+}
+
+static void
+check_mutable(const struct vsctl_table_class *table,
+              const struct ovsdb_idl_column *column)
+{
+    if (!column->mutable) {
+        vsctl_fatal("cannot modify read-only column %s in table %s",
+                    column->name, table->class->name);
+    }
 }
 
 static void
@@ -3084,7 +3124,10 @@ pre_cmd_set(struct vsctl_context *ctx)
 
     table = pre_get_table(ctx, table_name);
     for (i = 3; i < ctx->argc; i++) {
-        pre_parse_column_key_value(ctx, ctx->argv[i], table);
+        const struct ovsdb_idl_column *column;
+
+        column = pre_parse_column_key_value(ctx, ctx->argv[i], table);
+        check_mutable(table, column);
     }
 }
 
@@ -3167,6 +3210,7 @@ pre_cmd_add(struct vsctl_context *ctx)
 
     table = pre_get_table(ctx, table_name);
     pre_get_column(ctx, table, column_name, &column);
+    check_mutable(table, column);
 }
 
 static void
@@ -3223,6 +3267,7 @@ pre_cmd_remove(struct vsctl_context *ctx)
 
     table = pre_get_table(ctx, table_name);
     pre_get_column(ctx, table, column_name, &column);
+    check_mutable(table, column);
 }
 
 static void
@@ -3288,6 +3333,7 @@ pre_cmd_clear(struct vsctl_context *ctx)
         const struct ovsdb_idl_column *column;
 
         pre_get_column(ctx, table, ctx->argv[i], &column);
+        check_mutable(table, column);
     }
 }
 
@@ -3405,20 +3451,41 @@ static void
 cmd_destroy(struct vsctl_context *ctx)
 {
     bool must_exist = !shash_find(&ctx->options, "--if-exists");
+    bool delete_all = shash_find(&ctx->options, "--all");
     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++) {
+
+    if (delete_all && ctx->argc > 2) {
+        vsctl_fatal("--all and records argument should not be specified together");
+    }
+
+    if (delete_all && !must_exist) {
+        vsctl_fatal("--all and --if-exists should not be specified together");
+    }
+
+    if (delete_all) {
         const struct ovsdb_idl_row *row;
+        const struct ovsdb_idl_row *next_row;
 
-        row = (must_exist ? must_get_row : get_row)(ctx, table, ctx->argv[i]);
-        if (row) {
-            ovsdb_idl_txn_delete(row);
+        for (row = ovsdb_idl_first_row(ctx->idl, table->class);
+             row;) {
+             next_row = ovsdb_idl_next_row(row);
+             ovsdb_idl_txn_delete(row);
+             row = next_row;
         }
-    }
+    } else {
+        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);
+            }
+        }
+    }
     vsctl_context_invalidate_cache(ctx);
 }
 
@@ -3743,8 +3810,6 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands,
 
         if (ctx.try_again) {
             vsctl_context_done(&ctx, NULL);
-
-            status = TXN_TRY_AGAIN;
             goto try_again;
         }
     }
@@ -3851,7 +3916,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands,
         table_destroy(c->table);
         free(c->table);
 
-        smap_destroy(&c->options);
+        shash_destroy_free_data(&c->options);
     }
     free(commands);
 
@@ -3930,7 +3995,7 @@ static const struct vsctl_command_syntax all_commands[] = {
 
     /* Manager commands. */
     {"get-manager", 0, 0, pre_manager, cmd_get_manager, NULL, "", RO},
-    {"del-manager", 0, INT_MAX, pre_manager, cmd_del_manager, NULL, "", RW},
+    {"del-manager", 0, 0, pre_manager, cmd_del_manager, NULL, "", RW},
     {"set-manager", 1, INT_MAX, pre_manager, cmd_set_manager, NULL, "", RW},
 
     /* SSL commands. */
@@ -3951,8 +4016,8 @@ static const struct vsctl_command_syntax all_commands[] = {
     {"remove", 4, INT_MAX, pre_cmd_remove, cmd_remove, NULL, "", RW},
     {"clear", 3, INT_MAX, pre_cmd_clear, cmd_clear, NULL, "", RW},
     {"create", 2, INT_MAX, pre_create, cmd_create, post_create, "--id=", RW},
-    {"destroy", 1, INT_MAX, pre_cmd_destroy, cmd_destroy, NULL, "--if-exists",
-     RW},
+    {"destroy", 1, INT_MAX, pre_cmd_destroy, cmd_destroy, NULL,
+     "--if-exists,--all", RW},
     {"wait-until", 2, INT_MAX, pre_cmd_wait_until, cmd_wait_until, NULL, "",
      RO},