[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#55
Merged
mssonicbld merged 9 commits intoAzure:202205from Jul 8, 2023
Merged
Conversation
Collaborator
mssonicbld
commented
Jul 8, 2023
mssonicbld
commented
Why I did it To reduce the container's dependency from host system Work item tracking Microsoft ADO (number only): 17713469 How I did it Move the k8s container startup script to config engine container, other than mount it from host. How to verify it Check file path(/usr/share/sonic/scripts/container_startup.py) inside config engine container. Signed-off-by: Yun Li <yunli1@microsoft.com> Co-authored-by: Qi Luo <qiluo-msft@users.noreply.github.com>
…ld config is loaded (#14933)" (#15464)" (#15684) (#15746)
…atically (#15738) src/sonic-utilities * b9320928 - (HEAD -> 202205, origin/202205) [db_migrator] Set correct CURRENT_VERSION, extend UT (#2894) (24 hours ago) [Vadym Hlushko]
… automatically (#15748) src/sonic-platform-common * 56f227a - (HEAD -> 202205, origin/202205) More prevention of fatal exception caused by VDM dictionary missing fields when a transceiver has just been pulled (Azure#376) (3 hours ago) [snider-nokia]
…D automatically (#15749) src/sonic-platform-daemons * 112656c - (HEAD -> 202205, origin/202205) [ycabled][active-active] no initialize Async Client, when no active-active cable type; fix names for all ycabled threads (Azure#373) (4 minutes ago) [vdahiya12] * e325d5a - Revert "Revert "[ycabled] correct the wrong function call for 'config hwmode state' (Azure#372)"" (4 minutes ago) [Ying Xie] * ddabca1 - Revert "Revert "[dualtor] Fix command `show mux status` (Azure#371)"" (4 minutes ago) [Ying Xie] * 28918da - Revert "Revert "[ycabled] fix bug for `show mux status` delayed response (Azure#364)"" (4 minutes ago) [Ying Xie] * a849de9 - Revert "Revert "add async notification support in active-active topo; refactor code for ycable tasks for change events (Azure#327)"" (4 minutes ago) [Ying Xie] * cf1e73a - Revert "Revert "[ycabled] refactor code for onboarding async client changes;refactor (Azure#355)"" (4 minutes ago) [Ying Xie]
jon-nokia
pushed a commit
to jon-nokia/sonic-buildimage-msft
that referenced
this pull request
Aug 9, 2023
mssonicbld
added a commit
that referenced
this pull request
May 10, 2025
…D automatically (#1105) #### Why I did it src/sonic-sairedis ``` * 3c33c26 - (HEAD -> 202412, origin/HEAD, origin/202412) Update codeql runs-on ubuntu version to 22.04 (#56) (3 hours ago) [mssonicbld] * 87d6f46 - [trim]: Add Packet Trimming to VS lib (#55) (18 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
prabhataravind
pushed a commit
that referenced
this pull request
Jul 7, 2025
…ly (#21230) #### Why I did it src/dhcprelay ``` * b242307 - (HEAD -> master, origin/master, origin/HEAD) Revert "Fail build when test fail (#53)" (#62) (19 hours ago) [Yaqiang Zhu] * dbaee8b - Fail build when test fail (#53) (6 days ago) [Yaqiang Zhu] * ef7b972 - [Build] Update to build bookworm debian package (#55) (8 days ago) [Yaqiang Zhu] * 011066a - Add wait and check ip address check when dhcp6relay init (#52) (11 days ago) [Yaqiang Zhu] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Jul 8, 2025
…D automatically (#1323) #### Why I did it src/sonic-sairedis ``` * c4d152d4 - (HEAD -> 202503, origin/202503) Merge pull request #59 from mssonicbld/sonicbld/202503-merge (23 hours ago) [mssonicbld] * 8f50be71 - Merge branch '202412' of https://github.com/Azure/sonic-sairedis.msft into 202503 (23 hours ago) [Sonic Automation] * b36d5641 - (origin/HEAD, origin/202412, 202412) [trim]: Add Packet Trimming Asym DSCP to VS lib (#68) (4 days ago) [mssonicbld] * 6e75cc6c - [TAM]: Add default SAI_TAM_ATTR_TELEMETRY_OBJECTS_LIST of TAM for saivs create operation (#1614) (#66) (8 days ago) [Ze Gan] * 0ae8494d - [unittest ]Conditionally enable TestServerSaiMockChannel (#67) (8 days ago) [mssonicbld] * 12b21f3b - [syncd] Check whether stat_st and tam_telemetry is defined (#1590) (#65) (13 days ago) [Ze Gan] * 701a114b - [TAM]: Fix TAM notification and vslib implementation (#1606) (#62) (13 days ago) [Ze Gan] * 6b97f74e - [SAI]: Update SAI to support QUERY_STATS_ST_CAPABILITY and TAM (#1573) (#63) (13 days ago) [Ze Gan] * f21e12ce - [trim]: Add Packet Trimming Port/Queue stats to VS lib (#60) (4 weeks ago) [Nazarii Hnydyn] * 9d396448 - Merge pull request #61 from mssonicbld/cherry/msft-202412/1548 (4 weeks ago) [Ze Gan] |\ | failure_prs.log 613654bb - [syncd] Move log set function after api initialize (4 weeks ago) [Sonic Build Admin] |/ * e18530c8 - Update SAI version to 1.16.1 (#54) (8 weeks ago) [mramezani95] * 3c33c26e - Update codeql runs-on ubuntu version to 22.04 (#56) (8 weeks ago) [mssonicbld] * 87d6f464 - [trim]: Add Packet Trimming to VS lib (#55) (9 weeks ago) [mssonicbld] * 80c43090 - Support auto negotiation on the VS platform to avoid error messages. (#52) (10 weeks ago) [mssonicbld] * 0209ab89 - [FlexCounter] add support for SRv6 MySID counters (#50) (2 months ago) [mssonicbld] * aceb9ed1 - Move time stamp to time stamp table in counter database to avoid frequently update the counter table (#51) (2 months ago) [mssonicbld] ``` #### 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
…ly (#22595) #### Why I did it src/sonic-stp ``` * 33314fc - (HEAD -> master, origin/master, origin/HEAD) MSTP Feature - stpsync API changes (#55) (12 days ago) [Divya Kumaran Chandralekha] ``` #### 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
…ically (#23843) #### Why I did it src/sonic-dash-ha ``` * a680530 - (HEAD -> master, origin/master, origin/HEAD) Route exchange (#55) (2 days ago) [yue-fred-gao] * e205d4d - Convert Unspecified to Standby in DashHaScopeTable. (#97) (2 days ago) [dypet] * 557fe19 - Fix producer bridge CI issue (#105) (3 days ago) [yue-fred-gao] ``` #### 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
… (#24099) #### Why I did it src/dhcpmon ``` * 5636443 - (HEAD -> master, origin/master, origin/HEAD) Add packet length check when receiving a packet (#55) (23 hours ago) [Yanpeng Zhang] ``` #### 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
The following are the changes to get the modules compile:
* Update `probe` function signature in the `i2c_driver instance dropping
`i2c_device_id` parameter. This parameter is mostly unused in the probe
function, if used, can be derived from the passed client pointer.
* Remove `llseek` assignment to `no_llseek` in `file_operations`.
* Remove `I2C_CLASS_SPD` attribute added by the modules.
* Add missing import to `PMBUS` namespace.
* Update `remove` function signature in the `platform_driver` and `pci_driver`
instances, dropping return values.
* Update `i2c_mux_add_adapter` args, dropping more than 3 args, if passed.
* Fix `-Wint-conversion` errors occurring when `resource_size_t` is set to
`NULL` instead of `0`.
* Replace `strlcpy` with `strscpy`.
The following changes are done to align with trixie build (and other platforms):
* Remove `debian/compat` file.
* Update compat level to 13 and kernel version in `debian/control`.
* Update `debian/rules` to use `pybuild` for non-PDDF modules and the
conventional wheel package build for the PDDF modules. Also set shell option to
exit upon encountering error.
* Cleanup copying of wheel package in non-PDDF modules as the scripts are
installed as part of debian package.
* Make wheel package available under `build-<mod>` instead of under `modules`.
The changes are tested by building the platform packages through invoking the
below command:
`make NOBUSTER=1 NOBULLSEYE=1 NOBOOKWORM=1 target/debs/trixie/platform-modules-dx010_1.0_amd64.deb`
Additionally, with further changes to rebranding of platform (not part of this
commit, will be raised separately) and skipping inclusion of other platforms,
verified install/boot of the `sonic-broadcom.bin` on a `DS3000` unit.
platform-celestica: config and script fixes for pddf init (#55)
The following fixes applicable to platforms (ds1000, ds2000, ds3000,
ds4000/silverstone-v2) for correct pddf intialization and access of platform
devices:
* Update pddf-device json eliminating the need for additional indexing,
multiplication operations in raw ipmi get.
* The PDDF infra expects `num_components` as part of json config, update the
same.
* The ASIC PCIe firmware version uses `bcmcmd` to fetch the version. However,
when syncd is not running, the error string is reported as version, fix this
by return version as `Unknown` instead.
* The PDDF component init passes pddf_data and pddf_plugin_data parameters,
accommodate this.
* Lookup correct overridden fan names from the PDDF plugin data accommodating
fantray/psu and fan indices.
* Lookup correct overridden thermal names from the PDDF plugin data.
* Update platform specific monitoring service to start after `pddf-platform-init`
service as this service imports `sonic_platform` module.
* Update references of `/sys/class/i2c-adapter` to `/sys/bus/i2c/devices`
instead.
Tested these changes on ds1000, ds2000, ds3000 and silverstone-v2 platforms with
accessing platform commands querying PDDF components. Verified that the accesses
to the components are ok.
Co-authored-by: Ramasamy Chandramouli <rachandr@celestica.com>
liushilongbuaa
pushed a commit
that referenced
this pull request
Mar 25, 2026
The following are the changes to get the modules compile:
* Update `probe` function signature in the `i2c_driver instance dropping
`i2c_device_id` parameter. This parameter is mostly unused in the probe
function, if used, can be derived from the passed client pointer.
* Remove `llseek` assignment to `no_llseek` in `file_operations`.
* Remove `I2C_CLASS_SPD` attribute added by the modules.
* Add missing import to `PMBUS` namespace.
* Update `remove` function signature in the `platform_driver` and `pci_driver`
instances, dropping return values.
* Update `i2c_mux_add_adapter` args, dropping more than 3 args, if passed.
* Fix `-Wint-conversion` errors occurring when `resource_size_t` is set to
`NULL` instead of `0`.
* Replace `strlcpy` with `strscpy`.
The following changes are done to align with trixie build (and other platforms):
* Remove `debian/compat` file.
* Update compat level to 13 and kernel version in `debian/control`.
* Update `debian/rules` to use `pybuild` for non-PDDF modules and the
conventional wheel package build for the PDDF modules. Also set shell option to
exit upon encountering error.
* Cleanup copying of wheel package in non-PDDF modules as the scripts are
installed as part of debian package.
* Make wheel package available under `build-<mod>` instead of under `modules`.
The changes are tested by building the platform packages through invoking the
below command:
`make NOBUSTER=1 NOBULLSEYE=1 NOBOOKWORM=1 target/debs/trixie/platform-modules-dx010_1.0_amd64.deb`
Additionally, with further changes to rebranding of platform (not part of this
commit, will be raised separately) and skipping inclusion of other platforms,
verified install/boot of the `sonic-broadcom.bin` on a `DS3000` unit.
platform-celestica: config and script fixes for pddf init (#55)
The following fixes applicable to platforms (ds1000, ds2000, ds3000,
ds4000/silverstone-v2) for correct pddf intialization and access of platform
devices:
* Update pddf-device json eliminating the need for additional indexing,
multiplication operations in raw ipmi get.
* The PDDF infra expects `num_components` as part of json config, update the
same.
* The ASIC PCIe firmware version uses `bcmcmd` to fetch the version. However,
when syncd is not running, the error string is reported as version, fix this
by return version as `Unknown` instead.
* The PDDF component init passes pddf_data and pddf_plugin_data parameters,
accommodate this.
* Lookup correct overridden fan names from the PDDF plugin data accommodating
fantray/psu and fan indices.
* Lookup correct overridden thermal names from the PDDF plugin data.
* Update platform specific monitoring service to start after `pddf-platform-init`
service as this service imports `sonic_platform` module.
* Update references of `/sys/class/i2c-adapter` to `/sys/bus/i2c/devices`
instead.
Tested these changes on ds1000, ds2000, ds3000 and silverstone-v2 platforms with
accessing platform commands querying PDDF components. Verified that the accesses
to the components are ok.
Co-authored-by: Ramasamy Chandramouli <rachandr@celestica.com>
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
2 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.