Skip to content

[t0 t1 merge] Migrate multidut pfc to t2#16694

Merged
yejianquan merged 1 commit intosonic-net:masterfrom
auspham:austinpham/31085729-migrate-multidut-pfc-t2
Feb 7, 2025
Merged

[t0 t1 merge] Migrate multidut pfc to t2#16694
yejianquan merged 1 commit intosonic-net:masterfrom
auspham:austinpham/31085729-migrate-multidut-pfc-t2

Conversation

@auspham
Copy link
Copy Markdown
Contributor

@auspham auspham commented Jan 28, 2025 •
edited
Loading

Description of PR

Summary:
Fixes # (issue) 31085729

Migrate the following PR:

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?

Migrate PRs for pfc test cases to t2

How did you do it?

How did you verify/test it?

Any platform specific information?

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

Documentation

@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Jan 28, 2025

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jan 28, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@auspham auspham requested a review from sdszhang January 28, 2025 04:33
@auspham
Copy link
Copy Markdown
Contributor Author

auspham commented Jan 28, 2025

@sdszhang for review

sdszhang
sdszhang approved these changes Jan 28, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@sdszhang sdszhang left a comment

Choose a reason for hiding this comment

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

lgtm

@auspham auspham force-pushed the austinpham/31085729-migrate-multidut-pfc-t2 branch from 7b0dfd6 to dca541f Compare January 28, 2025 06:23
@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Jan 28, 2025

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jan 28, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@sdszhang
Copy link
Copy Markdown
Contributor

sdszhang commented Jan 28, 2025 •
edited
Loading

@developfast @amitpawar12 @selldinesh @kamalsahu0001 @rraghav-cisco @vmittal-msft for review, this is the T0/T1 merge for pfc test cases.

@auspham auspham force-pushed the austinpham/31085729-migrate-multidut-pfc-t2 branch from dca541f to 9567daa Compare January 28, 2025 12:31
@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Jan 28, 2025

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jan 28, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@auspham auspham force-pushed the austinpham/31085729-migrate-multidut-pfc-t2 branch from 9567daa to 8cbca8e Compare January 30, 2025 07:26
@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Jan 30, 2025

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jan 30, 2025

Azure Pipelines successfully started running 1 pipeline(s).

auspham
auspham commented Jan 31, 2025
View reviewed changes
tests/snappi_tests/multidut/pfc/files/multidut_helper.py
dut.command("sonic-clear queuecounters")
time.sleep(1)
dut.command("sonic-clear counters")
time.sleep(1)
Copy link
Copy Markdown
Contributor Author

@auspham auspham Jan 31, 2025

Choose a reason for hiding this comment

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

@sdszhang These are the changes needed to fix the test_pfc_pause_counter_check on T2. I have double check on t0 it still pass as well

auspham
auspham commented Jan 31, 2025
View reviewed changes
tests/snappi_tests/multidut/pfc/files/multidut_helper.py
verify_rx_frame_count_dut(duthost=duthost,
verify_rx_frame_count_dut(duthost=ingress_duthost,
api=api,
snappi_extra_params=snappi_extra_params)
Copy link
Copy Markdown
Contributor Author

@auspham auspham Jan 31, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

also this one where we need to specify the ingress_duthost for test_pfc_pause_counter_check @sdszhang

@auspham
chore: migrate multidut pfc-t2
f55493d 
chore: migrate sonic-net#11704 to multidut_helper

chore: migrate sonic-net#15002 to multidut_helper

Signed-off-by: Austin Pham <austinpham@microsoft.com>

chore: fix disable_pfcwd

Signed-off-by: Austin Pham <austinpham@microsoft.com>

chore: migrate sonic-net#9847 to test_multidut_pfc_pause_lossless_with_snappi

Signed-off-by: Austin Pham <austinpham@microsoft.com>
@auspham auspham force-pushed the austinpham/31085729-migrate-multidut-pfc-t2 branch from 8cbca8e to f55493d Compare February 2, 2025 22:31
@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Feb 2, 2025

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Feb 2, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@auspham auspham mentioned this pull request Feb 6, 2025
Merged
11 tasks
@yejianquan yejianquan merged commit fa57f32 into sonic-net:master Feb 7, 2025
9 checks passed
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Feb 7, 2025
@auspham @mssonicbld
chore: migrate multidut pfc-t2 (sonic-net#16694)
d90a065 
Description of PR
Summary:
Fixes # (issue) 31085729

Migrate the following PR:

[Snappi] Update test PFC pause frame functionality to include DUT counter polling sonic-net#9847
Fixed the failure of test_valid_pfc_frame_with_snappi.py in Cisco DUT  sonic-net#15002
[Snappi] Bug fix for checking counters to account for forwarding lag sonic-net#11704

Approach
What is the motivation for this PR?
Migrate PRs for pfc test cases to t2

Signed-off-by: Austin Pham <austinpham@microsoft.com>
@mssonicbld mssonicbld mentioned this pull request Feb 7, 2025
Merged
11 tasks
@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Feb 7, 2025

Cherry-pick PR to 202411: #16853

@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Feb 7, 2025

Cherry-pick PR to msft-202405: Azure/sonic-mgmt.msft#68

@mssonicbld mssonicbld mentioned this pull request Feb 7, 2025
Open
11 tasks
yejianquan pushed a commit that referenced this pull request Feb 27, 2025
@auspham
chore: merge multidut pfc folder (#16783)
768dd33 
Description of PR
Summary: merge multidut pfc folder
Fixes # (issue) 31217322

As part of test merge plan, we're merging tests/snappi_tests/multidut to tests/snappi_tests for PFC folder.

This PR simply moving over the same code in tests/snappi_tests/multidut/pfc to tests/snappi_tests/pfc as it and resolve a few conflicts.

Need to merge #16694 first before this

Approach
What is the motivation for this PR?
Described above

How did you do it?
All the tests in tests/snappi_tests/multidut/pfc folder are ran nightly on t0 to verify the status
Compare each file in tests/snappi_tests/multidut/pfc folder with tests/snappi_tests/pfc folder to find the differences
Resolve the differences and modify so that it fits with t0 platform
Ran regression on t0 platforms and verify if it works
How did you verify/test it?
We run regression on T0 platform and T2 platforms to verify if this works. Verification includes 2 main process

Nightly verification trigger on before-merge branch multidut for regression
Verification trigger on original tests/snappi_tests/pfc folder for baseline comparison
Verification trigger on after-merge branch to compare new process. Only failures existed in baseline are acceptable.

Signed-off-by: Austin Pham <austinpham@microsoft.com>
nissampa pushed a commit to nissampa/sonic-mgmt_dpu_test that referenced this pull request Mar 4, 2025
@auspham @nissampa
chore: merge multidut pfc folder (sonic-net#16783)
ab1afab 
Description of PR
Summary: merge multidut pfc folder
Fixes # (issue) 31217322

As part of test merge plan, we're merging tests/snappi_tests/multidut to tests/snappi_tests for PFC folder.

This PR simply moving over the same code in tests/snappi_tests/multidut/pfc to tests/snappi_tests/pfc as it and resolve a few conflicts.

Need to merge sonic-net#16694 first before this

Approach
What is the motivation for this PR?
Described above

How did you do it?
All the tests in tests/snappi_tests/multidut/pfc folder are ran nightly on t0 to verify the status
Compare each file in tests/snappi_tests/multidut/pfc folder with tests/snappi_tests/pfc folder to find the differences
Resolve the differences and modify so that it fits with t0 platform
Ran regression on t0 platforms and verify if it works
How did you verify/test it?
We run regression on T0 platform and T2 platforms to verify if this works. Verification includes 2 main process

Nightly verification trigger on before-merge branch multidut for regression
Verification trigger on original tests/snappi_tests/pfc folder for baseline comparison
Verification trigger on after-merge branch to compare new process. Only failures existed in baseline are acceptable.

Signed-off-by: Austin Pham <austinpham@microsoft.com>
nnelluri-cisco pushed a commit to nnelluri-cisco/sonic-mgmt that referenced this pull request Mar 15, 2025
@auspham @nnelluri-cisco
chore: migrate multidut pfc-t2 (sonic-net#16694)
13b5072 
Description of PR
Summary:
Fixes # (issue) 31085729

Migrate the following PR:

[Snappi] Update test PFC pause frame functionality to include DUT counter polling sonic-net#9847
Fixed the failure of test_valid_pfc_frame_with_snappi.py in Cisco DUT  sonic-net#15002
[Snappi] Bug fix for checking counters to account for forwarding lag sonic-net#11704

Approach
What is the motivation for this PR?
Migrate PRs for pfc test cases to t2

Signed-off-by: Austin Pham <austinpham@microsoft.com>
nnelluri-cisco pushed a commit to nnelluri-cisco/sonic-mgmt that referenced this pull request Mar 15, 2025
@auspham @nnelluri-cisco
chore: merge multidut pfc folder (sonic-net#16783)
c5d2022 
Description of PR
Summary: merge multidut pfc folder
Fixes # (issue) 31217322

As part of test merge plan, we're merging tests/snappi_tests/multidut to tests/snappi_tests for PFC folder.

This PR simply moving over the same code in tests/snappi_tests/multidut/pfc to tests/snappi_tests/pfc as it and resolve a few conflicts.

Need to merge sonic-net#16694 first before this

Approach
What is the motivation for this PR?
Described above

How did you do it?
All the tests in tests/snappi_tests/multidut/pfc folder are ran nightly on t0 to verify the status
Compare each file in tests/snappi_tests/multidut/pfc folder with tests/snappi_tests/pfc folder to find the differences
Resolve the differences and modify so that it fits with t0 platform
Ran regression on t0 platforms and verify if it works
How did you verify/test it?
We run regression on T0 platform and T2 platforms to verify if this works. Verification includes 2 main process

Nightly verification trigger on before-merge branch multidut for regression
Verification trigger on original tests/snappi_tests/pfc folder for baseline comparison
Verification trigger on after-merge branch to compare new process. Only failures existed in baseline are acceptable.

Signed-off-by: Austin Pham <austinpham@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sdszhang sdszhang sdszhang approved these changes

Assignees

No one assigned

Labels

Approved for msft-202405 Branch Approved for 202411 branch Created PR to 202411 branch Included in msft-202405 Branch Request for msft-202405 Branch Request for 202411 branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@auspham @mssonicbld @sdszhang @yejianquan