[device/alibaba] - Update fanutil plugin to avoid null fru data

SONIC-DEV · Jan 30, 2019 · cff353a · cff353a
1 parent 5a8a4bb
commit cff353a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 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
@@ -256,6 +256,8 @@ def get_all(self):
 
             if len(fan_fru) == 0:
                 fan_idx = fan_raw_idx
+                fan_pn = "N/A"
+                fan_sn = "N/A"
             else:
                 fan_key = fan_fru[0].split()
                 if str(fan_key[-1]).lower() == "absent":
@@ -290,7 +292,8 @@ def get_all(self):
                     fan_data = sensor_data.get(fan_key)
                     fan_sp_list = map(int, re.findall(r'\d+', fan_data))
                     fan_dict["Present"] = fan_fru_dict[f_index]["Present"]
-                    if fan_dict["Present"]:
+                    if fan_dict["Present"] or fan_sp_list[0] > 0:
+                        fan_dict["Present"] = True
                         fan_dict["Speed"] = fan_sp_list[0]
                         fan_dict["Running"] = True if fan_dict["Speed"] > 0 else False
                         fan_dict["LowThd"] = fan_sp_list[1]

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
@@ -256,6 +256,8 @@ def get_all(self):
 
             if len(fan_fru) == 0:
                 fan_idx = fan_raw_idx
+                fan_pn = "N/A"
+                fan_sn = "N/A"
             else:
                 fan_key = fan_fru[0].split()
                 if str(fan_key[-1]).lower() == "absent":
@@ -290,7 +292,8 @@ def get_all(self):
                     fan_data = sensor_data.get(fan_key)
                     fan_sp_list = map(int, re.findall(r'\d+', fan_data))
                     fan_dict["Present"] = fan_fru_dict[f_index]["Present"]
-                    if fan_dict["Present"]:
+                    if fan_dict["Present"] or fan_sp_list[0] > 0:
+                        fan_dict["Present"] = True
                         fan_dict["Speed"] = fan_sp_list[0]
                         fan_dict["Running"] = True if fan_dict["Speed"] > 0 else False
                         fan_dict["LowThd"] = fan_sp_list[1]

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
@@ -256,6 +256,8 @@ def get_all(self):
 
             if len(fan_fru) == 0:
                 fan_idx = fan_raw_idx
+                fan_pn = "N/A"
+                fan_sn = "N/A"
             else:
                 fan_key = fan_fru[0].split()
                 if str(fan_key[-1]).lower() == "absent":
@@ -290,7 +292,8 @@ def get_all(self):
                     fan_data = sensor_data.get(fan_key)
                     fan_sp_list = map(int, re.findall(r'\d+', fan_data))
                     fan_dict["Present"] = fan_fru_dict[f_index]["Present"]
-                    if fan_dict["Present"]:
+                    if fan_dict["Present"] or fan_sp_list[0] > 0:
+                        fan_dict["Present"] = True
                         fan_dict["Speed"] = fan_sp_list[0]
                         fan_dict["Running"] = True if fan_dict["Speed"] > 0 else False
                         fan_dict["LowThd"] = fan_sp_list[1]