Skip to content

[action] [PR:18443] Fix decap test on FT2 topo#476

Merged
bingwang-ms merged 1 commit intoAzure:202503from
mssonicbld:cherry/msft-202503/18443
Jul 1, 2025
Merged

[action] [PR:18443] Fix decap test on FT2 topo#476
bingwang-ms merged 1 commit intoAzure:202503from
mssonicbld:cherry/msft-202503/18443

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

Description of PR

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

  • 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?

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

<!--
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
Copy link
Copy Markdown
Collaborator Author

Original PR: sonic-net/sonic-mgmt#18443

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@bingwang-ms bingwang-ms merged commit 6374c1c into Azure:202503 Jul 1, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants