[submodule] Update sonic-sairedis for VPP CoPP dataplane enforcement - #29465
nhegde-microsoft wants to merge 1 commit into
Conversation
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
|
/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. |
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
292a6d6 to
f27aad2
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
🟡 Changes recommended
The pinned code leaves BGPV6 unpoliced and mishandles overlapping or moved CoPP policer bindings.
Get a fresh assessment by requesting another Copilot review.
Review details
- Files reviewed: 2/2 changed files
- Comments generated: 0 new
- Review effort level: Lite
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
Copilot review overview
🟡 Changes recommended
The selected sonic-sairedis pin contains a compile-breaking stale IP2ME deferred-work call, and BGPV6 is not attached to an IPv6 punt arc.
Get a fresh assessment by requesting another Copilot review.
Review effort: Lite
Findings: None
Advance src/sonic-sairedis to the upstream merge commit for sonic-sairedis#2070. The companion sonic-platform-vpp#281 merge commit is already pinned by current sonic-buildimage master after the rebase, completing the matched SAI and VPP-plugin CoPP dataplane pair. Signed-off-by: Nikhil Hegde <nikhilhegde@microsoft.com>
56b9cbf to
202d73d
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
nhegde-microsoft
changed the title
Why I did it
Advance
src/sonic-sairedisto the merged CoPP dataplane implementation so the CoPP plugin already pinned inplatform/vpphas its matching SAI programming layer.Merged prerequisites:
sonic-platform-vpp#281(35f2a8d4671e28be16549447ca6739d0bb8a34e9): [vpp] add plugins for CoPP dataplane enforcement sonic-platform-vpp#281sonic-sairedis#2070(a706e04cfb6b3de7e756e9462216b2962bdf7bad): [vpp] SAI support for CoPP dataplane enforcement sonic-sairedis#2070SONiC#2539: [vpp] CoPP dataplane enablement HLD SONiC#2539Current
sonic-buildimagemaster already pins the VPP merge commit through #29888. After rebasing, this PR therefore only needs thesonic-sairedisgitlink update. The final sairedis merge commit is also a descendant of the target in the pending automated bump #29924, so it includes that update.Next in the landing sequence:
sonic-mgmt#27726: [vpp][copp] Unskip CoPP tests on sonic-vpp sonic-mgmt#27726How I did it
masterwith current upstreammaster.master.src/sonic-sairedisfroma3d3cf6147d650900a37b8a21629eed87b93a704toa706e04cfb6b3de7e756e9462216b2962bdf7bad.How to verify it
tests/copp/test_copp.pysubtests onvlab-vpp-01.BuildVS vppagainst the final upstream VPP and sairedis merge commits.