Skip to content

[t0 t1 test merge] merge PFC multidut #16783

Merged
yejianquan merged 1 commit intosonic-net:masterfrom
auspham:austinpham/31217322-merge-multidut-pfc
Feb 27, 2025
Merged

[t0 t1 test merge] merge PFC multidut #16783
yejianquan merged 1 commit intosonic-net:masterfrom
auspham:austinpham/31217322-merge-multidut-pfc

Conversation

@auspham
Copy link
Copy Markdown
Contributor

@auspham auspham commented Feb 4, 2025

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

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?

Described above

How did you do it?

  1. All the tests in tests/snappi_tests/multidut/pfc folder are ran nightly on t0 to verify the status
  2. Compare each file in tests/snappi_tests/multidut/pfc folder with tests/snappi_tests/pfc folder to find the differences
  3. Resolve the differences and modify so that it fits with t0 platform
  4. 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

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

Any platform specific information?

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

Documentation

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@auspham auspham force-pushed the austinpham/31217322-merge-multidut-pfc branch from ad5faff to 25cf76b Compare February 5, 2025 00:07
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@auspham auspham force-pushed the austinpham/31217322-merge-multidut-pfc branch from 25cf76b to fe4f0e6 Compare February 5, 2025 00:35
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@auspham auspham force-pushed the austinpham/31217322-merge-multidut-pfc branch from fe4f0e6 to 4d16264 Compare February 5, 2025 04:51
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@auspham auspham force-pushed the austinpham/31217322-merge-multidut-pfc branch from 4d16264 to 17e34b5 Compare February 5, 2025 22:21
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

test_traffic_pause,
snappi_extra_params=None):
duthost=None,
dut_port=None,
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

please note new changes for t0 t2 compatibility

egress_duthost = rx_port['duthost']

tx_port = snappi_extra_params.multi_dut_params.multi_dut_ports[1]
ingress_duthost = tx_port['duthost']
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Also here

flow_metrics=in_flight_flow_metrics,
snappi_extra_params=snappi_extra_params)
snappi_extra_params=snappi_extra_params,
asic_value=tx_port.get('asic_value'))
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

also here change to tx_port.get(..)

@auspham auspham marked this pull request as ready for review February 6, 2025 11:12
@auspham auspham requested a review from sdszhang February 6, 2025 11:16
@auspham auspham changed the title [t0 t1 merge] merge PFC multidut [t0 t1 test merge] merge PFC multidut Feb 7, 2025
@auspham auspham force-pushed the austinpham/31217322-merge-multidut-pfc branch from 17e34b5 to 41719d0 Compare February 9, 2025 22:24
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Pull request contains merge conflicts.

@auspham auspham force-pushed the austinpham/31217322-merge-multidut-pfc branch from 41719d0 to 513b029 Compare February 9, 2025 22:25
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@sdszhang
Copy link
Copy Markdown
Contributor

@auspham auspham force-pushed the austinpham/31217322-merge-multidut-pfc branch from 2463d03 to 12c4373 Compare February 19, 2025 01:16
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Copy Markdown
Contributor

@developfast developfast left a comment

Choose a reason for hiding this comment

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

code move from multidut directory to t0 directory - no new code added

yejianquan
yejianquan previously approved these changes Feb 25, 2025
Copy link
Copy Markdown
Collaborator

@yejianquan yejianquan left a comment

Choose a reason for hiding this comment

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

LGTM

Signed-off-by: Austin Pham <austinpham@microsoft.com>
@auspham auspham force-pushed the austinpham/31217322-merge-multidut-pfc branch from 12c4373 to 1612479 Compare February 25, 2025 01:28
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Copy Markdown
Collaborator

@yejianquan yejianquan left a comment

Choose a reason for hiding this comment

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

LGTM

@yejianquan yejianquan merged commit 768dd33 into sonic-net:master Feb 27, 2025
17 checks passed
@mssonicbld
Copy link
Copy Markdown
Collaborator

@auspham PR conflicts with 202411 branch

yejianquan added a commit to Azure/sonic-mgmt.msft that referenced this pull request Feb 27, 2025
…2405

chore: merge multidut pfc folder (cherry-pick #16783)

Description of PR
Summary: Fix cherrypick sonic-net/sonic-mgmt#16783

co-authorized by: jianquanye@microsoft.com
yejianquan pushed a commit that referenced this pull request Mar 3, 2025
Description of PR
Summary: fix conflict #16783 for 202411

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
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>
@rlhui rlhui moved this to Done in SONiC Chassis Mar 12, 2025
nnelluri-cisco pushed a commit to nnelluri-cisco/sonic-mgmt that referenced this pull request Mar 15, 2025
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

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

7 participants