mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00
Code Issues Releases Wiki Activity

db-ctl-base: Allow record UUIDs to be abbreviated.

Browse Source 
This makes it easier to type ovs-vsctl, ovn-sbctl, ovn-nbctl, and vtep-ctl
commands without cut-and-paste.

Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Andy Zhou <azhou@ovn.org>
This commit is contained in:
Ben Pfaff
2017-04-27 12:36:24 -07:00
parent ad73c1429a
commit 4e3000a09f
7 changed files with 86 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/db-ctl-base.c
View File

@@ -300,6 +300,14 @@ get_row_by_id(struct ctl_context *ctx,
return final;
}
static bool
is_partial_uuid_match(const struct uuid *uuid, const char *match)
{
char uuid_s[UUID_LEN + 1];
snprintf(uuid_s, sizeof uuid_s, UUID_FMT, UUID_ARGS(uuid));
return !strncmp(uuid_s, match, strlen(match));
}
static const struct ovsdb_idl_row *
get_row(struct ctl_context *ctx,
const struct ovsdb_idl_table_class *table, const char *record_id,
@@ -330,6 +338,26 @@ get_row(struct ctl_context *ctx,
}
}
}
if (!row
&& record_id[uuid_is_partial_string(record_id)] == '\0'
&& strlen(record_id) >= 4) {
for (const struct ovsdb_idl_row *r = ovsdb_idl_first_row(ctx->idl,
table);
r != NULL;
r = ovsdb_idl_next_row(r)) {
if (is_partial_uuid_match(&r->uuid, record_id)) {
if (!row) {
row = r;
} else {
ctl_fatal("%s contains 2 or more rows whose UUIDs begin "
"with %s: at least "UUID_FMT" and "UUID_FMT,
table->name, record_id,
UUID_ARGS(&row->uuid),
UUID_ARGS(&r->uuid));
}
}
}
}
if (must_exist && !row) {
ctl_fatal("no row \"%s\" in table %s", record_id, table->name);
}