Conversation
Signed-off-by: Austin (Ngoc Thang) Pham <austinpham@microsoft.com>
|
/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). |
Signed-off-by: Austin (Ngoc Thang) Pham <austinpham@microsoft.com>
|
/azp run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
Author
|
Added the missing PR #255 startup prerequisite in commit With this change plus #276, the |
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.
Summary
Backport the PortChannel punt-via-member support from upstream PR #257 to the
202605release branch.Original PR: #257
Conflict resolution
The
202605branch diverged before PR #255 introduced thesonic_extplugin, so the three files modified by #257 were absent rather than relocated. The active custom-plugin source path remainsvppbld/plugins, whichvppbld/Makefilecopies into the VPP source tree during a local build.Instead of restoring only the three conflicted fragments, this backport adds the complete
sonic_extplugin 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
git diff --checksonic_extfile is byte-for-byte identical to merge commit53a0712b199b5cba54b6a433ca0b8c688d2c60ccmake -s -n -C vppbld repo_clone