/*
- * 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"
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;
};
}
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;
- 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(&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_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)
{
SHASH_FOR_EACH (node, &ctx->bridges) {
struct vsctl_bridge *bridge = node->data;
+ hmap_destroy(&bridge->children);
free(bridge->name);
free(bridge);
}
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;
}
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);
}
}
}
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;
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);
}
}
}
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)
{
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
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);
}
}
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);
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);
}
}
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;
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);
- 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
}
del_port(ctx, port);
- vsctl_context_invalidate_cache(ctx);
}
}
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);
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);
/* 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);
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);
+ 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);
-
- vsctl_context_invalidate_cache(ctx);
+ if (br->controller) {
+ delete_controllers(br->controller, br->n_controller);
+ ovsrec_bridge_set_controller(br, NULL, 0);
}
}
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
cmd_get_fail_mode(struct vsctl_context *ctx)
{
struct vsctl_bridge *br;
+ const char *fail_mode;
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);
+
+ fail_mode = br->br_cfg->fail_mode;
+ if (fail_mode && strlen(fail_mode)) {
+ ds_put_format(&ctx->output, "%s\n", fail_mode);
}
}
br = find_real_bridge(ctx, ctx->argv[1], true);
ovsrec_bridge_set_fail_mode(br->br_cfg, NULL);
- vsctl_context_invalidate_cache(ctx);
}
static void
}
ovsrec_bridge_set_fail_mode(br->br_cfg, fail_mode);
- vsctl_context_invalidate_cache(ctx);
}
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);
}
if (ctx.try_again) {
vsctl_context_done(&ctx, NULL);
-
- status = TXN_TRY_AGAIN;
goto try_again;
}
}
table_destroy(c->table);
free(c->table);
- smap_destroy(&c->options);
+ shash_destroy_free_data(&c->options);
}
free(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},
git://git.onelab.eu / sliver-openvswitch.git / blobdiff