[202605] Backport LAG subinterface hwif name resolution - #2054
Closed
Xichen96 wants to merge 1 commit into
Closed
Conversation
Manual 202605 backport of sonic-net#1883. (cherry picked from commit 50de3c5) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8b98940f-1ce7-4b16-ae0c-bf2f235c2bb2 Signed-off-by: Xichen96 <lukelin0907@gmail.com>
Collaborator
|
/azp run |
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
Contributor
Author
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
3 participants
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.
Description of PR
Summary:
Manual 202605 backport of #1883.
Conflict tracing for the VPP VLAN/LAG DHCP backport #2048 found that #1883 is a missing master prerequisite on 202605. Without it, LAG subinterface operations can resolve
PortChannelX.<vlan>to the parentBondEthernetXor toUnknowninstead ofBondEthernetX.<vlan>.Deliver this prerequisite before rebuilding or reconciling #2048.
Type of change
Approach
What is the motivation for this PR?
The 202605 branch lacks the LAG-aware VPP hardware-interface resolution added by #1883. The missing change caused the
SwitchVppRif.cppconflict while backporting #1981 and left shared nonzero-VLAN callers resolving the parent bond rather than the LAG subinterface.Work item tracking
How did you do it?
Cherry-picked #1883 onto the current 202605 branch without source conflicts. The backport patch is byte-equivalent to the original #1883 patch.
How did you verify/test it?
git diff --checkpassed.Any platform specific information?
VPP only.
Documentation
Not applicable; this is a release backport of an existing fix.