[code sync] Merge sonic-host-services 202605 into 202608 - #21
Merged
Lun Yue (lunyue-ms) merged 2 commits intoSep 10, 2026
Conversation
…(#426) Manual 202605 backport of sonic-net/sonic-host-services#412. The release branch does not contain the separate REDFISH feature implementation, so retain a DHCP-only FEATURE event handler and its dedicated unit coverage. (cherry picked from commit f913bf925a64ec09fdab3c8fead918cdbc3e0f0c) Signed-off-by: Xichen96 <lukelin0907@gmail.com> Copilot-Session: 8b98940f-1ce7-4b16-ae0c-bf2f235c2bb2
Merge exact upstream commit cd0f04a into Azure target e590a35. Resolve caclmgrd FEATURE-event conflicts with one queue consumer that preserves Azure REDFISH ACL gating and upstream DHCP-server docker0 syslog handling. Keep both persisted feature flags and schedule ACL rebuilds independently on state changes. Update REDFISH handler coverage and add mixed-feature event-order, no-op, and deletion regression cases. Signed-off-by: Elastictest AI Worker <sonicbld@microsoft.com>
yijingyan2
approved these changes
Sep 10, 2026
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
4 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.
Resolve the code-sync conflict reported in work item 39608223 by merging the exact requested upstream revision, not a newer branch tip.
Provenance
202608, starting at e590a35c8bbfaf44bac9c1bf122f9214e7959927202605, exact requested cd0f04a5d4a107b9f058b2d3033aa846ee6cb958The live submodule sync policy maps the target to the public source branch above. The sync configuration includes
src/sonic-host-services. Original notification: pipeline run 1215463.Resolution
scripts/caclmgrd: keep independentRedfishAllowedandDhcpServerSyslogAlloweddefaults and persisted FEATURE initialization, retain the REDFISH enable/disable helpers, and dispatch both features throughhandle_feature_state_events.docker0TCP/2514 syslog exception before the catch-all DROP.Validation and limitations
handle_redfish_feature_eventsreferences. Confirmed one FEATURE subscription, one handler, and one event-loop call.HEADandORIG_HEADmatched the target revision andMERGE_HEADmatched the exact requested source. Trusted publication produced a merge commit, confirmed by the local reflog. No cherry-pick, squash, rebase, or newer source-tip substitution was used.pytest tests/caclmgrd/caclmgrd_redfish_acl_test.py tests/caclmgrd/caclmgrd_dhcp_server_syslog_test.pyin the existing SONiC test environment.Merge requirement
Complete this PR using Create a merge commit / no-fast-forward. Do not squash or rebase, because the exact upstream source must remain in the target's ancestry. This task does not merge the PR or enable auto-merge.