Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#228

Merged
mssonicbld merged 10 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge
Jan 19, 2024
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#228
mssonicbld merged 10 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge

Conversation

@mssonicbld
Copy link
Collaborator

* 898f1263c - (head/202305) [staticroutebfd]double commit PR-16450, change bfd to singlehop (#17549) (2024-01-18) [Baorong Liu]
* d81780baa - Fix host service for 202305 branch (#17781) (2024-01-18) [ganglv]
* b99c46e3f - [build] Add gpg keys for sonic-slave-bullseye in arm64 cross build on amd64. (#17182) (#17828) (2024-01-18) [Liu Shilong]
* f460347a3 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#17821) (2024-01-18) [mssonicbld]
* ed71c12e0 - Enable BFD for Static Route for chassis-packet. (#15383) (2024-01-18) [abdosi]
* aa0163084 - [build]: Added flag in sonic_version.yml to see if image is secured or non-secured (#16191) (2024-01-18) [abdosi]
* 9f81d9d1b - [Nokia][sonic-platform] Update Nokia sonic-platform submodule and device data (#17378) (2024-01-18) [snider-nokia]
* 2f8630c85 - [Nokia-IXR7250E] Modify the platform_reboot on the IXR7250E for PMON API reboot and Disable all SFPs (#17483) (2024-01-18) [Marty Y. Lok]
* 6926171e9 - [build] Fix a bash script some times called by sh issue. (#17761) (2024-01-18) [Liu Shilong]<br>```

liushilongbuaa and others added 10 commits January 18, 2024 14:36
Why I did it
Fix a bug that sometimes the script runs in sh not bash.

Work item tracking
Microsoft ADO (number only): 26297955
How I did it
…API reboot and Disable all SFPs (#17483)

Why I did it
When Supervisor card is rebooted by using PMON API, it takes about 90 seconds to trigger the shutdown in down path. At this time linecards have been up. This delays linecards database initialization which is trying to PING/PONG the database-chassis. To address this issue, we modified the NDK to use the system call with "sudo reboot" when the request is from PMON API on Supervisor case. The NDK version is 22.9.20 and greater. This new NDK requires this modifcaiton of platform_reboot to work with.

Work item tracking
Microsoft ADO (number only): 26365734
How I did it
Modify the platform_reboot In Supervisor not to reboot all IMMs since it has been done in the function reboot() in module.py. Also handle the reboot-cause.txt for on the Supervisor when the reboot is request from PMON API.
Modify the Nokia platform specific platform_reboot in linecard to disable all SPFs.
This PR works with NDK version 22.9.20 and above

Signed-off-by: mlok <marty.lok@nokia.com>
…ice data (#17378)

These changes, in conjunction with NDK version >= 22.9.17 address the thermal logging issues discussed at Nokia-ION/ndk#27. While the changes contained at this PR do not require coupling to NDK version >= 22.9.17, thermal logging enhancements will not be available without updated NDK >= 22.9.17. Thus, coupling with NDK >=22.9.17 is preferred and recommended.

Why I did it
To address thermal logging deficiencies.

Work item tracking
Microsoft ADO (number only): 26365734
How I did it
The following changes are included:

Threshold configuration values are provided in the associated device data .json files. There is also a change included to better handle the condition where an SFP module read fails.

Modify the module.py reboot to support reboot linecard from Supervisor

 - Modify reboot to call _reboot_imm for single IMM card reboot
 - Add log to the ndk_cmd to log the operation of "reboot-linecard" and "shutdown/satrtup the sfm"
Add new nokia_cmd set command and modify show ndk-status output

 - Add a new function reboot_imm() to nokia_common.py to support reboot a single IMM slot from CPM
 - Added new command: nokia_cmd set reboot-linecard <slot> [forece] for CPM
 - Append a new column "RebootStatus" at the end of output of "nokia_cmd show ndk-status"
 - Provide ability for IMM to disable all transceiver module TX at reboot time
 - Remove defunct xcvr-resync service
…r non-secured (#16191)

What I did:

Added flag in sonic_version.yml to see if compiled image is secured or non-secured. This is done using build/compile time environmental variable SECURE_UPGRADE_MODE as define in HLD: https://github.com/sonic-net/SONiC/blob/master/doc/secure_boot/hld_secure_boot.md

This flag does not provide the runtime status of whether the image has booted securely or not. It's possible that compile time signed image (secured image) can boot on non secure platform.

Why I did:
Flag can be used for manual check or by the test case.

ADO: 24319390

How I verify:
Manual Verification

---
build_version: 'master-16191.346262-cdc5e72a3'
debian_version: '11.7'
kernel_version: '5.10.0-18-2-amd64'
asic_type: broadcom
asic_subtype: 'broadcom'
commit_id: 'cdc5e72a3'
branch: 'master-16191'
release: 'none'
build_date: Fri Aug 25 03:15:45 UTC 2023
build_number: 346262
built_by: AzDevOps@vmss-soni001UR5
libswsscommon: 1.0.0
sonic_utilities: 1.2
sonic_os_version: 11
secure_boot_image: 'no'

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
*What I did:
Enable BFD for Static Route for chassis-packet. This will trigger the use of the feature as defined in here: #13789

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
…lly (#17821)

#### Why I did it
src/sonic-swss
```
* ac94f0b7 - (HEAD -> 202305, origin/202305) [202305][routeorch] Fixing bug with multiple routes pointing to nhg (#3002) (2 hours ago) [Nikola Dancejic]
```
#### How I did it
#### How to verify it
#### Description for the changelog
… amd64. (#17182) (#17828)

Fix #16204

Microsoft ADO (number only): 25746782

How I did it
multiarch/debian-debootstrap:arm64-bullseye is too old.
It needs to add some gpg keys before 'apt-get update'
Why I did it
When we disable telemetry.service, sonic-hostservice will not start. And root cause is sonic-hostservice is only wanted by telemetry.service.

Work item tracking
Microsoft ADO (number only):
How I did it
Add dependency for gnmi.service.

How to verify it
Disable telemetry.service and build new image, and then check sonic-hostservice with new image.
Why I did it
double commit PR-16450 because of cherry pick conflict for PR#202305

Work item tracking
Microsoft ADO (number only):
How I did it
How to verify it
@mssonicbld mssonicbld merged commit 3cc0be9 into Azure:202305 Jan 19, 2024
r12f pushed a commit that referenced this pull request Dec 19, 2024
…lly (#18991)

#### Why I did it
src/sonic-gnmi
```
* 692f967 - (HEAD -> master, origin/master, origin/HEAD) Update pipeline to check memory leak (#228) (19 hours ago) [ganglv]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Jul 7, 2025
…utomatically (#22660)

#### Why I did it
src/sonic-host-services
```
* 0206da1 - (HEAD -> 202505, origin/202505) Revert "[featured] fix non existing feature start (#234)" (#273) (51 minutes ago) [mssonicbld]
* d4d624e - Add iptables rules to drop all bgp packets destined for loopback1 IP addresses in dual ToR (#269) (10 days ago) [mssonicbld]
* 93db579 - Fix PyGObject required version (#265) (2 weeks ago) [mssonicbld]
* 112acad - [build] Update Azure pipeline to use Ubuntu 24.04 image (#266) (2 weeks ago) [mssonicbld]
* 1ee792e - Implement Download and Delete For File Service (#242) (5 weeks ago) [Dawei Huang]
* 00393e3 - [kdump-config] Update kdump default config with pre-defined value in /proc/cmdline (installer.conf) (#237) (7 weeks ago) [Marty Y. Lok]
* d028745 - [Radius] Add require_message_authenticator option to fix BlastRadius issue. (#172) (7 weeks ago) [Julian Chang]
* 8237b5d - Monitor rsyslog feature flag change and update rsyslog config by restart rsyslog-config service (#245) (7 weeks ago) [Hua Liu]
* 55cee71 - Improve Detection Logic for HALT Command in is_halt_command_running() (#247) (8 weeks ago) [Vasundhara Volam]
* 29b8be8 - [featured] fix non existing feature start (#234) (3 months ago) [Stepan Blyshchak]
* fe90cb1 - Adding support for filtering by destination IP and/or incoming interface to caclmgrd. (#195) (3 months ago) [nyanto]
* 6006e05 - caclmgrd interface rules patch 1 (#197) (3 months ago) [Nanma Purushotam]
* 3ba0c59 - Pin PyGObject to 3.50.0 (#228) (3 months ago) [cpackham-atlnz]
* 5445cf6 - Radius Access request to use configured src interface (#230) (3 months ago) [lakshmi-nexthop]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Aug 15, 2025
…AD automatically (#1516)

#### Why I did it
src/sonic-utilities
```
* 0dab1b7a - (HEAD -> 202503, origin/202503) Merge pull request #229 from mssonicbld/sonicbld/202503-merge (23 hours ago) [mssonicbld]
* 372f958c - Merge branch '202412' of https://github.com/Azure/sonic-utilities.msft into 202503 (23 hours ago) [Sonic Automation]
* 87420914 - (origin/202412) Pr json support for show platform temperature (#228) (34 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
r12f pushed a commit that referenced this pull request Aug 15, 2025
…AD automatically (#1507)

#### Why I did it
src/sonic-utilities
```
* 87420914 - (HEAD -> 202412, origin/202412) Pr json support for show platform temperature (#228) (5 hours 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
…utomatically (#22160)

#### Why I did it
src/sonic-host-services
```
* aa971f6 - (HEAD -> master, origin/master, origin/HEAD) Revert "[featured] fix non existing feature start (#234)" (#272) (29 hours ago) [Qi Luo]
* 04e49f8 - Add iptables rules to drop all bgp packets destined for loopback1 IP addresses in dual ToR (#262) (11 days ago) [Yawen]
* 727e21b - [Caclmgrd]Fix key error issue about acl_source_ip_map (#268) (11 days ago) [Changrong Wu]
* 4cb6b97 - Restart caclmgrd whenever catch exception in child thread or in main thread (#194) (13 days ago) [Zhaohui Sun]
* d7842aa - config_db should not mandate True and False for featured (#252) (2 weeks ago) [Brad House - NextHop]
* 70de4d1 - Fix PyGObject required version (#264) (3 weeks ago) [Qi Luo]
* 953816b - Modify cacl rules to allow incoming packets to dash-ha (#256) (3 weeks ago) [yue-fred-gao]
* 5460c29 - Improve reboot status tracking and add reboot count & method to status (#259) (3 weeks ago) [Vasundhara Volam]
* e46e36e - Update ubuntu version in azure pipeline (#260) (4 weeks ago) [Vasundhara Volam]
* 23b81f9 - Fix reboot without message (#250) (4 weeks ago) [jkmar]
* 1ee792e - Implement Download and Delete For File Service (#242) (5 weeks ago) [Dawei Huang]
* 00393e3 - [kdump-config] Update kdump default config with pre-defined value in /proc/cmdline (installer.conf) (#237) (7 weeks ago) [Marty Y. Lok]
* d028745 - [Radius] Add require_message_authenticator option to fix BlastRadius issue. (#172) (7 weeks ago) [Julian Chang]
* 8237b5d - Monitor rsyslog feature flag change and update rsyslog config by restart rsyslog-config service (#245) (8 weeks ago) [Hua Liu]
* 55cee71 - Improve Detection Logic for HALT Command in is_halt_command_running() (#247) (8 weeks ago) [Vasundhara Volam]
* 29b8be8 - [featured] fix non existing feature start (#234) (3 months ago) [Stepan Blyshchak]
* fe90cb1 - Adding support for filtering by destination IP and/or incoming interface to caclmgrd. (#195) (3 months ago) [nyanto]
* 6006e05 - caclmgrd interface rules patch 1 (#197) (3 months ago) [Nanma Purushotam]
* 3ba0c59 - Pin PyGObject to 3.50.0 (#228) (3 months ago) [cpackham-atlnz]
* 5445cf6 - Radius Access request to use configured src interface (#230) (3 months ago) [lakshmi-nexthop]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants