Skip to content

Restore fixture disable_packet_aging#17800

Merged
bingwang-ms merged 1 commit intosonic-net:masterfrom
bingwang-ms:restore_disable_packet_aging_fixture
Apr 4, 2025
Merged

Restore fixture disable_packet_aging#17800
bingwang-ms merged 1 commit intosonic-net:masterfrom
bingwang-ms:restore_disable_packet_aging_fixture

Conversation

@bingwang-ms
Copy link
Collaborator

@bingwang-ms bingwang-ms commented Apr 1, 2025

Description of PR

Summary:
This PR is to fix an issue introduced by #17728

The auto-used PR is still required for the test cases in tests/qos/test_tunnel_qos_remap.py because fixture update_docker_services is only called for several test cases.

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?

This PR is to fix an issue introduced by #17728

How did you do it?

Add the fixture back.

How did you verify/test it?

Verified on a physical SN4700 dualtor testbed.

collected 4 items                                                                                                                                                                                                             

qos/test_tunnel_qos_remap.py::test_xoff_for_pcbb[pcbb_xoff_1] PASSED                                                                                                                                                    [ 25%]
qos/test_tunnel_qos_remap.py::test_xoff_for_pcbb[pcbb_xoff_2] PASSED                                                                                                                                                    [ 50%]
qos/test_tunnel_qos_remap.py::test_xoff_for_pcbb[pcbb_xoff_3] PASSED                                                                                                                                                    [ 75%]
qos/test_tunnel_qos_remap.py::test_xoff_for_pcbb[pcbb_xoff_4] PASSED                                                                                                                                                    [100%]

Any platform specific information?

Mellanox platform specific.

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

Not a new test case.

Documentation

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@bingwang-ms
Copy link
Collaborator Author

@congh-nvidia , @nhe-NV Can you please help review?

Copy link
Contributor

@congh-nvidia congh-nvidia left a comment

Choose a reason for hiding this comment

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

LGTM

@bingwang-ms bingwang-ms merged commit 4eb5c8c into sonic-net:master Apr 4, 2025
14 checks passed
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Apr 4, 2025
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202405: #17853

@mssonicbld
Copy link
Collaborator

@bingwang-ms PR conflicts with 202411 branch

@rbpittman
Copy link
Contributor

rbpittman commented Apr 9, 2025

@bingwang-ms Can confirm saw a test failure against 202411 for PCBB tests saying Fixture "disable_packet_aging" called directly.
Edit: This is only because of an excess change I had in #17889 that I have now removed.

@echuawu
Copy link
Contributor

echuawu commented Apr 11, 2025

Hi @bingwang-ms , this PR leads to test_xoff_for_pcbb failure due to:

python: can't open file '/packets_aging.py': [Errno 2] No such file or directory

the packets_aging.py had been removed by fixture update_docker_services.

@echuawu
Copy link
Contributor

echuawu commented Apr 14, 2025

Hi @bingwang-ms , any update?

@bingwang-ms
Copy link
Collaborator Author

Hi @bingwang-ms , this PR leads to test_xoff_for_pcbb failure due to:

python: can't open file '/packets_aging.py': [Errno 2] No such file or directory

the packets_aging.py had been removed by fixture update_docker_services.

Thanks for reporting this issue. Will check and fix

@bingwang-ms
Copy link
Collaborator Author

@echuawu Issue fixed by PR #18104 Please help review

opcoder0 pushed a commit to opcoder0/sonic-mgmt that referenced this pull request Dec 8, 2025
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Jan 26, 2026
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.

5 participants