Add support for specifying rbac "role" when setting remote
connection configuration in the southbound database.
Prior to this change, usage examples included:
ovn-sbctl set-connection ptcp:6642
ovn-sbctl set-connection pssl:6642 \
read-only ptcp:7777 \
read-write punix:/tmp.foo
With this change, in addition to the above:
ovn-sbctl set-connection role=ovn-controller pssl:6642 \
read-only role= ptcp:7777 \
read-write punix:/tmp/foo
As with the "read-only"/"read-write" attributes, the specified
role is applied to all subsequent connections until changed.
Signed-off-by: Lance Richardson <lrich...@redhat.com>
---
v3: No changes.
v2: No changes.
ovn/utilities/ovn-sbctl.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/ovn/utilities/ovn-sbctl.c b/ovn/utilities/ovn-sbctl.c
index 4a88423..4301971 100644
--- a/ovn/utilities/ovn-sbctl.c
+++ b/ovn/utilities/ovn-sbctl.c
@@ -943,6 +943,7 @@ pre_connection(struct ctl_context *ctx)
ovsdb_idl_add_column(ctx->idl, &sbrec_sb_global_col_connections);
ovsdb_idl_add_column(ctx->idl, &sbrec_connection_col_target);
ovsdb_idl_add_column(ctx->idl, &sbrec_connection_col_read_only);
+ ovsdb_idl_add_column(ctx->idl, &sbrec_connection_col_role);
}
static void
@@ -960,8 +961,10 @@ cmd_get_connection(struct ctl_context *ctx)
SBREC_CONNECTION_FOR_EACH(conn, ctx->idl) {
char *s;
- s = xasprintf("%s %s", conn->read_only ? "read-only" : "read-write",
- conn->target);
+ s = xasprintf("%s role=\"%s\" %s",
+ conn->read_only ? "read-only" : "read-write",
+ conn->role,
+ conn->target);
svec_add(&targets, s);
free(s);
}
@@ -1002,6 +1005,7 @@ insert_connections(struct ctl_context *ctx, char
*targets[], size_t n)
struct sbrec_connection **connections;
size_t i, conns=0;
bool read_only = false;
+ char *role = "";
/* Insert each connection in a new row in Connection table. */
connections = xmalloc(n * sizeof *connections);
@@ -1012,6 +1016,9 @@ insert_connections(struct ctl_context *ctx, char
*targets[], size_t n)
} else if (!strcmp(targets[i], "read-write")) {
read_only = false;
continue;
+ } else if (!strncmp(targets[i], "role=", 5)) {
+ role = targets[i] + 5;
+ continue;
} else if (stream_verify_name(targets[i]) &&
pstream_verify_name(targets[i])) {
VLOG_WARN("target type \"%s\" is possibly erroneous", targets[i]);
@@ -1020,6 +1027,7 @@ insert_connections(struct ctl_context *ctx, char
*targets[], size_t n)
connections[conns] = sbrec_connection_insert(ctx->txn);
sbrec_connection_set_target(connections[conns], targets[i]);
sbrec_connection_set_read_only(connections[conns], read_only);
+ sbrec_connection_set_role(connections[conns], role);
conns++;
}
--
2.9.4
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
