if (!def) {
def = getenv("OVN_NB_DB");
if (!def) {
- def = xasprintf("unix:%s/db.sock", ovs_rundir());
+ def = ctl_default_db();
}
}
return def;
lswitch-add [LSWITCH] create a logical switch named LSWITCH\n\
lswitch-del LSWITCH delete LSWITCH and all its ports\n\
lswitch-list print the names of all logical switches\n\
- lswitch-set-external-id LSWITCH KEY [VALUE]\n\
- set or delete an external-id on LSWITCH\n\
- lswitch-get-external-id LSWITCH [KEY]\n\
- list one or all external-ids on LSWITCH\n\
\n\
ACL commands:\n\
acl-add LSWITCH DIRECTION PRIORITY MATCH ACTION [log]\n\
lport-list LSWITCH print the names of all logical ports on LSWITCH\n\
lport-get-parent LPORT get the parent of LPORT if set\n\
lport-get-tag LPORT get the LPORT's tag if set\n\
- lport-set-external-id LPORT KEY [VALUE]\n\
- set or delete an external-id on LPORT\n\
- lport-get-external-id LPORT [KEY]\n\
- list one or all external-ids on LPORT\n\
- lport-set-macs LPORT [MAC]...\n\
- set MAC addresses for LPORT.\n\
- lport-get-macs LPORT get a list of MAC addresses on LPORT\n\
+ lport-set-addresses LPORT [ADDRESS]...\n\
+ set addresses for LPORT.\n\
+ lport-get-addresses LPORT get a list of MAC addresses on LPORT\n\
lport-set-port-security LPORT [ADDRS]...\n\
set port security addresses for LPORT.\n\
lport-get-port-security LPORT get LPORT's port security addresses\n\
const struct nbrec_logical_port *lport = lswitch->ports[i];
ds_put_format(s, " lport %s\n", lport->name);
- if (lport->parent_name && lport->n_tag) {
- ds_put_format(s, " parent: %s, tag:%"PRIu64"\n",
- lport->parent_name, lport->tag[0]);
+ if (lport->parent_name) {
+ ds_put_format(s, " parent: %s\n", lport->parent_name);
}
- if (lport->n_macs) {
- ds_put_cstr(s, " macs:");
- for (size_t j = 0; j < lport->n_macs; j++) {
- ds_put_format(s, " %s", lport->macs[j]);
+ if (lport->n_tag) {
+ ds_put_format(s, " tag: %"PRIu64"\n", lport->tag[0]);
+ }
+ if (lport->n_addresses) {
+ ds_put_cstr(s, " addresses:");
+ for (size_t j = 0; j < lport->n_addresses; j++) {
+ ds_put_format(s, " %s", lport->addresses[j]);
}
ds_put_char(s, '\n');
}
smap_destroy(&lswitches);
free(nodes);
}
-
-static void
-nbctl_lswitch_set_external_id(struct ctl_context *ctx)
-{
- const char *id = ctx->argv[1];
- const struct nbrec_logical_switch *lswitch;
- struct smap new_external_ids;
-
- lswitch = lswitch_by_name_or_uuid(ctx, id);
- if (!lswitch) {
- return;
- }
-
- smap_init(&new_external_ids);
- smap_clone(&new_external_ids, &lswitch->external_ids);
- if (ctx->argc == 4) {
- smap_replace(&new_external_ids, ctx->argv[2], ctx->argv[3]);
- } else {
- smap_remove(&new_external_ids, ctx->argv[2]);
- }
- nbrec_logical_switch_set_external_ids(lswitch, &new_external_ids);
- smap_destroy(&new_external_ids);
-}
-
-static void
-nbctl_lswitch_get_external_id(struct ctl_context *ctx)
-{
- const char *id = ctx->argv[1];
- const struct nbrec_logical_switch *lswitch;
-
- lswitch = lswitch_by_name_or_uuid(ctx, id);
- if (!lswitch) {
- return;
- }
-
- if (ctx->argc == 3) {
- const char *key = ctx->argv[2];
- const char *value;
-
- /* List one external ID */
-
- value = smap_get(&lswitch->external_ids, key);
- if (value) {
- ds_put_format(&ctx->output, "%s\n", value);
- }
- } else {
- struct smap_node *node;
-
- /* List all external IDs */
-
- SMAP_FOR_EACH(node, &lswitch->external_ids) {
- ds_put_format(&ctx->output, "%s=%s\n", node->key, node->value);
- }
- }
-}
\f
static const struct nbrec_logical_port *
lport_by_name_or_uuid(struct ctl_context *ctx, const char *id)
}
static void
-nbctl_lport_set_external_id(struct ctl_context *ctx)
-{
- const char *id = ctx->argv[1];
- const struct nbrec_logical_port *lport;
- struct smap new_external_ids;
-
- lport = lport_by_name_or_uuid(ctx, id);
- if (!lport) {
- return;
- }
-
- smap_init(&new_external_ids);
- smap_clone(&new_external_ids, &lport->external_ids);
- if (ctx->argc == 4) {
- smap_replace(&new_external_ids, ctx->argv[2], ctx->argv[3]);
- } else {
- smap_remove(&new_external_ids, ctx->argv[2]);
- }
- nbrec_logical_port_set_external_ids(lport, &new_external_ids);
- smap_destroy(&new_external_ids);
-}
-
-static void
-nbctl_lport_get_external_id(struct ctl_context *ctx)
-{
- const char *id = ctx->argv[1];
- const struct nbrec_logical_port *lport;
-
- lport = lport_by_name_or_uuid(ctx, id);
- if (!lport) {
- return;
- }
-
- if (ctx->argc == 3) {
- const char *key = ctx->argv[2];
- const char *value;
-
- /* List one external ID */
-
- value = smap_get(&lport->external_ids, key);
- if (value) {
- ds_put_format(&ctx->output, "%s\n", value);
- }
- } else {
- struct smap_node *node;
-
- /* List all external IDs */
-
- SMAP_FOR_EACH(node, &lport->external_ids) {
- ds_put_format(&ctx->output, "%s=%s\n", node->key, node->value);
- }
- }
-}
-
-static void
-nbctl_lport_set_macs(struct ctl_context *ctx)
+nbctl_lport_set_addresses(struct ctl_context *ctx)
{
const char *id = ctx->argv[1];
const struct nbrec_logical_port *lport;
return;
}
- nbrec_logical_port_set_macs(lport,
+ nbrec_logical_port_set_addresses(lport,
(const char **) ctx->argv + 2, ctx->argc - 2);
}
static void
-nbctl_lport_get_macs(struct ctl_context *ctx)
+nbctl_lport_get_addresses(struct ctl_context *ctx)
{
const char *id = ctx->argv[1];
const struct nbrec_logical_port *lport;
- struct svec macs;
+ struct svec addresses;
const char *mac;
size_t i;
return;
}
- svec_init(&macs);
- for (i = 0; i < lport->n_macs; i++) {
- svec_add(&macs, lport->macs[i]);
+ svec_init(&addresses);
+ for (i = 0; i < lport->n_addresses; i++) {
+ svec_add(&addresses, lport->addresses[i]);
}
- svec_sort(&macs);
- SVEC_FOR_EACH(i, mac, &macs) {
+ svec_sort(&addresses);
+ SVEC_FOR_EACH(i, mac, &addresses) {
ds_put_format(&ctx->output, "%s\n", mac);
}
- svec_destroy(&macs);
+ svec_destroy(&addresses);
}
static void
{ "lswitch-del", 1, 1, "LSWITCH", NULL, nbctl_lswitch_del,
NULL, "", RW },
{ "lswitch-list", 0, 0, "", NULL, nbctl_lswitch_list, NULL, "", RO },
- { "lswitch-set-external-id", 2, 3, "LSWITCH KEY [VALUE]", NULL,
- nbctl_lswitch_set_external_id, NULL, "", RW },
- { "lswitch-get-external-id", 1, 2, "LSWITCH [KEY]", NULL,
- nbctl_lswitch_get_external_id, NULL, "", RO },
/* acl commands. */
{ "acl-add", 5, 5, "LSWITCH DIRECTION PRIORITY MATCH ACTION", NULL,
"", RO },
{ "lport-get-tag", 1, 1, "LPORT", NULL, nbctl_lport_get_tag, NULL, "",
RO },
- { "lport-set-external-id", 2, 3, "LPORT KEY [VALUE]", NULL,
- nbctl_lport_set_external_id, NULL, "", RW },
- { "lport-get-external-id", 1, 2, "LPORT [KEY]", NULL,
- nbctl_lport_get_external_id, NULL, "", RO },
- { "lport-set-macs", 1, INT_MAX, "LPORT [MAC]...", NULL,
- nbctl_lport_set_macs, NULL, "", RW },
- { "lport-get-macs", 1, 1, "LPORT", NULL, nbctl_lport_get_macs, NULL,
+ { "lport-set-addresses", 1, INT_MAX, "LPORT [ADDRESS]...", NULL,
+ nbctl_lport_set_addresses, NULL, "", RW },
+ { "lport-get-addresses", 1, 1, "LPORT", NULL,
+ nbctl_lport_get_addresses, NULL,
"", RO },
{ "lport-set-port-security", 0, INT_MAX, "LPORT [ADDRS]...", NULL,
nbctl_lport_set_port_security, NULL, "", RW },
projects / cascardo / ovs.git / blobdiff