From 96c2eb270be35e1555a607ecc0753f63609eec35 Mon Sep 17 00:00:00 2001 From: Wirut Getbamrung Date: Wed, 2 Jan 2019 11:10:38 +0700 Subject: [PATCH 1/2] Update fan name for platformutil --- .../alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/fanutil.py | 4 ++-- .../x86_64-alibaba_as13-48f8h-cl-r0/plugins/fanutil.py | 4 ++-- .../alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/fanutil.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/fanutil.py b/device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/fanutil.py index ea2b920afefb..33866a6f9377 100644 --- a/device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/fanutil.py +++ b/device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/fanutil.py @@ -221,7 +221,7 @@ def get_fans_name_list(self): for x in range(1, n_fan + 1): f_index = int(round(float(x)/2)) pos = 1 if x % 2 else 2 - fan_name = 'FAN{}-{}'.format(f_index, pos) + fan_name = 'FAN{}_{}'.format(f_index, pos) fan_names.append(fan_name) return fan_names @@ -291,7 +291,7 @@ def get_all(self): fan_dict["HighThd"] = fan_sp_list[2] fan_dict["PN"] = fan_fru_dict[f_index]["PN"] fan_dict["SN"] = fan_fru_dict[f_index]["SN"] - fan_name = 'FAN{}-{}'.format(f_index, pos) + fan_name = 'FAN{}_{}'.format(f_index, pos) all_fan_dict[fan_name] = fan_dict break diff --git a/device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/fanutil.py b/device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/fanutil.py index ea2b920afefb..33866a6f9377 100644 --- a/device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/fanutil.py +++ b/device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/fanutil.py @@ -221,7 +221,7 @@ def get_fans_name_list(self): for x in range(1, n_fan + 1): f_index = int(round(float(x)/2)) pos = 1 if x % 2 else 2 - fan_name = 'FAN{}-{}'.format(f_index, pos) + fan_name = 'FAN{}_{}'.format(f_index, pos) fan_names.append(fan_name) return fan_names @@ -291,7 +291,7 @@ def get_all(self): fan_dict["HighThd"] = fan_sp_list[2] fan_dict["PN"] = fan_fru_dict[f_index]["PN"] fan_dict["SN"] = fan_fru_dict[f_index]["SN"] - fan_name = 'FAN{}-{}'.format(f_index, pos) + fan_name = 'FAN{}_{}'.format(f_index, pos) all_fan_dict[fan_name] = fan_dict break diff --git a/device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/fanutil.py b/device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/fanutil.py index e32c20655962..d3e8334271b8 100644 --- a/device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/fanutil.py +++ b/device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/fanutil.py @@ -216,7 +216,7 @@ def get_fans_name_list(self): for x in range(1, n_fan + 1): f_index = int(round(float(x)/2)) pos = 1 if x % 2 else 2 - fan_name = 'FAN{}-{}'.format(f_index, pos) + fan_name = 'FAN{}_{}'.format(f_index, pos) fan_names.append(fan_name) return fan_names @@ -286,7 +286,7 @@ def get_all(self): fan_dict["HighThd"] = fan_sp_list[2] fan_dict["PN"] = fan_fru_dict[f_index]["PN"] fan_dict["SN"] = fan_fru_dict[f_index]["SN"] - fan_name = 'FAN{}-{}'.format(f_index, pos) + fan_name = 'FAN{}_{}'.format(f_index, pos) all_fan_dict[fan_name] = fan_dict break From 6ef0f96ad85f34f37cd9eea6262629ab6233c48f Mon Sep 17 00:00:00 2001 From: Pradchaya P Date: Thu, 3 Jan 2019 14:53:12 +0700 Subject: [PATCH 2/2] [platform/braodcom] Fishbone48 fix abnormal value return from i2c bus. --- platform/broadcom/sonic-platform-modules-cel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/broadcom/sonic-platform-modules-cel b/platform/broadcom/sonic-platform-modules-cel index 460f57e94d69..2b31b0cc42e1 160000 --- a/platform/broadcom/sonic-platform-modules-cel +++ b/platform/broadcom/sonic-platform-modules-cel @@ -1 +1 @@ -Subproject commit 460f57e94d6954f6981ceeb52ea8e12a7fc8a3d2 +Subproject commit 2b31b0cc42e1da768c8a5af4bae3cf880a434338