This makes it more consistent with other IDs in the system.
Signed-off-by: Justin Pettit <jpettit@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
txn = ovsdb_idl_txn_create(ctx->ovnsb_idl);
ovsdb_idl_txn_add_comment(txn,
"ovn-controller: updating bindings for '%s'",
- ctx->chassis_name);
+ ctx->chassis_id);
SBREC_BINDINGS_FOR_EACH(bindings_rec, ctx->ovnsb_idl) {
if (sset_find_and_delete(&lports, bindings_rec->logical_port)) {
- if (!strcmp(bindings_rec->chassis, ctx->chassis_name)) {
+ if (!strcmp(bindings_rec->chassis, ctx->chassis_id)) {
continue;
}
if (bindings_rec->chassis[0]) {
VLOG_INFO("Changing chassis for lport %s from %s to %s",
bindings_rec->logical_port, bindings_rec->chassis,
- ctx->chassis_name);
+ ctx->chassis_id);
}
- sbrec_bindings_set_chassis(bindings_rec, ctx->chassis_name);
- } else if (!strcmp(bindings_rec->chassis, ctx->chassis_name)) {
+ sbrec_bindings_set_chassis(bindings_rec, ctx->chassis_id);
+ } else if (!strcmp(bindings_rec->chassis, ctx->chassis_id)) {
sbrec_bindings_set_chassis(bindings_rec, "");
}
}
txn = ovsdb_idl_txn_create(ctx->ovnsb_idl);
ovsdb_idl_txn_add_comment(txn,
"ovn-controller: removing all bindings for '%s'",
- ctx->chassis_name);
+ ctx->chassis_id);
SBREC_BINDINGS_FOR_EACH(bindings_rec, ctx->ovnsb_idl) {
- if (!strcmp(bindings_rec->chassis, ctx->chassis_name)) {
+ if (!strcmp(bindings_rec->chassis, ctx->chassis_id)) {
sbrec_bindings_set_chassis(bindings_rec, "");
}
}
txn = ovsdb_idl_txn_create(ctx->ovnsb_idl);
ovsdb_idl_txn_add_comment(txn,
"ovn-controller: registering chassis '%s'",
- ctx->chassis_name);
+ ctx->chassis_id);
if (!chassis_rec) {
chassis_rec = sbrec_chassis_insert(txn);
- sbrec_chassis_set_name(chassis_rec, ctx->chassis_name);
+ sbrec_chassis_set_name(chassis_rec, ctx->chassis_id);
}
encap_rec = sbrec_encap_insert(txn);
static bool inited = false;
SBREC_CHASSIS_FOR_EACH(chassis_rec, ctx->ovnsb_idl) {
- if (!strcmp(chassis_rec->name, ctx->chassis_name)) {
+ if (!strcmp(chassis_rec->name, ctx->chassis_id)) {
break;
}
}
struct ovsdb_idl_txn *txn;
SBREC_CHASSIS_FOR_EACH(chassis_rec, ctx->ovnsb_idl) {
- if (!strcmp(chassis_rec->name, ctx->chassis_name)) {
+ if (!strcmp(chassis_rec->name, ctx->chassis_id)) {
break;
}
}
txn = ovsdb_idl_txn_create(ctx->ovnsb_idl);
ovsdb_idl_txn_add_comment(txn,
"ovn-controller: unregistering chassis '%s'",
- ctx->chassis_name);
+ ctx->chassis_id);
sbrec_chassis_delete(chassis_rec);
retval = ovsdb_idl_txn_commit_block(txn);
}
ovnsb_remote = xstrdup(remote);
- ctx->chassis_name = xstrdup(system_id);
+ ctx->chassis_id = xstrdup(system_id);
return;
try_again:
main(int argc, char *argv[])
{
struct unixctl_server *unixctl;
- struct controller_ctx ctx = { .chassis_name = NULL };
+ struct controller_ctx ctx = { .chassis_id = NULL };
bool exiting;
int retval;
#define OVN_CONTROLLER_H 1
struct controller_ctx {
- char *chassis_name; /* Name for this chassis. */
+ char *chassis_id; /* ID for this chassis. */
const char *br_int_name; /* Name of local integration bridge. */
struct ovsdb_idl *ovnsb_idl;
struct ovsdb_idl *ovs_idl;