X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=911d8fe822db11fb0bdc7c97a3dace09652ab5e1;hb=ce6f1d1fc55a26e3ae56d81fadfffde566937c62;hp=35a3f3974e754a72d786c97e35d4885298a64a86;hpb=734500471524159650e7ded2ebff2536391ffd53;p=cascardo%2Fovs.git diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index 35a3f3974..4fb88b117 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,33 +16,44 @@ #include -#include #include #include #include #include #include -#include #include #include #include #include +#include + +#include "db-ctl-base.h" #include "command-line.h" #include "compiler.h" -#include "dirs.h" #include "dynamic-string.h" +#include "fatal-signal.h" +#include "hash.h" #include "json.h" #include "ovsdb-data.h" #include "ovsdb-idl.h" #include "poll-loop.h" +#include "process.h" +#include "stream.h" +#include "stream-ssl.h" +#include "smap.h" +#include "sset.h" #include "svec.h" -#include "vswitchd/vswitch-idl.h" +#include "lib/vswitch-idl.h" +#include "table.h" #include "timeval.h" #include "util.h" +#include "openvswitch/vconn.h" +#include "openvswitch/vlog.h" + +VLOG_DEFINE_THIS_MODULE(vsctl); -#include "vlog.h" -#define THIS_MODULE VLM_vsctl +struct vsctl_context; /* --db: The database server to contact. */ static const char *db; @@ -57,100 +68,132 @@ static bool dry_run; static bool wait_for_reload = true; /* --timeout: Time to wait for a connection to 'db'. */ -static int timeout = 5; +static int timeout; -static void vsctl_fatal(const char *, ...) PRINTF_FORMAT(1, 2) NO_RETURN; -static char *default_db(void); -static void usage(void) NO_RETURN; -static void parse_options(int argc, char *argv[]); +/* --retry: If true, ovs-vsctl will retry connecting to the database forever. + * If false and --db says to use an active connection method (e.g. "unix:", + * "tcp:", "ssl:"), then ovs-vsctl will try to connect once and exit with an + * error if the database server cannot be contacted (e.g. ovsdb-server is not + * running). + * + * Regardless of this setting, --timeout always limits how long ovs-vsctl will + * wait. */ +static bool retry; + +/* Format for table output. */ +static struct table_style table_style = TABLE_STYLE_DEFAULT; + +static void vsctl_cmd_init(void); + +/* The IDL we're using and the current transaction, if any. + * This is for use by vsctl_exit() only, to allow it to clean up. + * Other code should use its context arguments. */ +static struct ovsdb_idl *the_idl; +static struct ovsdb_idl_txn *the_idl_txn; +OVS_NO_RETURN static void vsctl_exit(int status); + +OVS_NO_RETURN static void usage(void); +static void parse_options(int argc, char *argv[], struct shash *local_options); +static void run_prerequisites(struct ctl_command[], size_t n_commands, + struct ovsdb_idl *); +static void do_vsctl(const char *args, struct ctl_command *, size_t n, + struct ovsdb_idl *); + +/* post_db_reload_check frame work is to allow ovs-vsctl to do additional + * checks after OVSDB transactions are successfully recorded and reload by + * ovs-vswitchd. + * + * For example, When a new interface is added to OVSDB, ovs-vswitchd will + * either store a positive values on successful implementing the new + * interface, or -1 on failure. + * + * Unless -no-wait command line option is specified, + * post_db_reload_do_checks() is called right after any configuration + * changes is picked up (i.e. reload) by ovs-vswitchd. Any error detected + * post OVSDB reload is reported as ovs-vsctl errors. OVS-vswitchd logs + * more detailed messages about those errors. + * + * Current implementation only check for Post OVSDB reload failures on new + * interface additions with 'add-br' and 'add-port' commands. + * + * post_db_reload_expect_iface() + * + * keep track of interfaces to be checked post OVSDB reload. */ +static void post_db_reload_check_init(void); +static void post_db_reload_do_checks(const struct vsctl_context *); +static void post_db_reload_expect_iface(const struct ovsrec_interface *); -static void check_vsctl_command(int argc, char *argv[]); -static void do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl); +static struct uuid *neoteric_ifaces; +static size_t n_neoteric_ifaces; +static size_t allocated_neoteric_ifaces; int main(int argc, char *argv[]) { + extern struct vlog_module VLM_reconnect; struct ovsdb_idl *idl; + struct ctl_command *commands; + struct shash local_options; unsigned int seqno; - struct ds args; - int start, n_commands; - int trials; - int i; + size_t n_commands; + char *args; set_program_name(argv[0]); - signal(SIGPIPE, SIG_IGN); - time_init(); - vlog_init(); - vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_WARN); - vlog_set_levels(VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN); - parse_options(argc, argv); + fatal_ignore_sigpipe(); + vlog_set_levels(NULL, VLF_CONSOLE, VLL_WARN); + vlog_set_levels(&VLM_reconnect, VLF_ANY_DESTINATION, VLL_WARN); + ovsrec_init(); + + vsctl_cmd_init(); + + /* Log our arguments. This is often valuable for debugging systems. */ + args = process_escape_args(argv); + VLOG(ctl_might_write_to_db(argv) ? VLL_INFO : VLL_DBG, "Called as %s", args); + + /* Parse command line. */ + shash_init(&local_options); + parse_options(argc, argv, &local_options); + commands = ctl_parse_commands(argc - optind, argv + optind, &local_options, + &n_commands); if (timeout) { time_alarm(timeout); } - /* Log our arguments. This is often valuable for debugging systems. */ - ds_init(&args); - for (i = 1; i < argc; i++) { - ds_put_format(&args, " %s", argv[i]); - } - VLOG_INFO("Called as%s", ds_cstr(&args)); - ds_destroy(&args); - - /* Do basic command syntax checking. */ - n_commands = 0; - for (start = i = optind; i <= argc; i++) { - if (i == argc || !strcmp(argv[i], "--")) { - if (i > start) { - check_vsctl_command(i - start, &argv[start]); - n_commands++; - } - start = i + 1; - } - } - if (!n_commands) { - vsctl_fatal("missing command name (use --help for help)"); - } + /* Initialize IDL. */ + idl = the_idl = ovsdb_idl_create(db, &ovsrec_idl_class, false, retry); + run_prerequisites(commands, n_commands, idl); - /* Now execute the commands. */ - idl = ovsdb_idl_create(db, &ovsrec_idl_class); + /* Execute the commands. + * + * 'seqno' is the database sequence number for which we last tried to + * execute our transaction. There's no point in trying to commit more than + * once for any given sequence number, because if the transaction fails + * it's because the database changed and we need to obtain an up-to-date + * view of the database before we try the transaction again. */ seqno = ovsdb_idl_get_seqno(idl); - trials = 0; for (;;) { - unsigned int new_seqno; - ovsdb_idl_run(idl); - new_seqno = ovsdb_idl_get_seqno(idl); - if (new_seqno != seqno) { - if (++trials > 5) { - vsctl_fatal("too many database inconsistency failures"); - } - do_vsctl(argc - optind, argv + optind, idl); - seqno = new_seqno; + if (!ovsdb_idl_is_alive(idl)) { + int retval = ovsdb_idl_get_last_error(idl); + ctl_fatal("%s: database connection failed (%s)", + db, ovs_retval_to_string(retval)); } - ovsdb_idl_wait(idl); - poll_block(); - } -} - -static void -vsctl_fatal(const char *format, ...) -{ - char *message; - va_list args; - - va_start(args, format); - message = xvasprintf(format, args); - va_end(args); + if (seqno != ovsdb_idl_get_seqno(idl)) { + seqno = ovsdb_idl_get_seqno(idl); + do_vsctl(args, commands, n_commands, idl); + } - vlog_set_levels(VLM_vsctl, VLF_CONSOLE, VLL_EMER); - VLOG_ERR("%s", message); - ovs_fatal(0, "%s", message); + if (seqno == ovsdb_idl_get_seqno(idl)) { + ovsdb_idl_wait(idl); + poll_block(); + } + } } static void -parse_options(int argc, char *argv[]) +parse_options(int argc, char *argv[], struct shash *local_options) { enum { OPT_DB = UCHAR_MAX + 1, @@ -158,26 +201,59 @@ parse_options(int argc, char *argv[]) OPT_NO_SYSLOG, OPT_NO_WAIT, OPT_DRY_RUN, - VLOG_OPTION_ENUMS + OPT_PEER_CA_CERT, + OPT_LOCAL, + OPT_RETRY, + OPT_COMMANDS, + OPT_OPTIONS, + VLOG_OPTION_ENUMS, + TABLE_OPTION_ENUMS }; - static struct option long_options[] = { - {"db", required_argument, 0, OPT_DB}, - {"no-syslog", no_argument, 0, OPT_NO_SYSLOG}, - {"no-wait", no_argument, 0, OPT_NO_WAIT}, - {"dry-run", no_argument, 0, OPT_DRY_RUN}, - {"oneline", no_argument, 0, OPT_ONELINE}, - {"timeout", required_argument, 0, 't'}, - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, + static const struct option global_long_options[] = { + {"db", required_argument, NULL, OPT_DB}, + {"no-syslog", no_argument, NULL, OPT_NO_SYSLOG}, + {"no-wait", no_argument, NULL, OPT_NO_WAIT}, + {"dry-run", no_argument, NULL, OPT_DRY_RUN}, + {"oneline", no_argument, NULL, OPT_ONELINE}, + {"timeout", required_argument, NULL, 't'}, + {"retry", no_argument, NULL, OPT_RETRY}, + {"help", no_argument, NULL, 'h'}, + {"commands", no_argument, NULL, OPT_COMMANDS}, + {"options", no_argument, NULL, OPT_OPTIONS}, + {"version", no_argument, NULL, 'V'}, VLOG_LONG_OPTIONS, - {0, 0, 0, 0}, + TABLE_LONG_OPTIONS, + STREAM_SSL_LONG_OPTIONS, + {"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT}, + {NULL, 0, NULL, 0}, }; + const int n_global_long_options = ARRAY_SIZE(global_long_options) - 1; + char *tmp, *short_options; + + struct option *options; + size_t allocated_options; + size_t n_options; + size_t i; + + tmp = ovs_cmdl_long_options_to_short_options(global_long_options); + short_options = xasprintf("+%s", tmp); + free(tmp); + /* We want to parse both global and command-specific options here, but + * getopt_long() isn't too convenient for the job. We copy our global + * options into a dynamic array, then append all of the command-specific + * options. */ + options = xmemdup(global_long_options, sizeof global_long_options); + allocated_options = ARRAY_SIZE(global_long_options); + n_options = n_global_long_options; + ctl_add_cmd_options(&options, &n_options, &allocated_options, OPT_LOCAL); + table_style.format = TF_LIST; for (;;) { + int idx; int c; - c = getopt_long(argc, argv, "+v::hVt:", long_options, NULL); + c = getopt_long(argc, argv, short_options, options, &idx); if (c == -1) { break; } @@ -192,7 +268,7 @@ parse_options(int argc, char *argv[]) break; case OPT_NO_SYSLOG: - vlog_set_levels(VLM_vsctl, VLF_SYSLOG, VLL_WARN); + vlog_set_levels(&VLM_vsctl, VLF_SYSLOG, VLL_WARN); break; case OPT_NO_WAIT: @@ -203,22 +279,50 @@ parse_options(int argc, char *argv[]) dry_run = true; break; + case OPT_LOCAL: + if (shash_find(local_options, options[idx].name)) { + ctl_fatal("'%s' option specified multiple times", + options[idx].name); + } + shash_add_nocopy(local_options, + xasprintf("--%s", options[idx].name), + optarg ? xstrdup(optarg) : NULL); + break; + case 'h': usage(); + case OPT_COMMANDS: + ctl_print_commands(); + + case OPT_OPTIONS: + ctl_print_options(global_long_options); + case 'V': - OVS_PRINT_VERSION(0, 0); + ovs_print_version(0, 0); + printf("DB Schema %s\n", ovsrec_get_db_version()); exit(EXIT_SUCCESS); case 't': timeout = strtoul(optarg, NULL, 10); if (timeout < 0) { - ovs_fatal(0, "value %s on -t or --timeout is invalid", - optarg); + ctl_fatal("value %s on -t or --timeout is invalid", + optarg); } break; + case OPT_RETRY: + retry = true; + break; + VLOG_OPTION_HANDLERS + TABLE_OPTION_HANDLERS(&table_style) + + STREAM_SSL_OPTION_HANDLERS + + case OPT_PEER_CA_CERT: + stream_ssl_set_peer_ca_cert_file(optarg); + break; case '?': exit(EXIT_FAILURE); @@ -227,357 +331,530 @@ parse_options(int argc, char *argv[]) abort(); } } + free(short_options); if (!db) { - db = default_db(); + db = ctl_default_db(); } + + for (i = n_global_long_options; options[i].name; i++) { + free(CONST_CAST(char *, options[i].name)); + } + free(options); } static void usage(void) { - printf("%s: ovs-vswitchd management utility\n" - "usage: %s [OPTIONS] COMMAND [ARG...]\n", - program_name, program_name); - printf("\nBridge commands:\n" - " add-br BRIDGE " - "create a new bridge named BRIDGE\n" - " add-br BRIDGE PARENT VLAN " - "create new fake bridge BRIDGE in PARENT on VLAN\n" - " del-br BRIDGE " - "delete BRIDGE and all of its ports\n" - " list-br " - "print the names of all the bridges\n" - " br-exists BRIDGE " - "test whether BRIDGE exists\n" - " br-to-vlan BRIDGE " - "print the VLAN which BRIDGE is on\n" - " br-to-parent BRIDGE " - "print the parent of BRIDGE\n" - " br-set-external-id BRIDGE KEY VALUE" - " set KEY on BRIDGE to VALUE\n" - " br-set-external-id BRIDGE KEY" - " unset KEY on BRIDGE\n" - " br-get-external-id BRIDGE KEY" - " print value of KEY on BRIDGE\n" - " br-get-external-id BRIDGE" - " list key-value pairs on BRIDGE\n" - ); - printf("\nPort commands:\n" - " list-ports BRIDGE " - "print the names of all the ports on BRIDGE\n" - " add-port BRIDGE PORT " - "add network device PORT to BRIDGE\n" - " add-bond BRIDGE PORT IFACE... " - "add new bonded port PORT in BRIDGE from IFACES\n" - " del-port [BRIDGE] PORT " - "delete PORT (which may be bonded) from BRIDGE\n" - " port-to-br PORT " - "print name of bridge that contains PORT\n" - " port-set-external-id PORT KEY VALUE" - " set KEY on PORT to VALUE\n" - " port-set-external-id PORT KEY" - " unset KEY on PORT\n" - " port-get-external-id PORT KEY" - " print value of KEY on PORT\n" - " port-get-external-id PORT" - " list key-value pairs on PORT\n" - "A bond is considered to be a single port.\n" - ); - printf("\nInterface commands (a bond consists of multiple interfaces):\n" - " list-ifaces BRIDGE " - "print the names of all the interfaces on BRIDGE\n" - " iface-to-br IFACE " - "print name of bridge that contains IFACE\n" - " iface-set-external-id IFACE KEY VALUE" - " set KEY on IFACE to VALUE\n" - " iface-set-external-id IFACE KEY" - " unset KEY on IFACE\n" - " iface-get-external-id IFACE KEY" - " print value of KEY on IFACE\n" - " iface-get-external-id IFACE" - " list key-value pairs on IFACE\n" - ); - printf("\nController commands:\n" - " get-controller [BRIDGE] " - "print the controller for BRIDGE\n" - " del-controller [BRIDGE] " - "delete the controller for BRIDGE\n" - " set-controller [BRIDGE] TARGET " - "set the controller for BRIDGE to TARGET\n" - " get-fail-mode [BRIDGE] " - "print the fail-mode for BRIDGE\n" - " del-fail-mode [BRIDGE] " - "delete the fail-mode for BRIDGE\n" - " set-fail-mode [BRIDGE] MODE " - "set the fail-mode for BRIDGE to MODE\n" - ); - printf("\nSSL commands:\n" - " get-ssl " - "print the SSL configuration\n" - " del-ssl " - "delete the SSL configuration\n" - " set-ssl PRIV-KEY CERT CA-CERT " - "set the SSL configuration\n" - ); - printf("\nOptions:\n" - " --db=DATABASE " - "connect to DATABASE\n" - " " - "(default: %s)\n" - " --oneline " - "print exactly one line of output per command\n", - default_db()); + printf("\ +%s: ovs-vswitchd management utility\n\ +usage: %s [OPTIONS] COMMAND [ARG...]\n\ +\n\ +Open vSwitch commands:\n\ + init initialize database, if not yet initialized\n\ + show print overview of database contents\n\ + emer-reset reset configuration to clean state\n\ +\n\ +Bridge commands:\n\ + add-br BRIDGE create a new bridge named BRIDGE\n\ + add-br BRIDGE PARENT VLAN create new fake BRIDGE in PARENT on VLAN\n\ + del-br BRIDGE delete BRIDGE and all of its ports\n\ + list-br print the names of all the bridges\n\ + br-exists BRIDGE exit 2 if BRIDGE does not exist\n\ + br-to-vlan BRIDGE print the VLAN which BRIDGE is on\n\ + br-to-parent BRIDGE print the parent of BRIDGE\n\ + br-set-external-id BRIDGE KEY VALUE set KEY on BRIDGE to VALUE\n\ + br-set-external-id BRIDGE KEY unset KEY on BRIDGE\n\ + br-get-external-id BRIDGE KEY print value of KEY on BRIDGE\n\ + br-get-external-id BRIDGE list key-value pairs on BRIDGE\n\ +\n\ +Port commands (a bond is considered to be a single port):\n\ + list-ports BRIDGE print the names of all the ports on BRIDGE\n\ + add-port BRIDGE PORT add network device PORT to BRIDGE\n\ + add-bond BRIDGE PORT IFACE... add bonded port PORT in BRIDGE from IFACES\n\ + del-port [BRIDGE] PORT delete PORT (which may be bonded) from BRIDGE\n\ + port-to-br PORT print name of bridge that contains PORT\n\ +\n\ +Interface commands (a bond consists of multiple interfaces):\n\ + list-ifaces BRIDGE print the names of all interfaces on BRIDGE\n\ + iface-to-br IFACE print name of bridge that contains IFACE\n\ +\n\ +Controller commands:\n\ + get-controller BRIDGE print the controllers for BRIDGE\n\ + del-controller BRIDGE delete the controllers for BRIDGE\n\ + set-controller BRIDGE TARGET... set the controllers for BRIDGE\n\ + get-fail-mode BRIDGE print the fail-mode for BRIDGE\n\ + del-fail-mode BRIDGE delete the fail-mode for BRIDGE\n\ + set-fail-mode BRIDGE MODE set the fail-mode for BRIDGE to MODE\n\ +\n\ +Manager commands:\n\ + get-manager print the managers\n\ + del-manager delete the managers\n\ + set-manager TARGET... set the list of managers to TARGET...\n\ +\n\ +SSL commands:\n\ + get-ssl print the SSL configuration\n\ + del-ssl delete the SSL configuration\n\ + set-ssl PRIV-KEY CERT CA-CERT set the SSL configuration\n\ +\n\ +Auto Attach commands:\n\ + add-aa-mapping BRIDGE I-SID VLAN add Auto Attach mapping to BRIDGE\n\ + del-aa-mapping BRIDGE I-SID VLAN delete Auto Attach mapping VLAN from BRIDGE\n\ + get-aa-mapping BRIDGE get Auto Attach mappings from BRIDGE\n\ +\n\ +Switch commands:\n\ + emer-reset reset switch to known good state\n\ +\n\ +%s\ +\n\ +Options:\n\ + --db=DATABASE connect to DATABASE\n\ + (default: %s)\n\ + --no-wait do not wait for ovs-vswitchd to reconfigure\n\ + --retry keep trying to connect to server forever\n\ + -t, --timeout=SECS wait at most SECS seconds for ovs-vswitchd\n\ + --dry-run do not commit changes to database\n\ + --oneline print exactly one line of output per command\n", + program_name, program_name, ctl_get_db_cmd_usage(), ctl_default_db()); vlog_usage(); - printf("\nOther options:\n" - " -h, --help " - "display this help message\n" - " -V, --version " - "display version information\n"); + printf("\ + --no-syslog equivalent to --verbose=vsctl:syslog:warn\n"); + stream_usage("database", true, true, false); + printf("\n\ +Other options:\n\ + -h, --help display this help message\n\ + -V, --version display version information\n"); exit(EXIT_SUCCESS); } -static char * -default_db(void) -{ - static char *def; - if (!def) { - def = xasprintf("unix:%s/ovsdb-server", ovs_rundir); - } - return def; -} +/* ovs-vsctl specific context. Inherits the 'struct ctl_context' as base. */ struct vsctl_context { - int argc; - char **argv; - struct ovsdb_idl *idl; + struct ctl_context base; + + /* Modifiable state. */ const struct ovsrec_open_vswitch *ovs; - struct ds output; - struct shash options; + 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. */ }; struct vsctl_bridge { struct ovsrec_bridge *br_cfg; char *name; - struct ovsrec_controller *ctrl; - struct vsctl_bridge *parent; - int vlan; + struct ovs_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 ovs_list ports_node; /* In struct vsctl_bridge's 'ports' list. */ + struct ovs_list ifaces; /* Contains "struct vsctl_iface"s. */ struct ovsrec_port *port_cfg; struct vsctl_bridge *bridge; }; struct vsctl_iface { + struct ovs_list ifaces_node; /* In struct vsctl_port's 'ifaces' list. */ struct ovsrec_interface *iface_cfg; struct vsctl_port *port; }; -struct vsctl_info { - struct shash bridges; - struct shash ports; - struct shash ifaces; - struct ovsrec_controller *ctrl; -}; +/* Casts 'base' into 'strcut vsctl_context'. */ +static struct vsctl_context * +vsctl_context_cast(struct ctl_context *base) +{ + return CONTAINER_OF(base, struct vsctl_context, base); +} + +static struct vsctl_bridge *find_vlan_bridge(struct vsctl_bridge *parent, + int vlan); + +static char * +vsctl_context_to_string(const struct ctl_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); -static struct ovsdb_idl_txn * -txn_from_openvswitch(const struct ovsrec_open_vswitch *ovs) + s = process_escape_args(words.names); + + svec_destroy(&words); + + return s; +} + +static void +verify_ports(struct vsctl_context *vsctl_ctx) { - return ovsdb_idl_txn_get(&ovs->header_); + if (!vsctl_ctx->verified_ports) { + const struct ovsrec_bridge *bridge; + const struct ovsrec_port *port; + + ovsrec_open_vswitch_verify_bridges(vsctl_ctx->ovs); + OVSREC_BRIDGE_FOR_EACH (bridge, vsctl_ctx->base.idl) { + ovsrec_bridge_verify_ports(bridge); + } + OVSREC_PORT_FOR_EACH (port, vsctl_ctx->base.idl) { + ovsrec_port_verify_interfaces(port); + } + + vsctl_ctx->verified_ports = true; + } } 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 *vsctl_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; - br->ctrl = parent ? parent->br_cfg->controller : br_cfg->controller; - shash_add(&b->bridges, br->name, br); + hmap_init(&br->children); + if (parent) { + struct vsctl_bridge *conflict = find_vlan_bridge(parent, vlan); + if (conflict) { + VLOG_WARN("%s: bridge has multiple VLAN bridges (%s and %s) " + "for VLAN %d, but only one is allowed", + parent->name, name, conflict->name, vlan); + } else { + hmap_insert(&parent->children, &br->children_node, + hash_int(vlan, 0)); + } + } + shash_add(&vsctl_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 *vsctl_ctx, struct vsctl_bridge *br) +{ + ovs_assert(list_is_empty(&br->ports)); + ovs_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(vsctl_ctx->ovs, br->br_cfg); + } + shash_find_and_delete(&vsctl_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) { return (port_cfg->fake_bridge && port_cfg->tag - && *port_cfg->tag >= 1 && *port_cfg->tag <= 4095); + && *port_cfg->tag >= 0 && *port_cfg->tag <= 4095); } 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 *vsctl_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(&vsctl_ctx->ports, port_cfg->name, port); + + return port; +} + +static void +del_cached_port(struct vsctl_context *vsctl_ctx, struct vsctl_port *port) +{ + ovs_assert(list_is_empty(&port->ifaces)); + list_remove(&port->ports_node); + shash_find_and_delete(&vsctl_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 *vsctl_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(&vsctl_ctx->ifaces, iface_cfg->name, iface); + + return iface; +} + +static void +del_cached_iface(struct vsctl_context *vsctl_ctx, struct vsctl_iface *iface) +{ + list_remove(&iface->ifaces_node); + shash_find_and_delete(&vsctl_ctx->ifaces, iface->iface_cfg->name); + ovsrec_interface_delete(iface->iface_cfg); + free(iface); +} + static void -free_info(struct vsctl_info *info) +vsctl_context_invalidate_cache(struct ctl_context *ctx) { + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); struct shash_node *node; - SHASH_FOR_EACH (node, &info->bridges) { + if (!vsctl_ctx->cache_valid) { + return; + } + vsctl_ctx->cache_valid = false; + + SHASH_FOR_EACH (node, &vsctl_ctx->bridges) { struct vsctl_bridge *bridge = node->data; + hmap_destroy(&bridge->children); free(bridge->name); free(bridge); } - shash_destroy(&info->bridges); + shash_destroy(&vsctl_ctx->bridges); - SHASH_FOR_EACH (node, &info->ports) { - struct vsctl_port *port = node->data; - free(port); - } - shash_destroy(&info->ports); + shash_destroy_free_data(&vsctl_ctx->ports); + shash_destroy_free_data(&vsctl_ctx->ifaces); +} - SHASH_FOR_EACH (node, &info->ifaces) { - struct vsctl_iface *iface = node->data; - free(iface); - } - shash_destroy(&info->ifaces); +static void +pre_get_info(struct ctl_context *ctx) +{ + ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_bridges); + + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_name); + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_controller); + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_fail_mode); + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_ports); + + ovsdb_idl_add_column(ctx->idl, &ovsrec_port_col_name); + ovsdb_idl_add_column(ctx->idl, &ovsrec_port_col_fake_bridge); + ovsdb_idl_add_column(ctx->idl, &ovsrec_port_col_tag); + ovsdb_idl_add_column(ctx->idl, &ovsrec_port_col_interfaces); + + ovsdb_idl_add_column(ctx->idl, &ovsrec_interface_col_name); + + ovsdb_idl_add_column(ctx->idl, &ovsrec_interface_col_ofport); } static void -get_info(const struct ovsrec_open_vswitch *ovs, struct vsctl_info *info) +vsctl_context_populate_cache(struct ctl_context *ctx) { - struct shash bridges, ports; + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + const struct ovsrec_open_vswitch *ovs = vsctl_ctx->ovs; + struct sset bridges, ports; size_t i; - shash_init(&info->bridges); - shash_init(&info->ports); - shash_init(&info->ifaces); - - info->ctrl = ovs->controller; + if (vsctl_ctx->cache_valid) { + /* Cache is already populated. */ + return; + } + vsctl_ctx->cache_valid = true; + shash_init(&vsctl_ctx->bridges); + shash_init(&vsctl_ctx->ports); + shash_init(&vsctl_ctx->ifaces); - shash_init(&bridges); - shash_init(&ports); + sset_init(&bridges); + sset_init(&ports); for (i = 0; i < ovs->n_bridges; i++) { struct ovsrec_bridge *br_cfg = ovs->bridges[i]; struct vsctl_bridge *br; size_t j; - if (!shash_add_once(&bridges, br_cfg->name, NULL)) { + if (!sset_add(&bridges, br_cfg->name)) { VLOG_WARN("%s: database contains duplicate bridge name", br_cfg->name); continue; } - br = add_bridge(info, br_cfg, br_cfg->name, NULL, 0); - if (!br) { - continue; - } + br = add_bridge_to_cache(vsctl_ctx, br_cfg, br_cfg->name, NULL, 0); for (j = 0; j < br_cfg->n_ports; j++) { struct ovsrec_port *port_cfg = br_cfg->ports[j]; - if (!shash_add_once(&ports, port_cfg->name, NULL)) { - VLOG_WARN("%s: database contains duplicate port name", - port_cfg->name); + if (!sset_add(&ports, port_cfg->name)) { + /* Duplicate port name. (We will warn about that later.) */ continue; } if (port_is_fake_bridge(port_cfg) - && shash_add_once(&bridges, port_cfg->name, NULL)) { - add_bridge(info, NULL, port_cfg->name, br, *port_cfg->tag); + && sset_add(&bridges, port_cfg->name)) { + add_bridge_to_cache(vsctl_ctx, NULL, port_cfg->name, br, + *port_cfg->tag); } } } - shash_destroy(&bridges); - shash_destroy(&ports); + sset_destroy(&bridges); + sset_destroy(&ports); - shash_init(&bridges); - shash_init(&ports); + sset_init(&bridges); for (i = 0; i < ovs->n_bridges; i++) { struct ovsrec_bridge *br_cfg = ovs->bridges[i]; struct vsctl_bridge *br; size_t j; - if (!shash_add_once(&bridges, br_cfg->name, NULL)) { + if (!sset_add(&bridges, br_cfg->name)) { continue; } - br = shash_find_data(&info->bridges, br_cfg->name); + br = shash_find_data(&vsctl_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; - if (!shash_add_once(&ports, port_cfg->name, NULL)) { + port = shash_find_data(&vsctl_ctx->ports, port_cfg->name); + if (port) { + if (port_cfg == port->port_cfg) { + VLOG_WARN("%s: port is in multiple bridges (%s and %s)", + port_cfg->name, br->name, port->bridge->name); + } else { + /* Log as an error because this violates the database's + * uniqueness constraints, so the database server shouldn't + * have allowed it. */ + VLOG_ERR("%s: database contains duplicate port name", + port_cfg->name); + } continue; } if (port_is_fake_bridge(port_cfg) - && !shash_add_once(&bridges, port_cfg->name, NULL)) { + && !sset_add(&bridges, port_cfg->name)) { continue; } - port = xmalloc(sizeof *port); - port->port_cfg = port_cfg; - if (port_cfg->tag - && *port_cfg->tag >= 1 && *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(vsctl_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; - if (shash_find(&info->ifaces, iface_cfg->name)) { - VLOG_WARN("%s: database contains duplicate interface name", - iface_cfg->name); + iface = shash_find_data(&vsctl_ctx->ifaces, iface_cfg->name); + if (iface) { + if (iface_cfg == iface->iface_cfg) { + VLOG_WARN("%s: interface is in multiple ports " + "(%s and %s)", + iface_cfg->name, + iface->port->port_cfg->name, + port->port_cfg->name); + } else { + /* Log as an error because this violates the database's + * uniqueness constraints, so the database server + * shouldn't have allowed it. */ + VLOG_ERR("%s: database contains duplicate interface " + "name", iface_cfg->name); + } 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(vsctl_ctx, port, iface_cfg); } } } - shash_destroy(&bridges); - shash_destroy(&ports); + sset_destroy(&bridges); } static void -check_conflicts(struct vsctl_info *info, const char *name, +check_conflicts(struct vsctl_context *vsctl_ctx, const char *name, char *msg) { struct vsctl_iface *iface; struct vsctl_port *port; - if (shash_find(&info->bridges, name)) { - vsctl_fatal("%s because a bridge named %s already exists", + verify_ports(vsctl_ctx); + + if (shash_find(&vsctl_ctx->bridges, name)) { + ctl_fatal("%s because a bridge named %s already exists", msg, name); } - port = shash_find_data(&info->ports, name); + port = shash_find_data(&vsctl_ctx->ports, name); if (port) { - vsctl_fatal("%s because a port named %s already exists on " + ctl_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(&vsctl_ctx->ifaces, name); if (iface) { - vsctl_fatal("%s because an interface named %s already exists " + ctl_fatal("%s because an interface named %s already exists " "on bridge %s", msg, name, iface->port->bridge->name); } @@ -585,48 +862,64 @@ check_conflicts(struct vsctl_info *info, const char *name, } static struct vsctl_bridge * -find_bridge(struct vsctl_info *info, const char *name, bool must_exist) +find_bridge(struct vsctl_context *vsctl_ctx, const char *name, bool must_exist) { - struct vsctl_bridge *br = shash_find_data(&info->bridges, name); + struct vsctl_bridge *br; + + ovs_assert(vsctl_ctx->cache_valid); + + br = shash_find_data(&vsctl_ctx->bridges, name); if (must_exist && !br) { - vsctl_fatal("no bridge named %s", name); + ctl_fatal("no bridge named %s", name); } + ovsrec_open_vswitch_verify_bridges(vsctl_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 *vsctl_ctx, + const char *name, bool must_exist) { - struct vsctl_bridge *br = find_bridge(info, name, must_exist); + struct vsctl_bridge *br = find_bridge(vsctl_ctx, name, must_exist); if (br && br->parent) { - vsctl_fatal("%s is a fake bridge", name); + ctl_fatal("%s is a fake bridge", name); } return br; } static struct vsctl_port * -find_port(struct vsctl_info *info, const char *name, bool must_exist) +find_port(struct vsctl_context *vsctl_ctx, const char *name, bool must_exist) { - struct vsctl_port *port = shash_find_data(&info->ports, name); + struct vsctl_port *port; + + ovs_assert(vsctl_ctx->cache_valid); + + port = shash_find_data(&vsctl_ctx->ports, name); if (port && !strcmp(name, port->bridge->name)) { port = NULL; } if (must_exist && !port) { - vsctl_fatal("no port named %s", name); + ctl_fatal("no port named %s", name); } + verify_ports(vsctl_ctx); return port; } static struct vsctl_iface * -find_iface(struct vsctl_info *info, const char *name, bool must_exist) +find_iface(struct vsctl_context *vsctl_ctx, const char *name, bool must_exist) { - struct vsctl_iface *iface = shash_find_data(&info->ifaces, name); + struct vsctl_iface *iface; + + ovs_assert(vsctl_ctx->cache_valid); + + iface = shash_find_data(&vsctl_ctx->ifaces, name); if (iface && !strcmp(name, iface->port->bridge->name)) { iface = NULL; } if (must_exist && !iface) { - vsctl_fatal("no interface named %s", name); + ctl_fatal("no interface named %s", name); } + verify_ports(vsctl_ctx); return iface; } @@ -678,148 +971,342 @@ ovs_insert_bridge(const struct ovsrec_open_vswitch *ovs, } static void -ovs_delete_bridge(const struct ovsrec_open_vswitch *ovs, - struct ovsrec_bridge *bridge) +cmd_init(struct ctl_context *ctx OVS_UNUSED) +{ +} + +struct cmd_show_table cmd_show_tables[] = { + {&ovsrec_table_open_vswitch, + NULL, + {&ovsrec_open_vswitch_col_manager_options, + &ovsrec_open_vswitch_col_bridges, + &ovsrec_open_vswitch_col_ovs_version}, + false}, + + {&ovsrec_table_bridge, + &ovsrec_bridge_col_name, + {&ovsrec_bridge_col_controller, + &ovsrec_bridge_col_fail_mode, + &ovsrec_bridge_col_ports}, + false}, + + {&ovsrec_table_port, + &ovsrec_port_col_name, + {&ovsrec_port_col_tag, + &ovsrec_port_col_trunks, + &ovsrec_port_col_interfaces}, + false}, + + {&ovsrec_table_interface, + &ovsrec_interface_col_name, + {&ovsrec_interface_col_type, + &ovsrec_interface_col_options, + &ovsrec_interface_col_error}, + false}, + + {&ovsrec_table_controller, + &ovsrec_controller_col_target, + {&ovsrec_controller_col_is_connected, + NULL, + NULL}, + false}, + + {&ovsrec_table_manager, + &ovsrec_manager_col_target, + {&ovsrec_manager_col_is_connected, + NULL, + NULL}, + false}, + + {NULL, NULL, {NULL, NULL, NULL}, false} +}; + +static void +pre_cmd_emer_reset(struct ctl_context *ctx) { - struct ovsrec_bridge **bridges; - size_t i, n; + ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_manager_options); + ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_ssl); - 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); + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_controller); + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_fail_mode); + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_mirrors); + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_netflow); + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_sflow); + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_ipfix); + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_flood_vlans); + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_other_config); + + ovsdb_idl_add_column(ctx->idl, &ovsrec_port_col_other_config); + + ovsdb_idl_add_column(ctx->idl, + &ovsrec_interface_col_ingress_policing_rate); + ovsdb_idl_add_column(ctx->idl, + &ovsrec_interface_col_ingress_policing_burst); } static void -cmd_init(struct vsctl_context *ctx UNUSED) -{ +cmd_emer_reset(struct ctl_context *ctx) +{ + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + const struct ovsdb_idl *idl = ctx->idl; + const struct ovsrec_bridge *br; + const struct ovsrec_port *port; + const struct ovsrec_interface *iface; + const struct ovsrec_mirror *mirror, *next_mirror; + const struct ovsrec_controller *ctrl, *next_ctrl; + const struct ovsrec_manager *mgr, *next_mgr; + const struct ovsrec_netflow *nf, *next_nf; + const struct ovsrec_ssl *ssl, *next_ssl; + const struct ovsrec_sflow *sflow, *next_sflow; + const struct ovsrec_ipfix *ipfix, *next_ipfix; + const struct ovsrec_flow_sample_collector_set *fscset, *next_fscset; + + /* Reset the Open_vSwitch table. */ + ovsrec_open_vswitch_set_manager_options(vsctl_ctx->ovs, NULL, 0); + ovsrec_open_vswitch_set_ssl(vsctl_ctx->ovs, NULL); + + OVSREC_BRIDGE_FOR_EACH (br, idl) { + const char *hwaddr; + + ovsrec_bridge_set_controller(br, NULL, 0); + ovsrec_bridge_set_fail_mode(br, NULL); + ovsrec_bridge_set_mirrors(br, NULL, 0); + ovsrec_bridge_set_netflow(br, NULL); + ovsrec_bridge_set_sflow(br, NULL); + ovsrec_bridge_set_ipfix(br, NULL); + ovsrec_bridge_set_flood_vlans(br, NULL, 0); + + /* We only want to save the "hwaddr" key from other_config. */ + 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); + } + } + + OVSREC_PORT_FOR_EACH (port, idl) { + ovsrec_port_set_other_config(port, NULL); + } + + OVSREC_INTERFACE_FOR_EACH (iface, idl) { + /* xxx What do we do about gre/patch devices created by mgr? */ + + ovsrec_interface_set_ingress_policing_rate(iface, 0); + ovsrec_interface_set_ingress_policing_burst(iface, 0); + } + + OVSREC_MIRROR_FOR_EACH_SAFE (mirror, next_mirror, idl) { + ovsrec_mirror_delete(mirror); + } + + OVSREC_CONTROLLER_FOR_EACH_SAFE (ctrl, next_ctrl, idl) { + ovsrec_controller_delete(ctrl); + } + + OVSREC_MANAGER_FOR_EACH_SAFE (mgr, next_mgr, idl) { + ovsrec_manager_delete(mgr); + } + + OVSREC_NETFLOW_FOR_EACH_SAFE (nf, next_nf, idl) { + ovsrec_netflow_delete(nf); + } + + OVSREC_SSL_FOR_EACH_SAFE (ssl, next_ssl, idl) { + ovsrec_ssl_delete(ssl); + } + + OVSREC_SFLOW_FOR_EACH_SAFE (sflow, next_sflow, idl) { + ovsrec_sflow_delete(sflow); + } + + OVSREC_IPFIX_FOR_EACH_SAFE (ipfix, next_ipfix, idl) { + ovsrec_ipfix_delete(ipfix); + } + + OVSREC_FLOW_SAMPLE_COLLECTOR_SET_FOR_EACH_SAFE (fscset, next_fscset, idl) { + ovsrec_flow_sample_collector_set_delete(fscset); + } + + vsctl_context_invalidate_cache(ctx); } static void -cmd_add_br(struct vsctl_context *ctx) +cmd_add_br(struct ctl_context *ctx) { - const char *br_name = ctx->argv[1]; - struct vsctl_info info; + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + bool may_exist = shash_find(&ctx->options, "--may-exist") != NULL; + const char *br_name, *parent_name; + struct ovsrec_interface *iface; + int vlan; - get_info(ctx->ovs, &info); - check_conflicts(&info, br_name, + 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 < 0 || vlan > 4095) { + ctl_fatal("%s: vlan must be between 0 and 4095", ctx->argv[0]); + } + } else { + ctl_fatal("'%s' command takes exactly 1 or 3 arguments", + ctx->argv[0]); + } + + vsctl_context_populate_cache(ctx); + if (may_exist) { + struct vsctl_bridge *br; + + br = find_bridge(vsctl_ctx, br_name, false); + if (br) { + if (!parent_name) { + if (br->parent) { + ctl_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) { + ctl_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)) { + ctl_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) { + ctl_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(vsctl_ctx, 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(txn_from_openvswitch(ctx->ovs)); + iface = ovsrec_interface_insert(ctx->txn); ovsrec_interface_set_name(iface, br_name); + ovsrec_interface_set_type(iface, "internal"); - port = ovsrec_port_insert(txn_from_openvswitch(ctx->ovs)); + port = ovsrec_port_insert(ctx->txn); ovsrec_port_set_name(port, br_name); ovsrec_port_set_interfaces(port, &iface, 1); - br = ovsrec_bridge_insert(txn_from_openvswitch(ctx->ovs)); + br = ovsrec_bridge_insert(ctx->txn); ovsrec_bridge_set_name(br, br_name); 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; + ovs_insert_bridge(vsctl_ctx->ovs, br); + } else { + struct vsctl_bridge *conflict; 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"); + parent = find_bridge(vsctl_ctx, parent_name, false); + if (parent && parent->parent) { + ctl_fatal("cannot create bridge with fake bridge as parent"); } if (!parent) { - vsctl_fatal("parent bridge %s does not exist", parent_name); + ctl_fatal("parent bridge %s does not exist", parent_name); + } + conflict = find_vlan_bridge(parent, vlan); + if (conflict) { + ctl_fatal("bridge %s already has a child VLAN bridge %s " + "on VLAN %d", parent_name, conflict->name, vlan); } br = parent->br_cfg; - iface = ovsrec_interface_insert(txn_from_openvswitch(ctx->ovs)); + iface = ovsrec_interface_insert(ctx->txn); ovsrec_interface_set_name(iface, br_name); ovsrec_interface_set_type(iface, "internal"); - port = ovsrec_port_insert(txn_from_openvswitch(ctx->ovs)); + port = ovsrec_port_insert(ctx->txn); ovsrec_port_set_name(port, br_name); ovsrec_port_set_interfaces(port, &iface, 1); ovsrec_port_set_fake_bridge(port, true); ovsrec_port_set_tag(port, &tag, 1); bridge_insert_port(br, port); - } else { - NOT_REACHED(); } - free_info(&info); + post_db_reload_expect_iface(iface); + vsctl_context_invalidate_cache(ctx); } static void -del_port(struct vsctl_info *info, struct vsctl_port *port) +del_port(struct vsctl_context *vsctl_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(vsctl_ctx, iface); + } + del_cached_port(vsctl_ctx, port); } static void -cmd_del_br(struct vsctl_context *ctx) +del_bridge(struct vsctl_context *vsctl_ctx, struct vsctl_bridge *br) { - bool must_exist = !shash_find(&ctx->options, "--if-exists"); - struct vsctl_bridge *bridge; - struct vsctl_info info; + struct vsctl_bridge *child, *next_child; + struct vsctl_port *port, *next_port; + const struct ovsrec_flow_sample_collector_set *fscset, *next_fscset; - get_info(ctx->ovs, &info); - bridge = find_bridge(&info, ctx->argv[1], must_exist); - if (bridge) { - struct shash_node *node; + HMAP_FOR_EACH_SAFE (child, next_child, children_node, &br->children) { + del_bridge(vsctl_ctx, child); + } - SHASH_FOR_EACH (node, &info.ports) { - struct vsctl_port *port = node->data; - if (port->bridge == bridge - || !strcmp(port->port_cfg->name, bridge->name)) { - del_port(&info, port); - } - } - if (bridge->br_cfg) { - ovsrec_bridge_delete(bridge->br_cfg); - ovs_delete_bridge(ctx->ovs, bridge->br_cfg); + LIST_FOR_EACH_SAFE (port, next_port, ports_node, &br->ports) { + del_port(vsctl_ctx, port); + } + + OVSREC_FLOW_SAMPLE_COLLECTOR_SET_FOR_EACH_SAFE (fscset, next_fscset, + vsctl_ctx->base.idl) { + if (fscset->bridge == br->br_cfg) { + ovsrec_flow_sample_collector_set_delete(fscset); } } - free_info(&info); + + del_cached_bridge(vsctl_ctx, br); } static void -output_sorted(struct svec *svec, struct ds *output) +cmd_del_br(struct ctl_context *ctx) { - const char *name; - size_t i; - + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + bool must_exist = !shash_find(&ctx->options, "--if-exists"); + struct vsctl_bridge *bridge; + + vsctl_context_populate_cache(ctx); + bridge = find_bridge(vsctl_ctx, ctx->argv[1], must_exist); + if (bridge) { + del_bridge(vsctl_ctx, bridge); + } +} + +static void +output_sorted(struct svec *svec, struct ds *output) +{ + const char *name; + size_t i; + svec_sort(svec); SVEC_FOR_EACH (i, name, svec) { ds_put_format(output, "%s\n", name); @@ -827,598 +1314,727 @@ output_sorted(struct svec *svec, struct ds *output) } static void -cmd_list_br(struct vsctl_context *ctx) +cmd_list_br(struct ctl_context *ctx) { + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); struct shash_node *node; - struct vsctl_info info; struct svec bridges; + bool real = shash_find(&ctx->options, "--real"); + bool fake = shash_find(&ctx->options, "--fake"); + + /* If neither fake nor real were requested, return both. */ + if (!real && !fake) { + real = fake = true; + } - get_info(ctx->ovs, &info); + vsctl_context_populate_cache(ctx); svec_init(&bridges); - SHASH_FOR_EACH (node, &info.bridges) { + SHASH_FOR_EACH (node, &vsctl_ctx->bridges) { struct vsctl_bridge *br = node->data; - svec_add(&bridges, br->name); + + if (br->parent ? fake : real) { + 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) +cmd_br_exists(struct ctl_context *ctx) { - struct vsctl_info info; + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); - get_info(ctx->ovs, &info); - if (!find_bridge(&info, ctx->argv[1], false)) { - exit(2); + vsctl_context_populate_cache(ctx); + if (!find_bridge(vsctl_ctx, ctx->argv[1], false)) { + vsctl_exit(2); } - free_info(&info); -} - -/* 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 -cmd_br_set_external_id(struct vsctl_context *ctx) +pre_cmd_br_set_external_id(struct ctl_context *ctx) { - struct vsctl_info info; + pre_get_info(ctx); + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_external_ids); + ovsdb_idl_add_column(ctx->idl, &ovsrec_port_col_external_ids); +} + +static void +cmd_br_set_external_id(struct ctl_context *ctx) +{ + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); struct vsctl_bridge *bridge; - char **keys, **values; - size_t n; + struct smap new; - get_info(ctx->ovs, &info); - bridge = find_bridge(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + bridge = find_bridge(vsctl_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); - ovsrec_bridge_set_external_ids(bridge->br_cfg, 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, &new); } else { char *key = xasprintf("fake-bridge-%s", ctx->argv[2]); - struct vsctl_port *port = shash_find_data(&info.ports, ctx->argv[1]); - set_external_id(port->port_cfg->key_external_ids, - port->port_cfg->value_external_ids, - port->port_cfg->n_external_ids, - key, ctx->argc >= 4 ? ctx->argv[3] : NULL, - &keys, &values, &n); - ovsrec_port_set_external_ids(port->port_cfg, keys, values, n); + struct vsctl_port *port = shash_find_data(&vsctl_ctx->ports, + ctx->argv[1]); + 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, &new); free(key); } - free(keys); - free(values); - - free_info(&info); + 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_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 -cmd_br_get_external_id(struct vsctl_context *ctx) +pre_cmd_br_get_external_id(struct ctl_context *ctx) { - struct vsctl_info info; + pre_cmd_br_set_external_id(ctx); +} + +static void +cmd_br_get_external_id(struct ctl_context *ctx) +{ + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); struct vsctl_bridge *bridge; - get_info(ctx->ovs, &info); - bridge = find_bridge(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + + bridge = find_bridge(vsctl_ctx, ctx->argv[1], true); if (bridge->br_cfg) { - get_external_id(bridge->br_cfg->key_external_ids, - bridge->br_cfg->value_external_ids, - bridge->br_cfg->n_external_ids, - "", ctx->argc >= 3 ? ctx->argv[2] : NULL, - &ctx->output); + ovsrec_bridge_verify_external_ids(bridge->br_cfg); + 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(&info.ports, ctx->argv[1]); - get_external_id(port->port_cfg->key_external_ids, - port->port_cfg->value_external_ids, - port->port_cfg->n_external_ids, - "fake-bridge-", ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output); + struct vsctl_port *port = shash_find_data(&vsctl_ctx->ports, + ctx->argv[1]); + ovsrec_port_verify_external_ids(port->port_cfg); + get_external_id(&port->port_cfg->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) +cmd_list_ports(struct ctl_context *ctx) { + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); struct vsctl_bridge *br; - struct shash_node *node; - struct vsctl_info info; + struct vsctl_port *port; struct svec ports; - get_info(ctx->ovs, &info); - br = find_bridge(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + br = find_bridge(vsctl_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 -add_port(const struct ovsrec_open_vswitch *ovs, - const char *br_name, const char *port_name, bool fake_iface, - char *iface_names[], int n_ifaces) -{ - struct vsctl_info info; +add_port(struct ctl_context *ctx, + 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_context *vsctl_ctx = vsctl_context_cast(ctx); + struct vsctl_port *vsctl_port; struct vsctl_bridge *bridge; struct ovsrec_interface **ifaces; struct ovsrec_port *port; size_t i; - get_info(ovs, &info); - check_conflicts(&info, port_name, + vsctl_context_populate_cache(ctx); + if (may_exist) { + struct vsctl_port *vsctl_port; + + vsctl_port = find_port(vsctl_ctx, port_name, false); + if (vsctl_port) { + struct svec want_names, have_names; + + 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 < vsctl_port->port_cfg->n_interfaces; i++) { + svec_add(&have_names, + vsctl_port->port_cfg->interfaces[i]->name); + } + svec_sort(&have_names); + + if (strcmp(vsctl_port->bridge->name, br_name)) { + char *command = vsctl_context_to_string(ctx); + ctl_fatal("\"%s\" but %s is actually attached to bridge %s", + command, port_name, vsctl_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); + + ctl_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(vsctl_ctx, port_name, xasprintf("cannot create a port named %s", port_name)); - /* XXX need to check for conflicts on interfaces too */ - bridge = find_bridge(&info, br_name, true); + for (i = 0; i < n_ifaces; i++) { + check_conflicts(vsctl_ctx, iface_names[i], + xasprintf("cannot create an interface named %s", + iface_names[i])); + } + bridge = find_bridge(vsctl_ctx, br_name, true); ifaces = xmalloc(n_ifaces * sizeof *ifaces); for (i = 0; i < n_ifaces; i++) { - ifaces[i] = ovsrec_interface_insert(txn_from_openvswitch(ovs)); + ifaces[i] = ovsrec_interface_insert(ctx->txn); ovsrec_interface_set_name(ifaces[i], iface_names[i]); + post_db_reload_expect_iface(ifaces[i]); } - port = ovsrec_port_insert(txn_from_openvswitch(ovs)); + port = ovsrec_port_insert(ctx->txn); 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->vlan) { + if (bridge->parent) { int64_t tag = bridge->vlan; ovsrec_port_set_tag(port, &tag, 1); } + for (i = 0; i < n_settings; i++) { + ctl_set_column("Port", &port->header_, settings[i], + ctx->symtab); + } + bridge_insert_port((bridge->parent ? bridge->parent->br_cfg : bridge->br_cfg), port); - free_info(&info); + vsctl_port = add_port_to_cache(vsctl_ctx, bridge, port); + for (i = 0; i < n_ifaces; i++) { + add_iface_to_cache(vsctl_ctx, vsctl_port, ifaces[i]); + } + free(ifaces); } static void -cmd_add_port(struct vsctl_context *ctx) +cmd_add_port(struct ctl_context *ctx) { - add_port(ctx->ovs, ctx->argv[1], ctx->argv[2], false, &ctx->argv[2], 1); + bool may_exist = shash_find(&ctx->options, "--may-exist") != NULL; + + 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) +cmd_add_bond(struct ctl_context *ctx) { + bool may_exist = shash_find(&ctx->options, "--may-exist") != NULL; bool fake_iface = shash_find(&ctx->options, "--fake-iface"); + int n_ifaces; + int i; - add_port(ctx->ovs, ctx->argv[1], ctx->argv[2], fake_iface, - &ctx->argv[3], ctx->argc - 3); + 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) { + ctl_fatal("add-bond requires at least 2 interfaces, but only " + "%d were specified", n_ifaces); + } + + 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) +cmd_del_port(struct ctl_context *ctx) { + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); bool must_exist = !shash_find(&ctx->options, "--if-exists"); - struct vsctl_info info; + bool with_iface = shash_find(&ctx->options, "--with-iface") != NULL; + const char *target = ctx->argv[ctx->argc - 1]; + struct vsctl_port *port; - 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); + vsctl_context_populate_cache(ctx); + if (find_bridge(vsctl_ctx, target, false)) { + if (must_exist) { + ctl_fatal("cannot delete port %s because it is the local port " + "for bridge %s (deleting this port requires deleting " + "the entire bridge)", target, 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]); + port = NULL; + } else if (!with_iface) { + port = find_port(vsctl_ctx, target, must_exist); + } else { + struct vsctl_iface *iface; + + port = find_port(vsctl_ctx, target, false); + if (!port) { + iface = find_iface(vsctl_ctx, target, false); + if (iface) { + port = iface->port; } } + if (must_exist && !port) { + ctl_fatal("no port or interface named %s", target); + } } - free_info(&info); -} -static void -cmd_port_to_br(struct vsctl_context *ctx) -{ - struct vsctl_port *port; - struct vsctl_info info; + if (port) { + if (ctx->argc == 3) { + struct vsctl_bridge *bridge; + + bridge = find_bridge(vsctl_ctx, ctx->argv[1], true); + if (port->bridge != bridge) { + if (port->bridge->parent == bridge) { + ctl_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 { + ctl_fatal("bridge %s does not have a port %s", + ctx->argv[1], ctx->argv[2]); + } + } + } - get_info(ctx->ovs, &info); - port = find_port(&info, ctx->argv[1], true); - ds_put_format(&ctx->output, "%s\n", port->bridge->name); - free_info(&info); + del_port(vsctl_ctx, port); + } } static void -cmd_port_set_external_id(struct vsctl_context *ctx) +cmd_port_to_br(struct ctl_context *ctx) { - struct vsctl_info info; + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); struct vsctl_port *port; - char **keys, **values; - size_t n; - get_info(ctx->ovs, &info); - port = find_port(&info, ctx->argv[1], true); - set_external_id(port->port_cfg->key_external_ids, - port->port_cfg->value_external_ids, - port->port_cfg->n_external_ids, - ctx->argv[2], ctx->argc >= 4 ? ctx->argv[3] : NULL, - &keys, &values, &n); - ovsrec_port_set_external_ids(port->port_cfg, keys, values, n); - free(keys); - free(values); - - free_info(&info); -} + vsctl_context_populate_cache(ctx); -static void -cmd_port_get_external_id(struct vsctl_context *ctx) -{ - struct vsctl_info info; - struct vsctl_port *port; - - get_info(ctx->ovs, &info); - port = find_port(&info, ctx->argv[1], true); - get_external_id(port->port_cfg->key_external_ids, - port->port_cfg->value_external_ids, - port->port_cfg->n_external_ids, - "", ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output); - free_info(&info); + port = find_port(vsctl_ctx, ctx->argv[1], true); + ds_put_format(&ctx->output, "%s\n", port->bridge->name); } static void -cmd_br_to_vlan(struct vsctl_context *ctx) +cmd_br_to_vlan(struct ctl_context *ctx) { + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); struct vsctl_bridge *bridge; - struct vsctl_info info; - get_info(ctx->ovs, &info); - bridge = find_bridge(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + + bridge = find_bridge(vsctl_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) +cmd_br_to_parent(struct ctl_context *ctx) { + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); struct vsctl_bridge *bridge; - struct vsctl_info info; - get_info(ctx->ovs, &info); - bridge = find_bridge(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + + bridge = find_bridge(vsctl_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) +cmd_list_ifaces(struct ctl_context *ctx) { + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); struct vsctl_bridge *br; - struct shash_node *node; - struct vsctl_info info; + struct vsctl_port *port; struct svec ifaces; - get_info(ctx->ovs, &info); - br = find_bridge(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + + br = find_bridge(vsctl_ctx, ctx->argv[1], true); + verify_ports(vsctl_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) +cmd_iface_to_br(struct ctl_context *ctx) { + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); struct vsctl_iface *iface; - struct vsctl_info info; - get_info(ctx->ovs, &info); - iface = find_iface(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + + iface = find_iface(vsctl_ctx, ctx->argv[1], true); ds_put_format(&ctx->output, "%s\n", iface->port->bridge->name); - free_info(&info); } static void -cmd_iface_set_external_id(struct vsctl_context *ctx) +verify_controllers(struct ovsrec_bridge *bridge) { - struct vsctl_info info; - struct vsctl_iface *iface; - char **keys, **values; - size_t n; - - get_info(ctx->ovs, &info); - iface = find_iface(&info, ctx->argv[1], true); - set_external_id(iface->iface_cfg->key_external_ids, - iface->iface_cfg->value_external_ids, - iface->iface_cfg->n_external_ids, - ctx->argv[2], ctx->argc >= 4 ? ctx->argv[3] : NULL, - &keys, &values, &n); - ovsrec_interface_set_external_ids(iface->iface_cfg, keys, values, n); - free(keys); - free(values); + size_t i; - free_info(&info); + ovsrec_bridge_verify_controller(bridge); + for (i = 0; i < bridge->n_controller; i++) { + ovsrec_controller_verify_target(bridge->controller[i]); + } } static void -cmd_iface_get_external_id(struct vsctl_context *ctx) +pre_controller(struct ctl_context *ctx) { - struct vsctl_info info; - struct vsctl_iface *iface; + pre_get_info(ctx); - get_info(ctx->ovs, &info); - iface = find_iface(&info, ctx->argv[1], true); - get_external_id(iface->iface_cfg->key_external_ids, - iface->iface_cfg->value_external_ids, - iface->iface_cfg->n_external_ids, - "", ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output); - free_info(&info); + ovsdb_idl_add_column(ctx->idl, &ovsrec_controller_col_target); } static void -cmd_get_controller(struct vsctl_context *ctx) +cmd_get_controller(struct ctl_context *ctx) { - struct vsctl_info info; + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + struct vsctl_bridge *br; + struct svec targets; + size_t i; - get_info(ctx->ovs, &info); + vsctl_context_populate_cache(ctx); - if (ctx->argc == 1) { - /* Return the controller from the "Open_vSwitch" table */ - if (info.ctrl) { - ds_put_format(&ctx->output, "%s\n", info.ctrl->target); - } - } else { - /* Return the controller for a particular bridge. */ - struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true); - - /* If no controller is explicitly defined for the requested - * bridge, fallback to the "Open_vSwitch" table's controller. */ - if (br->ctrl) { - ds_put_format(&ctx->output, "%s\n", br->ctrl->target); - } else if (info.ctrl) { - ds_put_format(&ctx->output, "%s\n", info.ctrl->target); - } + br = find_bridge(vsctl_ctx, ctx->argv[1], true); + if (br->parent) { + br = br->parent; + } + verify_controllers(br->br_cfg); + + /* Print the targets in sorted order for reproducibility. */ + svec_init(&targets); + for (i = 0; i < br->br_cfg->n_controller; i++) { + svec_add(&targets, br->br_cfg->controller[i]->target); } - free_info(&info); + 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 +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) +cmd_del_controller(struct ctl_context *ctx) { - struct vsctl_info info; + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + struct ovsrec_bridge *br; - get_info(ctx->ovs, &info); + vsctl_context_populate_cache(ctx); - if (ctx->argc == 1) { - if (info.ctrl) { - ovsrec_controller_delete(info.ctrl); - ovsrec_open_vswitch_set_controller(ctx->ovs, NULL); - } - } else { - struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + br = find_real_bridge(vsctl_ctx, ctx->argv[1], true)->br_cfg; + verify_controllers(br); - if (br->ctrl) { - ovsrec_controller_delete(br->ctrl); - ovsrec_bridge_set_controller(br->br_cfg, NULL); + if (br->controller) { + delete_controllers(br->controller, br->n_controller); + ovsrec_bridge_set_controller(br, NULL, 0); + } +} + +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++) { + if (vconn_verify_name(targets[i]) && pvconn_verify_name(targets[i])) { + VLOG_WARN("target type \"%s\" is possibly erroneous", targets[i]); } + controllers[i] = ovsrec_controller_insert(txn); + ovsrec_controller_set_target(controllers[i], targets[i]); } - free_info(&info); + return controllers; } static void -cmd_set_controller(struct vsctl_context *ctx) +cmd_set_controller(struct ctl_context *ctx) { - struct vsctl_info info; - struct ovsrec_controller *ctrl; + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + struct ovsrec_controller **controllers; + struct ovsrec_bridge *br; + size_t n; - get_info(ctx->ovs, &info); + vsctl_context_populate_cache(ctx); - if (ctx->argc == 2) { - /* Set the controller in the "Open_vSwitch" table. */ - if (info.ctrl) { - ovsrec_controller_delete(info.ctrl); - } - ctrl = ovsrec_controller_insert(txn_from_openvswitch(ctx->ovs)); - ovsrec_controller_set_target(ctrl, ctx->argv[1]); - ovsrec_open_vswitch_set_controller(ctx->ovs, ctrl); - } else { - /* Set the controller for a particular bridge. */ - struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + br = find_real_bridge(vsctl_ctx, ctx->argv[1], true)->br_cfg; + verify_controllers(br); - if (br->ctrl) { - ovsrec_controller_delete(br->ctrl); - } - ctrl = ovsrec_controller_insert(txn_from_openvswitch(ctx->ovs)); - ovsrec_controller_set_target(ctrl, ctx->argv[2]); - ovsrec_bridge_set_controller(br->br_cfg, ctrl); - } + delete_controllers(br->controller, br->n_controller); - free_info(&info); + n = ctx->argc - 2; + controllers = insert_controllers(ctx->txn, &ctx->argv[2], n); + ovsrec_bridge_set_controller(br, controllers, n); + free(controllers); } static void -cmd_get_fail_mode(struct vsctl_context *ctx) +cmd_get_fail_mode(struct ctl_context *ctx) { - struct vsctl_info info; - const char *fail_mode = NULL; + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + struct vsctl_bridge *br; + const char *fail_mode; - get_info(ctx->ovs, &info); + vsctl_context_populate_cache(ctx); + br = find_bridge(vsctl_ctx, ctx->argv[1], true); - if (ctx->argc == 1) { - /* Return the fail-mode from the "Open_vSwitch" table */ - if (info.ctrl && info.ctrl->fail_mode) { - fail_mode = info.ctrl->fail_mode; - } - } else { - /* Return the fail-mode for a particular bridge. */ - struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true); - - /* If no controller or fail-mode is explicitly defined for the - * requested bridge, fallback to the "Open_vSwitch" table's - * setting. */ - if (br->ctrl && br->ctrl->fail_mode) { - fail_mode = br->ctrl->fail_mode; - } else if (info.ctrl && info.ctrl->fail_mode) { - fail_mode = info.ctrl->fail_mode; - } + if (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); } +} + +static void +cmd_del_fail_mode(struct ctl_context *ctx) +{ + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + struct vsctl_bridge *br; + + vsctl_context_populate_cache(ctx); + + br = find_real_bridge(vsctl_ctx, ctx->argv[1], true); - free_info(&info); + ovsrec_bridge_set_fail_mode(br->br_cfg, NULL); } static void -cmd_del_fail_mode(struct vsctl_context *ctx) +cmd_set_fail_mode(struct ctl_context *ctx) { - struct vsctl_info info; + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + struct vsctl_bridge *br; + const char *fail_mode = ctx->argv[2]; - get_info(ctx->ovs, &info); + vsctl_context_populate_cache(ctx); - if (ctx->argc == 1) { - if (info.ctrl && info.ctrl->fail_mode) { - ovsrec_controller_set_fail_mode(info.ctrl, NULL); - } - } else { - struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + br = find_real_bridge(vsctl_ctx, ctx->argv[1], true); - if (br->ctrl && br->ctrl->fail_mode) { - ovsrec_controller_set_fail_mode(br->ctrl, NULL); - } + if (strcmp(fail_mode, "standalone") && strcmp(fail_mode, "secure")) { + ctl_fatal("fail-mode must be \"standalone\" or \"secure\""); } - free_info(&info); + ovsrec_bridge_set_fail_mode(br->br_cfg, fail_mode); } static void -cmd_set_fail_mode(struct vsctl_context *ctx) +verify_managers(const struct ovsrec_open_vswitch *ovs) { - struct vsctl_info info; - const char *fail_mode; + size_t i; - get_info(ctx->ovs, &info); + ovsrec_open_vswitch_verify_manager_options(ovs); - fail_mode = (ctx->argc == 2) ? ctx->argv[1] : ctx->argv[2]; + for (i = 0; i < ovs->n_manager_options; ++i) { + const struct ovsrec_manager *mgr = ovs->manager_options[i]; - if (strcmp(fail_mode, "standalone") && strcmp(fail_mode, "secure")) { - vsctl_fatal("fail-mode must be \"standalone\" or \"secure\""); + ovsrec_manager_verify_target(mgr); } +} - if (ctx->argc == 2) { - /* Set the fail-mode in the "Open_vSwitch" table. */ - if (!info.ctrl) { - vsctl_fatal("no controller declared"); - } - ovsrec_controller_set_fail_mode(info.ctrl, fail_mode); - } else { - struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); +static void +pre_manager(struct ctl_context *ctx) +{ + ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_manager_options); + ovsdb_idl_add_column(ctx->idl, &ovsrec_manager_col_target); +} + +static void +cmd_get_manager(struct ctl_context *ctx) +{ + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + const struct ovsrec_open_vswitch *ovs = vsctl_ctx->ovs; + struct svec targets; + size_t i; + + verify_managers(ovs); + + /* Print the targets in sorted order for reproducibility. */ + svec_init(&targets); + + for (i = 0; i < ovs->n_manager_options; i++) { + svec_add(&targets, ovs->manager_options[i]->target); + } - if (!br->ctrl) { - vsctl_fatal("no controller declared for %s", br->name); + svec_sort_unique(&targets); + for (i = 0; i < targets.n; i++) { + ds_put_format(&ctx->output, "%s\n", targets.names[i]); + } + svec_destroy(&targets); +} + +static void +delete_managers(const struct ovsrec_open_vswitch *ovs) +{ + size_t i; + + /* Delete Manager rows pointed to by 'manager_options' column. */ + for (i = 0; i < ovs->n_manager_options; i++) { + ovsrec_manager_delete(ovs->manager_options[i]); + } + + /* Delete 'Manager' row refs in 'manager_options' column. */ + ovsrec_open_vswitch_set_manager_options(ovs, NULL, 0); +} + +static void +cmd_del_manager(struct ctl_context *ctx) +{ + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + const struct ovsrec_open_vswitch *ovs = vsctl_ctx->ovs; + + verify_managers(ovs); + delete_managers(ovs); +} + +static void +insert_managers(struct vsctl_context *vsctl_ctx, char *targets[], size_t n) +{ + struct ovsrec_manager **managers; + size_t i; + + /* Insert each manager in a new row in Manager table. */ + managers = xmalloc(n * sizeof *managers); + for (i = 0; i < n; i++) { + if (stream_verify_name(targets[i]) && pstream_verify_name(targets[i])) { + VLOG_WARN("target type \"%s\" is possibly erroneous", targets[i]); } - ovsrec_controller_set_fail_mode(br->ctrl, fail_mode); + managers[i] = ovsrec_manager_insert(vsctl_ctx->base.txn); + ovsrec_manager_set_target(managers[i], targets[i]); } - free_info(&info); + /* Store uuids of new Manager rows in 'manager_options' column. */ + ovsrec_open_vswitch_set_manager_options(vsctl_ctx->ovs, managers, n); + free(managers); +} + +static void +cmd_set_manager(struct ctl_context *ctx) +{ + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + const size_t n = ctx->argc - 1; + + verify_managers(vsctl_ctx->ovs); + delete_managers(vsctl_ctx->ovs); + insert_managers(vsctl_ctx, &ctx->argv[1], n); +} + +static void +pre_cmd_get_ssl(struct ctl_context *ctx) +{ + ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_ssl); + + ovsdb_idl_add_column(ctx->idl, &ovsrec_ssl_col_private_key); + ovsdb_idl_add_column(ctx->idl, &ovsrec_ssl_col_certificate); + ovsdb_idl_add_column(ctx->idl, &ovsrec_ssl_col_ca_cert); + ovsdb_idl_add_column(ctx->idl, &ovsrec_ssl_col_bootstrap_ca_cert); } static void -cmd_get_ssl(struct vsctl_context *ctx) +cmd_get_ssl(struct ctl_context *ctx) { - struct ovsrec_ssl *ssl = ctx->ovs->ssl; + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + struct ovsrec_ssl *ssl = vsctl_ctx->ovs->ssl; + ovsrec_open_vswitch_verify_ssl(vsctl_ctx->ovs); if (ssl) { + ovsrec_ssl_verify_private_key(ssl); + ovsrec_ssl_verify_certificate(ssl); + ovsrec_ssl_verify_ca_cert(ssl); + ovsrec_ssl_verify_bootstrap_ca_cert(ssl); + ds_put_format(&ctx->output, "Private key: %s\n", ssl->private_key); ds_put_format(&ctx->output, "Certificate: %s\n", ssl->certificate); ds_put_format(&ctx->output, "CA Certificate: %s\n", ssl->ca_cert); @@ -1428,26 +2044,42 @@ cmd_get_ssl(struct vsctl_context *ctx) } static void -cmd_del_ssl(struct vsctl_context *ctx) +pre_cmd_del_ssl(struct ctl_context *ctx) +{ + ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_ssl); +} + +static void +cmd_del_ssl(struct ctl_context *ctx) { - struct ovsrec_ssl *ssl = ctx->ovs->ssl; + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + struct ovsrec_ssl *ssl = vsctl_ctx->ovs->ssl; if (ssl) { + ovsrec_open_vswitch_verify_ssl(vsctl_ctx->ovs); ovsrec_ssl_delete(ssl); - ovsrec_open_vswitch_set_ssl(ctx->ovs, NULL); + ovsrec_open_vswitch_set_ssl(vsctl_ctx->ovs, NULL); } } static void -cmd_set_ssl(struct vsctl_context *ctx) +pre_cmd_set_ssl(struct ctl_context *ctx) { + ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_ssl); +} + +static void +cmd_set_ssl(struct ctl_context *ctx) +{ + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); bool bootstrap = shash_find(&ctx->options, "--bootstrap"); - struct ovsrec_ssl *ssl = ctx->ovs->ssl; + struct ovsrec_ssl *ssl = vsctl_ctx->ovs->ssl; + ovsrec_open_vswitch_verify_ssl(vsctl_ctx->ovs); if (ssl) { ovsrec_ssl_delete(ssl); } - ssl = ovsrec_ssl_insert(txn_from_openvswitch(ctx->ovs)); + ssl = ovsrec_ssl_insert(ctx->txn); ovsrec_ssl_set_private_key(ssl, ctx->argv[1]); ovsrec_ssl_set_certificate(ssl, ctx->argv[2]); @@ -1455,779 +2087,397 @@ cmd_set_ssl(struct vsctl_context *ctx) ovsrec_ssl_set_bootstrap_ca_cert(ssl, bootstrap); - ovsrec_open_vswitch_set_ssl(ctx->ovs, ssl); + ovsrec_open_vswitch_set_ssl(vsctl_ctx->ovs, ssl); } - -/* Parameter commands. */ - -/* POSIX extended regular expression for an 8-bit unsigned decimal integer. */ -#define OCTET_RE "([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])" - -/* POSIX extended regular expression for an IP address. */ -#define IP_RE "("OCTET_RE"\\."OCTET_RE"\\."OCTET_RE"\\."OCTET_RE")" - -/* POSIX extended regular expression for a netmask. */ -#define NETMASK_RE \ - "255.255.255."NETMASK_END_RE"|" \ - "255.255."NETMASK_END_RE".0|" \ - "255."NETMASK_END_RE".0.0|" \ - NETMASK_END_RE".0.0.0" -#define NETMASK_END_RE "(255|254|252|248|240|224|192|128|0)" - -/* POSIX extended regular expression for an Ethernet address. */ -#define XX_RE "[0-9a-fA-F][0-9a-fA-F]" -#define MAC_RE XX_RE":"XX_RE":"XX_RE":"XX_RE":"XX_RE":"XX_RE - -/* POSIX extended regular expression for a TCP or UDP port number. */ -#define PORT_RE \ - "([0-9]|" \ - "[1-9][0-9]|" \ - "[1-9][0-9][0-9]|" \ - "[1-9][0-9][0-9][0-9]|" \ - "[1-5][0-9][0-9][0-9][0-9]|" \ - "6[1-4][0-9][0-9][0-9]|" \ - "65[1-4][0-9][0-9]|" \ - "655[1-2][0-9]|" \ - "6553[1-5])" - -enum { - VSCF_READONLY = 1 << 0, - VSCF_HIDDEN = 1 << 1 -}; - -struct vsctl_column { - struct ovsdb_idl_column *idl; - int flags; - const char *constraint; -}; - -static const struct vsctl_column bridge_columns[] = { - {&ovsrec_bridge_col_datapath_id, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_name, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_mirrors, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_other_config, 0, NULL}, - {&ovsrec_bridge_col_flood_vlans, 0, "[1,4095]"}, - {&ovsrec_bridge_col_controller, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_netflow, VSCF_READONLY, NULL}, - {&ovsrec_bridge_col_external_ids, 0, NULL}, - {&ovsrec_bridge_col_ports, VSCF_READONLY, NULL}, - {NULL, 0, NULL}, -}; -static const struct vsctl_column controller_columns[] = { - {&ovsrec_controller_col_connection_mode, 0, "in-band|out-of-band"}, - {&ovsrec_controller_col_controller_burst_limit, 0, "[25,]"}, - {&ovsrec_controller_col_controller_rate_limit, 0, "[100,]"}, - {&ovsrec_controller_col_discover_accept_regex, 0, NULL}, - {&ovsrec_controller_col_discover_update_resolv_conf, 0, NULL}, - {&ovsrec_controller_col_fail_mode, 0, "standalone|secure"}, - {&ovsrec_controller_col_inactivity_probe, 0, "[5000,]"}, - {&ovsrec_controller_col_local_gateway, 0, IP_RE}, - {&ovsrec_controller_col_local_ip, 0, IP_RE}, - {&ovsrec_controller_col_local_netmask, 0, NETMASK_RE}, - {&ovsrec_controller_col_max_backoff, 0, "[1000,]"}, - {&ovsrec_controller_col_target, 0, NULL}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column interface_columns[] = { - {&ovsrec_interface_col_external_ids, 0, NULL}, - {&ovsrec_interface_col_ingress_policing_burst, 0, "[10,]"}, - {&ovsrec_interface_col_ingress_policing_rate, 0, "[100,]"}, - {&ovsrec_interface_col_mac, 0, MAC_RE}, - {&ovsrec_interface_col_name, VSCF_READONLY, NULL}, - {&ovsrec_interface_col_ofport, VSCF_READONLY, NULL}, - {&ovsrec_interface_col_options, 0, NULL}, - {&ovsrec_interface_col_type, VSCF_READONLY, NULL}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column mirror_columns[] = { - {&ovsrec_mirror_col_name, VSCF_READONLY, NULL}, - {&ovsrec_mirror_col_output_port, 0, "Port"}, - {&ovsrec_mirror_col_output_vlan, 0, "[1,4095]"}, - {&ovsrec_mirror_col_select_dst_port, 0, "Port"}, - {&ovsrec_mirror_col_select_src_port, 0, "Port"}, - {&ovsrec_mirror_col_select_vlan, 0, "[1,4095]"}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column netflow_columns[] = { - {&ovsrec_netflow_col_active_timeout, 0, "[-1,]"}, - {&ovsrec_netflow_col_add_id_to_interface, 0, NULL}, - {&ovsrec_netflow_col_targets, 0, IP_RE":"PORT_RE}, - {&ovsrec_netflow_col_engine_type, 0, "[0,255]"}, - {&ovsrec_netflow_col_engine_id, 0, "[0,255]"}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column open_vswitch_columns[] = { - {&ovsrec_open_vswitch_col_bridges, VSCF_READONLY, NULL}, - {&ovsrec_open_vswitch_col_controller, VSCF_READONLY, NULL}, - {&ovsrec_open_vswitch_col_cur_cfg, VSCF_HIDDEN, NULL}, - {&ovsrec_open_vswitch_col_management_id, 0, "[0-9a-fA-F]{12}"}, - {&ovsrec_open_vswitch_col_managers, 0, "p?(ssl|tcp|unix):.*"}, - {&ovsrec_open_vswitch_col_next_cfg, VSCF_HIDDEN, NULL}, - {&ovsrec_open_vswitch_col_ssl, VSCF_READONLY, NULL}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column port_columns[] = { - {&ovsrec_port_col_bond_updelay, 0, "[0,]"}, - {&ovsrec_port_col_bond_downdelay, 0, "[0,]"}, - {&ovsrec_port_col_bond_fake_iface, VSCF_READONLY, NULL}, - {&ovsrec_port_col_external_ids, 0, NULL}, - {&ovsrec_port_col_fake_bridge, VSCF_READONLY, NULL}, - {&ovsrec_port_col_interfaces, VSCF_READONLY, NULL}, - {&ovsrec_port_col_mac, 0, MAC_RE}, - {&ovsrec_port_col_name, VSCF_READONLY, NULL}, - {&ovsrec_port_col_other_config, 0, NULL}, - {&ovsrec_port_col_tag, 0, "[0,4095]"}, - {&ovsrec_port_col_trunks, 0, "[0,4095]"}, - {NULL, 0, NULL}, -}; - -static const struct vsctl_column ssl_columns[] = { - {&ovsrec_ssl_col_bootstrap_ca_cert, 0, NULL}, - {&ovsrec_ssl_col_ca_cert, 0, NULL}, - {&ovsrec_ssl_col_certificate, 0, NULL}, - {&ovsrec_ssl_col_private_key, 0, NULL}, - {NULL, 0, NULL}, -}; - -struct vsctl_row_id { - const struct ovsdb_idl_table_class *table; - const struct ovsdb_idl_column *name_column; - const struct ovsdb_idl_column *uuid_column; -}; - -struct vsctl_table_class { - struct ovsdb_idl_table_class *class; - const struct vsctl_column *columns; - struct vsctl_row_id row_ids[2]; -}; - -static const struct vsctl_table_class tables[] = { - {&ovsrec_table_bridge, bridge_columns, - {{&ovsrec_table_bridge, &ovsrec_bridge_col_name, NULL}, - {NULL, NULL, NULL}}}, +static void +autoattach_insert_mapping(struct ovsrec_autoattach *aa, + int64_t isid, + int64_t vlan) +{ + int64_t *key_mappings, *value_mappings; + size_t i; - {&ovsrec_table_controller, controller_columns, - {{&ovsrec_table_bridge, - &ovsrec_bridge_col_name, - &ovsrec_bridge_col_controller}, - {&ovsrec_table_open_vswitch, - NULL, - &ovsrec_open_vswitch_col_controller}}}, + key_mappings = xmalloc(sizeof *aa->key_mappings * (aa->n_mappings + 1)); + value_mappings = xmalloc(sizeof *aa->value_mappings * (aa->n_mappings + 1)); - {&ovsrec_table_interface, interface_columns, - {{&ovsrec_table_interface, &ovsrec_interface_col_name, NULL}, - {NULL, NULL, NULL}}}, + for (i = 0; i < aa->n_mappings; i++) { + key_mappings[i] = aa->key_mappings[i]; + value_mappings[i] = aa->value_mappings[i]; + } + key_mappings[aa->n_mappings] = isid; + value_mappings[aa->n_mappings] = vlan; - {&ovsrec_table_mirror, mirror_columns, - {{&ovsrec_table_mirror, &ovsrec_mirror_col_name, NULL}, - {NULL, NULL, NULL}}}, + ovsrec_autoattach_set_mappings(aa, key_mappings, value_mappings, + aa->n_mappings + 1); - {&ovsrec_table_netflow, netflow_columns, - {{&ovsrec_table_bridge, - &ovsrec_bridge_col_name, - &ovsrec_bridge_col_netflow}, - {NULL, NULL, NULL}}}, - - {&ovsrec_table_open_vswitch, open_vswitch_columns, - {{&ovsrec_table_open_vswitch, NULL, NULL}, - {NULL, NULL, NULL}}}, + free(key_mappings); + free(value_mappings); +} - {&ovsrec_table_port, port_columns, - {{&ovsrec_table_port, &ovsrec_port_col_name, NULL}, - {NULL, NULL, NULL}}}, +static void +cmd_add_aa_mapping(struct ctl_context *ctx) +{ + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + struct vsctl_bridge *br; + int64_t isid, vlan; + char *nptr = NULL; - {&ovsrec_table_ssl, ssl_columns, - {{&ovsrec_table_open_vswitch, NULL, &ovsrec_open_vswitch_col_ssl}}}, + isid = strtoull(ctx->argv[2], &nptr, 10); + if (nptr == ctx->argv[2] || nptr == NULL) { + ctl_fatal("Invalid argument %s", ctx->argv[2]); + return; + } - {NULL, NULL, {{NULL, NULL, NULL}, {NULL, NULL, NULL}}} -}; + vlan = strtoull(ctx->argv[3], &nptr, 10); + if (nptr == ctx->argv[3] || nptr == NULL) { + ctl_fatal("Invalid argument %s", ctx->argv[3]); + return; + } -static int -to_lower_and_underscores(unsigned c) -{ - return c == '-' ? '_' : tolower(c); -} + vsctl_context_populate_cache(ctx); -static unsigned int -score_partial_match(const char *name, const char *s) -{ - int score; + br = find_bridge(vsctl_ctx, ctx->argv[1], true); + if (br->parent) { + br = br->parent; + } - for (score = 0; ; score++, name++, s++) { - if (to_lower_and_underscores(*name) != to_lower_and_underscores(*s)) { - break; - } else if (*name == '\0') { - return UINT_MAX; + if (br->br_cfg) { + if (!br->br_cfg->auto_attach) { + struct ovsrec_autoattach *aa = ovsrec_autoattach_insert(ctx->txn); + ovsrec_bridge_set_auto_attach(br->br_cfg, aa); } + autoattach_insert_mapping(br->br_cfg->auto_attach, isid, vlan); } - return *s == '\0' ? score : 0; } -static const struct vsctl_table_class * -get_table(const char *table_name) +static void +del_aa_mapping(struct ovsrec_autoattach *aa, + int64_t isid, + int64_t vlan) { - const struct vsctl_table_class *table; - const struct vsctl_table_class *best_match = NULL; - unsigned int best_score = 0; + int64_t *key_mappings, *value_mappings; + size_t i, n; - for (table = tables; table->class; table++) { - unsigned int score = score_partial_match(table->class->name, - table_name); - if (score > best_score) { - best_match = table; - best_score = score; - } else if (score == best_score) { - best_match = NULL; + key_mappings = xmalloc(sizeof *aa->key_mappings * (aa->n_mappings)); + value_mappings = xmalloc(sizeof *value_mappings * (aa->n_mappings)); + + for (i = n = 0; i < aa->n_mappings; i++) { + if (aa->key_mappings[i] != isid && aa->value_mappings[i] != vlan) { + key_mappings[n] = aa->key_mappings[i]; + value_mappings[n++] = aa->value_mappings[i]; } } - if (best_match) { - return best_match; - } else if (best_score) { - ovs_fatal(0, "multiple table names match \"%s\"", table_name); - } else { - ovs_fatal(0, "unknown table \"%s\"", table_name); - } + + ovsrec_autoattach_set_mappings(aa, key_mappings, value_mappings, n); + + free(key_mappings); + free(value_mappings); } -static const struct ovsdb_idl_row * -get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, - const struct vsctl_row_id *id, const char *record_id) +static void +cmd_del_aa_mapping(struct ctl_context *ctx) { - const struct ovsdb_idl_row *referrer, *final; + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + struct vsctl_bridge *br; + int64_t isid, vlan; + char *nptr = NULL; - if (!id->table) { - return NULL; + isid = strtoull(ctx->argv[2], &nptr, 10); + if (nptr == ctx->argv[2] || nptr == NULL) { + ctl_fatal("Invalid argument %s", ctx->argv[2]); + return; } - if (!id->name_column) { - if (strcmp(record_id, ".")) { - return NULL; - } - referrer = ovsdb_idl_first_row(ctx->idl, id->table); - if (!referrer || ovsdb_idl_next_row(referrer)) { - return NULL; - } - } else { - const struct ovsdb_idl_row *row; - unsigned int best_score = 0; - - /* It might make sense to relax this assertion. */ - assert(id->name_column->type.key_type == OVSDB_TYPE_STRING); - - referrer = NULL; - for (row = ovsdb_idl_first_row(ctx->idl, id->table); - row != NULL && best_score != UINT_MAX; - row = ovsdb_idl_next_row(row)) - { - struct ovsdb_datum name; - - ovsdb_idl_txn_read(row, id->name_column, &name); - if (name.n == 1) { - unsigned int score = score_partial_match(name.keys[0].string, - record_id); - if (score > best_score) { - referrer = row; - best_score = score; - } else if (score == best_score) { - referrer = NULL; - } - } - ovsdb_datum_destroy(&name, &id->name_column->type); - } - } - if (!referrer) { - return NULL; + vlan = strtoull(ctx->argv[3], &nptr, 10); + if (nptr == ctx->argv[3] || nptr == NULL) { + ctl_fatal("Invalid argument %s", ctx->argv[3]); + return; } - if (id->uuid_column) { - struct ovsdb_datum uuid; + vsctl_context_populate_cache(ctx); - assert(id->uuid_column->type.key_type == OVSDB_TYPE_UUID); - assert(id->uuid_column->type.value_type == OVSDB_TYPE_VOID); - - ovsdb_idl_txn_read(referrer, id->uuid_column, &uuid); - if (uuid.n == 1) { - final = ovsdb_idl_get_row_for_uuid(ctx->idl, table->class, - &uuid.keys[0].uuid); - } - ovsdb_datum_destroy(&uuid, &id->uuid_column->type); - } else { - final = referrer; + br = find_bridge(vsctl_ctx, ctx->argv[1], true); + if (br->parent) { + br = br->parent; } - return final; -} + if (br->br_cfg && br->br_cfg->auto_attach && + br->br_cfg->auto_attach->key_mappings && + br->br_cfg->auto_attach->value_mappings) { + size_t i; -static const struct ovsdb_idl_row * -get_row(struct vsctl_context *ctx, - const struct vsctl_table_class *table, const char *record_id) -{ - const struct ovsdb_idl_row *row; - struct uuid uuid; - - if (uuid_from_string(&uuid, record_id)) { - row = ovsdb_idl_get_row_for_uuid(ctx->idl, table->class, &uuid); - } else { - int i; - - for (i = 0; i < ARRAY_SIZE(table->row_ids); i++) { - row = get_row_by_id(ctx, table, &table->row_ids[i], record_id); - if (row) { + for (i = 0; i < br->br_cfg->auto_attach->n_mappings; i++) { + if (br->br_cfg->auto_attach->key_mappings[i] == isid && + br->br_cfg->auto_attach->value_mappings[i] == vlan) { + del_aa_mapping(br->br_cfg->auto_attach, isid, vlan); break; } } } - if (!row) { - ovs_fatal(0, "no row \"%s\" in table %s", - record_id, table->class->name); - } - return row; } -static const struct vsctl_column * -get_column(const struct vsctl_table_class *table, const char *column_name) +static void +pre_aa_mapping(struct ctl_context *ctx) { - const struct vsctl_column *column; - const struct vsctl_column *best_match = NULL; - unsigned int best_score = 0; + pre_get_info(ctx); - for (column = table->columns; column->idl; column++) { - if (!(column->flags & VSCF_HIDDEN)) { - unsigned int score = score_partial_match(column->idl->name, - column_name); - if (score > best_score) { - best_match = column; - best_score = score; - } else if (score == best_score) { - best_match = NULL; - } - } - } - if (best_match) { - return best_match; - } else if (best_score) { - ovs_fatal(0, "%s has more than one column whose name matches \"%s\"", - table->class->name, column_name); - } else { - ovs_fatal(0, "%s does not have a column \"%s\"", - table->class->name, column_name); - } + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_auto_attach); + ovsdb_idl_add_column(ctx->idl, &ovsrec_autoattach_col_mappings); } static void -check_trailer(const char *s, const char *p) +verify_auto_attach(struct ovsrec_bridge *bridge) { - if (*p != '\0') { - ovs_fatal(0, "%s: trailing garbage in argument at offset %td", - s, p - s); + if (bridge) { + ovsrec_bridge_verify_auto_attach(bridge); + + if (bridge->auto_attach) { + ovsrec_autoattach_verify_mappings(bridge->auto_attach); + } } } static void -parse_column_key_value(const char *arg, const struct vsctl_table_class *table, - const struct vsctl_column **columnp, - char **keyp, char **valuep) +cmd_get_aa_mapping(struct ctl_context *ctx) { - const char *p = arg; - - assert(columnp || keyp); + struct vsctl_context *vsctl_ctx = vsctl_context_cast(ctx); + struct vsctl_bridge *br; - /* Parse column name. */ - if (columnp) { - char *column_name; + vsctl_context_populate_cache(ctx); - p = ovsdb_token_parse(arg, &column_name); - if (column_name[0] == '\0') { - ovs_fatal(0, "%s: missing column name", arg); - } - *columnp = get_column(table, column_name); - free(column_name); + br = find_bridge(vsctl_ctx, ctx->argv[1], true); + if (br->parent) { + br = br->parent; } - /* Parse key string. */ - if (*p == ':' || !columnp) { - if (columnp) { - p++; - } else if (!keyp) { - ovs_fatal(0, "%s: key not accepted here", arg); - } - p = ovsdb_token_parse(p, keyp); - } else if (keyp) { - *keyp = NULL; - } + verify_auto_attach(br->br_cfg); - /* Parse value string. */ - if (*p == '=') { - if (!valuep) { - ovs_fatal(0, "%s: value not accepted here", arg); - } - *valuep = xstrdup(p + 1); - return; - } else { - if (valuep) { - *valuep = NULL; + if (br->br_cfg && br->br_cfg->auto_attach && + br->br_cfg->auto_attach->key_mappings && + br->br_cfg->auto_attach->value_mappings) { + size_t i; + + for (i = 0; i < br->br_cfg->auto_attach->n_mappings; i++) { + ds_put_format(&ctx->output, "%"PRId64" %"PRId64"\n", + br->br_cfg->auto_attach->key_mappings[i], + br->br_cfg->auto_attach->value_mappings[i]); } - check_trailer(arg, p); } } -static void -cmd_get(struct vsctl_context *ctx) -{ - const char *table_name = ctx->argv[1]; - const char *record_id = ctx->argv[2]; - const struct vsctl_table_class *table; - const struct ovsdb_idl_row *row; - struct ds *out = &ctx->output; - int i; + +static const struct ctl_table_class tables[] = { + {&ovsrec_table_bridge, + {{&ovsrec_table_bridge, &ovsrec_bridge_col_name, NULL}, + {&ovsrec_table_flow_sample_collector_set, NULL, + &ovsrec_flow_sample_collector_set_col_bridge}}}, - table = get_table(table_name); - row = get_row(ctx, table, record_id); - for (i = 3; i < ctx->argc; i++) { - const struct vsctl_column *column; - struct ovsdb_datum datum; - char *key_string; + {&ovsrec_table_controller, + {{&ovsrec_table_bridge, + &ovsrec_bridge_col_name, + &ovsrec_bridge_col_controller}}}, - parse_column_key_value(ctx->argv[i], table, - &column, &key_string, NULL); + {&ovsrec_table_interface, + {{&ovsrec_table_interface, &ovsrec_interface_col_name, NULL}, + {NULL, NULL, NULL}}}, - ovsdb_idl_txn_read(row, column->idl, &datum); - if (key_string) { - union ovsdb_atom key; - unsigned int idx; + {&ovsrec_table_mirror, + {{&ovsrec_table_mirror, &ovsrec_mirror_col_name, NULL}, + {NULL, NULL, NULL}}}, - if (column->idl->type.value_type == OVSDB_TYPE_VOID) { - ovs_fatal(0, "cannot specify key to get for non-map column %s", - column->idl->name); - } + {&ovsrec_table_manager, + {{&ovsrec_table_manager, &ovsrec_manager_col_target, NULL}, + {NULL, NULL, NULL}}}, - ovsdb_atom_from_string(&key, column->idl->type.key_type, - key_string); + {&ovsrec_table_netflow, + {{&ovsrec_table_bridge, + &ovsrec_bridge_col_name, + &ovsrec_bridge_col_netflow}, + {NULL, NULL, NULL}}}, - idx = ovsdb_datum_find_key(&datum, &key, - column->idl->type.key_type); - if (idx == UINT_MAX) { - ovs_fatal(0, "no key %s in %s record \"%s\" column %s", - key_string, table_name, record_id, - column->idl->name); + {&ovsrec_table_open_vswitch, + {{&ovsrec_table_open_vswitch, NULL, NULL}, + {NULL, NULL, NULL}}}, - } - ovsdb_atom_to_string(&datum.values[idx], - column->idl->type.value_type, out); + {&ovsrec_table_port, + {{&ovsrec_table_port, &ovsrec_port_col_name, NULL}, + {NULL, NULL, NULL}}}, - ovsdb_atom_destroy(&key, column->idl->type.key_type); - } else { - ovsdb_datum_to_string(&datum, &column->idl->type, out); - } - ds_put_char(out, '\n'); - ovsdb_datum_destroy(&datum, &column->idl->type); + {&ovsrec_table_qos, + {{&ovsrec_table_port, &ovsrec_port_col_name, &ovsrec_port_col_qos}, + {NULL, NULL, NULL}}}, - free(key_string); - } -} + {&ovsrec_table_queue, + {{NULL, NULL, NULL}, + {NULL, NULL, NULL}}}, -static void -list_record(const struct vsctl_table_class *table, const struct ovsdb_idl_row *row, - struct ds *out) -{ - const struct vsctl_column *column; + {&ovsrec_table_ssl, + {{&ovsrec_table_open_vswitch, NULL, &ovsrec_open_vswitch_col_ssl}}}, - ds_put_format(out, "%-20s: "UUID_FMT"\n", "_uuid", UUID_ARGS(&row->uuid)); - for (column = table->columns; column->idl; column++) { - struct ovsdb_datum datum; + {&ovsrec_table_sflow, + {{&ovsrec_table_bridge, + &ovsrec_bridge_col_name, + &ovsrec_bridge_col_sflow}, + {NULL, NULL, NULL}}}, - if (column->flags & VSCF_HIDDEN) { - continue; - } + {&ovsrec_table_flow_table, + {{&ovsrec_table_flow_table, &ovsrec_flow_table_col_name, NULL}, + {NULL, NULL, NULL}}}, - ovsdb_idl_txn_read(row, column->idl, &datum); + {&ovsrec_table_ipfix, + {{&ovsrec_table_bridge, + &ovsrec_bridge_col_name, + &ovsrec_bridge_col_ipfix}, + {&ovsrec_table_flow_sample_collector_set, NULL, + &ovsrec_flow_sample_collector_set_col_ipfix}}}, + + {&ovsrec_table_autoattach, + {{&ovsrec_table_bridge, + &ovsrec_bridge_col_name, + &ovsrec_bridge_col_auto_attach}, + {NULL, NULL, NULL}}}, - ds_put_format(out, "%-20s (%s): ", column->idl->name, - column->flags & VSCF_READONLY ? "RO" : "RW"); - ovsdb_datum_to_string(&datum, &column->idl->type, out); - ds_put_char(out, '\n'); + {&ovsrec_table_flow_sample_collector_set, + {{NULL, NULL, NULL}, + {NULL, NULL, NULL}}}, - ovsdb_datum_destroy(&datum, &column->idl->type); - } -} + {NULL, {{NULL, NULL, NULL}, {NULL, NULL, NULL}}} +}; static void -cmd_list(struct vsctl_context *ctx) +post_db_reload_check_init(void) { - const char *table_name = ctx->argv[1]; - const struct vsctl_table_class *table; - struct ds *out = &ctx->output; - int i; - - table = get_table(table_name); - if (ctx->argc > 2) { - for (i = 2; i < ctx->argc; i++) { - if (i > 2) { - ds_put_char(out, '\n'); - } - list_record(table, get_row(ctx, table, ctx->argv[i]), out); - } - } else { - const struct ovsdb_idl_row *row; - bool first; - - for (row = ovsdb_idl_first_row(ctx->idl, table->class), first = true; - row != NULL; - row = ovsdb_idl_next_row(row), first = false) { - if (!first) { - ds_put_char(out, '\n'); - } - list_record(table, row, out); - } - } + n_neoteric_ifaces = 0; } static void -check_string_constraint(const struct ovsdb_datum *datum, - const char *constraint) +post_db_reload_expect_iface(const struct ovsrec_interface *iface) { - unsigned int i; - char *regex; - regex_t re; - int retval; - - regex = xasprintf("^%s$", constraint); - retval = regcomp(&re, regex, REG_NOSUB | REG_EXTENDED); - if (retval) { - size_t length = regerror(retval, &re, NULL, 0); - char *buffer = xmalloc(length); - regerror(retval, &re, buffer, length); - ovs_fatal(0, "internal error compiling regular expression %s: %s", - regex, buffer); - } - - for (i = 0; i < datum->n; i++) { - const char *key = datum->keys[i].string; - if (regexec(&re, key, 0, NULL, 0)) { - ovs_fatal(0, "%s is not valid (it does not match %s)", key, regex); - } + if (n_neoteric_ifaces >= allocated_neoteric_ifaces) { + neoteric_ifaces = x2nrealloc(neoteric_ifaces, + &allocated_neoteric_ifaces, + sizeof *neoteric_ifaces); } - free(regex); - regfree(&re); + neoteric_ifaces[n_neoteric_ifaces++] = iface->header_.uuid; } static void -check_integer_constraint(const struct ovsdb_datum *datum, - const char *constraint) +post_db_reload_do_checks(const struct vsctl_context *vsctl_ctx) { - int64_t min, max; - unsigned int i; - int n = -1; + struct ds dead_ifaces = DS_EMPTY_INITIALIZER; + size_t i; - sscanf(constraint, "[%"SCNd64",%"SCNd64"]%n", &min, &max, &n); - if (n == -1) { - sscanf(constraint, "[%"SCNd64",]%n", &min, &n); - if (n == -1) { - sscanf(constraint, "[,%"SCNd64"]%n", &max, &n); - if (n == -1) { - VLOG_DBG("internal error: bad integer contraint \"%s\"", - constraint); - return; - } else { - min = INT64_MIN; + for (i = 0; i < n_neoteric_ifaces; i++) { + const struct uuid *uuid; + + uuid = ovsdb_idl_txn_get_insert_uuid(vsctl_ctx->base.txn, + &neoteric_ifaces[i]); + if (uuid) { + const struct ovsrec_interface *iface; + + iface = ovsrec_interface_get_for_uuid(vsctl_ctx->base.idl, uuid); + if (iface && (!iface->ofport || *iface->ofport == -1)) { + ds_put_format(&dead_ifaces, "'%s', ", iface->name); } - } else { - max = INT64_MAX; } } - for (i = 0; i < datum->n; i++) { - int64_t value = datum->keys[i].integer; - if (value < min || value > max) { - if (max == INT64_MAX) { - ovs_fatal(0, "%"PRId64" is less than the minimum " - "allowed value %"PRId64, value, min); - } else if (min == INT64_MIN) { - ovs_fatal(0, "%"PRId64" is greater than the maximum " - "allowed value %"PRId64, value, max); - } else { - ovs_fatal(0, "%"PRId64" is outside the valid range %"PRId64" " - "to %"PRId64" (inclusive)", value, min, max); - } - } + if (dead_ifaces.length) { + dead_ifaces.length -= 2; /* Strip off trailing comma and space. */ + ovs_error(0, "Error detected while setting up %s. See ovs-vswitchd " + "log for details.", ds_cstr(&dead_ifaces)); } + + ds_destroy(&dead_ifaces); } + static void -check_constraint(const struct ovsdb_datum *datum, - const struct ovsdb_type *type, const char *constraint) +vsctl_context_init_command(struct vsctl_context *vsctl_ctx, + struct ctl_command *command) { - if (constraint && datum->n) { - if (type->key_type == OVSDB_TYPE_STRING) { - check_string_constraint(datum, constraint); - } else if (type->key_type == OVSDB_TYPE_INTEGER) { - check_integer_constraint(datum, constraint); - } - } + ctl_context_init_command(&vsctl_ctx->base, command); + vsctl_ctx->verified_ports = false; } static void -cmd_set(struct vsctl_context *ctx) +vsctl_context_init(struct vsctl_context *vsctl_ctx, + struct ctl_command *command, struct ovsdb_idl *idl, + struct ovsdb_idl_txn *txn, + const struct ovsrec_open_vswitch *ovs, + struct ovsdb_symbol_table *symtab) { - const char *table_name = ctx->argv[1]; - const char *record_id = ctx->argv[2]; - const struct vsctl_table_class *table; - const struct ovsdb_idl_row *row; - struct ds *out = &ctx->output; - int i; - - table = get_table(table_name); - row = get_row(ctx, table, record_id); - for (i = 3; i < ctx->argc; i++) { - const struct vsctl_column *column; - char *key_string, *value_string; - - parse_column_key_value(ctx->argv[i], table, - &column, &key_string, &value_string); - if (column->flags & VSCF_READONLY) { - ovs_fatal(0, "%s: cannot modify read-only column %s in table %s", - ctx->argv[i], column->idl->name, table_name); - } - if (!value_string) { - ovs_fatal(0, "%s: missing value", ctx->argv[i]); - } - - if (key_string) { - union ovsdb_atom key, value; - struct ovsdb_datum old, new; - - if (column->idl->type.value_type == OVSDB_TYPE_VOID) { - ovs_fatal(0, "cannot specify key to set for non-map column %s", - column->idl->name); - } - - ovsdb_atom_from_string(&key, column->idl->type.key_type, - key_string); - ovsdb_atom_from_string(&value, column->idl->type.value_type, - value_string); - - ovsdb_datum_init_empty(&new); - ovsdb_datum_add_unsafe(&new, &key, &value, &column->idl->type); - - ovsdb_idl_txn_read(row, column->idl, &old); - ovsdb_datum_union(&old, &new, &column->idl->type, true); - ovsdb_idl_txn_write(row, column->idl, &old); - - ovsdb_datum_destroy(&new, &column->idl->type); - } else { - struct ovsdb_datum datum; - - ovsdb_datum_from_string(&datum, &column->idl->type, value_string); - check_constraint(&datum, &column->idl->type, column->constraint); - ovsdb_idl_txn_write(row, column->idl, &datum); - } - ds_put_char(out, '\n'); - - free(key_string); + ctl_context_init(&vsctl_ctx->base, command, idl, txn, symtab, + vsctl_context_invalidate_cache); + if (command) { + vsctl_ctx->verified_ports = false; } + vsctl_ctx->ovs = ovs; + vsctl_ctx->cache_valid = false; } static void -cmd_add(struct vsctl_context *ctx) +vsctl_context_done_command(struct vsctl_context *vsctl_ctx, + struct ctl_command *command) { - const char *table_name = ctx->argv[1]; - const char *record_id = ctx->argv[2]; - const char *column_name = ctx->argv[3]; - const struct vsctl_table_class *table; - const struct vsctl_column *column; - const struct ovsdb_idl_row *row; - const struct ovsdb_type *type; - struct ovsdb_datum old; - int i; + ctl_context_done_command(&vsctl_ctx->base, command); +} - table = get_table(table_name); - row = get_row(ctx, table, record_id); - column = get_column(table, column_name); - type = &column->idl->type; - ovsdb_idl_txn_read(row, column->idl, &old); - for (i = 4; i < ctx->argc; i++) { - struct ovsdb_type add_type; - struct ovsdb_datum add; - - if (column->flags & VSCF_READONLY) { - ovs_fatal(0, "%s: cannot modify read-only column %s in table %s", - ctx->argv[i], column->idl->name, table_name); - } +static void +vsctl_context_done(struct vsctl_context *vsctl_ctx, + struct ctl_command *command) +{ + ctl_context_done(&vsctl_ctx->base, command); +} - add_type = *type; - add_type.n_min = 1; - add_type.n_max = UINT_MAX; - ovsdb_datum_from_string(&add, &add_type, ctx->argv[i]); - ovsdb_datum_union(&old, &add, type, false); - ovsdb_datum_destroy(&add, type); - } - if (old.n > type->n_max) { - ovs_fatal(0, "\"add\" operation would put %u %s in column %s of " - "table %s but at most %u are allowed", - old.n, - type->value_type == OVSDB_TYPE_VOID ? "values" : "pairs", - column->idl->name, table_name, type->n_max); +static void +run_prerequisites(struct ctl_command *commands, size_t n_commands, + struct ovsdb_idl *idl) +{ + struct ctl_command *c; + + ovsdb_idl_add_table(idl, &ovsrec_table_open_vswitch); + if (wait_for_reload) { + ovsdb_idl_add_column(idl, &ovsrec_open_vswitch_col_cur_cfg); } - ovsdb_idl_txn_write(row, column->idl, &old); -} - -typedef void vsctl_handler_func(struct vsctl_context *); + for (c = commands; c < &commands[n_commands]; c++) { + if (c->syntax->prerequisites) { + struct vsctl_context vsctl_ctx; -struct vsctl_command { - const char *name; - int min_args; - int max_args; - vsctl_handler_func *handler; - const char *options; -}; + ds_init(&c->output); + c->table = NULL; -static void run_vsctl_command(int argc, char *argv[], - const struct ovsrec_open_vswitch *, - struct ovsdb_idl *, struct ds *output); + vsctl_context_init(&vsctl_ctx, c, idl, NULL, NULL, NULL); + (c->syntax->prerequisites)(&vsctl_ctx.base); + vsctl_context_done(&vsctl_ctx, c); -static struct json * -where_uuid_equals(const struct uuid *uuid) -{ - return - json_array_create_1( - json_array_create_3( - json_string_create("_uuid"), - json_string_create("=="), - json_array_create_2( - json_string_create("uuid"), - json_string_create_nocopy( - xasprintf(UUID_FMT, UUID_ARGS(uuid)))))); + ovs_assert(!c->output.string); + ovs_assert(!c->table); + } + } } static void -do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) +do_vsctl(const char *args, struct ctl_command *commands, size_t n_commands, + struct ovsdb_idl *idl) { struct ovsdb_idl_txn *txn; const struct ovsrec_open_vswitch *ovs; enum ovsdb_idl_txn_status status; - struct ds comment, *output; + struct ovsdb_symbol_table *symtab; + struct vsctl_context vsctl_ctx; + struct ctl_command *c; + struct shash_node *node; int64_t next_cfg = 0; - int n_output; - int i, start; + char *error = NULL; - txn = ovsdb_idl_txn_create(idl); + txn = the_idl_txn = ovsdb_idl_txn_create(idl); if (dry_run) { ovsdb_idl_txn_set_dry_run(txn); } - ds_init(&comment); - ds_put_cstr(&comment, "ovs-vsctl:"); - for (i = 0; i < argc; i++) { - ds_put_format(&comment, " %s", argv[i]); - } - ovsdb_idl_txn_add_comment(txn, ds_cstr(&comment)); - ds_destroy(&comment); + ovsdb_idl_txn_add_comment(txn, "ovs-vsctl: %s", args); ovs = ovsrec_open_vswitch_first(idl); if (!ovs) { @@ -2236,69 +2486,108 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) } if (wait_for_reload) { - struct json *where = where_uuid_equals(&ovs->header_.uuid); - ovsdb_idl_txn_increment(txn, "Open_vSwitch", "next_cfg", where); - json_destroy(where); - } - - output = xmalloc(argc * sizeof *output); - n_output = 0; - for (start = i = 0; i <= argc; i++) { - if (i == argc || !strcmp(argv[i], "--")) { - if (i > start) { - ds_init(&output[n_output]); - run_vsctl_command(i - start, &argv[start], ovs, idl, - &output[n_output++]); - } - start = i + 1; + ovsdb_idl_txn_increment(txn, &ovs->header_, + &ovsrec_open_vswitch_col_next_cfg); + } + + post_db_reload_check_init(); + symtab = ovsdb_symbol_table_create(); + for (c = commands; c < &commands[n_commands]; c++) { + ds_init(&c->output); + c->table = NULL; + } + vsctl_context_init(&vsctl_ctx, NULL, idl, txn, ovs, symtab); + for (c = commands; c < &commands[n_commands]; c++) { + vsctl_context_init_command(&vsctl_ctx, c); + if (c->syntax->run) { + (c->syntax->run)(&vsctl_ctx.base); + } + vsctl_context_done_command(&vsctl_ctx, c); + + if (vsctl_ctx.base.try_again) { + vsctl_context_done(&vsctl_ctx, NULL); + goto try_again; } } + vsctl_context_done(&vsctl_ctx, NULL); - while ((status = ovsdb_idl_txn_commit(txn)) == TXN_INCOMPLETE) { - ovsdb_idl_run(idl); - ovsdb_idl_wait(idl); - ovsdb_idl_txn_wait(txn); - poll_block(); + SHASH_FOR_EACH (node, &symtab->sh) { + struct ovsdb_symbol *symbol = node->data; + if (!symbol->created) { + ctl_fatal("row id \"%s\" is referenced but never created (e.g. " + "with \"-- --id=%s create ...\")", + node->name, node->name); + } + if (!symbol->strong_ref) { + if (!symbol->weak_ref) { + VLOG_WARN("row id \"%s\" was created but no reference to it " + "was inserted, so it will not actually appear in " + "the database", node->name); + } else { + VLOG_WARN("row id \"%s\" was created but only a weak " + "reference to it was inserted, so it will not " + "actually appear in the database", node->name); + } + } } + + status = ovsdb_idl_txn_commit_block(txn); if (wait_for_reload && status == TXN_SUCCESS) { next_cfg = ovsdb_idl_txn_get_increment_new_value(txn); } - ovsdb_idl_txn_destroy(txn); + if (status == TXN_UNCHANGED || status == TXN_SUCCESS) { + for (c = commands; c < &commands[n_commands]; c++) { + if (c->syntax->postprocess) { + vsctl_context_init(&vsctl_ctx, c, idl, txn, ovs, symtab); + (c->syntax->postprocess)(&vsctl_ctx.base); + vsctl_context_done(&vsctl_ctx, c); + } + } + } + error = xstrdup(ovsdb_idl_txn_get_error(txn)); switch (status) { + case TXN_UNCOMMITTED: case TXN_INCOMPLETE: - NOT_REACHED(); + OVS_NOT_REACHED(); case TXN_ABORTED: /* Should not happen--we never call ovsdb_idl_txn_abort(). */ - vsctl_fatal("transaction aborted"); + ctl_fatal("transaction aborted"); case TXN_UNCHANGED: case TXN_SUCCESS: break; case TXN_TRY_AGAIN: - for (i = 0; i < n_output; i++) { - ds_destroy(&output[i]); - } - return; + goto try_again; case TXN_ERROR: - vsctl_fatal("transaction error"); + ctl_fatal("transaction error: %s", error); + + case TXN_NOT_LOCKED: + /* Should not happen--we never call ovsdb_idl_set_lock(). */ + ctl_fatal("database not locked"); default: - NOT_REACHED(); + OVS_NOT_REACHED(); } + free(error); + + ovsdb_symbol_table_destroy(symtab); - for (i = 0; i < n_output; i++) { - struct ds *ds = &output[i]; - if (oneline) { + for (c = commands; c < &commands[n_commands]; c++) { + struct ds *ds = &c->output; + + if (c->table) { + table_print(c->table, &table_style); + } else if (oneline) { size_t j; ds_chomp(ds, '\n'); for (j = 0; j < ds->length; j++) { - int c = ds->string[j]; - switch (c) { + int ch = ds->string[j]; + switch (ch) { case '\n': fputs("\\n", stdout); break; @@ -2308,22 +2597,32 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) break; default: - putchar(c); + putchar(ch); } } putchar('\n'); } else { fputs(ds_cstr(ds), stdout); } + ds_destroy(&c->output); + table_destroy(c->table); + free(c->table); + + shash_destroy_free_data(&c->options); } + free(commands); if (wait_for_reload && status != TXN_UNCHANGED) { + /* Even, if --retry flag was not specified, ovs-vsctl still + * has to retry to establish OVSDB connection, if wait_for_reload + * was set. Otherwise, ovs-vsctl would end up waiting forever + * until cur_cfg would be updated. */ + ovsdb_idl_enable_reconnect(idl); for (;;) { - const struct ovsrec_open_vswitch *ovs; - ovsdb_idl_run(idl); OVSREC_OPEN_VSWITCH_FOR_EACH (ovs, idl) { if (ovs->cur_cfg >= next_cfg) { + post_db_reload_do_checks(&vsctl_ctx); goto done; } } @@ -2332,137 +2631,146 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) } done: ; } + ovsdb_idl_txn_destroy(txn); + ovsdb_idl_destroy(idl); exit(EXIT_SUCCESS); -} - -static vsctl_handler_func * -get_vsctl_handler(int argc, char *argv[], struct vsctl_context *ctx) -{ - static const struct vsctl_command all_commands[] = { - /* Open vSwitch commands. */ - {"init", 0, 0, cmd_init, ""}, - - /* Bridge commands. */ - {"add-br", 1, 3, cmd_add_br, ""}, - {"del-br", 1, 1, cmd_del_br, "--if-exists"}, - {"list-br", 0, 0, cmd_list_br, ""}, - {"br-exists", 1, 1, cmd_br_exists, ""}, - {"br-to-vlan", 1, 1, cmd_br_to_vlan, ""}, - {"br-to-parent", 1, 1, cmd_br_to_parent, ""}, - {"br-set-external-id", 2, 3, cmd_br_set_external_id, ""}, - {"br-get-external-id", 1, 2, cmd_br_get_external_id, ""}, - - /* Port commands. */ - {"list-ports", 1, 1, cmd_list_ports, ""}, - {"add-port", 2, 2, cmd_add_port, ""}, - {"add-bond", 4, INT_MAX, cmd_add_bond, "--fake-iface"}, - {"del-port", 1, 2, cmd_del_port, "--if-exists"}, - {"port-to-br", 1, 1, cmd_port_to_br, ""}, - {"port-set-external-id", 2, 3, cmd_port_set_external_id, ""}, - {"port-get-external-id", 1, 2, cmd_port_get_external_id, ""}, - - /* Interface commands. */ - {"list-ifaces", 1, 1, cmd_list_ifaces, ""}, - {"iface-to-br", 1, 1, cmd_iface_to_br, ""}, - {"iface-set-external-id", 2, 3, cmd_iface_set_external_id, ""}, - {"iface-get-external-id", 1, 2, cmd_iface_get_external_id, ""}, - - /* Controller commands. */ - {"get-controller", 0, 1, cmd_get_controller, ""}, - {"del-controller", 0, 1, cmd_del_controller, ""}, - {"set-controller", 1, 2, cmd_set_controller, ""}, - {"get-fail-mode", 0, 1, cmd_get_fail_mode, ""}, - {"del-fail-mode", 0, 1, cmd_del_fail_mode, ""}, - {"set-fail-mode", 1, 2, cmd_set_fail_mode, ""}, - - /* SSL commands. */ - {"get-ssl", 0, 0, cmd_get_ssl, ""}, - {"del-ssl", 0, 0, cmd_del_ssl, ""}, - {"set-ssl", 3, 3, cmd_set_ssl, "--bootstrap"}, - - /* Parameter commands. */ - {"get", 3, INT_MAX, cmd_get, ""}, - {"list", 1, INT_MAX, cmd_list, ""}, - {"set", 3, INT_MAX, cmd_set, ""}, - {"add", 4, INT_MAX, cmd_add, ""}, -#if 0 - /* XXX Not yet implemented. */ - {"remove", 4, INT_MAX, cmd_remove, ""}, - {"clear", 3, INT_MAX, cmd_clear, ""}, -#endif - }; - const struct vsctl_command *p; - int i; - - shash_init(&ctx->options); - for (i = 0; i < argc; i++) { - if (argv[i][0] != '-') { - break; - } - if (!shash_add_once(&ctx->options, argv[i], NULL)) { - vsctl_fatal("'%s' option specified multiple times", argv[i]); - } - } - if (i == argc) { - vsctl_fatal("missing command name"); +try_again: + /* Our transaction needs to be rerun, or a prerequisite was not met. Free + * resources and return so that the caller can try again. */ + if (txn) { + ovsdb_idl_txn_abort(txn); + ovsdb_idl_txn_destroy(txn); + the_idl_txn = NULL; } - - for (p = all_commands; p < &all_commands[ARRAY_SIZE(all_commands)]; p++) { - if (!strcmp(p->name, argv[i])) { - struct shash_node *node; - int n_arg; - - SHASH_FOR_EACH (node, &ctx->options) { - const char *s = strstr(p->options, node->name); - int end = s ? s[strlen(node->name)] : EOF; - if (end != ',' && end != ' ' && end != '\0') { - vsctl_fatal("'%s' command has no '%s' option", - argv[i], node->name); - } - } - - n_arg = argc - i - 1; - if (n_arg < p->min_args) { - vsctl_fatal("'%s' command requires at least %d arguments", - p->name, p->min_args); - } else if (n_arg > p->max_args) { - vsctl_fatal("'%s' command takes at most %d arguments", - p->name, p->max_args); - } else { - ctx->argc = n_arg + 1; - ctx->argv = &argv[i]; - return p->handler; - } - } + ovsdb_symbol_table_destroy(symtab); + for (c = commands; c < &commands[n_commands]; c++) { + ds_destroy(&c->output); + table_destroy(c->table); + free(c->table); } - - vsctl_fatal("unknown command '%s'; use --help for help", argv[i]); + free(error); } +/* Frees the current transaction and the underlying IDL and then calls + * exit(status). + * + * Freeing the transaction and the IDL is not strictly necessary, but it makes + * for a clean memory leak report from valgrind in the normal case. That makes + * it easier to notice real memory leaks. */ static void -check_vsctl_command(int argc, char *argv[]) +vsctl_exit(int status) { - struct vsctl_context ctx; - - get_vsctl_handler(argc, argv, &ctx); - shash_destroy(&ctx.options); + if (the_idl_txn) { + ovsdb_idl_txn_abort(the_idl_txn); + ovsdb_idl_txn_destroy(the_idl_txn); + } + ovsdb_idl_destroy(the_idl); + exit(status); } +/* + * Developers who add new commands to the 'struct ctl_command_syntax' must + * define the 'arguments' member of the struct. The following keywords are + * available for composing the argument format: + * + * TABLE RECORD BRIDGE PARENT PORT + * KEY VALUE ARG KEY=VALUE ?KEY=VALUE + * IFACE SYSIFACE COLUMN COLUMN?:KEY COLUMN?:KEY=VALUE + * MODE CA-CERT CERTIFICATE PRIVATE-KEY + * TARGET NEW-* (e.g. NEW-PORT) + * + * For argument types not listed above, just uses 'ARG' as place holder. + * + * Encloses the keyword with '[]' if it is optional. Appends '...' to + * keyword or enclosed keyword to indicate that the argument can be specified + * multiple times. + * + * */ +static const struct ctl_command_syntax vsctl_commands[] = { + /* Open vSwitch commands. */ + {"init", 0, 0, "", NULL, cmd_init, NULL, "", RW}, + + /* Bridge commands. */ + {"add-br", 1, 3, "NEW-BRIDGE [PARENT] [NEW-VLAN]", pre_get_info, + cmd_add_br, NULL, "--may-exist", RW}, + {"del-br", 1, 1, "BRIDGE", pre_get_info, cmd_del_br, + NULL, "--if-exists", RW}, + {"list-br", 0, 0, "", pre_get_info, cmd_list_br, NULL, "--real,--fake", + RO}, + {"br-exists", 1, 1, "BRIDGE", pre_get_info, cmd_br_exists, NULL, "", RO}, + {"br-to-vlan", 1, 1, "BRIDGE", pre_get_info, cmd_br_to_vlan, NULL, "", + RO}, + {"br-to-parent", 1, 1, "BRIDGE", pre_get_info, cmd_br_to_parent, NULL, + "", RO}, + {"br-set-external-id", 2, 3, "BRIDGE KEY [VALUE]", + pre_cmd_br_set_external_id, cmd_br_set_external_id, NULL, "", RW}, + {"br-get-external-id", 1, 2, "BRIDGE [KEY]", pre_cmd_br_get_external_id, + cmd_br_get_external_id, NULL, "", RO}, + + /* Port commands. */ + {"list-ports", 1, 1, "BRIDGE", pre_get_info, cmd_list_ports, NULL, "", + RO}, + {"add-port", 2, INT_MAX, "BRIDGE NEW-PORT [COLUMN[:KEY]=VALUE]...", + pre_get_info, cmd_add_port, NULL, "--may-exist", RW}, + {"add-bond", 4, INT_MAX, + "BRIDGE NEW-BOND-PORT SYSIFACE... [COLUMN[:KEY]=VALUE]...", pre_get_info, + cmd_add_bond, NULL, "--may-exist,--fake-iface", RW}, + {"del-port", 1, 2, "[BRIDGE] PORT|IFACE", pre_get_info, cmd_del_port, NULL, + "--if-exists,--with-iface", RW}, + {"port-to-br", 1, 1, "PORT", pre_get_info, cmd_port_to_br, NULL, "", RO}, + + /* Interface commands. */ + {"list-ifaces", 1, 1, "BRIDGE", pre_get_info, cmd_list_ifaces, NULL, "", + RO}, + {"iface-to-br", 1, 1, "IFACE", pre_get_info, cmd_iface_to_br, NULL, "", + RO}, + + /* Controller commands. */ + {"get-controller", 1, 1, "BRIDGE", pre_controller, cmd_get_controller, + NULL, "", RO}, + {"del-controller", 1, 1, "BRIDGE", pre_controller, cmd_del_controller, + NULL, "", RW}, + {"set-controller", 1, INT_MAX, "BRIDGE TARGET...", pre_controller, + cmd_set_controller, NULL, "", RW}, + {"get-fail-mode", 1, 1, "BRIDGE", pre_get_info, cmd_get_fail_mode, NULL, + "", RO}, + {"del-fail-mode", 1, 1, "BRIDGE", pre_get_info, cmd_del_fail_mode, NULL, + "", RW}, + {"set-fail-mode", 2, 2, "BRIDGE MODE", pre_get_info, cmd_set_fail_mode, + NULL, "", RW}, + + /* Manager commands. */ + {"get-manager", 0, 0, "", pre_manager, cmd_get_manager, NULL, "", RO}, + {"del-manager", 0, 0, "", pre_manager, cmd_del_manager, NULL, "", RW}, + {"set-manager", 1, INT_MAX, "TARGET...", pre_manager, cmd_set_manager, + NULL, "", RW}, + + /* SSL commands. */ + {"get-ssl", 0, 0, "", pre_cmd_get_ssl, cmd_get_ssl, NULL, "", RO}, + {"del-ssl", 0, 0, "", pre_cmd_del_ssl, cmd_del_ssl, NULL, "", RW}, + {"set-ssl", 3, 3, "PRIVATE-KEY CERTIFICATE CA-CERT", pre_cmd_set_ssl, + cmd_set_ssl, NULL, "--bootstrap", RW}, + + /* Auto Attach commands. */ + {"add-aa-mapping", 3, 3, "BRIDGE ARG ARG", pre_aa_mapping, cmd_add_aa_mapping, + NULL, "", RW}, + {"del-aa-mapping", 3, 3, "BRIDGE ARG ARG", pre_aa_mapping, cmd_del_aa_mapping, + NULL, "", RW}, + {"get-aa-mapping", 1, 1, "BRIDGE", pre_aa_mapping, cmd_get_aa_mapping, + NULL, "", RO}, + + /* Switch commands. */ + {"emer-reset", 0, 0, "", pre_cmd_emer_reset, cmd_emer_reset, NULL, "", RW}, + + {NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, RO}, +}; + +/* Registers vsctl and common db commands. */ static void -run_vsctl_command(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, - struct ovsdb_idl *idl, struct ds *output) +vsctl_cmd_init(void) { - vsctl_handler_func *function; - struct vsctl_context ctx; - - function = get_vsctl_handler(argc, argv, &ctx); - ctx.ovs = ovs; - ctx.idl = idl; - ds_init(&ctx.output); - function(&ctx); - *output = ctx.output; - shash_destroy(&ctx.options); + ctl_init(tables, vsctl_exit); + ctl_register_commands(vsctl_commands); }