[code sync] Merge code from sonic-net/sonic-buildimage:202511 to 202603#2167
Merged
mssonicbld merged 7 commits intoAzure:202603from Apr 11, 2026
Merged
[code sync] Merge code from sonic-net/sonic-buildimage:202511 to 202603#2167mssonicbld merged 7 commits intoAzure:202603from
mssonicbld merged 7 commits intoAzure:202603from
Conversation
Collaborator
mssonicbld
commented
Apr 11, 2026
mssonicbld
commented
Root cause:
On T2 device, the TO_BGP_PEER route-map sequence 60 was missing "on-match next", causing it to stop processing and preventing sequence 100 (CHECK_IDF_ISOLATION) from being reached.
Route → Seq 50 (tag contributing routes) → on-match next → Seq 60 (strip local anchor community) → STOP (no on-match next) → Seq 100 (CHECK_IDF_ISOLATION) ← NEVER REACHED!
This caused:
- IDF isolation to not work (no-export community not added)
- test_seq_idf_isolation.py to fail on T2
In disaggregated case, though only LT2 will have the peers with T1, we will see this issue consistently when UT2 is peered with T1, which has discovered the gaps in the templates. This gap is potential enough cause issues in other cases as well.
Resolution:
Add "on-match next" to sequence 60 in TO_BGP_PEER_V4/V6 route-maps to allow processing to continue to sequence 100 (CHECK_IDF_ISOLATION).
Route → Seq 50 (tag contributing routes) → on-match next → Seq 60 (strip local anchor community) → on-match next → Seq 100 (CHECK_IDF_ISOLATION) ← NOW REACHABLE
Tested the below testcases with this fix and it is passing.
- test_seq_idf_isolation.py
- test_prefix_list.py
- test_ipv6_nlri_over_ipv4.py
- test_bgp_update_timer.py
- test_route_flap.py
<!--
Please make sure you've read and understood our contributing guidelines:
https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
** Make sure all your commits include a signature generated with `git commit -s` **
If this is a bug fix, make sure your description includes "fixes #xxxx", or
"closes #xxxx" or "resolves #xxxx"
Please provide the following information:
-->
#### Why I did it
##### Work item tracking
- Microsoft ADO **(number only)**:
#### How I did it
#### How to verify it
<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->
#### Which release branch to backport (provide reason below if selected)
<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505
- [x] 202511
#### Tested branch (Please provide the tested image version)
<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->
- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->
#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
<!--
Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->
#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->
Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
#### A picture of a cute animal (not mandatory but encouraged)
…atically (#26692) #### Why I did it src/sonic-utilities ``` * b0cc77ff - (HEAD -> 202511, origin/202511) Enable express boot support for Marvell Teralynx platform (#4443) (2 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
…tically (#26690) #### Why I did it src/sonic-sairedis ``` * 3f2cdff3 - (HEAD -> 202511, origin/202511) [202511] Upgrade SAI to v1.17.5 (Azure#1838) (16 minutes ago) [prabhataravind] * 00d08dde - [syncd]: Clean up ENI counter entries from COUNTERS_DB on ENI deletion (Azure#1841) (48 minutes ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
#### Why I did it Upgrade Broadcom xgs SAI version from 14.3.0.0.0.0.8.0 to 14.3.0.0.0.0.9.0. Changelog: - 14.3.0.0.0.0.9.0: Fix for - Preemphasis Settings Are Not Correctly Applied to Subordinated Interfaces ##### Work item tracking - Microsoft ADO **(number only)**: 37432955 #### How I did it Updated `LIBSAIBCM_XGS_VERSION` in `platform/broadcom/sai-xgs.mk` from `14.3.0.0.0.0.8.0` to `14.3.0.0.0.0.9.0`. #### How to verify it Load image on a DUT, all containers and BGP are up and running. ``` admin@bjw2-can-7260-2:~$ show version SONiC Software Version: SONiC.master-26632.1081721-c7383d15a SONiC OS Version: 13 Distribution: Debian 13.4 Kernel: 6.12.41+deb13-sonic-amd64 Build commit: c7383d15a Build date: Tue Apr 7 10:54:44 UTC 2026 Built by: azureuser@89343121c000000 Platform: x86_64-arista_7260cx3_64 HwSKU: Arista-7260CX3-D108C8 ASIC: broadcom ASIC Count: 1 Serial Number: JPA2403P33Z Model Number: DCS-7260CX3-64 Hardware Revision: 03.00 Uptime: 07:07:13 up 6 min, 1 user, load average: 1.82, 1.50, 0.79 Date: Thu 09 Apr 2026 07:07:13 admin@bjw2-can-7260-2:~$ docker ps -a CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES aa3a186dde3c docker-snmp:latest "/usr/bin/docker-snm…" 5 minutes ago Up 5 minutes snmp c156c44f725a docker-platform-monitor:latest "/usr/bin/docker_ini…" 5 minutes ago Up 5 minutes pmon 6a6d7b015ba0 docker-sonic-mgmt-framework:latest "/usr/local/bin/supe…" 5 minutes ago Up 5 minutes mgmt-framework a2a69f869212 docker-lldp:latest "/usr/bin/docker-lld…" 5 minutes ago Up 5 minutes lldp 90227a66a984 docker-sonic-gnmi:latest "/usr/local/bin/supe…" 5 minutes ago Up 5 minutes gnmi bc63f097192e docker-dhcp-relay:latest "/usr/bin/docker_ini…" 5 minutes ago Up 5 minutes dhcp_relay 719468639bcd docker-router-advertiser:latest "/usr/bin/docker-ini…" 6 minutes ago Up 6 minutes radv b119e221b2b1 docker-eventd:latest "/usr/local/bin/supe…" 6 minutes ago Up 6 minutes eventd 1b4e918a7740 docker-syncd-brcm:latest "/usr/local/bin/supe…" 6 minutes ago Up 6 minutes syncd b9cb2193233d docker-fpm-frr:latest "/usr/bin/docker_ini…" 6 minutes ago Up 6 minutes bgp 5b40c20a2413 docker-teamd:latest "/usr/local/bin/supe…" 6 minutes ago Up 6 minutes teamd 3ecf69cb429a docker-sysmgr:latest "/usr/local/bin/supe…" 6 minutes ago Up 6 minutes sysmgr 8dd8960fba80 docker-orchagent:latest "/usr/bin/docker-ini…" 6 minutes ago Up 6 minutes swss 9b654d3c9af7 docker-sonic-restapi:latest "/usr/local/bin/supe…" 6 minutes ago Up 6 minutes restapi add481ec5998 docker-database:latest "/usr/local/bin/dock…" 7 minutes ago Up 7 minutes database admin@bjw2-can-7260-2:~$ show ip bgp summary IPv4 Unicast Summary: BGP router identifier 10.1.0.32, local AS number 4200065100 vrf-id 0 BGP table version 6406 RIB entries 12808, using 1639424 bytes of memory Peers 4, using 96288 KiB of memory Peer groups 4, using 256 bytes of memory Neighbhor V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd NeighborName ----------- --- ---------- --------- --------- -------- ----- ------ --------- -------------- -------------- 10.0.0.33 4 4200064600 3347 3380 6406 0 0 00:05:57 6400 ARISTA01T1 10.0.0.35 4 4200064600 3348 3380 6406 0 0 00:05:57 6400 ARISTA02T1 10.0.0.37 4 4200064600 3347 3380 6406 0 0 00:05:58 6400 ARISTA03T1 10.0.0.39 4 4200064600 3346 3380 6406 0 0 00:05:58 6400 ARISTA04T1 Total number of neighbors 4 ``` #### Which release branch to backport (provide reason below if selected) - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [x] 202511 #### Tested branch (Please provide the tested image version) - [x] master <!-- image version: SONiC.master-26632.1081721-c7383d15a --> #### Description for the changelog Upgrade Broadcom xgs SAI version to 14.3.0.0.0.0.9.0. Signed-off-by: zitingguo <zitingguo@microsoft.com> Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
SAI 14.1 fixes for Arista-7060X6-64PE-B-P32O64 Arista-7060X6-64PE-B-P64 Followup to sonic-net/sonic-buildimage#25451 <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it #### How to verify it <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [ ] 202511 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com> #### A picture of a cute animal (not mandatory but encouraged)
SAI 14.1 fixes for Arista-7060X6-64PE-B-C448O16 Arista-7060X6-64PE-B-C512S2 Arista-7060X6-64PE-B-O128 Followup to sonic-net/sonic-buildimage#25451 <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it #### How to verify it <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [ ] 202511 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com> #### A picture of a cute animal (not mandatory but encouraged)
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
1 participant
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.