diff mbox series

[ovs-dev] Fix the test case "ACL label usage" for northd-ddlog.

Message ID 20210820183807.975918-1-numans@ovn.org
State Accepted
Headers show
Series [ovs-dev] Fix the test case "ACL label usage" for northd-ddlog. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test fail github build: failed
ovsrobot/github-robot-_ovn-kubernetes fail github build: failed

Commit Message

Numan Siddique Aug. 20, 2021, 6:38 p.m. UTC 
From: Numan Siddique <numans@ovn.org>

Commit in the fixes tag added an extra space in the action
causing the test case to fail.

Fixes: b5b434b4d49("Intern all the matches and actions.")
Signed-off-by: Numan Siddique <numans@ovn.org>
---
 northd/ovn_northd.dl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Michelson Aug. 27, 2021, 6:30 p.m. UTC | #1 
Acked-by: Mark Michelson <mmichels@redhat.com>

I went ahead and merged the change to master since it is trivial.

On 8/20/21 2:38 PM, numans@ovn.org wrote:
> From: Numan Siddique <numans@ovn.org>
> 
> Commit in the fixes tag added an extra space in the action
> causing the test case to fail.
> 
> Fixes: b5b434b4d49("Intern all the matches and actions.")
> Signed-off-by: Numan Siddique <numans@ovn.org>
> ---
>   northd/ovn_northd.dl | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/northd/ovn_northd.dl b/northd/ovn_northd.dl
> index 9cf4c373b..38a0f79d4 100644
> --- a/northd/ovn_northd.dl
> +++ b/northd/ovn_northd.dl
> @@ -2819,7 +2819,7 @@ for (&SwitchACL(.sw = sw, .acl = acl, .has_fair_meter = fair_meter)) {
>                */
>               var __action = if (acl.label != 0) {
>                   i"${rEGBIT_CONNTRACK_COMMIT()} = 1; ${rEGBIT_ACL_LABEL()} = 1; "
> -                " ${rEG_LABEL()} = ${acl.label}; ${acl_log}next;"
> +                "${rEG_LABEL()} = ${acl.label}; ${acl_log}next;"
>               } else {
>                   i"${rEGBIT_CONNTRACK_COMMIT()} = 1; ${acl_log}next;"
>               } in Flow(.logical_datapath = sw._uuid,
>
diff mbox series

Patch

diff --git a/northd/ovn_northd.dl b/northd/ovn_northd.dl
index 9cf4c373b..38a0f79d4 100644
--- a/northd/ovn_northd.dl
+++ b/northd/ovn_northd.dl
@@ -2819,7 +2819,7 @@  for (&SwitchACL(.sw = sw, .acl = acl, .has_fair_meter = fair_meter)) {
              */
             var __action = if (acl.label != 0) {
                 i"${rEGBIT_CONNTRACK_COMMIT()} = 1; ${rEGBIT_ACL_LABEL()} = 1; "
-                " ${rEG_LABEL()} = ${acl.label}; ${acl_log}next;"
+                "${rEG_LABEL()} = ${acl.label}; ${acl_log}next;"
             } else {
                 i"${rEGBIT_CONNTRACK_COMMIT()} = 1; ${acl_log}next;"
             } in Flow(.logical_datapath = sw._uuid,