To align all relevant branches bump
ovs submodule to v3.1.1.
Also partially cherry-pick following patch which
is required for some changes that happened
between the ovs versions.
1b0dbde94070 ("ovn-controller: Only set monitor conditions on available
tables.")
Signed-off-by: Ales Musil <[email protected]>
---
This patch can be applied down to 22.03 without any change.
---
ovs | 2 +-
utilities/ovn-dbctl.c | 2 +-
utilities/ovn-ic-nbctl.c | 7 ++++---
utilities/ovn-ic-sbctl.c | 7 ++++---
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ovs b/ovs
index 2410b9559..0187eadfc 160000
--- a/ovs
+++ b/ovs
@@ -1 +1 @@
-Subproject commit 2410b95597fcec5f733caf77febdb46f4ffacd27
+Subproject commit 0187eadfce4505d502e57c0e688b830f0a1ec728
diff --git a/utilities/ovn-dbctl.c b/utilities/ovn-dbctl.c
index 7ee0b92b4..a850c2f31 100644
--- a/utilities/ovn-dbctl.c
+++ b/utilities/ovn-dbctl.c
@@ -721,7 +721,7 @@ do_dbctl(const struct ovn_dbctl_options *dbctl_options,
ctl_context_init(ctx, NULL, idl, txn, symtab, NULL);
for (size_t i = 0; i < n_commands; i++) {
struct ctl_command *c = &commands[i];
- ctl_context_init_command(ctx, c);
+ ctl_context_init_command(ctx, c, c == &commands[n_commands - 1]);
if (c->syntax->run) {
(c->syntax->run)(ctx);
}
diff --git a/utilities/ovn-ic-nbctl.c b/utilities/ovn-ic-nbctl.c
index be294a7be..c5d58da61 100644
--- a/utilities/ovn-ic-nbctl.c
+++ b/utilities/ovn-ic-nbctl.c
@@ -675,9 +675,9 @@ static const struct ctl_table_class
tables[ICNBREC_N_TABLES] = {
static void
ic_nbctl_context_init_command(struct ic_nbctl_context *ic_nbctl_ctx,
- struct ctl_command *command)
+ struct ctl_command *command, bool last_command)
{
- ctl_context_init_command(&ic_nbctl_ctx->base, command);
+ ctl_context_init_command(&ic_nbctl_ctx->base, command, last_command);
}
static void
@@ -762,7 +762,8 @@ do_ic_nbctl(const char *args, struct ctl_command *commands,
size_t n_commands,
}
ic_nbctl_context_init(&ic_nbctl_ctx, NULL, idl, txn, symtab);
for (c = commands; c < &commands[n_commands]; c++) {
- ic_nbctl_context_init_command(&ic_nbctl_ctx, c);
+ ic_nbctl_context_init_command(&ic_nbctl_ctx, c,
+ c == &commands[n_commands - 1]);
if (c->syntax->run) {
(c->syntax->run)(&ic_nbctl_ctx.base);
}
diff --git a/utilities/ovn-ic-sbctl.c b/utilities/ovn-ic-sbctl.c
index 64d1d469e..f374ccaf7 100644
--- a/utilities/ovn-ic-sbctl.c
+++ b/utilities/ovn-ic-sbctl.c
@@ -747,9 +747,9 @@ static const struct ctl_table_class
tables[ICSBREC_N_TABLES] = {
static void
ic_sbctl_context_init_command(struct ic_sbctl_context *ic_sbctl_ctx,
- struct ctl_command *command)
+ struct ctl_command *command, bool last_command)
{
- ctl_context_init_command(&ic_sbctl_ctx->base, command);
+ ctl_context_init_command(&ic_sbctl_ctx->base, command, last_command);
}
static void
@@ -833,7 +833,8 @@ do_ic_sbctl(const char *args, struct ctl_command *commands,
size_t n_commands,
}
ic_sbctl_context_init(&ic_sbctl_ctx, NULL, idl, txn, symtab);
for (c = commands; c < &commands[n_commands]; c++) {
- ic_sbctl_context_init_command(&ic_sbctl_ctx, c);
+ ic_sbctl_context_init_command(&ic_sbctl_ctx, c,
+ c == &commands[n_commands - 1]);
if (c->syntax->run) {
(c->syntax->run)(&ic_sbctl_ctx.base);
}
--
2.40.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
