Verified this fix on top of commit acd38429638c01afe1b2a1d15404e4724232ec1d .
Tested-by: Flavio Fernandes <fla...@flaviof.com>
> On Aug 6, 2020, at 9:38 AM, Mark Michelson <mmich...@redhat.com> wrote:
>
> In the fixes commit below, ct_commit was changed to use nested actions.
> This requires that curly braces be present for all ct_commits. When
> adjusting ovn-northd, some ct_commits were not updated to have them.
> This commit fixes the issue.
>
> Fixes: 6cfb44a76c61("Used nested actions in ct_commit")
> Signed-off-by: Mark Michelson <mmich...@redhat.com>
> ---
> northd/ovn-northd.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c
> index 03c62bafa..d2312f020 100644
> --- a/northd/ovn-northd.c
> +++ b/northd/ovn-northd.c
> @@ -5590,7 +5590,7 @@ build_acls(struct ovn_datapath *od, struct hmap *lflows,
> if (server_id && server_mac && lease_time) {
> struct ds match = DS_EMPTY_INITIALIZER;
> const char *actions =
> - has_stateful ? "ct_commit; next;" : "next;";
> + has_stateful ? "ct_commit { }; next;" : "next;";
> ds_put_format(&match, "outport == \"%s\" && eth.src == %s "
> "&& ip4.src == %s && udp && udp.src == 67 "
> "&& udp.dst == 68", od->nbs->ports[i]->name,
> @@ -5616,7 +5616,7 @@ build_acls(struct ovn_datapath *od, struct hmap *lflows,
> ipv6_string_mapped(server_ip, &lla);
>
> struct ds match = DS_EMPTY_INITIALIZER;
> - const char *actions = has_stateful ? "ct_commit; next;" :
> + const char *actions = has_stateful ? "ct_commit { }; next;" :
> "next;";
> ds_put_format(&match, "outport == \"%s\" && eth.src == %s "
> "&& ip6.src == %s && udp && udp.src == 547 "
> @@ -5634,7 +5634,7 @@ build_acls(struct ovn_datapath *od, struct hmap *lflows,
> * if the CMS has configured DNS records for the datapath.
> */
> if (ls_has_dns_records(od->nbs)) {
> - const char *actions = has_stateful ? "ct_commit; next;" : "next;";
> + const char *actions = has_stateful ? "ct_commit { }; next;" :
> "next;";
> ovn_lflow_add(
> lflows, od, S_SWITCH_OUT_ACL, 34000, "udp.src == 53",
> actions);
> --
> 2.25.4
>
> _______________________________________________
> dev mailing list
> d...@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
