Skip to content

fix(vpp): backport portchannel punt support to 202605 - #275

Closed
auspham wants to merge 2 commits into
sonic-net:202605from
auspham:austinpham/backport-pr-257-202605
Closed

auspham wants to merge 2 commits into
sonic-net:202605from
auspham:austinpham/backport-pr-257-202605

Conversation

@auspham

@auspham auspham commented Aug 20, 2026

Copy link
Copy Markdown

Summary

Backport the PortChannel punt-via-member support from upstream PR #257 to the 202605 release branch.

Original PR: #257

Conflict resolution

The 202605 branch diverged before PR #255 introduced the sonic_ext plugin, so the three files modified by #257 were absent rather than relocated. The active custom-plugin source path remains vppbld/plugins, which vppbld/Makefile copies into the VPP source tree during a local build.

Instead of restoring only the three conflicted fragments, this backport adds the complete sonic_ext plugin tree exactly as it exists at the #257 merge commit and enables it in both VPP startup templates. This supplies the prerequisite plugin baseline and the PortChannel-specific behavior at the branch's active implementation path.

Validation

Signed-off-by: Austin (Ngoc Thang) Pham <austinpham@microsoft.com>
@mssonicbld

Copy link
Copy Markdown

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

@azure-pipelines

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

Signed-off-by: Austin (Ngoc Thang) Pham <austinpham@microsoft.com>
@mssonicbld

Copy link
Copy Markdown

/azp run

@azure-pipelines

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

@auspham

auspham commented Aug 20, 2026

Copy link
Copy Markdown
Author

Added the missing PR #255 startup prerequisite in commit 1b24e83: disable linux-cp lcp-auto-subint in both VPP startup templates. The VLAN-BVI HLD requires this to keep tagged control-plane traffic on the physical member netdev where DHCP relay listens; leaving it enabled can create Ethernet<n>.<vid> LCP pairs that intercept the punted frame before VLAN delivery.

With this change plus #276, the sonic_ext plugin sources and VPP_VERSION=2606-0.4 are identical to the platform tree used by successful 202605 validation build 1196355 / Elastictest plan https://elastictest.org/scheduler/testplan/6a84bdd4e437251d82f52a1a.

@auspham auspham closed this Aug 20, 2026
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.

3 participants