[aclorch] add generic AclOrch::updateAclRule() method by stepanblyschak · Pull Request #1993 · sonic-net/sonic-swss

stepanblyschak · 2021-10-28T11:51:00Z

What I did

I added generic AclOrch::updateAclRule() implementation. This implementation takes a newly constructed shared_ptr<AclRule> provided by the user, calculates a difference between priority, matches and actions and calls sai_acl_api->set_acl_entry_attribute() for those attributes that were changed. The derivatives of AclRule can customize the behaviour of AclRule::update(const AclRule& updatedRule) by polymorphic override, although in that case the derivative needs dynamic_cast the updatedRule to a concrete derivative type.
Added unit test to cover update scenario. Currently this new API is not used by any clients nor handling ACL_RULE table updates. This API will be used by PBH ACL rule update flow.

Why I did it

To support the scenario for updating PBH ACL rule in the future.

How I verified it

Temporary changed the ACL_RULE table update to leverage this new API and tested updates through CONFIG_DB and unit test coverage.

Details if related

Signed-off-by: Stepan Blyshchak <[email protected]>

prsunny · 2021-10-28T20:35:44Z

@stepanblyschak, the changes looks to be significant. Is there any document covering this new change? Request @bingwang-ms and @anish-n to sign-off

stepanblyschak · 2021-10-29T11:59:19Z

@prsunny This is briefly covered https://github.com/azure/SONiC/blob/master/doc/acl/ACL-Table-Type-HLD.md#acl-rule-update

bingwang-ms · 2021-11-01T06:25:37Z

Reviewing

stepanblyschak · 2021-11-08T15:06:17Z

/azpw run

mssonicbld · 2021-11-08T15:06:18Z

/AzurePipelines run

azure-pipelines · 2021-11-08T15:06:29Z

Azure Pipelines successfully started running 1 pipeline(s).

orchagent/aclorch.cpp

Signed-off-by: Stepan Blyschak <[email protected]>

…s into acl-rule-update

Signed-off-by: Stepan Blyschak <[email protected]>

…date Signed-off-by: Stepan Blyschak <[email protected]>

Signed-off-by: Stepan Blyschak <[email protected]>

bingwang-ms · 2021-11-17T07:19:49Z

Please ping me when the PR is ready for review. Thanks

stepanblyschak · 2021-11-17T08:23:33Z

@bingwang-ms This PR is ready.

orchagent/aclorch.cpp

Signed-off-by: Stepan Blyshchak <[email protected]>

bingwang-ms · 2021-11-18T10:50:26Z

/azp run

azure-pipelines · 2021-11-18T10:50:37Z

Azure Pipelines successfully started running 1 pipeline(s).

This reverts commit eacb0c8.

Signed-off-by: Stepan Blyshchak <[email protected]>

This reverts commit 5b26cbc.

stepanblyschak · 2021-11-18T13:22:34Z

There is some issue with LGTM:

[2021-11-18 13:03:05] [build-stdout] g++ -DHAVE_CONFIG_H -I. -I.. -I .. -g -DNDEBUG  -ansi -fPIC -std=c++11 -Wall -Wcast-align -Wcast-qual -Wconversion -Wdisabled-optimization -Werror -Wextra -Wfloat-equal -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-y2k -Wimport -Winit-self -Winvalid-pch -Wlong-long -Wmissing-field-initializers -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-noreturn -Wno-aggregate-return -Wno-padded -Wno-switch-enum -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wshadow -Wstack-protector -Wstrict-aliasing=3 -Wswitch -Wswitch-default -Wunreachable-code -Wunused -Wvariadic-macros -Wno-write-strings -Wno-missing-format-attribute -Wno-long-long  -I/usr/include/libnl3  -Wdate-time -D_FORTIFY_SOURCE=2  -g -O2 -fdebug-prefix-map=/opt/src/sonic-swss-common=. -fstack-protector-strong -Wformat -Werror=format-security -c -o tests-saiaclschema_ut.o `test -f 'saiaclschema_ut.cpp' || echo './'`saiaclschema_ut.cpp
[2021-11-18 13:03:05] [build-stderr] saiaclschema_ut.cpp:1:10: fatal error: gmock/gmock.h: No such file or directory
[2021-11-18 13:03:05] [build-stderr]     1 | #include <gmock/gmock.h>
[2021-11-18 13:03:05] [build-stderr]       |          ^~~~~~~~~~~~~~~
[2021-11-18 13:03:05] [build-stderr] compilation terminated.

stepanblyschak · 2021-11-19T09:05:50Z

/azpw run

mssonicbld · 2021-11-19T09:05:51Z

/AzurePipelines run

azure-pipelines · 2021-11-19T09:06:02Z

Azure Pipelines successfully started running 1 pipeline(s).

stepanblyschak · 2021-11-19T14:47:49Z

/azpw run

mssonicbld · 2021-11-19T14:47:51Z

/AzurePipelines run

azure-pipelines · 2021-11-19T14:48:02Z

Azure Pipelines successfully started running 1 pipeline(s).

…-rule-update

stepanblyschak · 2021-11-22T09:34:02Z

/azpw run

mssonicbld · 2021-11-22T09:34:03Z

/AzurePipelines run

azure-pipelines · 2021-11-22T09:34:14Z

Azure Pipelines successfully started running 1 pipeline(s).

- What I did I added generic AclOrch::updateAclRule() implementation. This implementation takes a newly constructed shared_ptr<AclRule> provided by the user, calculates a difference between priority, matches and actions and calls sai_acl_api->set_acl_entry_attribute() for those attributes that were changed. The derivatives of AclRule can customize the behaviour of AclRule::update(const AclRule& updatedRule) by polymorphic override, although in that case the derivative needs dynamic_cast the updatedRule to a concrete derivative type. Added unit test to cover update scenario. Currently this new API is not used by any clients nor handling ACL_RULE table updates. This API will be used by PBH ACL rule update flow. - Why I did it To support the scenario for updating PBH ACL rule in the future. - How I verified it Temporary changed the ACL_RULE table update to leverage this new API and tested updates through CONFIG_DB and unit test coverage. Signed-off-by: Stepan Blyshchak <[email protected]>

stepanblyschak added 7 commits October 11, 2021 20:19

[aclorch] add basic AclOrch::updateAclRule method

f72a86b

Signed-off-by: Stepan Blyshchak <[email protected]>

intermediate commit

9fb206d

Signed-off-by: Stepan Blyshchak <[email protected]>

intermediate commit

8556078

Signed-off-by: Stepan Blyshchak <[email protected]>

intermediate commit

f9bcfa2

Signed-off-by: Stepan Blyshchak <[email protected]>

intermediate commit

37a6d4d

Signed-off-by: Stepan Blyshchak <[email protected]>

intermediate commit

da587bc

Signed-off-by: Stepan Blyshchak <[email protected]>

internal review

902853d

Signed-off-by: Stepan Blyshchak <[email protected]>

stepanblyschak requested a review from prsunny as a code owner October 28, 2021 11:51

prsunny requested a review from bingwang-ms October 28, 2021 20:35

bingwang-ms reviewed Nov 10, 2021

View reviewed changes

orchagent/aclorch.cpp Show resolved Hide resolved

stepanblyschak added 7 commits November 10, 2021 10:08

fix issues found during vs tests

0b219aa

Signed-off-by: Stepan Blyschak <[email protected]>

fix issue observed during mux test: change IN_PORT to IN_PORTS

c1287d3

Signed-off-by: Stepan Blyschak <[email protected]>

Merge branch 'acl-rule-update' of github.com:stepanblyschak/sonic-sws…

e2ce426

…s into acl-rule-update

fix indentation

ff570c0

Signed-off-by: Stepan Blyschak <[email protected]>

remove redundant include

b6632ec

Signed-off-by: Stepan Blyschak <[email protected]>

Merge branch 'master' of github.com:azure/sonic-swss into acl-rule-up…

ebe77a2

…date Signed-off-by: Stepan Blyschak <[email protected]>

define udpate for flow watch list entry acl

ffea5c0

Signed-off-by: Stepan Blyschak <[email protected]>

bingwang-ms self-requested a review November 12, 2021 08:18

bingwang-ms reviewed Nov 18, 2021

View reviewed changes

orchagent/aclorch.cpp Show resolved Hide resolved

orchagent/aclorch.cpp Outdated Show resolved Hide resolved

orchagent/aclorch.cpp Show resolved Hide resolved

[aclorch] make AclRule::validateAddAction pure virtual

eacb0c8

Signed-off-by: Stepan Blyshchak <[email protected]>

stepanblyschak added 3 commits November 18, 2021 14:38

Revert "[aclorch] make AclRule::validateAddAction pure virtual"

5b26cbc

This reverts commit eacb0c8.

impl AclRule::validateAddAction on PbhRule

efadc50

Signed-off-by: Stepan Blyshchak <[email protected]>

Revert "Revert "[aclorch] make AclRule::validateAddAction pure virtual""

691019e

This reverts commit 5b26cbc.

bingwang-ms approved these changes Nov 19, 2021

View reviewed changes

Merge branch 'master' of https://github.com/Azure/sonic-swss into acl…

1f6baa9

…-rule-update

liat-grozovik merged commit da21172 into sonic-net:master Nov 22, 2021

stephenxs mentioned this pull request Nov 23, 2021

[sonic-swss] Advance submodule sonic-net/sonic-buildimage#9288

Merged

5 tasks

Conversation

stepanblyschak commented Oct 28, 2021 • edited by liat-grozovik Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

prsunny commented Oct 28, 2021

Uh oh!

stepanblyschak commented Oct 29, 2021

Uh oh!

bingwang-ms commented Nov 1, 2021

Uh oh!

stepanblyschak commented Nov 8, 2021

Uh oh!

mssonicbld commented Nov 8, 2021

Uh oh!

azure-pipelines bot commented Nov 8, 2021

Uh oh!

Uh oh!

bingwang-ms commented Nov 17, 2021

Uh oh!

stepanblyschak commented Nov 17, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bingwang-ms commented Nov 18, 2021

Uh oh!

azure-pipelines bot commented Nov 18, 2021

Uh oh!

stepanblyschak commented Nov 18, 2021

Uh oh!

stepanblyschak commented Nov 19, 2021

Uh oh!

mssonicbld commented Nov 19, 2021

Uh oh!

azure-pipelines bot commented Nov 19, 2021

Uh oh!

stepanblyschak commented Nov 19, 2021

Uh oh!

mssonicbld commented Nov 19, 2021

Uh oh!

azure-pipelines bot commented Nov 19, 2021

Uh oh!

stepanblyschak commented Nov 22, 2021

Uh oh!

mssonicbld commented Nov 22, 2021

Uh oh!

azure-pipelines bot commented Nov 22, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

stepanblyschak commented Oct 28, 2021 •

edited by liat-grozovik

Loading