From b7d8a7c26258a9ea7b334728e0f96fa91932fdce Mon Sep 17 00:00:00 2001 From: Wirut Getbamrung Date: Wed, 20 Feb 2019 14:14:08 +0700 Subject: [PATCH 1/3] [device/alibaba] - Fix invalid fan cpld monitoring format --- .../x86_64-alibaba_as13-32h-cl-r0/plugins/fwmgrutil.py | 4 ++-- .../x86_64-alibaba_as13-48f8h-cl-r0/plugins/fwmgrutil.py | 4 ++-- .../x86_64-alibaba_as23-128h-cl-r0/plugins/fwmgrutil.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/fwmgrutil.py b/device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/fwmgrutil.py index 16b97f6a143b..75aa199f7fd1 100644 --- a/device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/fwmgrutil.py +++ b/device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/fwmgrutil.py @@ -101,8 +101,8 @@ def get_cpld_version(self): int(CPLD_3[2], 16), int(CPLD_3[3], 16)) CPLD_4 = 'None' if CPLD_4 is 'None' else "{}.{}".format( int(CPLD_4[2], 16), int(CPLD_4[3], 16)) - FAN_CPLD = 'None' if CPLD_4 is None else "{:.1f}".format( - float(fan_cpld)) + FAN_CPLD = 'None' if CPLD_4 is None else "{}.{}".format( + int(fan_cpld[0], 16), int(fan_cpld[1], 16)) cpld_version_dict = {} cpld_version_dict.update({'CPLD_B': CPLD_B}) diff --git a/device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/fwmgrutil.py b/device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/fwmgrutil.py index a84ed4a5946f..34e174398473 100644 --- a/device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/fwmgrutil.py +++ b/device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/fwmgrutil.py @@ -101,8 +101,8 @@ def get_cpld_version(self): int(CPLD_3[2], 16), int(CPLD_3[3], 16)) CPLD_4 = 'None' if CPLD_4 is 'None' else "{}.{}".format( int(CPLD_4[2], 16), int(CPLD_4[3], 16)) - FAN_CPLD = 'None' if CPLD_4 is None else "{:.1f}".format( - float(fan_cpld)) + FAN_CPLD = 'None' if CPLD_4 is None else "{}.{}".format( + int(fan_cpld[0], 16), int(fan_cpld[1], 16)) cpld_version_dict = {} cpld_version_dict.update({'CPLD_B': CPLD_B}) diff --git a/device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/fwmgrutil.py b/device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/fwmgrutil.py index 230f652cd639..64c83bec7a00 100644 --- a/device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/fwmgrutil.py +++ b/device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/fwmgrutil.py @@ -101,8 +101,8 @@ def get_cpld_version(self): int(CPLD_3[2], 16), int(CPLD_3[3], 16)) CPLD_4 = 'None' if CPLD_4 is 'None' else "{}.{}".format( int(CPLD_4[2], 16), int(CPLD_4[3], 16)) - FAN_CPLD = 'None' if CPLD_4 is None else "{:.1f}".format( - float(fan_cpld)) + FAN_CPLD = 'None' if CPLD_4 is None else "{}.{}".format( + int(fan_cpld[0], 16), int(fan_cpld[1], 16)) cpld_version_dict = {} cpld_version_dict.update({'CPLD_B': CPLD_B}) From 82a4919f64484de0d6276a064e9d0e8dbd2ec0da Mon Sep 17 00:00:00 2001 From: Wirut Getbamrung Date: Thu, 21 Feb 2019 17:25:42 +0700 Subject: [PATCH 2/3] [platform/cel] - Update platform utility to version 1.2 --- 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 2391914c4d3f..1e8afebd7952 160000 --- a/platform/broadcom/sonic-platform-modules-cel +++ b/platform/broadcom/sonic-platform-modules-cel @@ -1 +1 @@ -Subproject commit 2391914c4d3f3de0c6d203eabc53e96d8727cfbc +Subproject commit 1e8afebd7952af502210d07cb675a8cde6fcb22d From fb9f435a7da89d0f72a92e7fdcb28206148c40be Mon Sep 17 00:00:00 2001 From: Wirut Getbamrung Date: Fri, 22 Feb 2019 10:31:44 +0700 Subject: [PATCH 3/3] [device/ali] - Update sensorutil to support INLET_TEMP format --- .../x86_64-alibaba_as13-32h-cl-r0/plugins/sensorutil.py | 6 ++++++ .../x86_64-alibaba_as13-48f8h-cl-r0/plugins/sensorutil.py | 7 +++++++ .../x86_64-alibaba_as23-128h-cl-r0/plugins/sensorutil.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/sensorutil.py b/device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/sensorutil.py index 4bf14ce6310b..796949126ccc 100644 --- a/device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/sensorutil.py +++ b/device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/sensorutil.py @@ -68,6 +68,12 @@ def input_name_selector(self, sensor_name, input_name): "tmp75-i2c-39-48": "BTF_INLET_RIGHT", "tmp75-i2c-39-49": "BTF_INLET_LEFT" }.get(sensor_name, input_name) + if self.get_sys_airflow() == "FTOB" and sensor_name == "tmp75-i2c-7-4d": + input_name = "INLET_TEMP" + + if self.get_sys_airflow() == "BTOF" and sensor_name == "tmp75-i2c-39-48": + input_name = "INLET_TEMP" + self.sensor_name = "TEMPERATURE" elif 'fancpld' in sensor_name: diff --git a/device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/sensorutil.py b/device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/sensorutil.py index 4bf14ce6310b..44e48e743b57 100644 --- a/device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/sensorutil.py +++ b/device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/sensorutil.py @@ -68,6 +68,12 @@ def input_name_selector(self, sensor_name, input_name): "tmp75-i2c-39-48": "BTF_INLET_RIGHT", "tmp75-i2c-39-49": "BTF_INLET_LEFT" }.get(sensor_name, input_name) + if self.get_sys_airflow() == "FTOB" and sensor_name == "tmp75-i2c-7-4d": + input_name = "INLET_TEMP" + + if self.get_sys_airflow() == "BTOF" and sensor_name == "tmp75-i2c-39-48": + input_name = "INLET_TEMP" + self.sensor_name = "TEMPERATURE" elif 'fancpld' in sensor_name: @@ -326,6 +332,7 @@ def get_all(self): # Set sensor data. sensor_dict = dict() + for k, v in sensor_info.items(): sensor_i_dict = dict() sensor_data_str = v.split() diff --git a/device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/sensorutil.py b/device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/sensorutil.py index fc437dc8c8b7..29f56e8578e6 100644 --- a/device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/sensorutil.py +++ b/device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/sensorutil.py @@ -79,7 +79,7 @@ def input_name_selector(self, sensor_name, input_name): "tmp75-i2c-7-4e": "BASEBOARD_INLET_CENTER", "tmp75-i2c-7-4d": "SWITCH_OUTLET", "tmp75-i2c-31-48": "PSU_INLET_LEFT", - "tmp75-i2c-31-49": "PSU_INLET_RIGHT", + "tmp75-i2c-31-49": "INLET_TEMP", "tmp75-i2c-39-48": "FANBOARD_LEFT", "tmp75-i2c-39-49": "FANBOARD_RIGHT", "tmp75-i2c-42-48": "LINECARD_TOP_RIGHT",