Enable dynamic port selection from setup in snappi pfcwd test by ediwibowo-msft · Pull Request #23225 · sonic-net/sonic-mgmt

ediwibowo-msft · 2026-03-23T23:16:49Z

Description of PR

Summary:
Adapt the PFC watchdog basic snappi test to use the tgen_port_info fixture for dynamic port selection, aligning with the refactoring introduced in PR #18067. Also fix a fixture scope mismatch and improve reboot test reliability.

Type of change

Back port request

Approach

What is the motivation for this PR?

PR #18067 refactored snappi port selection by introducing tgen_port_info and snappi_port_selection fixtures. The pfcwd basic test needed to be updated to consume these new fixtures instead of directly calling setup_ports_and_dut in each test body.

How did you do it?

Replace inline setup_ports_and_dut usage in all 6 test function bodies with the tgen_port_info fixture parameter
Remove redundant setup_ports_and_dut from test function signatures where it was no longer used in the body
Change number_of_tx_rx_ports fixture scope from function (default) to module to match the module-scoped snappi_port_selection dependency
Add snappi_port_selection to imports (was missing)
Update save_restore_config to use tgen_port_info fixture parameter. save_restore_config needs tgen_port_info to get the snappi_ports list, which contains duthost handles for each port. It uses those to identify which DUTs to back up and restore config on.

How did you verify/test it?

Validated on a T0/T1 and T2 chassis testbed (Cisco 8800) with IXIA traffic generator:

test_pfcwd_basic_single_lossless_prio — PASSED
test_pfcwd_basic_multi_lossless_prio — PASSED
test_pfcwd_basic_single_lossless_prio_reboot (cold reboot) — PASSED
test_pfcwd_basic_multi_lossless_prio_reboot (cold reboot) — PASSED
test_pfcwd_basic_single_lossless_prio_service_restart — PASSED
test_pfcwd_basic_multi_lossless_prio_restart_service — PASSED

T0/T1:
snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py::test_pfcwd_basic_single_lossless_prio_service_restart[multidut_port_info0-tgen_port_info0-True-swss] PASSED [ 82%]
snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py::test_pfcwd_basic_multi_lossless_prio_restart_service[multidut_port_info0-tgen_port_info0-True-swss] PASSED [ 92%]
snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py::test_pfcwd_basic_single_lossless_prio_reboot[multidut_port_info0-cold-NOTSET-tgen_port_info0-False] SKIPPED [ 30%]
snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py::test_pfcwd_basic_multi_lossless_prio_reboot[multidut_port_info0-warm-tgen_port_info0-True] SKIPPED [ 52%]
snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py::test_pfcwd_basic_single_lossless_prio_service_restart[multidut_port_info0-tgen_port_info0-True-swss] PASSED [ 82%]
snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py::test_pfcwd_basic_multi_lossless_prio_restart_service[multidut_port_info0-tgen_port_info0-True-swss] PASSED [ 92%]

T2:
snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py::test_pfcwd_basic_single_lossless_prio[multidut_port_info0-tgen_port_info1-False] PASSED [  5%]
snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py::test_pfcwd_basic_multi_lossless_prio[multidut_port_info0-tgen_port_info0-True] SKIPPED [ 11%]
snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py::test_pfcwd_basic_single_lossless_prio_reboot[multidut_port_info0-warm-NOTSET-tgen_port_info0-True] SKIPPED [ 21%]
snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py::test_pfcwd_basic_multi_lossless_prio_reboot[multidut_port_info0-warm-tgen_port_info0-True] SKIPPED [ 51%]
snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py::test_pfcwd_basic_single_lossless_prio_service_restart[multidut_port_info0-tgen_port_info0-True-swss] SKIPPED [ 81%]

Individual tests on T2:
snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py::test_pfcwd_basic_multi_lossless_prio_restart_service[multidut_port_info0-tgen_port_info0-True-swss] 
snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py::test_pfcwd_basic_multi_lossless_prio_restart_service[multidut_port_info0-tgen_port_info0-False-swss] SKIPPED [ 25%]
snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py::test_pfcwd_basic_multi_lossless_prio_restart_service[multidut_port_info0-tgen_port_info1-True-swss] 
snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py::test_pfcwd_basic_multi_lossless_prio_restart_service[multidut_port_info0-tgen_port_info1-False-swss] PASSED [ 50%]

Any platform specific information?

T0/T1: Tested on Arista 8102 (single-ASIC per linecard)
T2: Tested on Cisco 8800 modular chassis (multi-ASIC, 3 ASICs per linecard).

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

N/A — existing test, supports multidut-tgen and tgen topologies.

Documentation

N/A

mssonicbld · 2026-03-23T23:16:56Z

/azp run

linux-foundation-easycla · 2026-03-23T23:16:58Z

The committers listed above are authorized under a signed CLA.

✅ login: ediwibowo-msft / name: Edi Wibowo (049342d)

azure-pipelines · 2026-03-23T23:17:09Z

Azure Pipelines successfully started running 1 pipeline(s).

tests/snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py

mssonicbld · 2026-03-24T06:57:57Z

/azp run

azure-pipelines · 2026-03-24T06:58:11Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-03-24T07:00:16Z

/azp run

azure-pipelines · 2026-03-24T07:00:54Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-03-24T22:45:06Z

/azp run

azure-pipelines · 2026-03-24T22:45:20Z

Azure Pipelines successfully started running 1 pipeline(s).

tests/snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py

mssonicbld · 2026-03-25T05:03:42Z

/azp run

azure-pipelines · 2026-03-25T05:03:49Z

Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

mssonicbld · 2026-03-25T05:06:38Z

/azp run

azure-pipelines · 2026-03-25T05:06:51Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-03-25T05:12:36Z

/azp run

azure-pipelines · 2026-03-25T05:12:51Z

Azure Pipelines successfully started running 1 pipeline(s).

…ction from setup in snappi Replace setup_ports_and_dut with tgen_port_info fixture in test_pfcwd_basic_with_snappi.py for dynamic port selection Signed-off-by: Edi Wibowo <[email protected]>

mssonicbld · 2026-03-25T05:31:29Z

/azp run

azure-pipelines · 2026-03-25T05:31:42Z

Azure Pipelines successfully started running 1 pipeline(s).

ediwibowo-msft · 2026-03-27T03:10:08Z

Github issue: #23366

…ction from setup in snappi (sonic-net#23225) Replace setup_ports_and_dut with tgen_port_info fixture in test_pfcwd_basic_with_snappi.py for dynamic port selection Signed-off-by: Edi Wibowo <[email protected]> Signed-off-by: mssonicbld <[email protected]>

mssonicbld · 2026-03-27T03:50:08Z

Cherry-pick PR to 202511: #23369

…ction from setup in snappi (sonic-net#23225) Replace setup_ports_and_dut with tgen_port_info fixture in test_pfcwd_basic_with_snappi.py for dynamic port selection Signed-off-by: Edi Wibowo <[email protected]>

…ction from setup in snappi (#23225) (#23369) Replace setup_ports_and_dut with tgen_port_info fixture in test_pfcwd_basic_with_snappi.py for dynamic port selection Signed-off-by: Edi Wibowo <[email protected]> Signed-off-by: mssonicbld <[email protected]> Co-authored-by: ediwibowo-msft <[email protected]>

github-actions bot requested review from auspham, rraghav-cisco and sdszhang March 23, 2026 23:17

Copilot AI mentioned this pull request Mar 24, 2026

Review: human-authored PRs opened in past 48 hours (24 PRs) #23231

Draft

sdszhang reviewed Mar 24, 2026

View reviewed changes

tests/snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py Show resolved Hide resolved

tests/snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py Outdated Show resolved Hide resolved

tests/snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py Outdated Show resolved Hide resolved

ediwibowo-msft force-pushed the pfcwd-basic-with-snappi branch from e6b7d57 to a574782 Compare March 24, 2026 06:57

github-actions bot requested a review from sdszhang March 24, 2026 06:58

ediwibowo-msft force-pushed the pfcwd-basic-with-snappi branch from a574782 to cf5bd12 Compare March 24, 2026 07:00

ediwibowo-msft force-pushed the pfcwd-basic-with-snappi branch from cf5bd12 to ffefa43 Compare March 24, 2026 22:45

github-advanced-security bot found potential problems Mar 24, 2026

View reviewed changes

tests/snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py Fixed Show fixed Hide fixed

ediwibowo-msft force-pushed the pfcwd-basic-with-snappi branch from ffefa43 to a5d2fe9 Compare March 25, 2026 05:03

github-actions bot requested review from r12f and wangxin March 25, 2026 05:04

ediwibowo-msft force-pushed the pfcwd-basic-with-snappi branch from a5d2fe9 to 3355b86 Compare March 25, 2026 05:06

ediwibowo-msft force-pushed the pfcwd-basic-with-snappi branch from 3355b86 to 086dbb0 Compare March 25, 2026 05:12

sdszhang approved these changes Mar 25, 2026

View reviewed changes

[snappi/pfcwd]: Refactor pfcwd basic test to enable dynamic port sele…

049342d

…ction from setup in snappi Replace setup_ports_and_dut with tgen_port_info fixture in test_pfcwd_basic_with_snappi.py for dynamic port selection Signed-off-by: Edi Wibowo <[email protected]>

ediwibowo-msft force-pushed the pfcwd-basic-with-snappi branch from 086dbb0 to 049342d Compare March 25, 2026 05:31

github-actions bot requested a review from sdszhang March 25, 2026 05:31

auspham approved these changes Mar 25, 2026

View reviewed changes

auspham merged commit 37cfa87 into sonic-net:master Mar 26, 2026
15 checks passed

sdszhang added the Request for 202511 branch Request to backport a change to 202511 branch label Mar 27, 2026

sdszhang mentioned this pull request Mar 27, 2026

Enable dynamic port selection from setup in snappi pfcwd test #18536

Closed

11 tasks

StormLiangMS added the Approved for 202511 branch label Mar 27, 2026

mssonicbld added the Created PR to 202511 branch label Mar 27, 2026

mssonicbld mentioned this pull request Mar 27, 2026

[action] [PR:23225] Enable dynamic port selection from setup in snappi pfcwd test #23369

Merged

12 tasks

mssonicbld added Included in 202511 branch and removed Created PR to 202511 branch labels Mar 27, 2026

ediwibowo-msft deleted the pfcwd-basic-with-snappi branch March 28, 2026 02:51

Conversation

ediwibowo-msft commented Mar 23, 2026 • edited by sdszhang Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of PR

Type of change

Back port request

Approach

What is the motivation for this PR?

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

Uh oh!

mssonicbld commented Mar 23, 2026

Uh oh!

linux-foundation-easycla bot commented Mar 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

azure-pipelines bot commented Mar 23, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mssonicbld commented Mar 24, 2026

Uh oh!

azure-pipelines bot commented Mar 24, 2026

Uh oh!

mssonicbld commented Mar 24, 2026

Uh oh!

azure-pipelines bot commented Mar 24, 2026

Uh oh!

mssonicbld commented Mar 24, 2026

Uh oh!

azure-pipelines bot commented Mar 24, 2026

Uh oh!

Uh oh!

mssonicbld commented Mar 25, 2026

Uh oh!

azure-pipelines bot commented Mar 25, 2026

Uh oh!

mssonicbld commented Mar 25, 2026

Uh oh!

azure-pipelines bot commented Mar 25, 2026

Uh oh!

mssonicbld commented Mar 25, 2026

Uh oh!

azure-pipelines bot commented Mar 25, 2026

Uh oh!

mssonicbld commented Mar 25, 2026

Uh oh!

azure-pipelines bot commented Mar 25, 2026

Uh oh!

Uh oh!

ediwibowo-msft commented Mar 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mssonicbld commented Mar 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

ediwibowo-msft commented Mar 23, 2026 •

edited by sdszhang

Loading

linux-foundation-easycla bot commented Mar 23, 2026 •

edited

Loading

ediwibowo-msft commented Mar 27, 2026 •

edited

Loading