Skip to content

Porting sai-qos-tests.py changes from 202205 to master.#9780

Merged
XuChen-MSFT merged 15 commits intosonic-net:masterfrom
rraghav-cisco:qos-sai-ptf-code
Nov 20, 2023
Merged

Porting sai-qos-tests.py changes from 202205 to master.#9780
XuChen-MSFT merged 15 commits intosonic-net:masterfrom
rraghav-cisco:qos-sai-ptf-code

Conversation

@rraghav-cisco
Copy link
Copy Markdown
Contributor

@rraghav-cisco rraghav-cisco commented Aug 31, 2023

This is the 3rd part of the porting effort that we are doing - porting cisco-8000/T2 related code changes from 202205 to master. This PR is for the changes in tests/saitests/py3/sai_qos_tests.py. Changes include:

  1. Adding get_multiple_flows function for cisco platforms.
  2. Using the new function for LosslessVoq, AllPortQWaterMark, PGSharedWaterMark, BufferPoolWatermarkTest and PFCXon.
  3. Introduce new functions : dynamicall_fill_leakout, fill_egress_plus_one, and overflow_egress. These functions enhance fill_leakout_plus_one for T2 - allowing us to take care of packets needed to fill both dst ASIC memory, backplane memory and then src ASIC memory.
  4. Minor formatting changes needed by pre-commit.
  5. Remove hardcoded values for queue numbers in AllPortQWaterMark.

@XuChen-MSFT
Copy link
Copy Markdown
Contributor

XuChen-MSFT commented Sep 15, 2023

Thanks Raghav!
Can you describe which 202205 PRs changes are covered in this double commit?
and can you share test report?

@XuChen-MSFT
Copy link
Copy Markdown
Contributor

XuChen-MSFT commented Sep 18, 2023

@rraghav-cisco
can you please fix conflicts?

@rraghav-cisco
Copy link
Copy Markdown
Contributor Author

rraghav-cisco commented Sep 19, 2023

Thanks Raghav! Can you describe which 202205 PRs changes are covered in this double commit? and can you share test report?

Hi @XuChen-MSFT : Thanks for reviewing the code. I have resolved the conflicts. This PR ports the code from the following 202205 PRs:
8377, 8541, 8565, 8546, 8563, 8664, 8500, 8565, 8672, 8673, 8560, 8933, 9302, 8323, and 8958.

@abdosi abdosi self-requested a review September 29, 2023 19:32
abdosi
abdosi previously approved these changes Oct 12, 2023
View reviewed changes
@rraghav-cisco
Copy link
Copy Markdown
Contributor Author

rraghav-cisco commented Oct 16, 2023

@XuChen-MSFT : Could you review/comment or merge all three PRs, pls? 9780, 9752 and 9758. There is no particular order, but all three must go in together.

XuChen-MSFT
XuChen-MSFT reviewed Nov 14, 2023
View reviewed changes
XuChen-MSFT
XuChen-MSFT approved these changes Nov 20, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@XuChen-MSFT XuChen-MSFT left a comment

Choose a reason for hiding this comment

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

looks good to me.
it's double commit #10725 pass test in 202305 branch

@XuChen-MSFT XuChen-MSFT merged commit a02204a into sonic-net:master Nov 20, 2023
@bingwang-ms bingwang-ms mentioned this pull request Feb 2, 2024
Merged
8 tasks
This was referenced Feb 4, 2024
Merged
Merged
@slutati1536 slutati1536 mentioned this pull request Mar 25, 2024
Merged
8 tasks
liat-grozovik pushed a commit that referenced this pull request Apr 16, 2024
@slutati1536
Fix Qos Xon Test (#12151)
fa5b94c 
Without this PR the Qos tests would fail on testQosSaiPfcXonLimit, because step 1 of the tests, which disable TX for dst_port_id, dst_port_2_id, dst_port_3_id is getting incorrect DST ports

Test was broken by #9780
This was referenced Apr 29, 2024
Closed
Merged
@vivekverma-arista vivekverma-arista mentioned this pull request May 16, 2024
Merged
8 tasks
@mssonicbld mssonicbld mentioned this pull request May 17, 2024
Merged
8 tasks
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request May 17, 2024
@slutati1536 @mssonicbld
Fix Qos Xon Test (sonic-net#12151)
f3aeb81 
Without this PR the Qos tests would fail on testQosSaiPfcXonLimit, because step 1 of the tests, which disable TX for dst_port_id, dst_port_2_id, dst_port_3_id is getting incorrect DST ports

Test was broken by sonic-net#9780
@mssonicbld mssonicbld mentioned this pull request May 17, 2024
Merged
8 tasks
mssonicbld pushed a commit that referenced this pull request May 17, 2024
@slutati1536 @mssonicbld
Fix Qos Xon Test (#12151)
250fa48 
Without this PR the Qos tests would fail on testQosSaiPfcXonLimit, because step 1 of the tests, which disable TX for dst_port_id, dst_port_2_id, dst_port_3_id is getting incorrect DST ports

Test was broken by #9780
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@XuChen-MSFT XuChen-MSFT XuChen-MSFT approved these changes

@abdosi abdosi abdosi left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@rraghav-cisco @XuChen-MSFT @abdosi