[as4630-54pe]Put correct fanuilt.py file

platform/broadcom/sonic-platform-modules-accton/as4630-54pe/classes/fanutil.py

@@ -20,50 +20,79 @@
 # ------------------------------------------------------------------
 
 try:
-    import os
     import time
     import logging
-    import glob
-    import commands
     from collections import namedtuple
 except ImportError as e:
     raise ImportError('%s - required module not found' % str(e))
+
+
+class FanUtil(object):
+    """Platform-specific FanUtil class"""
+
+    FAN_NUM_ON_MAIN_BROAD = 3
+    FAN_NUM_1_IDX = 1
+    FAN_NUM_2_IDX = 2
+    FAN_NUM_3_IDX = 3
 
-class ThermalUtil(object):
-    """Platform-specific ThermalUtil class"""
-    THERMAL_NUM_MAX = 4
-    THERMAL_NUM_1_IDX = 1 
-    THERMAL_NUM_2_IDX = 2 
-    THERMAL_NUM_3_IDX = 3 
-    THERMAL_NUM_4_IDX = 4
+    FAN_NODE_NUM_OF_MAP = 4
+    FAN_NODE_FAULT_IDX_OF_MAP  = 1    
+    FAN_NODE_DIR_IDX_OF_MAP    = 2
+    FAN_NODE_PRESENT_IDX_OF_MAP= 3
+    FAN_NODE_SPEED_IDX_OF_MAP  = 4
+
+    BASE_VAL_PATH = '/sys/bus/i2c/devices/3-0060/{0}'
+    FAN_DUTY_PATH = '/sys/bus/i2c/devices/3-0060/fan_duty_cycle_percentage'
 
     """ Dictionary where
-        key1 = thermal id index (integer) starting from 1
+        key1 = fan id index (integer) starting from 1
+        key2 = fan node index (interger) starting from 1
         value = path to fan device file (string) """
+    _fan_device_path_mapping = {}
 
-    thermal_sysfspath ={
-        THERMAL_NUM_1_IDX: ["/sys/bus/i2c/devices/14-0048/hwmon/hwmon*/temp1_input"],
-        THERMAL_NUM_2_IDX: ["/sys/bus/i2c/devices/24-004b/hwmon/hwmon*/temp1_input"],  
-        THERMAL_NUM_3_IDX: ["/sys/bus/i2c/devices/25-004a/hwmon/hwmon*/temp1_input"],
-        THERMAL_NUM_4_IDX: ["/sys/class/hwmon/hwmon1/temp1_input"],
+    _fan_device_node_mapping = {
+        (FAN_NUM_1_IDX, FAN_NODE_FAULT_IDX_OF_MAP):   'fan_fault_1',
+        (FAN_NUM_1_IDX, FAN_NODE_DIR_IDX_OF_MAP):     'fan_direction_1',
+        (FAN_NUM_1_IDX, FAN_NODE_PRESENT_IDX_OF_MAP): 'fan_present_1',
+        (FAN_NUM_1_IDX, FAN_NODE_SPEED_IDX_OF_MAP):  'fan1_input',
+
+
+        (FAN_NUM_2_IDX, FAN_NODE_FAULT_IDX_OF_MAP):  'fan_fault_2',
+        (FAN_NUM_2_IDX, FAN_NODE_DIR_IDX_OF_MAP):    'fan_direction_2',
+        (FAN_NUM_2_IDX, FAN_NODE_PRESENT_IDX_OF_MAP):'fan_present_2',
+        (FAN_NUM_2_IDX, FAN_NODE_SPEED_IDX_OF_MAP): 'fan2_input',
+
+        (FAN_NUM_3_IDX, FAN_NODE_FAULT_IDX_OF_MAP):  'fan_fault_3',
+        (FAN_NUM_3_IDX, FAN_NODE_DIR_IDX_OF_MAP):    'fan_direction_3',
+        (FAN_NUM_3_IDX, FAN_NODE_PRESENT_IDX_OF_MAP):'fan_present_3',
+        (FAN_NUM_3_IDX, FAN_NODE_SPEED_IDX_OF_MAP): 'fan3_input',
     }
 
-    def _get_thermal_val(self, thermal_num):
-        if thermal_num < self.THERMAL_NUM_1_IDX or thermal_num > self.THERMAL_NUM_MAX:
-            logging.debug('GET. Parameter error. thermal_num, %d', thermal_num)
+    def _get_fan_device_node(self, fan_num, node_num):
+        return self._fan_device_node_mapping[(fan_num, node_num)]
+
+    def _get_fan_node_val(self, fan_num, node_num):
+        if fan_num < self.FAN_NUM_1_IDX or fan_num > self.FAN_NUM_ON_MAIN_BROAD:
+            logging.debug('GET. Parameter error. fan_num:%d', fan_num)
+            return None
+
+        if node_num < self.FAN_NODE_FAULT_IDX_OF_MAP or node_num > self.FAN_NODE_NUM_OF_MAP:
+            logging.debug('GET. Parameter error. node_num:%d', node_num)
             return None
 
-        device_path = self.get_thermal_path(thermal_num)
-        for filename in glob.glob(device_path):
+        device_path = self.get_fan_device_path(fan_num, node_num)
+
             try:
-                val_file = open(filename, 'r')
+            val_file = open(device_path, 'r')
             except IOError as e:
                 logging.error('GET. unable to open file: %s', str(e))
                 return None
+
             content = val_file.readline().rstrip()
             if content == '':
                 logging.debug('GET. content is NULL. device_path:%s', device_path)
                 return None
+
             try:
                 val_file.close()
             except:
@@ -72,19 +101,103 @@ def _get_thermal_val(self, thermal_num):
 
             return int(content)
 
-        return 0
+    def _set_fan_node_val(self, fan_num, node_num, val):
+        if fan_num < self.FAN_NUM_1_IDX or fan_num > self.FAN_NUM_ON_MAIN_BROAD:
+            logging.debug('GET. Parameter error. fan_num:%d', fan_num)
+            return None
 
-    def get_num_thermals(self):
-        return self.THERMAL_NUM_MAX
+        if node_num < self.FAN_NODE_FAULT_IDX_OF_MAP or node_num > self.FAN_NODE_NUM_OF_MAP:
+            logging.debug('GET. Parameter error. node_num:%d', node_num)
+            return None
+
+        content = str(val)
+        if content == '':
+            logging.debug('GET. content is NULL. device_path:%s', device_path)
+            return None
 
-    def get_size_path_map(self):
-        return len(self.thermal_sysfspath)
+        device_path = self.get_fan_device_path(fan_num, node_num)
+        try:
+            val_file = open(device_path, 'w')
+        except IOError as e:
+            logging.error('GET. unable to open file: %s', str(e))
+            return None
 
-    def get_thermal_path(self, thermal_num):
-        return self.thermal_sysfspath[thermal_num][0]
+        val_file.write(content)
+
+        try:
+		    val_file.close()
+        except:
+            logging.debug('GET. unable to close file. device_path:%s', device_path)
+            return None
+
+        return True
+
+    def __init__(self):
+        fan_path = self.BASE_VAL_PATH
+        for fan_num in range(self.FAN_NUM_1_IDX, self.FAN_NUM_ON_MAIN_BROAD+1):
+            for node_num in range(self.FAN_NODE_FAULT_IDX_OF_MAP, self.FAN_NODE_NUM_OF_MAP+1):
+                self._fan_device_path_mapping[(fan_num, node_num)] = fan_path.format(
+                   self._fan_device_node_mapping[(fan_num, node_num)])
+
+    def get_size_node_map(self):
+        return len(self._fan_device_node_mapping)
+
+    def get_fan_device_path(self, fan_num, node_num):
+        return self._fan_device_path_mapping[(fan_num, node_num)]
+
+    def get_fan_fault(self, fan_num):
+        return self._get_fan_node_val(fan_num, self.FAN_NODE_FAULT_IDX_OF_MAP)
+
+    def get_fan_present(self, fan_num):
+        return self._get_fan_node_val(fan_num, self.FAN_NODE_PRESENT_IDX_OF_MAP)
+
+    def get_fan_dir(self, fan_num):
+        return self._get_fan_node_val(fan_num, self.FAN_NODE_DIR_IDX_OF_MAP)
+
+    def get_fan_duty_cycle(self):
+        try:
+            val_file = open(self.FAN_DUTY_PATH)
+        except IOError as e:
+            print "Error: unable to open file: %s" % str(e)          
+            return False
+
+        content = val_file.readline().rstrip()
+        val_file.close()
+
+        return int(content)
+
+    def set_fan_duty_cycle(self, val):
+        try:
+            fan_file = open(self.FAN_DUTY_PATH, 'r+')
+        except IOError as e:
+            print "Error: unable to open file: %s" % str(e)          
+            return False
+
+        fan_file.write(str(val))
+        fan_file.close()
+        return True
+
+    def get_fan_speed(self, fan_num):
+        return self._get_fan_node_val(fan_num, self.FAN_NODE_SPEED_IDX_OF_MAP)
+
+    def get_fan_status(self, fan_num):
+        if fan_num < self.FAN_NUM_1_IDX or fan_num > self.FAN_NUM_ON_MAIN_BROAD:
+            logging.debug('GET. Parameter error. fan_num, %d', fan_num)
+            return None
+        if self.get_fan_fault(fan_num)==0 and self.get_fan_present(fan_num)>0:
+            return 1
+        else:
+            logging.debug('GET. FAN fault. fan_num, %d', fan_num)
+            return 0    
 
 def main():
-    thermal = ThermalUtil()
+    fan = FanUtil()
+    logging.debug('fan_duty_cycle=%d', fan.get_fan_duty_cycle())
+    for i in range(1,4):
+        logging.debug('fan-%d speed=%d', i, fan.get_fan_speed(i))
+        logging.debug('fan-%d present=%d', i, fan.get_fan_present(i))
+        logging.debug('fan-%d fault=%d', i, fan.get_fan_fault(i))
+        logging.debug('fan-%d status=%d', i, fan.get_fan_status(i))
 
 if __name__ == '__main__':
     main()