[device][accton]Add fan monitor for as7816-64x (sonic-net#2859)

* catch signal SIGINT and SIGTERM to set all fans full-speed before end fan monitor.
Signed-off-by: roy_lee <[email protected]>

* Add fan_control monitor for as7816-64x.
Signed-off-by: roy_lee <[email protected]>

* Fix typo.
Signed-off-by: roy_lee <[email protected]>

* Correct typo and duty setting after verified.
Signed-off-by: roy_lee <[email protected]>

Author: roylee123

platform/broadcom/sonic-platform-modules-accton/as5712-54x/utils/accton_as5712_monitor.py

@@ -33,6 +33,7 @@
     import types
     import time  # this is only being used as part of the example
     import traceback
+    import signal
     from tabulate import tabulate
     from as5712_54x.fanutil import FanUtil
     from as5712_54x.thermalutil import ThermalUtil
@@ -42,6 +43,7 @@
 # Deafults
 VERSION = '1.0'
 FUNCTION_NAME = 'accton_as5712_monitor'
+DUTY_MAX = 100
 
 global log_file
 global log_level
@@ -166,6 +168,12 @@ def manage_fans(self):
 
         return True
 
+def handler(signum, frame):
+        fan = FanUtil()
+        logging.debug('INFO:Cause signal %d, set fan speed max.', signum)
+        fan.set_fan_duty_cycle(fan.get_idx_fan_start(), DUTY_MAX)
+        sys.exit(0)
+
 def main(argv):
     log_file = '%s.log' % FUNCTION_NAME
     log_level = logging.INFO
@@ -184,6 +192,8 @@ def main(argv):
             elif opt in ('-l', '--lfile'):
                 log_file = arg
 
+    signal.signal(signal.SIGINT, handler)
+    signal.signal(signal.SIGTERM, handler)
     monitor = accton_as5712_monitor(log_file, log_level)
 
     # Loop forever, doing something useful hopefully:

platform/broadcom/sonic-platform-modules-accton/as7312-54x/setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env pytho
+#!/usr/bin/env python
 
 import os
 import sys

platform/broadcom/sonic-platform-modules-accton/as7312-54x/utils/accton_as7312_monitor.py

@@ -34,6 +34,7 @@
     import types
     import time  # this is only being used as part of the example
     import traceback
+    import signal
     from tabulate import tabulate
     from as7312_54x.fanutil import FanUtil
     from as7312_54x.thermalutil import ThermalUtil
@@ -43,6 +44,7 @@
 # Deafults
 VERSION = '1.0'
 FUNCTION_NAME = 'accton_as7312_monitor'
+DUTY_MAX = 100
 
 global log_file
 global log_level
@@ -98,7 +100,7 @@ def __init__(self, log_file, log_level):
         logging.debug('SET. logfile:%s / loglevel:%d', log_file, log_level)
 
     def manage_fans(self):
-        max_duty = 100
+        max_duty = DUTY_MAX
         fan_policy_f2b = {
            0: [32, 0,      105000],
            1: [50, 105000, 120000],
@@ -179,6 +181,12 @@ def manage_fans(self):
             fan.set_fan_duty_cycle(new_duty_cycle)
         return True
 
+def handler(signum, frame):
+    fan = FanUtil()
+    logging.debug('INFO:Cause signal %d, set fan speed max.', signum)
+    fan.set_fan_duty_cycle(DUTY_MAX)
+    sys.exit(0)
+
 def main(argv):
     log_file = '%s.log' % FUNCTION_NAME
     log_level = logging.INFO
@@ -197,6 +205,8 @@ def main(argv):
             elif opt in ('-l', '--lfile'):
                 log_file = arg
 
+    signal.signal(signal.SIGINT, handler)
+    signal.signal(signal.SIGTERM, handler)
     monitor = accton_as7312_monitor(log_file, log_level)
 
     # Loop forever, doing something useful hopefully:

platform/broadcom/sonic-platform-modules-accton/as7816-64x/classes/fanutil.py

@@ -0,0 +1,244 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2017 Accton Technology Corporation
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# ------------------------------------------------------------------
+# HISTORY:
+#    mm/dd/yyyy (A.D.)
+#    11/13/2017: Polly Hsu, Create
+#    1/10/2018: Jostar modify for as7716_32
+#    5/02/2019: Roy Lee modify for as7816_64x
+# ------------------------------------------------------------------
+
+try:
+    import time
+    import logging
+    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 = 4
+    FAN_NUM_1_IDX = 1
+    FAN_NUM_2_IDX = 2
+    FAN_NUM_3_IDX = 3
+    FAN_NUM_4_IDX = 4
+
+    FAN_NODE_NUM_OF_MAP = 2
+    FAN_NODE_FAULT_IDX_OF_MAP = 1
+    #FAN_NODE_SPEED_IDX_OF_MAP = 2
+    FAN_NODE_DIR_IDX_OF_MAP = 2
+    #FAN_NODE_DUTY_IDX_OF_MAP = 4
+    #FANR_NODE_FAULT_IDX_OF_MAP = 5
+
+    BASE_VAL_PATH = '/sys/bus/i2c/devices/17-0068/{0}'
+    FAN_DUTY_PATH = '/sys/bus/i2c/devices/17-0068/fan_duty_cycle_percentage'
+
+    #logfile = ''
+    #loglevel = logging.INFO
+
+    """ Dictionary where
+        key1 = fan id index (integer) starting from 1
+        key2 = fan node index (interger) starting from 1
+        value = path to fan device file (string) """
+    _fan_to_device_path_mapping = {}
+    
+#fan1_direction
+#fan1_fault
+#fan1_present
+
+ #(FAN_NUM_2_IDX, FAN_NODE_DUTY_IDX_OF_MAP): 'fan2_duty_cycle_percentage',
+    _fan_to_device_node_mapping = {
+           (FAN_NUM_1_IDX, FAN_NODE_FAULT_IDX_OF_MAP): 'fan1_fault',           
+           (FAN_NUM_1_IDX, FAN_NODE_DIR_IDX_OF_MAP): 'fan1_direction',           
+           (FAN_NUM_2_IDX, FAN_NODE_FAULT_IDX_OF_MAP): 'fan2_fault',
+           (FAN_NUM_2_IDX, FAN_NODE_DIR_IDX_OF_MAP): 'fan2_direction',
+
+           (FAN_NUM_3_IDX, FAN_NODE_FAULT_IDX_OF_MAP): 'fan3_fault',
+           (FAN_NUM_3_IDX, FAN_NODE_DIR_IDX_OF_MAP): 'fan3_direction',
+
+           (FAN_NUM_4_IDX, FAN_NODE_FAULT_IDX_OF_MAP): 'fan4_fault',
+           (FAN_NUM_4_IDX, FAN_NODE_DIR_IDX_OF_MAP): 'fan4_direction',
+           }
+
+    def _get_fan_to_device_node(self, fan_num, node_num):
+        return self._fan_to_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_fan_to_device_path(fan_num, node_num)
+       
+        try:
+            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:
+            logging.debug('GET. unable to close file. device_path:%s', device_path)
+            return None
+
+        return int(content)
+
+    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
+
+        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
+
+        device_path = self.get_fan_to_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
+
+        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_to_device_path_mapping[(fan_num, node_num)] = fan_path.format(
+                   self._fan_to_device_node_mapping[(fan_num, node_num)])
+               
+    def get_num_fans(self):
+        return self.FAN_NUM_ON_MAIN_BROAD
+
+    def get_idx_fan_start(self):
+        return self.FAN_NUM_1_IDX
+
+    def get_num_nodes(self):
+        return self.FAN_NODE_NUM_OF_MAP
+
+    def get_idx_node_start(self):
+        return self.FAN_NODE_FAULT_IDX_OF_MAP
+
+    def get_size_node_map(self):
+        return len(self._fan_to_device_node_mapping)
+
+    def get_size_path_map(self):
+        return len(self._fan_to_device_path_mapping)
+
+    def get_fan_to_device_path(self, fan_num, node_num):
+        return self._fan_to_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_speed(self, fan_num):
+    #    return self._get_fan_node_val(fan_num, self.FAN_NODE_SPEED_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):
+        #duty_path = self.FAN_DUTY_PATH
+        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)
+        #self._get_fan_node_val(fan_num, self.FAN_NODE_DUTY_IDX_OF_MAP)
+#static u32 reg_val_to_duty_cycle(u8 reg_val) 
+#{
+#    reg_val &= FAN_DUTY_CYCLE_REG_MASK;
+#    return ((u32)(reg_val+1) * 625 + 75)/ 100;
+#}
+#
+    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_fanr_fault(self, fan_num):
+    #    return self._get_fan_node_val(fan_num, self.FANR_NODE_FAULT_IDX_OF_MAP)
+
+    def get_fanr_speed(self, fan_num):
+        return self._get_fan_node_val(fan_num, self.FANR_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) is not None and self.get_fan_fault(fan_num) > 0:
+            logging.debug('GET. FAN fault. fan_num, %d', fan_num)
+            return False
+
+        #if self.get_fanr_fault(fan_num) is not None and self.get_fanr_fault(fan_num) > 0:
+        #    logging.debug('GET. FANR fault. fan_num, %d', fan_num)
+        #   return False
+
+        return True
+
+#def main():
+#    fan = FanUtil()
+#
+#    print 'get_size_node_map : %d' % fan.get_size_node_map()
+#    print 'get_size_path_map : %d' % fan.get_size_path_map()
+#    for x in range(fan.get_idx_fan_start(), fan.get_num_fans()+1):
+#        for y in range(fan.get_idx_node_start(), fan.get_num_nodes()+1):
+#            print fan.get_fan_to_device_path(x, y)
+#
+#if __name__ == '__main__':
+#    main()