[code sync] Merge code from sonic-net/sonic-buildimage:master to kubesonic#2633
Merged
Merged
Conversation
mssonicbld
commented
Jul 9, 2026
mssonicbld
commented
Collaborator
…dnx (#28254) What: Points the platform/broadcom/saibcm-modules-dnx submodule (.gitmodules + pointer) back to upstream sonic-net/saibcm-modules on branch sdk-6.5.35-dnx, bumping the pointer to branch head 7ef751f (was nexthop-ai fork branch @ bfca8dd). Why: Follow-up to #28152, which temporarily pointed the submodule at the nexthop-ai fork PR branch while saibcm-modules PR Azure#41 was in review. That PR is now merged, so the submodule can point back at upstream (matching the XGS saibcm-modules setup). How: Updates the submodule url/branch in .gitmodules and advances the submodule commit to 7ef751f. No content change: 7ef751f is the merge commit of saibcm-modules PR Azure#41, whose second parent bfca8dd is exactly the commit the submodule points to today. Testing: All required CI green (29 checks passed, 0 failing). Approved by saravanan-nexthop and vmittal-msft. Signed-off-by: venu-nexthop <venu@nexthop.ai>
Use the dynamic PTF_MODIFIED coalesce so in-PR docker-ptf testing is enabled only when the PR modifies docker-ptf, and pass a branch-aligned PTF_IMAGE_TAG (latest) to the sonic-mgmt PR test template. PR builds only. Signed-off-by: Austin (Ngoc Thang) Pham <austinpham@microsoft.com>
…lly (#28291) #### Why I did it src/sonic-gnmi ``` * 3a64cef - (HEAD -> master, origin/master, origin/HEAD) Implement OnceRun for MixedDbClient and DbClient Subscribe ONCE (Azure#685) (24 hours ago) [Ashwin Srinivasan] ``` #### How I did it #### How to verify it #### Description for the changelog
…D automatically (#28293) #### Why I did it src/sonic-platform-daemons ``` * 01bff8a - (HEAD -> master, origin/master, origin/HEAD) [cmis] Fix issue: Potential race condition between split ports while doing DPSM (Azure#840) (19 hours ago) [Junchao-Mellanox] ``` #### How I did it #### How to verify it #### Description for the changelog
…lly (#28295) #### Why I did it src/sonic-swss ``` * 37d51fdb - (HEAD -> master, origin/master, origin/HEAD) portsorch: drop port from pending set on parse failure (#4720) (6 hours ago) [Anant] * c2327cec - [hftorch]: Fixbug skip commit for unrelated counter map updates (#4690) (10 hours ago) [Ze Gan] * 43978ad7 - orchagent: add tx_precoding / rx_precoding support using SAI (#4609) (11 hours ago) [Natgerbi] ``` #### How I did it #### How to verify it #### Description for the changelog
…atically (#28296) #### Why I did it src/sonic-utilities ``` * 9635c23a - (HEAD -> master, origin/master, origin/HEAD) [Mellanox] Preserve explicit buffer_model=dynamic in buffer migrator (#4609) (16 hours ago) [William Tsai] ``` #### How I did it #### How to verify it #### Description for the changelog
…tically (#28294) #### Why I did it src/sonic-sairedis ``` * cda43377 - (HEAD -> master, origin/master, origin/HEAD) [master] Smart Counter Poll to allow counters to work properly on Broadcom platforms. (Azure#1774) (23 hours ago) [Justin Wong] ``` #### How I did it #### How to verify it #### Description for the changelog
Remove zmq_enable/zmq_endpoint/zmq_ntf_endpoint from the ASIC_DB context of DNX-family platforms (Broadcom Jericho/Qumran/Ramon, Nokia J2 chassis, Nexthop 5010). These hardcoded fields pinned the ZMQ transport per platform; removing them lets the field default to the EMPTY state (per sonic-sairedis Azure#1919) so the transport is governed by the CONFIG_DB toggle (SYSTEM_DEFAULTS|swss_zmq -> syncd -z zmq_sync) instead. Gearbox (GB_ASIC_DB) contexts are left unchanged (zmq_enable: false). Supervisors (fabric-only) and non-DNX platforms are out of scope. No functional change today: in-scope platforms are non-DPU, so syncd is never launched with -z; both the previous DISABLED state and the new EMPTY state resolve to the default Redis transport. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Deepak Singhal <deepsinghal@microsoft.com>
… an element
An empty leaf-list is stored in CONFIG DB as `field@ = ""`, which the Python
ConfigDBConnector deserialises to a single empty-string element (['']). This is
the CONFIG DB representation of "no elements", not a real element.
Before the libyang1 -> libyang3 port (#26584) the '' sentinel was tolerated by
the validation library. libyang3 validates the '' element against the leaf
type's pattern (e.g. the ip-prefix pattern of BGP_ALLOWED_PREFIXES.prefixes_v4)
and rejects the whole config with:
Unsatisfied pattern - "" does not conform to <ipv4-prefix> ...
This breaks `config apply-patch` / `config replace` / `config rollback` for any
config that contains an empty pattern-constrained leaf-list (BGP_ALLOWED_PREFIXES
is a common trigger, since a deployment often populates only prefixes_v4 or only
prefixes_v6, leaving the other empty).
Fix: in the config -> YANG translation, drop the empty-string sentinel so an
empty leaf-list is represented as [] (which libyang3 accepts). This is gated on
the leaf-list having no schema default, so the existing empty-with-default
handling (which deliberately rejects the empty representation) is unchanged.
Added a regression unit test that loads BGP_ALLOWED_PREFIXES with an empty
prefixes_v4 leaf-list and asserts it validates and collapses to [].
Signed-off-by: Deepak Singhal <deepsinghal@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Collaborator
Author
|
/azp run |
|
Azure Pipelines could not run because the pipeline triggers exclude this branch/path. |
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.