Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mssonicbld merged 5 commits into from
Feb 25, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
698d7d3
[submodule] Update submodule sonic-platform-daemons to the latest HEA…
mssonicbld Feb 25, 2024
2bec153
[submodule] Update submodule sonic-platform-common to the latest HEAD…
mssonicbld Feb 25, 2024
9484b7d
[chassis] update service_checker module to handle database-chassis se…
mssonicbld Feb 25, 2024
5fdc7d2
[Nokia-IXR7250E][Devicedata] Update the device data for Nokia IXR7250…
mssonicbld Feb 25, 2024
9d3623e
Merge branch '202305' of https://github.com/sonic-net/sonic-buildimag…
mssonicbld Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_ndk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
},
{
"key": "thermal_log_current_threshold",
"intval": 2
"intval": 5
},
{
"key": "thermal_log_margin_threshold",
"intval": 2
"intval": 5
},
{
"key": "thermal_log_min_threshold",
Expand Down
4 changes: 2 additions & 2 deletions device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_ndk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
},
{
"key": "thermal_log_current_threshold",
"intval": 3
"intval": 5
},
{
"key": "thermal_log_margin_threshold",
"intval": 3
"intval": 5
},
{
"key": "thermal_log_min_threshold",
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-platform-common
Open in desktop
Submodule sonic-platform-common updated 2 files
+7 −6 sonic_platform_base/sonic_xcvr/api/public/cmis.py
+9 −5 tests/sonic_xcvr/test_cmis.py
2 changes: 1 addition & 1 deletion src/sonic-platform-daemons
Open in desktop
Submodule sonic-platform-daemons updated 2 files
+35 −2 sonic-xcvrd/tests/test_xcvrd.py
+55 −12 sonic-xcvrd/xcvrd/xcvrd.py
6 changes: 4 additions & 2 deletions src/system-health/health_checker/service_checker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import re

from swsscommon import swsscommon
from sonic_py_common import multi_asic
from sonic_py_common import multi_asic, device_info
from sonic_py_common.logger import Logger
from .health_checker import HealthChecker
from . import utils
Expand Down Expand Up @@ -99,7 +99,9 @@ def get_expected_running_containers(self, feature_table):
else:
expected_running_containers.add(feature_name)
container_feature_dict[feature_name] = feature_name


if device_info.is_supervisor():
expected_running_containers.add("database-chassis")
return expected_running_containers, container_feature_dict

def get_current_running_containers(self):
Expand Down