Support new testbed type LT2/FT2#18442
Merged
bingwang-ms merged 2 commits intosonic-net:masterfrom May 27, 2025
Merged
Conversation
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run |
bingwang-ms
changed the title
|
Azure Pipelines successfully started running 1 pipeline(s). |
tjchadaga
approved these changes
May 15, 2025
11 tasks
auspham
approved these changes
May 15, 2025
yejianquan
added a commit
to Azure/sonic-mgmt.msft
that referenced
this pull request
Jun 2, 2025
* Support new testbed type LT2/FT2/UT2 * Cherry-pick sonic-net/sonic-mgmt#18442
bachalla
pushed a commit
to bachalla/sonic-mgmt
that referenced
this pull request
Jun 2, 2025
* Support new testbed type LT2/FT2/UT2
auspham
pushed a commit
to auspham/sonic-mgmt
that referenced
this pull request
Jun 27, 2025
* Support new testbed type LT2/FT2/UT2
mssonicbld
added a commit
to mssonicbld/sonic-mgmt.msft
that referenced
this pull request
Jul 1, 2025
<!-- Please make sure you've read and understood our contributing guidelines; https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md Please provide following information to help code review process a bit easier: --> ### Description of PR <!-- - Please include a summary of the change and which issue is fixed. - Please also include relevant motivation and context. Where should reviewer start? background context? - List any dependencies that are required for this change. --> Summary: This PR is to fix decap test on FT2 topo. The test gets stuck on FT2 because all the ports are in nexthop for default route. Hence the check in function `get_src_and_exp_ports` runs into dead loop. This PR addressed that issue by checking if the route points to default route, and ignore the check `src_port in exp_port_list` if that's the case. This PR depends on sonic-net/sonic-mgmt#18442 ### Type of change <!-- - Fill x for your type of change. - e.g. - [x] Bug fix --> - [ ] Bug fix - [ ] Testbed and Framework(new/improvement) - [ ] New Test case - [ ] Skipped for non-supported platforms - [x] Test case improvement ### Back port request - [ ] 202012 - [ ] 202205 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 ### Approach #### What is the motivation for this PR? This PR is to fix decap test on FT2 topo. #### How did you do it? This PR addressed that issue by checking if the route points to default route, and ignore the check `src_port in exp_port_list` if that's the case. #### How did you verify/test it? The change is verified on a FT2 topo. ``` collected 4 items decap/test_decap.py::test_decap[ttl=pipe, dscp=uniform, vxlan=disable] -------------------------------------------------------------------------------------------------------- live log call -------------------------------------------------------------------------------------------------------- 23:29:27 ptf_runner.get_dut_type L0053 WARNING| DUT type file doesn't exist. PASSED [ 25%] decap/test_decap.py::test_decap[ttl=pipe, dscp=uniform, vxlan=set_unset] SKIPPED (Not supported on backend, T2 topologies , broadcom platforms before 202012 release, marvell-teralynx, x86_64-8111_32eh_o-r0 platform. Skip on mellanox 202412 release. Skip on 7260CX3 T1 topo in 202305 release) [ 50%] decap/test_decap.py::test_decap[ttl=pipe, dscp=pipe, vxlan=disable] SKIPPED (Not supported on broadcom after 201911 release and cisco-8000 all releases and marvell asics) [ 75%] decap/test_decap.py::test_decap[ttl=pipe, dscp=pipe, vxlan=set_unset] SKIPPED (Not supported on broadcom after 201911 release, and cisco-8000 all releases and marvell asics) [100%] ``` #### Any platform specific information? No. #### Supported testbed topology if it's a new test case? Not a new test. ### Documentation <!-- (If it's a new feature, new test case) Did you update documentation/Wiki relevant to your implementation? Link to the wiki page? -->
11 tasks
bingwang-ms
added a commit
to Azure/sonic-mgmt.msft
that referenced
this pull request
Jul 1, 2025
<!-- Please make sure you've read and understood our contributing guidelines; https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md Please provide following information to help code review process a bit easier: --> ### Description of PR <!-- - Please include a summary of the change and which issue is fixed. - Please also include relevant motivation and context. Where should reviewer start? background context? - List any dependencies that are required for this change. --> Summary: This PR is to fix decap test on FT2 topo. The test gets stuck on FT2 because all the ports are in nexthop for default route. Hence the check in function `get_src_and_exp_ports` runs into dead loop. This PR addressed that issue by checking if the route points to default route, and ignore the check `src_port in exp_port_list` if that's the case. This PR depends on sonic-net/sonic-mgmt#18442 ### Type of change <!-- - Fill x for your type of change. - e.g. - [x] Bug fix --> - [ ] Bug fix - [ ] Testbed and Framework(new/improvement) - [ ] New Test case - [ ] Skipped for non-supported platforms - [x] Test case improvement ### Back port request - [ ] 202012 - [ ] 202205 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 ### Approach #### What is the motivation for this PR? This PR is to fix decap test on FT2 topo. #### How did you do it? This PR addressed that issue by checking if the route points to default route, and ignore the check `src_port in exp_port_list` if that's the case. #### How did you verify/test it? The change is verified on a FT2 topo. ``` collected 4 items decap/test_decap.py::test_decap[ttl=pipe, dscp=uniform, vxlan=disable] -------------------------------------------------------------------------------------------------------- live log call -------------------------------------------------------------------------------------------------------- 23:29:27 ptf_runner.get_dut_type L0053 WARNING| DUT type file doesn't exist. PASSED [ 25%] decap/test_decap.py::test_decap[ttl=pipe, dscp=uniform, vxlan=set_unset] SKIPPED (Not supported on backend, T2 topologies , broadcom platforms before 202012 release, marvell-teralynx, x86_64-8111_32eh_o-r0 platform. Skip on mellanox 202412 release. Skip on 7260CX3 T1 topo in 202305 release) [ 50%] decap/test_decap.py::test_decap[ttl=pipe, dscp=pipe, vxlan=disable] SKIPPED (Not supported on broadcom after 201911 release and cisco-8000 all releases and marvell asics) [ 75%] decap/test_decap.py::test_decap[ttl=pipe, dscp=pipe, vxlan=set_unset] SKIPPED (Not supported on broadcom after 201911 release, and cisco-8000 all releases and marvell asics) [100%] ``` #### Any platform specific information? No. #### Supported testbed topology if it's a new test case? Not a new test. ### Documentation <!-- (If it's a new feature, new test case) Did you update documentation/Wiki relevant to your implementation? Link to the wiki page? -->
mssonicbld
pushed a commit
to mssonicbld/sonic-mgmt
that referenced
this pull request
Sep 22, 2025
* Support new testbed type LT2/FT2/UT2
Collaborator
|
Cherry-pick PR to 202505: #20770 |
11 tasks
mssonicbld
pushed a commit
that referenced
this pull request
Sep 23, 2025
* Support new testbed type LT2/FT2/UT2
mssonicbld
added
Included in 202505 branch
and removed
Created PR to 202505 branch
labels
opcoder0
pushed a commit
to opcoder0/sonic-mgmt
that referenced
this pull request
Dec 8, 2025
* Support new testbed type LT2/FT2/UT2 Signed-off-by: opcoder0 <[email protected]>
AharonMalkin
pushed a commit
to AharonMalkin/sonic-mgmt
that referenced
this pull request
Dec 16, 2025
* Support new testbed type LT2/FT2/UT2 Signed-off-by: Aharon Malkin <[email protected]>
gshemesh2
pushed a commit
to gshemesh2/sonic-mgmt
that referenced
this pull request
Dec 21, 2025
* Support new testbed type LT2/FT2/UT2 Signed-off-by: Guy Shemesh <[email protected]>
gshemesh2
pushed a commit
to gshemesh2/sonic-mgmt
that referenced
this pull request
Jan 26, 2026
* Support new testbed type LT2/FT2/UT2 Signed-off-by: Guy Shemesh <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of PR
Summary:
This PR is to support new testbed type
LT2andFT2.Without this change, the topo type for some test is
unsupported, which leads to unexpected behavior.Type of change
Back port request
Approach
What is the motivation for this PR?
This PR is to support new testbed type
LT2andFT2.How did you do it?
Add regex for matching new testbed type.
How did you verify/test it?
The change is verified by running a test on
FT2testbed. Not we can get correct topo type.Any platform specific information?
No.
Supported testbed topology if it's a new test case?
Not a new test.
Documentation