Skip to content

Remove MGMT_INTERFACE from ip2me block rule list#7092

Merged
SuvarnaMeenakshi merged 2 commits intosonic-net:masterfrom
SuvarnaMeenakshi:cacl_ip2me
Dec 28, 2022
Merged

Remove MGMT_INTERFACE from ip2me block rule list#7092
SuvarnaMeenakshi merged 2 commits intosonic-net:masterfrom
SuvarnaMeenakshi:cacl_ip2me

Conversation

@SuvarnaMeenakshi
Copy link
Contributor

@SuvarnaMeenakshi SuvarnaMeenakshi commented Dec 21, 2022

Signed-off-by: Suvarna Meenakshi sumeenak@microsoft.com

Description of PR

Summary:
Fixes #12464

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Back port request

  • 201911
  • 202012
  • 202205

Approach

What is the motivation for this PR?

Provides fix for sonic-net/sonic-buildimage#12464
MGMT_INTERFACE was removed from default ip2me block rules in PR sonic-net/sonic-host-services#6
This PR is to modify the test case according to the change in caclmgrd

How did you do it?

Remove MGMT_INTERFACE when generating ip2me block rule list.

How did you verify/test it?

Ran test on multi-asic vs DUT, without skipping this test:
..
cacl/test_cacl_application.py::test_cacl_application_nondualtor[vlab-08-1]
PASSED [ 70%]
cacl/test_cacl_application.py::test_cacl_application_dualtor[active_tor-vlab-08-1] SKIPPED [ 80%]
cacl/test_cacl_application.py::test_cacl_application_dualtor[standby_tor-vlab-08-1] SKIPPED [ 90%]
cacl/test_cacl_application.py::test_multiasic_cacl_application[vlab-08-1]
PASSED
SKIPPED [4] cacl/test_cacl_application.py: test_cacl_application_dualtor is only supported on dualtor topology
SKIPPED [1] cacl/test_cacl_application.py: caclmgrd may crash after loading scale ipv4 cacl rules.
SKIPPED [1] cacl/test_cacl_application.py: caclmgrd may crash after loading scale ipv6 cacl rules.
============================================================================================================ 4 passed, 6 skipped in 769.78 seconds =============================================================================================================

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

Signed-off-by: Suvarna Meenakshi <sumeenak@microsoft.com>
"PORTCHANNEL_INTERFACE",
"INTERFACE"
]
incl_mgmt_if_branch = ['201911', '202012', '202111', '202205']
Copy link
Contributor

@prsunny prsunny Dec 22, 2022

Choose a reason for hiding this comment

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

afaik, the caclmgrd changes were not backported to 201911, 202012 and previous branches. Is this only required for master?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the caclmgrd changes are not backported to 201911, 202012 or 202205 branches https://github.com/sonic-net/sonic-buildimage/blob/202205/src/sonic-host-services/scripts/caclmgrd#L246
So will need in master or in future branches based off master.
so we include mgmt_interface only for older branches.

Copy link
Contributor

Choose a reason for hiding this comment

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

yes, but we've sonic-mgmt branch for 201911, 202012 which still has MGMT_INTERFACE

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right, so we dont need this check here, should we assume that everyone will run this test case with the right sonic-mgmt branch corresponding to the image?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, because I don't think we can run master sonic-mgmt on older branches anymore as the tests have diverged

Signed-off-by: Suvarna Meenakshi <sumeenak@microsoft.com>
@SuvarnaMeenakshi SuvarnaMeenakshi merged commit 14768ea into sonic-net:master Dec 28, 2022
@SuvarnaMeenakshi SuvarnaMeenakshi deleted the cacl_ip2me branch December 28, 2022 01:05
ZhaohuiS added a commit that referenced this pull request Feb 2, 2023
…#7374)

What is the motivation for this PR?
Issue #12464 was fixed in #7092.

How did you do it?
Remove skip condition for test_cacl_application.py

How did you verify/test it?
Run test_cacl_application.py against master image.

Signed-off-by: Zhaohui Sun <zhaohuisun@microsoft.com>
kellyyeh pushed a commit to kellyyeh/sonic-mgmt that referenced this pull request Mar 31, 2023
…sonic-net#7374)

What is the motivation for this PR?
Issue sonic-net#12464 was fixed in sonic-net#7092.

How did you do it?
Remove skip condition for test_cacl_application.py

How did you verify/test it?
Run test_cacl_application.py against master image.

Signed-off-by: Zhaohui Sun <zhaohuisun@microsoft.com>
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.

2 participants