[202511_azd] Fix neighsyncd unit test constructor - #296
Merged
Lun Yue (lunyue-ms) merged 1 commit intoSep 10, 2026
Merged
Conversation
Match the three-argument NeighSync constructor used by the 202511 release branch. Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Lun Yue (lunyue-ms)
requested a review
from Prince Sunny (prsunny)
as a code owner
September 9, 2026 04:11
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Collaborator
|
/azp run |
|
Azure Pipelines: 1 pipeline(s) were filtered out due to trigger conditions. |
Lun Yue (lunyue-ms)
added a commit
to lunyue-ms/sonic-buildimage-msft
that referenced
this pull request
Sep 9, 2026
Point the 202511_azd build at Azure/sonic-swss.msft#296 to validate the corrected three-argument unit test constructor. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: lunyue-ms <lunyue-ms@users.noreply.github.com>
1 task
yijingyan2
approved these changes
Sep 10, 2026
Lun Yue (lunyue-ms)
added a commit
to lunyue-ms/sonic-buildimage-msft
that referenced
this pull request
Sep 10, 2026
Point the build at the 202511_azd squash merge from Azure/sonic-swss.msft#296. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com>
Lun Yue (lunyue-ms)
added a commit
to Azure/sonic-buildimage-msft
that referenced
this pull request
Sep 11, 2026
…11_azd (#3064) #### Why I did it The automated `202511` to `202511_azd` code sync stopped on a merge conflict reported by [Automation.codesync.msft build 1213774](https://dev.azure.com/mssonic/build/_build/results?buildId=1213774&view=results). This PR integrates the exact notified source commit [`e499471b20cb6f0d262d3ebec3d6d8f14fd111d1`](sonic-net/sonic-buildimage@e499471) into `202511_azd` at `95af9c931a3559093a032e978e59a7790e24b6fe`. It does not broaden the sync to the current `202511` tip. The older automation PR #2986 only integrates through `f37c6427ff1a8e5d9cdd758bb294385f7daf5c3f` and does not contain the notified source scope handled here. ##### Work item tracking - Microsoft ADO **(number only)**: 39581904 #### How I did it Created a normal two-parent merge commit, preserving both target and source ancestry. - Resolved `src/libteam/patch/series` by preserving patch `0018`, appending `0019-fix-event-fd-init-and-free.patch`, and restoring the required final newline. - Initially resolved `src/sonic-swss` to child-repository merge commit `1bfd192759e18d91fd8b587e99f627dacb7435f5`; follow-up validation now points it to `10e869aa39b186bd0cf39fe33a1426d5978c0aef` from Azure/sonic-swss.msft#296. - Updated `src/sonic-utilities` to the existing child-repository merge commit `9de3b8441a9d7a972a27e536e7bd275dadcaab35`. The resulting merge commit has parents: ```text 95af9c9 e499471 ``` This PR must be completed with a merge commit. Do not squash or rebase it, because the code-sync workflow depends on preserved source ancestry. #### How to verify it - Reproduced the same three unmerged paths reported by the sync automation. - Confirmed no unmerged entries or conflict markers remain. - Confirmed the final libteam patch-series resolution is identical to the notified source. - Applied all 15 enabled libteam patches in series order against Debian `libteam_1.31-1`; all patches applied successfully. - Confirmed the final `event_fd = -1` initialization and guarded `close()` are present in the patched source. - Confirmed both submodule gitlinks point to verified commits containing their required target and source history. A full SONiC image was not built locally; repository CI provides the platform build coverage. #### Which release branch to backport (provide reason below if selected) No backport requested. This PR directly repairs the `202511` to `202511_azd` synchronization. #### Tested branch (Please provide the tested image version) - [x] N/A - focused source and patch-series validation only #### Description for the changelog Merge the notified `202511` code-sync scope into `202511_azd` and resolve the libteam and submodule conflicts. #### Link to config_db schema for YANG module changes No YANG module changes. #### Follow-up CI validation - Commit `4da92e49ec33750318c79fe3d8b29be03c85cb9b` updates only the `src/sonic-swss` gitlink to the fix commit from Azure/sonic-swss.msft#296. - The original two-parent code-sync merge commit remains in this branch's ancestry. - This update reruns the full buildimage PR CI against the corrected `tests_neighsyncd` constructor call.
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.
Summary
Update the neighsyncd mock test to use the three-argument
NeighSyncconstructor provided by the202511_azdbranch.Why
Azure PR #276 backported the VLAN subinterface link-local tests from a master-based change, where
NeighSynctakes four arguments. The202511_azdproduction implementation still uses the release branch's three-argument constructor, causingtests_neighsyncdto fail compilation in Azure/sonic-buildimage-msft#3064 across multiple platform builds.Validation
git diff --checkneighsyncd/neighsync.handneighsyncd/neighsync.cpp