[code sync] Merge code from sonic-net/sonic-swss:202605 to 202607 - #300
Merged
Merged
Conversation
mssonicbld
commented
Sep 17, 2026
mssonicbld
commented
Collaborator
<!-- Please make sure you have read and understood the contribution guildlines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md 1. Make sure your commit includes a signature generted with `git commit -s` 2. Make sure your commit title follows the correct format: [component]: description 3. Make sure your commit message contains enough details about the change and related tests 4. Make sure your pull request adds related reviewers, asignees, labels Please also provide the following information in this pull request: --> **What I did** Default PortConfig::role and Port::m_role to Ext. Update unit tests to cover ports without an explicit role. **Why I did it** Port roles were left uninitialized when the role field was absent from port_config.ini. This could misidentify front-panel ports as inband or recirculation ports, skipping SerDes programming and causing subsequent warm-reboot reconciliation failures. **How I verified it** Verified that the Arista-7050CX3-32S-C32 retrieves preemphasis configurations from ASIC_DB when a role is omitted in port_config.ini and values are required from media_settings.json: 202511 with internal review build: ```shell admin@ld495:/tmp$ show version | grep "SONiC Software Version" SONiC Software Version: SONiC.branch.202511-ars.bb776d89-buildimage.origin.202511-review.800778.3-2026.09.11.16.37 admin@ld495:/tmp$ sonic-db-cli ASIC_DB HGETALL ASIC_STATE:SAI_OBJECT_TYPE_PORT_SERDES:oid:0x57000000000651 {'SAI_PORT_SERDES_ATTR_PORT_ID': 'oid:0x1000000000012', 'SAI_PORT_SERDES_ATTR_PREEMPHASIS': '4:404995,404995,404995,404995'} ``` 202605 with internal review build: ```shell admin@ld481:/tmp$ show version | grep "SONiC Software Version" SONiC Software Version: SONiC.branch.202605-ars.41a922a7-buildimage.4519ff2e1d167f878f9f29b1542174c3e04f411f-review.798485.3-2026.09.10.06.13 admin@ld481:/tmp$ sonic-db-cli ASIC_DB HGETALL ASIC_STATE:SAI_OBJECT_TYPE_PORT_SERDES:oid:0x5700000000448b {'SAI_PORT_SERDES_ATTR_PREEMPHASIS': '4:404995,404995,404995,404995', 'SAI_PORT_SERDES_ATTR_PORT_ID': 'oid:0x1000000000012'} ``` **Details if related** Fixes: sonic-net/sonic-buildimage#28167 Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Collaborator
Author
|
/azp run |
|
Azure Pipelines: 1 pipeline(s) were filtered out due to trigger conditions. |
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.