[DO NOT MERGE][submodule] Bump sonic-sairedis and platform/vpp for CoPP dataplane enforcement - #29465
Open
nhegde-microsoft wants to merge 1 commit into
Open
nhegde-microsoft wants to merge 1 commit into
nhegde-microsoft wants to merge 1 commit into
Conversation
…nforcement Points src/sonic-sairedis and platform/vpp at the copp-vpp-enablement branches implementing SAI POLICER/HOSTIF_TRAP/HOSTIF_TRAP_GROUP support backed by two new VPP plugins: copp_punt_policer (device-input, ethertype-keyed traps) and copp_ip2me_policer (ip4-punt, IP2ME/SNMP/SSH). This enables genuine dataplane CoPP enforcement (classify + rate-limit + punt) for ARP, LACP, LLDP, UDLD, TTL_ERROR, IP2ME, SNMP, and SSH control-plane traffic on the sonic-vpp platform, which previously had config-plane-only SAI support with no actual traffic policing. Validated: all 24 tests in tests/copp/test_copp.py pass, zero skips, on the t1-lag-vpp (vlab-vpp-01) testbed with these submodule commits. Signed-off-by: Nikhil Hegde <nikhilhegde@microsoft.com>
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
The submodule pins reference open PR head SHAs (from fork branches) and should be updated post-merge to stable upstream commit(s) to avoid non-reproducible/broken submodule fetches.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
Pull request overview
This PR bumps two git submodule pins (src/sonic-sairedis and platform/vpp) to pick up SONiC-VPP CoPP dataplane enforcement support (real VPP policers + new VPP CoPP plugins), aligning the buildimage with the companion feature work in those repos.
Changes:
- Update
platform/vppsubmodule pointer to0a879f227e12648442cf2848108d3529517e2f1b. - Update
src/sonic-sairedissubmodule pointer tocf3ea34383e8769842e8de6b3237cfd3ed86653d.
Review note (blocking):
- Both new gitlinks currently point at open upstream PR head SHAs (sonic-platform-vpp#281 and sonic-sairedis#2070) whose HEAD repos are fork branches; if those PRs are merged via squash/rebase (common), these exact SHAs will not land on
sonic-net/*@master, making the submodule pins non-reproducible and potentially breaking fresh clones/CI submodule fetches. This buildimage PR should be updated after the companion PRs merge to pin to the final merged upstream commit(s) (or a tag).
File summaries
| File | Description |
|---|---|
| platform/vpp | Submodule gitlink updated to pick up new VPP CoPP plugins needed for dataplane enforcement. |
| src/sonic-sairedis | Submodule gitlink updated to pick up VPP SAI POLICER/HOSTIF_TRAP/HOSTIF_TRAP_GROUP support needed for CoPP enforcement. |
Review details
- Files reviewed: 2/2 changed files
- Comments generated: 0
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
nhegde-microsoft
changed the title
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
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.
Why I did it
Bumps
src/sonic-sairedisandplatform/vppsubmodule pins to bring in CoPP dataplane enforcement for SONiC-VPP: real VPP policer objects, and two new VPP plugins (copp_punt_policerfor device-input ethertype-keyed traps,copp_ip2me_policerfor IP2ME/SNMP/SSH onip4-punt). Previously these traps were config-plane-only (accepted by SAI, never actually policed).Do not merge until companion PRs merge first (this bump only produces a working image once both are in):
How I did it
Bumped submodule gitlinks:
src/sonic-sairedis→ the commit implementing SAIPOLICER/HOSTIF_TRAP/HOSTIF_TRAP_GROUPsupportplatform/vpp→ the commit adding both new VPP pluginsHow to verify it
Manually validated on
vlab-vpp-01(t1-lag-vpptestbed) with these exact submodule commits deployed: all 24tests/copp/test_copp.pysubtests pass, zero skips.