[code sync] Merge code from sonic-net/sonic-buildimage:202405 to 202405#584
Merged
mssonicbld merged 6 commits intoAzure:202405from Feb 5, 2025
Merged
Conversation
Collaborator
mssonicbld
commented
Feb 5, 2025
mssonicbld
commented
This reverts commit c99c123.
…) (#21602)
<!--
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
There is a corner case where the MAC address includes a trailing "\n" character in the config_db.json file, leading to switch configuration failure.
##### Work item tracking
- Microsoft ADO **(number only)**: 28355624
#### How I did it
To prevent this issue, the final return statement now explicitly strips the MAC in all cases from get_system_mac().
#### 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.
-->
Load the new image to verify the mac does not contain any trailing unnecessary characters in the config_db.json file/
#### 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
-->
- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211
- [ ] 202305
- [x] 202311
- [x] 202405
- [x] 202411
#### 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
-->
#### A picture of a cute animal (not mandatory but encouraged)
Upgrade SymCrypt version to 1.5.2 #### Why I did it SymCrypt release new version: upstream SymCrypt upgrade to v103.8.0 upstream SymCrypt-Openssl upgrade to1.7.0 ##### Work item tracking - Microsoft ADO: 31063369 #### How I did it Upgrade SymCrypt and SymCrypt-Openssl to latest version #### How to verify it Pass all UT. <!-- 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 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [] #### Description for the changelog Upgrade SymCrypt version to 1.5.2 #### 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 --> #### A picture of a cute animal (not mandatory but encouraged)
mssonicbld
requested review from
lguohan,
qiluo-msft and
xumia
as code owners
prabhataravind
pushed a commit
that referenced
this pull request
Jul 7, 2025
…D automatically (#21662) #### Why I did it src/sonic-platform-daemons ``` * a2c4bc9 - (HEAD -> master, origin/master, origin/HEAD) Added fix for issue:21371 update cp and dp states when midplane goes down (#584) (20 hours ago) [rameshraghupathy] * 585541f - reset active application code as 'N/A' when port shutdown (#550) (20 hours ago) [ChiouRung Haung] * 8ace0f8 - [Smartswitch] Fix time format for dpu states (#583) (29 hours ago) [Gagan Punathil Ellath] * 7a0813a - [SmartSwitch] Enhance PCIe device check to skip the warning log, if device is in detaching mode (#546) (2 days ago) [Vasundhara Volam] ``` #### How I did it #### How to verify it #### Description for the changelog
bingwang-ms
pushed a commit
that referenced
this pull request
Jan 16, 2026
… automatically (#23672) #### Why I did it src/sonic-platform-common ``` * 9314538 - (HEAD -> master, origin/master, origin/HEAD) [Smartswitch] Host container differentiation for sensor commands (#604) (6 days ago) [Gagan Punathil Ellath] * 6a3f0d6 - Add new liquid cooling base object (#603) (6 days ago) [Yuanzhe] * a615dbc - [sonic-platform-common] Build failure with "ModuleNotFoundError: No module named 'sonic_platform_base.sonic_xcvr.cdb'" (#607) (10 days ago) [mihirpat1] * ef6ee2b - Update Host and single media interfaces IDs per SFF-8024 v4.13 (#596) (5 weeks ago) [mihirpat1] * 1ccb062 - Adding 800G-ZR codes and ability to check 150GHz grid spacing (#601) (6 weeks ago) [Aditya] * 47be7af - Update MODULE_FAULT_CAUSE with additional codes (4-6) (#597) (6 weeks ago) [infn-ke] * 320c11b - Add is_lpo API (#599) (6 weeks ago) [longhuan-cisco] * 2bcbe3a - Fix health check for SSD vendors: add a parser for ATP, and add a generic health ID for other brands (#595) (8 weeks ago) [Mark Xiao] * 499d775 - lock sensord restart (#594) (8 weeks ago) [Gagan Punathil Ellath] * aa32bef - CDB Refactor (#584) (3 months ago) [Prince George] ``` #### How I did it #### How to verify it #### Description for the changelog
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.