Skip to content

[vpp] add ipinip tunnel encap/decap support - #1860

Merged
lolyu merged 11 commits into
sonic-net:masterfrom
lolyu:add_vpp_ipinip
Jun 2, 2026
Merged

[vpp] add ipinip tunnel encap/decap support#1860
lolyu merged 11 commits into
sonic-net:masterfrom
lolyu:add_vpp_ipinip

Conversation

@lolyu

@lolyu lolyu commented Apr 19, 2026

Copy link
Copy Markdown
Contributor

Add VPP ipinip tunnel encap/decap support.
Please refer to HLD to design details: sonic-net/sonic-platform-vpp#222.

 tests/decap/test_decap.py::test_decap ✓                                                                                                                                                                         100%
  • Microsoft ADO (number only): 37902564

Signed-off-by: Longxiang Lyu lolv@microsoft.com

@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@lolyu lolyu left a comment

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.

✅ Review — Solid IPinIP Implementation

Matches the HLD (PR #222) exactly. Both decap (P2MP/P2P via tunnel term) and encap (P2P via tunnel nexthop) paths implemented with shared create_ipip_vpp_tunnel / remove_ipip_vpp_tunnel helpers. Clean error handling with partial-failure cleanup, VRF-aware with resolve_vrf_id / resolve_vrf_from_rif, proper get_tunnel_if fallthrough from VxLAN to IPIP.

Minor: verify that encap outer dst IP comes from tunnel object's ENCAP_DST_IP (not nexthop's SAI_NEXT_HOP_ATTR_IP) — the nexthop IP is the inner destination for MuxOrch.

LGTM 🚀

@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@lolyu lolyu changed the title [WIP][vpp] add ipinip tunnel encap/decap support [vpp] add ipinip tunnel encap/decap support Apr 28, 2026
@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

Copy link
Copy Markdown
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.

@lolyu
lolyu force-pushed the add_vpp_ipinip branch from cb3a5cc to c716ce0 Compare May 1, 2026 10:41
@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@lolyu
lolyu force-pushed the add_vpp_ipinip branch from c716ce0 to 073d6d8 Compare May 1, 2026 10:43
@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@lolyu

lolyu commented May 26, 2026

Copy link
Copy Markdown
Contributor Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@lolyu

lolyu commented May 27, 2026

Copy link
Copy Markdown
Contributor Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

lolyu added 11 commits May 27, 2026 10:40
Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
@lolyu
lolyu force-pushed the add_vpp_ipinip branch from 03019cf to 485d3e9 Compare May 27, 2026 10:41
@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@lolyu

lolyu commented May 28, 2026

Copy link
Copy Markdown
Contributor Author

VPP test sonic-buildimage PR: sonic-net/sonic-buildimage#27555, all vpp tests pass.

@lolyu

lolyu commented May 29, 2026

Copy link
Copy Markdown
Contributor Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@lolyu
lolyu merged commit 1fce3ab into sonic-net:master Jun 2, 2026
19 checks passed
@yue-fred-gao

Copy link
Copy Markdown
Contributor

This pr is merged a little bit too early. sonic-net/sonic-platform-vpp#226 is merged but not released. PR sonic-net/sonic-platform-vpp#225 will do that but it is pending on the sanity result. We may see compilation error until the latter is merged and updated in sonic-buildimage

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants