/*
- * 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.
#include "compiler.h"
#include "dirs.h"
#include "dynamic-string.h"
+#include "hash.h"
#include "json.h"
#include "ovsdb-data.h"
#include "ovsdb-idl.h"
const struct ovsrec_open_vswitch *ovs;
bool verified_ports;
+ /* A cache of the contents of the database.
+ *
+ * A command that needs to use any of this information must first call
+ * vsctl_context_populate_cache(). A command that changes anything that
+ * could invalidate the cache must either call
+ * vsctl_context_invalidate_cache() or manually update the cache to
+ * maintain its correctness. */
+ bool cache_valid;
+ struct shash bridges; /* Maps from bridge name to struct vsctl_bridge. */
+ struct shash ports; /* Maps from port name to struct vsctl_port. */
+ struct shash ifaces; /* Maps from port name to struct vsctl_iface. */
+
/* A command may set this member to true if some prerequisite is not met
* and the caller should wait for something to change and then retry. */
bool try_again;
struct vsctl_bridge {
struct ovsrec_bridge *br_cfg;
char *name;
- struct ovsrec_controller **ctrl;
- char *fail_mode;
- 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;
};
-struct vsctl_info {
- struct vsctl_context *ctx;
- struct shash bridges; /* Maps from bridge name to struct vsctl_bridge. */
- struct shash ports; /* Maps from port name to struct vsctl_port. */
- struct shash ifaces; /* Maps from port name to struct vsctl_iface. */
-};
-
static char *
vsctl_context_to_string(const struct vsctl_context *ctx)
{
}
static struct vsctl_bridge *
-add_bridge(struct vsctl_info *b,
- 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;
- br->fail_mode = parent->br_cfg->fail_mode;
- } else {
- br->ctrl = br_cfg->controller;
- br->n_ctrl = br_cfg->n_controller;
- br->fail_mode = br_cfg->fail_mode;
+ hmap_insert(&parent->children, &br->children_node, hash_int(vlan, 0));
}
- shash_add(&b->bridges, br->name, br);
+ 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)
{
}
static struct vsctl_bridge *
-find_vlan_bridge(struct vsctl_info *info,
- 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, &info->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
-free_info(struct vsctl_info *info)
+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)
{
struct shash_node *node;
- SHASH_FOR_EACH (node, &info->bridges) {
+ if (!ctx->cache_valid) {
+ return;
+ }
+ ctx->cache_valid = false;
+
+ SHASH_FOR_EACH (node, &ctx->bridges) {
struct vsctl_bridge *bridge = node->data;
+ hmap_destroy(&bridge->children);
free(bridge->name);
free(bridge);
}
- shash_destroy(&info->bridges);
+ shash_destroy(&ctx->bridges);
- shash_destroy_free_data(&info->ports);
- shash_destroy_free_data(&info->ifaces);
+ shash_destroy_free_data(&ctx->ports);
+ shash_destroy_free_data(&ctx->ifaces);
}
static void
}
static void
-get_info(struct vsctl_context *ctx, struct vsctl_info *info)
+vsctl_context_populate_cache(struct vsctl_context *ctx)
{
const struct ovsrec_open_vswitch *ovs = ctx->ovs;
struct sset bridges, ports;
size_t i;
- info->ctx = ctx;
- shash_init(&info->bridges);
- shash_init(&info->ports);
- shash_init(&info->ifaces);
+ if (ctx->cache_valid) {
+ /* Cache is already populated. */
+ return;
+ }
+ ctx->cache_valid = true;
+ shash_init(&ctx->bridges);
+ shash_init(&ctx->ports);
+ shash_init(&ctx->ifaces);
sset_init(&bridges);
sset_init(&ports);
br_cfg->name);
continue;
}
- br = add_bridge(info, br_cfg, br_cfg->name, NULL, 0);
+ br = add_bridge_to_cache(ctx, br_cfg, br_cfg->name, NULL, 0);
if (!br) {
continue;
}
if (port_is_fake_bridge(port_cfg)
&& sset_add(&bridges, port_cfg->name)) {
- add_bridge(info, NULL, port_cfg->name, br, *port_cfg->tag);
+ add_bridge_to_cache(ctx, NULL, port_cfg->name, br,
+ *port_cfg->tag);
}
}
}
if (!sset_add(&bridges, br_cfg->name)) {
continue;
}
- br = shash_find_data(&info->bridges, br_cfg->name);
+ br = shash_find_data(&ctx->bridges, br_cfg->name);
for (j = 0; j < br_cfg->n_ports; j++) {
struct ovsrec_port *port_cfg = br_cfg->ports[j];
struct vsctl_port *port;
size_t k;
- port = shash_find_data(&info->ports, port_cfg->name);
+ port = shash_find_data(&ctx->ports, port_cfg->name);
if (port) {
if (port_cfg == port->port_cfg) {
VLOG_WARN("%s: port is in multiple bridges (%s and %s)",
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(info, br, *port_cfg->tag);
- if (!port->bridge) {
- port->bridge = br;
- }
- } else {
- port->bridge = br;
- }
- shash_add(&info->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;
- iface = shash_find_data(&info->ifaces, iface_cfg->name);
+ iface = shash_find_data(&ctx->ifaces, iface_cfg->name);
if (iface) {
if (iface_cfg == iface->iface_cfg) {
VLOG_WARN("%s: interface is in multiple ports "
continue;
}
- iface = xmalloc(sizeof *iface);
- iface->iface_cfg = iface_cfg;
- iface->port = port;
- shash_add(&info->ifaces, iface_cfg->name, iface);
+ add_iface_to_cache(ctx, port, iface_cfg);
}
}
}
}
static void
-check_conflicts(struct vsctl_info *info, const char *name,
+check_conflicts(struct vsctl_context *ctx, const char *name,
char *msg)
{
struct vsctl_iface *iface;
struct vsctl_port *port;
- verify_ports(info->ctx);
+ verify_ports(ctx);
- if (shash_find(&info->bridges, name)) {
+ if (shash_find(&ctx->bridges, name)) {
vsctl_fatal("%s because a bridge named %s already exists",
msg, name);
}
- port = shash_find_data(&info->ports, name);
+ port = shash_find_data(&ctx->ports, name);
if (port) {
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);
+ iface = shash_find_data(&ctx->ifaces, name);
if (iface) {
vsctl_fatal("%s because an interface named %s already exists "
"on bridge %s", msg, name, iface->port->bridge->name);
}
static struct vsctl_bridge *
-find_bridge(struct vsctl_info *info, const char *name, bool must_exist)
+find_bridge(struct vsctl_context *ctx, const char *name, bool must_exist)
{
- struct vsctl_bridge *br = shash_find_data(&info->bridges, name);
+ struct vsctl_bridge *br;
+
+ assert(ctx->cache_valid);
+
+ br = shash_find_data(&ctx->bridges, name);
if (must_exist && !br) {
vsctl_fatal("no bridge named %s", name);
}
- ovsrec_open_vswitch_verify_bridges(info->ctx->ovs);
+ ovsrec_open_vswitch_verify_bridges(ctx->ovs);
return br;
}
static struct vsctl_bridge *
-find_real_bridge(struct vsctl_info *info, const char *name, bool must_exist)
+find_real_bridge(struct vsctl_context *ctx, const char *name, bool must_exist)
{
- struct vsctl_bridge *br = find_bridge(info, name, must_exist);
+ struct vsctl_bridge *br = find_bridge(ctx, name, must_exist);
if (br && br->parent) {
vsctl_fatal("%s is a fake bridge", name);
}
}
static struct vsctl_port *
-find_port(struct vsctl_info *info, const char *name, bool must_exist)
+find_port(struct vsctl_context *ctx, const char *name, bool must_exist)
{
- struct vsctl_port *port = shash_find_data(&info->ports, name);
+ struct vsctl_port *port;
+
+ assert(ctx->cache_valid);
+
+ port = shash_find_data(&ctx->ports, name);
if (port && !strcmp(name, port->bridge->name)) {
port = NULL;
}
if (must_exist && !port) {
vsctl_fatal("no port named %s", name);
}
- verify_ports(info->ctx);
+ verify_ports(ctx);
return port;
}
static struct vsctl_iface *
-find_iface(struct vsctl_info *info, const char *name, bool must_exist)
+find_iface(struct vsctl_context *ctx, const char *name, bool must_exist)
{
- struct vsctl_iface *iface = shash_find_data(&info->ifaces, name);
+ struct vsctl_iface *iface;
+
+ assert(ctx->cache_valid);
+
+ iface = shash_find_data(&ctx->ifaces, name);
if (iface && !strcmp(name, iface->port->bridge->name)) {
iface = NULL;
}
if (must_exist && !iface) {
vsctl_fatal("no interface named %s", name);
}
- verify_ports(info->ctx);
+ verify_ports(ctx);
return iface;
}
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)
{
OVSREC_SFLOW_FOR_EACH_SAFE (sflow, next_sflow, idl) {
ovsrec_sflow_delete(sflow);
}
+
+ vsctl_context_invalidate_cache(ctx);
}
static void
{
bool may_exist = shash_find(&ctx->options, "--may-exist") != NULL;
const char *br_name, *parent_name;
- struct vsctl_info info;
int vlan;
br_name = ctx->argv[1];
ctx->argv[0]);
}
- get_info(ctx, &info);
+ vsctl_context_populate_cache(ctx);
if (may_exist) {
struct vsctl_bridge *br;
- br = find_bridge(&info, br_name, false);
+ br = find_bridge(ctx, br_name, false);
if (br) {
if (!parent_name) {
if (br->parent) {
br_name, parent_name, vlan, br_name, br->vlan);
}
}
- free_info(&info);
return;
}
}
- check_conflicts(&info, br_name,
+ check_conflicts(ctx, br_name,
xasprintf("cannot create a bridge named %s", br_name));
if (!parent_name) {
struct ovsrec_bridge *br;
int64_t tag = vlan;
- parent = find_bridge(&info, parent_name, false);
+ parent = find_bridge(ctx, parent_name, false);
if (parent && parent->parent) {
vsctl_fatal("cannot create bridge with fake bridge as parent");
}
bridge_insert_port(br, port);
}
- free_info(&info);
+ vsctl_context_invalidate_cache(ctx);
}
static void
-del_port(struct vsctl_info *info, struct vsctl_port *port)
+del_port(struct vsctl_context *ctx, struct vsctl_port *port)
{
- struct shash_node *node;
-
- SHASH_FOR_EACH (node, &info->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
{
bool must_exist = !shash_find(&ctx->options, "--if-exists");
struct vsctl_bridge *bridge;
- struct vsctl_info info;
- get_info(ctx, &info);
- bridge = find_bridge(&info, ctx->argv[1], must_exist);
+ vsctl_context_populate_cache(ctx);
+ bridge = find_bridge(ctx, 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 || port->bridge->parent == 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);
- }
+ del_bridge(ctx, bridge);
}
- free_info(&info);
}
static void
cmd_list_br(struct vsctl_context *ctx)
{
struct shash_node *node;
- struct vsctl_info info;
struct svec bridges;
- get_info(ctx, &info);
+ vsctl_context_populate_cache(ctx);
svec_init(&bridges);
- SHASH_FOR_EACH (node, &info.bridges) {
+ SHASH_FOR_EACH (node, &ctx->bridges) {
struct vsctl_bridge *br = node->data;
svec_add(&bridges, br->name);
}
output_sorted(&bridges, &ctx->output);
svec_destroy(&bridges);
-
- free_info(&info);
}
static void
cmd_br_exists(struct vsctl_context *ctx)
{
- struct vsctl_info info;
-
- get_info(ctx, &info);
- if (!find_bridge(&info, ctx->argv[1], false)) {
+ vsctl_context_populate_cache(ctx);
+ if (!find_bridge(ctx, ctx->argv[1], false)) {
vsctl_exit(2);
}
- free_info(&info);
}
/* Returns true if 'b_prefix' (of length 'b_prefix_len') concatenated with 'b'
static void
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(ctx, &info);
- bridge = find_bridge(&info, ctx->argv[1], true);
+ 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,
ovsrec_bridge_set_external_ids(bridge->br_cfg, keys, values, n);
} else {
char *key = xasprintf("fake-bridge-%s", ctx->argv[2]);
- struct vsctl_port *port = shash_find_data(&info.ports, ctx->argv[1]);
+ 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,
}
free(keys);
free(values);
-
- free_info(&info);
}
static void
static void
cmd_br_get_external_id(struct vsctl_context *ctx)
{
- struct vsctl_info info;
struct vsctl_bridge *bridge;
- get_info(ctx, &info);
- bridge = find_bridge(&info, ctx->argv[1], true);
+ vsctl_context_populate_cache(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,
"", ctx->argc >= 3 ? ctx->argv[2] : NULL,
&ctx->output);
} else {
- struct vsctl_port *port = shash_find_data(&info.ports, ctx->argv[1]);
+ 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);
}
- free_info(&info);
}
-
static void
cmd_list_ports(struct vsctl_context *ctx)
{
struct vsctl_bridge *br;
- struct shash_node *node;
- struct vsctl_info info;
+ struct vsctl_port *port;
struct svec ports;
- get_info(ctx, &info);
- br = find_bridge(&info, ctx->argv[1], true);
+ vsctl_context_populate_cache(ctx);
+ br = find_bridge(ctx, ctx->argv[1], true);
ovsrec_bridge_verify_ports(br->br_cfg ? br->br_cfg : br->parent->br_cfg);
svec_init(&ports);
- SHASH_FOR_EACH (node, &info.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);
}
}
output_sorted(&ports, &ctx->output);
svec_destroy(&ports);
-
- free_info(&info);
}
static void
char *iface_names[], int n_ifaces,
char *settings[], int n_settings)
{
- struct vsctl_info info;
+ struct vsctl_port *vsctl_port;
struct vsctl_bridge *bridge;
struct ovsrec_interface **ifaces;
struct ovsrec_port *port;
size_t i;
- get_info(ctx, &info);
+ vsctl_context_populate_cache(ctx);
if (may_exist) {
struct vsctl_port *vsctl_port;
- vsctl_port = find_port(&info, port_name, false);
+ vsctl_port = find_port(ctx, port_name, false);
if (vsctl_port) {
struct svec want_names, have_names;
svec_destroy(&want_names);
svec_destroy(&have_names);
- free_info(&info);
return;
}
}
- check_conflicts(&info, port_name,
+ check_conflicts(ctx, port_name,
xasprintf("cannot create a port named %s", port_name));
for (i = 0; i < n_ifaces; i++) {
- check_conflicts(&info, iface_names[i],
+ check_conflicts(ctx, iface_names[i],
xasprintf("cannot create an interface named %s",
iface_names[i]));
}
- bridge = find_bridge(&info, br_name, true);
+ bridge = find_bridge(ctx, br_name, true);
ifaces = xmalloc(n_ifaces * sizeof *ifaces);
for (i = 0; i < n_ifaces; i++) {
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;
bridge_insert_port((bridge->parent ? bridge->parent->br_cfg
: bridge->br_cfg), port);
- free_info(&info);
+ 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
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, &info);
+ vsctl_context_populate_cache(ctx);
if (!with_iface) {
- port = find_port(&info, ctx->argv[ctx->argc - 1], must_exist);
+ port = find_port(ctx, 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);
+ port = find_port(ctx, target, false);
if (!port) {
- iface = find_iface(&info, target, false);
+ iface = find_iface(ctx, target, false);
if (iface) {
port = iface->port;
}
if (ctx->argc == 3) {
struct vsctl_bridge *bridge;
- bridge = find_bridge(&info, ctx->argv[1], true);
+ bridge = find_bridge(ctx, ctx->argv[1], true);
if (port->bridge != bridge) {
if (port->bridge->parent == bridge) {
vsctl_fatal("bridge %s does not have a port %s (although "
}
}
- del_port(&info, port);
+ del_port(ctx, port);
}
-
- free_info(&info);
}
static void
cmd_port_to_br(struct vsctl_context *ctx)
{
struct vsctl_port *port;
- struct vsctl_info info;
- get_info(ctx, &info);
- port = find_port(&info, ctx->argv[1], true);
+ vsctl_context_populate_cache(ctx);
+
+ port = find_port(ctx, ctx->argv[1], true);
ds_put_format(&ctx->output, "%s\n", port->bridge->name);
- free_info(&info);
}
static void
cmd_br_to_vlan(struct vsctl_context *ctx)
{
struct vsctl_bridge *bridge;
- struct vsctl_info info;
- get_info(ctx, &info);
- bridge = find_bridge(&info, ctx->argv[1], true);
+ vsctl_context_populate_cache(ctx);
+
+ bridge = find_bridge(ctx, ctx->argv[1], true);
ds_put_format(&ctx->output, "%d\n", bridge->vlan);
- free_info(&info);
}
static void
cmd_br_to_parent(struct vsctl_context *ctx)
{
struct vsctl_bridge *bridge;
- struct vsctl_info info;
- get_info(ctx, &info);
- bridge = find_bridge(&info, ctx->argv[1], true);
+ vsctl_context_populate_cache(ctx);
+
+ bridge = find_bridge(ctx, ctx->argv[1], true);
if (bridge->parent) {
bridge = bridge->parent;
}
ds_put_format(&ctx->output, "%s\n", bridge->name);
- free_info(&info);
}
static void
cmd_list_ifaces(struct vsctl_context *ctx)
{
struct vsctl_bridge *br;
- struct shash_node *node;
- struct vsctl_info info;
+ struct vsctl_port *port;
struct svec ifaces;
- get_info(ctx, &info);
- br = find_bridge(&info, ctx->argv[1], true);
+ vsctl_context_populate_cache(ctx);
+
+ br = find_bridge(ctx, ctx->argv[1], true);
verify_ports(ctx);
svec_init(&ifaces);
- SHASH_FOR_EACH (node, &info.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);
svec_destroy(&ifaces);
-
- free_info(&info);
}
static void
cmd_iface_to_br(struct vsctl_context *ctx)
{
struct vsctl_iface *iface;
- struct vsctl_info info;
- get_info(ctx, &info);
- iface = find_iface(&info, ctx->argv[1], true);
+ vsctl_context_populate_cache(ctx);
+
+ iface = find_iface(ctx, ctx->argv[1], true);
ds_put_format(&ctx->output, "%s\n", iface->port->bridge->name);
- free_info(&info);
}
static void
static void
cmd_get_controller(struct vsctl_context *ctx)
{
- struct vsctl_info info;
struct vsctl_bridge *br;
struct svec targets;
size_t i;
- get_info(ctx, &info);
- br = find_bridge(&info, ctx->argv[1], true);
+ vsctl_context_populate_cache(ctx);
+
+ br = find_bridge(ctx, ctx->argv[1], true);
if (br->parent) {
br = br->parent;
}
/* 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);
ds_put_format(&ctx->output, "%s\n", targets.names[i]);
}
svec_destroy(&targets);
-
- free_info(&info);
}
static void
static void
cmd_del_controller(struct vsctl_context *ctx)
{
- struct vsctl_info info;
- struct vsctl_bridge *br;
+ struct ovsrec_bridge *br;
- get_info(ctx, &info);
+ vsctl_context_populate_cache(ctx);
- br = find_real_bridge(&info, ctx->argv[1], true);
- verify_controllers(br->br_cfg);
+ br = find_real_bridge(ctx, ctx->argv[1], true)->br_cfg;
+ verify_controllers(br);
- if (br->ctrl) {
- delete_controllers(br->ctrl, br->n_ctrl);
- ovsrec_bridge_set_controller(br->br_cfg, NULL, 0);
+ if (br->controller) {
+ delete_controllers(br->controller, br->n_controller);
+ ovsrec_bridge_set_controller(br, NULL, 0);
}
-
- free_info(&info);
}
static struct ovsrec_controller **
static void
cmd_set_controller(struct vsctl_context *ctx)
{
- struct vsctl_info info;
- struct vsctl_bridge *br;
struct ovsrec_controller **controllers;
+ struct ovsrec_bridge *br;
size_t n;
- get_info(ctx, &info);
- br = find_real_bridge(&info, ctx->argv[1], true);
- verify_controllers(br->br_cfg);
+ vsctl_context_populate_cache(ctx);
+
+ 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);
-
- free_info(&info);
}
static void
cmd_get_fail_mode(struct vsctl_context *ctx)
{
- struct vsctl_info info;
struct vsctl_bridge *br;
+ const char *fail_mode;
- get_info(ctx, &info);
- br = find_bridge(&info, ctx->argv[1], true);
+ vsctl_context_populate_cache(ctx);
+ br = find_bridge(ctx, ctx->argv[1], true);
- ovsrec_bridge_verify_fail_mode(br->br_cfg
- ? br->br_cfg : br->parent->br_cfg);
- if (br->fail_mode && strlen(br->fail_mode)) {
- ds_put_format(&ctx->output, "%s\n", br->fail_mode);
+ if (br->parent) {
+ br = br->parent;
}
+ ovsrec_bridge_verify_fail_mode(br->br_cfg);
- free_info(&info);
+ fail_mode = br->br_cfg->fail_mode;
+ if (fail_mode && strlen(fail_mode)) {
+ ds_put_format(&ctx->output, "%s\n", fail_mode);
+ }
}
static void
cmd_del_fail_mode(struct vsctl_context *ctx)
{
- struct vsctl_info info;
struct vsctl_bridge *br;
- get_info(ctx, &info);
- br = find_real_bridge(&info, ctx->argv[1], true);
+ vsctl_context_populate_cache(ctx);
- ovsrec_bridge_set_fail_mode(br->br_cfg, NULL);
+ br = find_real_bridge(ctx, ctx->argv[1], true);
- free_info(&info);
+ ovsrec_bridge_set_fail_mode(br->br_cfg, NULL);
}
static void
cmd_set_fail_mode(struct vsctl_context *ctx)
{
- struct vsctl_info info;
struct vsctl_bridge *br;
const char *fail_mode = ctx->argv[2];
- get_info(ctx, &info);
- br = find_real_bridge(&info, ctx->argv[1], true);
+ vsctl_context_populate_cache(ctx);
+
+ br = find_real_bridge(ctx, ctx->argv[1], true);
if (strcmp(fail_mode, "standalone") && strcmp(fail_mode, "secure")) {
vsctl_fatal("fail-mode must be \"standalone\" or \"secure\"");
}
ovsrec_bridge_set_fail_mode(br->br_cfg, fail_mode);
-
- free_info(&info);
}
static void
for (i = 3; i < ctx->argc; i++) {
set_column(table, row, ctx->argv[i], ctx->symtab);
}
+
+ vsctl_context_invalidate_cache(ctx);
}
static void
}
ovsdb_idl_txn_verify(row, column);
ovsdb_idl_txn_write(row, column, &old);
+
+ vsctl_context_invalidate_cache(ctx);
}
static void
}
ovsdb_idl_txn_verify(row, column);
ovsdb_idl_txn_write(row, column, &old);
+
+ vsctl_context_invalidate_cache(ctx);
}
static void
ovsdb_datum_init_empty(&datum);
ovsdb_idl_txn_write(row, column, &datum);
}
+
+ vsctl_context_invalidate_cache(ctx);
}
static void
ovsdb_idl_txn_delete(row);
}
}
+
+ vsctl_context_invalidate_cache(ctx);
}
#define RELOPS \
}
}
\f
+/* Prepares 'ctx', which has already been initialized with
+ * vsctl_context_init(), for processing 'command'. */
static void
-vsctl_context_init(struct vsctl_context *ctx, struct vsctl_command *command,
- struct ovsdb_idl *idl, struct ovsdb_idl_txn *txn,
- const struct ovsrec_open_vswitch *ovs,
- struct ovsdb_symbol_table *symtab)
+vsctl_context_init_command(struct vsctl_context *ctx,
+ struct vsctl_command *command)
{
ctx->argc = command->argc;
ctx->argv = command->argv;
ds_swap(&ctx->output, &command->output);
ctx->table = command->table;
+
+ ctx->verified_ports = false;
+
+ ctx->try_again = false;
+}
+
+/* Prepares 'ctx' for processing commands, initializing its members with the
+ * values passed in as arguments.
+ *
+ * If 'command' is nonnull, calls vsctl_context_init_command() to prepare for
+ * that particular command. */
+static void
+vsctl_context_init(struct vsctl_context *ctx, struct vsctl_command *command,
+ struct ovsdb_idl *idl, struct ovsdb_idl_txn *txn,
+ const struct ovsrec_open_vswitch *ovs,
+ struct ovsdb_symbol_table *symtab)
+{
+ if (command) {
+ vsctl_context_init_command(ctx, command);
+ }
ctx->idl = idl;
ctx->txn = txn;
ctx->ovs = ovs;
ctx->symtab = symtab;
- ctx->verified_ports = false;
-
- ctx->try_again = false;
+ ctx->cache_valid = false;
}
+/* Completes processing of 'command' within 'ctx'. */
static void
-vsctl_context_done(struct vsctl_context *ctx, struct vsctl_command *command)
+vsctl_context_done_command(struct vsctl_context *ctx,
+ struct vsctl_command *command)
{
ds_swap(&ctx->output, &command->output);
command->table = ctx->table;
}
+/* Finishes up with 'ctx'.
+ *
+ * If command is nonnull, first calls vsctl_context_done_command() to complete
+ * processing that command within 'ctx'. */
+static void
+vsctl_context_done(struct vsctl_context *ctx, struct vsctl_command *command)
+{
+ if (command) {
+ vsctl_context_done_command(ctx, command);
+ }
+ vsctl_context_invalidate_cache(ctx);
+}
+
static void
run_prerequisites(struct vsctl_command *commands, size_t n_commands,
struct ovsdb_idl *idl)
const struct ovsrec_open_vswitch *ovs;
enum ovsdb_idl_txn_status status;
struct ovsdb_symbol_table *symtab;
+ struct vsctl_context ctx;
struct vsctl_command *c;
struct shash_node *node;
int64_t next_cfg = 0;
ds_init(&c->output);
c->table = NULL;
}
+ vsctl_context_init(&ctx, NULL, idl, txn, ovs, symtab);
for (c = commands; c < &commands[n_commands]; c++) {
- struct vsctl_context ctx;
-
- vsctl_context_init(&ctx, c, idl, txn, ovs, symtab);
+ vsctl_context_init_command(&ctx, c);
if (c->syntax->run) {
(c->syntax->run)(&ctx);
}
- vsctl_context_done(&ctx, c);
+ vsctl_context_done_command(&ctx, c);
if (ctx.try_again) {
+ vsctl_context_done(&ctx, NULL);
+
status = TXN_TRY_AGAIN;
goto try_again;
}
}
+ vsctl_context_done(&ctx, NULL);
SHASH_FOR_EACH (node, &symtab->sh) {
struct ovsdb_symbol *symbol = node->data;
git://git.onelab.eu / sliver-openvswitch.git / blobdiff