[Fix]: Enhancement of port selection criteria for multidut RDMA cases based on testbed informaition by selldinesh · Pull Request #14127 · sonic-net/sonic-mgmt

selldinesh · 2024-08-14T22:40:34Z

Description of PR

Summary: This PR enhances the logic for port selection for multidut RDMA cases based on the conf-name defined in the testbed.csv / testbed.yaml file. And also a generic fixture for single and multidut topology to get the snappi ports, dut port, asic_type, asic_value information
Fixes # (issue)
#13389
#13769

Type of change

Bug fix
Testbed and Framework(new/improvement)
Test case(new/improvement)

Back port request

Approach

What is the motivation for this PR?

For enhancing the port selection logic and a generic fixture for single and multidut topology

How did you do it?

Added a pytest fixture called get_snappi_ports and get_snappi_ports_for_rdma whcih selects the ports from the information provided in MULTIDUT_PORT_INFO in variables.py and the testbed info as shown below in testbed.csv

vms-snappi-sonic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,sonic-s6100-dut1,snappi-sonic,True,Batman
vms-snappi-sonic-multidut,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,[sonic-s6100-dut1;sonic-s6100-dut2],snappi-sonic,True,Batman
vms-snappi-single-dut-multi-asic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,sonic-s6100-dut1,snappi-sonic,True,Batman
vms-snappi-multi-dut-multi-asic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,[sonic-s6100-dut1;sonic-s6100-dut2],snappi-sonic,True,Batman

How did you verify/test it?

Tested the logic on pfc cases

Any platform specific information?

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

Documentation

mssonicbld · 2024-08-14T22:41:50Z

The pre-commit check detected issues in the files touched by this pull request.
The pre-commit check is a mandatory check, please fix detected issues.

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed fix end of files.........................................................Passed check yaml...........................................(no files to check)Skipped check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Failed - hook id: flake8 - exit code: 1 tests/common/snappi_tests/snappi_fixtures.py:1034:21: E128 continuation line under-indented for visual indent tests/common/snappi_tests/snappi_fixtures.py:1035:21: E128 continuation line under-indented for visual indent tests/common/snappi_tests/snappi_fixtures.py:1036:21: E128 continuation line under-indented for visual indent tests/common/snappi_tests/snappi_fixtures.py:1037:21: E124 closing bracket does not match visual indentation tests/snappi_tests/multidut/pfc/test_multidut_pfc_pause_lossless_with_snappi.py:2:1: F401 'random' imported but unused flake8...............................................(no files to check)Skipped check conditional mark sort..........................(no files to check)Skipped

To run the pre-commit checks locally, you can follow below steps:

Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
docker container.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

selldinesh · 2024-08-16T22:23:48Z

@sdszhang Added the testbed info in the form of parameter

mssonicbld · 2024-08-16T22:27:17Z

The pre-commit check detected issues in the files touched by this pull request.
The pre-commit check is a mandatory check, please fix detected issues.

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed fix end of files.........................................................Passed check yaml...........................................(no files to check)Skipped check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Failed - hook id: flake8 - exit code: 1 tests/common/snappi_tests/snappi_fixtures.py:17:1: F401 'tests.snappi_tests.variables.MULTIDUT_PORT_INFO' imported but unused tests/snappi_tests/multidut/pfc/test_multidut_pfc_pause_lossless_with_snappi.py:2:1: F401 'random' imported but unused flake8...............................................(no files to check)Skipped check conditional mark sort..........................(no files to check)Skipped

To run the pre-commit checks locally, you can follow below steps:

Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
docker container.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

yejianquan

LGTM

mssonicbld · 2024-08-20T23:17:32Z

@selldinesh PR conflicts with 202405 branch

… based on testbed informaition (sonic-net#14127) Description of PR Summary: This PR enhances the logic for port selection for multidut RDMA cases based on the conf-name defined in the testbed.csv / testbed.yaml file. And also a generic fixture for single and multidut topology to get the snappi ports, dut port, asic_type, asic_value information Fixes # (issue) Approach What is the motivation for this PR? For enhancing the port selection logic and a generic fixture for single and multidut topology How did you do it? Added a pytest fixture called get_snappi_ports and get_snappi_ports_for_rdma whcih selects the ports from the information provided in MULTIDUT_PORT_INFO in variables.py and the testbed info as shown below in testbed.csv vms-snappi-sonic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,sonic-s6100-dut1,snappi-sonic,True,Batman vms-snappi-sonic-multidut,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,[sonic-s6100-dut1;sonic-s6100-dut2],snappi-sonic,True,Batman vms-snappi-single-dut-multi-asic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,sonic-s6100-dut1,snappi-sonic,True,Batman vms-snappi-multi-dut-multi-asic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,[sonic-s6100-dut1;sonic-s6100-dut2],snappi-sonic,True,Batman How did you verify/test it? Tested the logic on pfc cases co-authorized by: [email protected]

… prio from test_flow for oversubscribtion cases (#14153) Description of PR Summary: This PR accomodates the infra change from PR 14127 and separates the flow prio from test_flow Fixes # (issue) #14004 Approach What is the motivation for this PR? To accomodate the infra change from PR 14127 and separe the flow prio from test_flow How did you do it? Assigned single prio to the test flow instead of passing the entire flow priority to the test flow Dependency Need to incorporate the changes from #14127 co-authorized by: [email protected]

… prio from test_flow for oversubscribtion cases (sonic-net#14153) Description of PR Summary: This PR accomodates the infra change from PR 14127 and separates the flow prio from test_flow Fixes # (issue) sonic-net#14004 Approach What is the motivation for this PR? To accomodate the infra change from PR 14127 and separe the flow prio from test_flow How did you do it? Assigned single prio to the test flow instead of passing the entire flow priority to the test flow Dependency Need to incorporate the changes from sonic-net#14127 co-authorized by: [email protected]

… based on testbed informaition (sonic-net#14127) Description of PR Summary: This PR enhances the logic for port selection for multidut RDMA cases based on the conf-name defined in the testbed.csv / testbed.yaml file. And also a generic fixture for single and multidut topology to get the snappi ports, dut port, asic_type, asic_value information Fixes # (issue) sonic-net#13389 sonic-net#13769 Approach What is the motivation for this PR? For enhancing the port selection logic and a generic fixture for single and multidut topology How did you do it? Added a pytest fixture called get_snappi_ports and get_snappi_ports_for_rdma whcih selects the ports from the information provided in MULTIDUT_PORT_INFO in variables.py and the testbed info as shown below in testbed.csv vms-snappi-sonic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,sonic-s6100-dut1,snappi-sonic,True,Batman vms-snappi-sonic-multidut,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,[sonic-s6100-dut1;sonic-s6100-dut2],snappi-sonic,True,Batman vms-snappi-single-dut-multi-asic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,sonic-s6100-dut1,snappi-sonic,True,Batman vms-snappi-multi-dut-multi-asic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,[sonic-s6100-dut1;sonic-s6100-dut2],snappi-sonic,True,Batman How did you verify/test it? Tested the logic on pfc cases co-authorized by: [email protected]

mssonicbld · 2024-08-29T04:28:59Z

Cherry-pick PR to 202405: #14314

… based on testbed informaition (#14127) Description of PR Summary: This PR enhances the logic for port selection for multidut RDMA cases based on the conf-name defined in the testbed.csv / testbed.yaml file. And also a generic fixture for single and multidut topology to get the snappi ports, dut port, asic_type, asic_value information Fixes # (issue) #13389 #13769 Approach What is the motivation for this PR? For enhancing the port selection logic and a generic fixture for single and multidut topology How did you do it? Added a pytest fixture called get_snappi_ports and get_snappi_ports_for_rdma whcih selects the ports from the information provided in MULTIDUT_PORT_INFO in variables.py and the testbed info as shown below in testbed.csv vms-snappi-sonic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,sonic-s6100-dut1,snappi-sonic,True,Batman vms-snappi-sonic-multidut,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,[sonic-s6100-dut1;sonic-s6100-dut2],snappi-sonic,True,Batman vms-snappi-single-dut-multi-asic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,sonic-s6100-dut1,snappi-sonic,True,Batman vms-snappi-multi-dut-multi-asic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,[sonic-s6100-dut1;sonic-s6100-dut2],snappi-sonic,True,Batman How did you verify/test it? Tested the logic on pfc cases co-authorized by: [email protected]

… prio from test_flow for oversubscribtion cases (#14153) Description of PR Summary: This PR accomodates the infra change from PR 14127 and separates the flow prio from test_flow Fixes # (issue) #14004 Approach What is the motivation for this PR? To accomodate the infra change from PR 14127 and separe the flow prio from test_flow How did you do it? Assigned single prio to the test flow instead of passing the entire flow priority to the test flow Dependency Need to incorporate the changes from #14127 co-authorized by: [email protected]

… prio from test_flow for oversubscribtion cases (sonic-net#14153) Description of PR Summary: This PR accomodates the infra change from PR 14127 and separates the flow prio from test_flow Fixes # (issue) sonic-net#14004 Approach What is the motivation for this PR? To accomodate the infra change from PR 14127 and separe the flow prio from test_flow How did you do it? Assigned single prio to the test flow instead of passing the entire flow priority to the test flow Dependency Need to incorporate the changes from sonic-net#14127 co-authorized by: [email protected]

… based on testbed informaition (sonic-net#14127) Description of PR Summary: This PR enhances the logic for port selection for multidut RDMA cases based on the conf-name defined in the testbed.csv / testbed.yaml file. And also a generic fixture for single and multidut topology to get the snappi ports, dut port, asic_type, asic_value information Fixes # (issue) sonic-net#13389 sonic-net#13769 Approach What is the motivation for this PR? For enhancing the port selection logic and a generic fixture for single and multidut topology How did you do it? Added a pytest fixture called get_snappi_ports and get_snappi_ports_for_rdma whcih selects the ports from the information provided in MULTIDUT_PORT_INFO in variables.py and the testbed info as shown below in testbed.csv vms-snappi-sonic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,sonic-s6100-dut1,snappi-sonic,True,Batman vms-snappi-sonic-multidut,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,[sonic-s6100-dut1;sonic-s6100-dut2],snappi-sonic,True,Batman vms-snappi-single-dut-multi-asic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,sonic-s6100-dut1,snappi-sonic,True,Batman vms-snappi-multi-dut-multi-asic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,[sonic-s6100-dut1;sonic-s6100-dut2],snappi-sonic,True,Batman How did you verify/test it? Tested the logic on pfc cases co-authorized by: [email protected]

… prio from test_flow for oversubscribtion cases (sonic-net#14153) Description of PR Summary: This PR accomodates the infra change from PR 14127 and separates the flow prio from test_flow Fixes # (issue) sonic-net#14004 Approach What is the motivation for this PR? To accomodate the infra change from PR 14127 and separe the flow prio from test_flow How did you do it? Assigned single prio to the test flow instead of passing the entire flow priority to the test flow Dependency Need to incorporate the changes from sonic-net#14127 co-authorized by: [email protected]

… based on testbed informaition (sonic-net#14127) Description of PR Summary: This PR enhances the logic for port selection for multidut RDMA cases based on the conf-name defined in the testbed.csv / testbed.yaml file. And also a generic fixture for single and multidut topology to get the snappi ports, dut port, asic_type, asic_value information Fixes # (issue) sonic-net#13389 sonic-net#13769 Approach What is the motivation for this PR? For enhancing the port selection logic and a generic fixture for single and multidut topology How did you do it? Added a pytest fixture called get_snappi_ports and get_snappi_ports_for_rdma whcih selects the ports from the information provided in MULTIDUT_PORT_INFO in variables.py and the testbed info as shown below in testbed.csv vms-snappi-sonic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,sonic-s6100-dut1,snappi-sonic,True,Batman vms-snappi-sonic-multidut,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,[sonic-s6100-dut1;sonic-s6100-dut2],snappi-sonic,True,Batman vms-snappi-single-dut-multi-asic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,sonic-s6100-dut1,snappi-sonic,True,Batman vms-snappi-multi-dut-multi-asic,vms6-1,ptf64,docker-ptf-snappi,snappi-sonic-ptf,10.36.78.59,,Server_6,,[sonic-s6100-dut1;sonic-s6100-dut2],snappi-sonic,True,Batman How did you verify/test it? Tested the logic on pfc cases co-authorized by: [email protected]

… prio from test_flow for oversubscribtion cases (sonic-net#14153) Description of PR Summary: This PR accomodates the infra change from PR 14127 and separates the flow prio from test_flow Fixes # (issue) sonic-net#14004 Approach What is the motivation for this PR? To accomodate the infra change from PR 14127 and separe the flow prio from test_flow How did you do it? Assigned single prio to the test flow instead of passing the entire flow priority to the test flow Dependency Need to incorporate the changes from sonic-net#14127 co-authorized by: [email protected]

Enhancement of port selection criteria for multidut RDMA cases

d4fe594

parameterizing the port info

ff79d18

selldinesh mentioned this pull request Aug 16, 2024

[Fix] Accomodating the infra change from PR 14127 and separating flow prio from test_flow for oversubscribtion cases #14153

Merged

8 tasks

sdszhang self-requested a review August 19, 2024 23:02

sdszhang approved these changes Aug 19, 2024

View reviewed changes

Comment thread tests/snappi_tests/variables.py Outdated

Comment thread tests/snappi_tests/variables.py Outdated

selldinesh added 2 commits August 19, 2024 23:31

Fixing pre-commit errors

12f0125

Renaming the testbed subtype

2fce91d

sdszhang added Request for 202405 branch IXIA_CHASSIS labels Aug 20, 2024

yejianquan approved these changes Aug 20, 2024

View reviewed changes

yejianquan merged commit 75fe8f7 into sonic-net:master Aug 20, 2024

yejianquan added the Approved for 202405 branch label Aug 20, 2024

mssonicbld added the Cherry Pick Conflict_202405 label Aug 20, 2024

sdszhang mentioned this pull request Aug 21, 2024

[Snappi]: PFC - Mixed Speed testcases #14122

Merged

8 tasks

selldinesh mentioned this pull request Aug 26, 2024

[202405 - cherry pick]: Enhancement of port selection criteria for multidut RDMA cases… #14256

Closed

8 tasks

mssonicbld mentioned this pull request Aug 29, 2024

[action] [PR:14153] [Fix] Accomodating the infra change from PR 14127 and separating flow prio from test_flow for oversubscribtion cases #14313

Merged

8 tasks

yejianquan added Approved for 202405 branch Request for 202405 branch and removed Cherry Pick Conflict_202405 Approved for 202405 branch Request for 202405 branch labels Aug 29, 2024

mssonicbld added the Created PR to 202405 branch label Aug 29, 2024

mssonicbld mentioned this pull request Aug 29, 2024

[action] [PR:14127] [Fix]: Enhancement of port selection criteria for multidut RDMA cases based on testbed informaition #14314

Merged

8 tasks

mssonicbld added Included in 202405 branch and removed Created PR to 202405 branch labels Aug 29, 2024

This was referenced Dec 11, 2024

[Snappi] cleanup unused code after PR #14127 #16015

Closed

[snappi] Need to generate asic_port_map based on dut info in snappi multidut fixture. #13389

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Fix]: Enhancement of port selection criteria for multidut RDMA cases based on testbed informaition#14127

[Fix]: Enhancement of port selection criteria for multidut RDMA cases based on testbed informaition#14127
yejianquan merged 4 commits intosonic-net:masterfrom
selldinesh:multidut_rdma_infra_fix_pr

selldinesh commented Aug 14, 2024 •

edited

Loading

Uh oh!

mssonicbld commented Aug 14, 2024

Uh oh!

selldinesh commented Aug 16, 2024

Uh oh!

mssonicbld commented Aug 16, 2024

Uh oh!

Uh oh!

Uh oh!

yejianquan left a comment

Uh oh!

mssonicbld commented Aug 20, 2024

Uh oh!

mssonicbld commented Aug 29, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

selldinesh commented Aug 14, 2024 • edited 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 Aug 14, 2024

Uh oh!

selldinesh commented Aug 16, 2024

Uh oh!

mssonicbld commented Aug 16, 2024

Uh oh!

Uh oh!

Uh oh!

yejianquan left a comment

Choose a reason for hiding this comment

Uh oh!

mssonicbld commented Aug 20, 2024

Uh oh!

mssonicbld commented Aug 29, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

selldinesh commented Aug 14, 2024 •

edited

Loading