Skip to content

[action] [PR:17767] Restore config after vxlan_crm from vxlan_ecmp.#18034

Merged
mssonicbld merged 1 commit intosonic-net:202411from
mssonicbld:cherry/202411/17767
Apr 18, 2025
Merged

[action] [PR:17767] Restore config after vxlan_crm from vxlan_ecmp.#18034
mssonicbld merged 1 commit intosonic-net:202411from
mssonicbld:cherry/202411/17767

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

Description of PR

Summary:
Fixes # (issue)

test_cacl_application.py was failing on smartswitch due to BFD iptable rules not being cleaned up by test_vxlan_crm.py, similarly to #17046 .

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
  • Skipped for non-supported platforms
  • Test case improvement

Back port request

  • 202012
  • 202205
  • 202305
  • 202311
  • 202405
  • 202411

Approach

What is the motivation for this PR?

test_vxlan_crm.py was recently enabled for smartswitch, which uses the same setup fixture as test_vxlan_ecmp.py. However, the tests in test_vxlan_ecmp.py have additional cleanup code to handle these BFD entries which is missing in test_vxlan_crm.py.

How did you do it?

Added a config restore fixture, same as in #17046, to test_vxlan_ecmp.py which is re-used by test_vxlan_crm.py

How did you verify/test it?

Ran test_cacl_application.py after running test_vxlan_crm.py and it's now passing with the fix in place. Also checked that iptable is cleaned up after running test_vxlan_crm.py.

Any platform specific information?

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

Documentation

What is the motivation for this PR?
test_vxlan_crm.py was recently enabled for smartswitch, which uses the same setup fixture as test_vxlan_ecmp.py. However, the tests in test_vxlan_ecmp.py have additional cleanup code to handle these BFD entries which is missing in test_vxlan_crm.py.

How did you do it?
Added a config restore fixture, same as in sonic-net#17046, to test_vxlan_ecmp.py which is re-used by test_vxlan_crm.py

How did you verify/test it?
Ran test_cacl_application.py after running test_vxlan_crm.py and it's now passing with the fix in place. Also checked that iptable is cleaned up after running test_vxlan_crm.py.
@mssonicbld
Copy link
Copy Markdown
Collaborator Author

Original PR: #17767

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld mssonicbld merged commit be542b0 into sonic-net:202411 Apr 18, 2025
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants