Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[201911][Cherry-pick] [acl mirror action] Mirror session ref count fix at acl rule attachment #1896

Merged
merged 2 commits into from
Sep 6, 2021

Conversation

bingwang-ms
Copy link
Contributor

@bingwang-ms bingwang-ms commented Sep 3, 2021

Signed-off-by: bingwang [email protected]

What I did
This PR is a cherry-pick of #1761 from master branch to 201911 branch.
I have to create another PR to pick up the code since it's not a cleanup cherry-pick. Conflicts exist in UT code.
This PR will fix #1891 as well.

Why I did it
Please see #1761.

How I verified it

sonic-swss/tests$ sudo pytest test_mirror.py -v
===================================================================================================================== test session starts ======================================================================================================================
platform linux2 -- Python 2.7.15+, pytest-3.3.0, py-1.10.0, pluggy-0.6.0 -- /usr/bin/python2.7
cachedir: .cache
rootdir: /home/bingwang/workspace/sonic-swss/tests, inifile:
collected 7 items                                                                                                                                                                                                                                              

test_mirror.py::TestMirror::test_MirrorAddRemove PASSED                                                                                                                                                                                                  [ 14%]
test_mirror.py::TestMirror::test_MirrorToVlanAddRemove PASSED                                                                                                                                                                                            [ 28%]
test_mirror.py::TestMirror::test_MirrorToLagAddRemove PASSED                                                                                                                                                                                             [ 42%]
test_mirror.py::TestMirror::test_MirrorDestMoveVlan PASSED                                                                                                                                                                                               [ 57%]
test_mirror.py::TestMirror::test_MirrorDestMoveLag PASSED                                                                                                                                                                                                [ 71%]
test_mirror.py::TestMirror::test_AclBindMirrorPerStage PASSED                                                                                                                                                                                            [ 85%]
test_mirror.py::TestMirror::test_AclBindMirror PASSED                                                                                                                                                                                                    [100%]

================================================================================================================== 7 passed in 183.56 seconds ==================================================================================================================

Details if related

@bingwang-ms bingwang-ms changed the title [Cherry-pick] [acl mirror action] Mirror session ref count fix at acl rule attachment [201911][Cherry-pick] [acl mirror action] Mirror session ref count fix at acl rule attachment Sep 3, 2021
@bingwang-ms
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Comment on lines 900 to 903
# Add Dummy always-pass test at end as workaroud
# for issue when Flaky fail on final test it invokes module tear-down before retrying
def test_nonflaky_dummy():
pass
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This section is not needed for 201911 vs test. But it does not matter if vs test is not run for 201911.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Why didn't we need this patch for 201911?

Signed-off-by: bingwang <[email protected]>
@bingwang-ms bingwang-ms marked this pull request as ready for review September 3, 2021 11:48
@bingwang-ms
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@bingwang-ms
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@bingwang-ms
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@bingwang-ms bingwang-ms merged commit cccb59e into sonic-net:201911 Sep 6, 2021
EdenGri pushed a commit to EdenGri/sonic-swss that referenced this pull request Feb 28, 2022
… table (sonic-net#1896)

* [acl-loader] modify acl-loader with change in STATE DB ACL capability table

Signed-off-by: Stepan Blyshchak <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants