From c490eca72dab9a8124e5ba0388e247827e88fde9 Mon Sep 17 00:00:00 2001 From: Srideep Devireddy Date: Thu, 14 May 2020 04:07:31 -0700 Subject: [PATCH] updates for alerts from LGTM --- .../s5232f/sonic_platform/__init__.py | 2 - .../s5232f/sonic_platform/chassis.py | 52 ++++--------------- .../s5232f/sonic_platform/component.py | 4 +- .../s5232f/sonic_platform/sfp.py | 15 ++---- .../s5232f/sonic_platform/thermal.py | 2 +- .../s5232f/sonic_platform/watchdog.py | 4 -- 6 files changed, 15 insertions(+), 64 deletions(-) diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/__init__.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/__init__.py index a3d1d73a0d9b..8b137891791f 100644 --- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/__init__.py +++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/__init__.py @@ -1,3 +1 @@ -__all__ = ["platform", "chassis", "sfp", "eeprom", "component", "thermal", "psu", "fan","watchdog","hwaccess"] -from sonic_platform import * diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/chassis.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/chassis.py index 8bc7fea782f3..977e6a3fd5c2 100644 --- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/chassis.py +++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/chassis.py @@ -11,7 +11,6 @@ try: import os import sys - import select from sonic_platform_base.chassis_base import ChassisBase from sonic_platform.sfp import Sfp from sonic_platform.eeprom import Eeprom @@ -35,8 +34,6 @@ class Chassis(ChassisBase): DELLEMC Platform-specific Chassis class """ - OIR_FD_PATH = "/sys/bus/pci/devices/0000:04:00.0/port_msi" - oir_fd = -1 epoll = -1 @@ -82,42 +79,6 @@ def __del__(self): self.epoll.close() self.oir_fd.close() -# not needed /delete after validation - - def _get_register(self, reg_file): - retval = 'ERR' - if (not os.path.isfile(reg_file)): - print reg_file, 'not found !' - return retval - - try: - with os.fdopen(os.open(reg_file, os.O_RDONLY)) as fd: - retval = fd.read() - except: - pass - retval = retval.rstrip('\r\n') - retval = retval.lstrip(" ") - return retval - -# not needed /delete after validation - - def _check_interrupts(self, port_dict): - retval = 0 - is_port_dict_updated = False - for port_num in range(self.PORT_START, (self.PORT_END + 1)): - # sfp get uses zero-indexing, but port numbers start from 1 - sfp = self.get_sfp(port_num) - presence = sfp.get_presence() - if(presence and (self._global_port_pres_dict[port_num] == '0')): - is_port_dict_updated = True - self._global_port_pres_dict[port_num] = '1' - port_dict[port_num] = '1' - elif(not presence and (self._global_port_pres_dict[port_num] == '1')): - is_port_dict_updated = True - self._global_port_pres_dict[port_num] = '0' - port_dict[port_num] = '0' - return retval, is_port_dict_updated - # check for this event change for sfp / do we need to handle timeout/sleep def get_change_event(self, timeout=0): @@ -129,6 +90,10 @@ def get_change_event(self, timeout=0): port_dict = {} change_dict = {} change_dict['sfp'] = port_dict + elapsed_time_ms = 0 + sleep_time_ms = 500 + sleep_time = sleep_time_ms / 1000 + while True: for port_num in range(self.PORT_START, (self.PORT_END + 1)): presence = self.get_sfp(port_num).get_presence() @@ -142,10 +107,13 @@ def get_change_event(self, timeout=0): if(len(port_dict) > 0): return True, change_dict + if timeout != 0: + elapsed_time_ms += sleep_time_ms + if elapsed_time_ms > timeout: + break - sleep(0.5) - - + time.sleep(sleep_time) + return True, change_dict def get_sfp(self, index): """ diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/component.py index cc7d99942e22..bf33bd043d83 100644 --- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/component.py +++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/component.py @@ -10,8 +10,6 @@ ######################################################################## try: - import os - import re import subprocess from sonic_platform_base.component_base import ComponentBase import sonic_platform.hwaccess as hwaccess @@ -62,7 +60,7 @@ class Component(ComponentBase): ], ['BMC', - 'Platform management controller for on-board temperature ' + 'Platform management controller for on-board temperature ', 'monitoring, in-chassis power, Fan and LED control', get_bmc_version ], diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/sfp.py index c4dc1b0e2e73..e946b76c0329 100644 --- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/sfp.py +++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/sfp.py @@ -12,9 +12,6 @@ import os import time import struct - import sys - import getopt - import select import mmap from sonic_platform_base.chassis_base import ChassisBase from sonic_platform_base.sfp_base import SfpBase @@ -970,7 +967,7 @@ def reset(self): reg_value = reg_value & ~mask # Convert our register value back to a hex string and write back - status = self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset) + self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset) # Sleep 1 second to allow it to settle time.sleep(1) @@ -978,7 +975,7 @@ def reset(self): reg_value = reg_value | mask # Convert our register value back to a hex string and write back - status = self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset) + self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset) return True @@ -1010,7 +1007,7 @@ def set_lpmode(self, lpmode): reg_value = reg_value & ~mask # Convert our register value back to a hex string and write back - status = self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset) + self.pci_set_value(self.BASE_RES_PATH, reg_value, port_offset) return True @@ -1029,12 +1026,6 @@ def tx_disable_channel(self, channel, disable): """ return False - def tx_disable_channel(self, channel, disable): - """ - Sets the tx_disable for specified SFP channels - """ - return False - def set_power_override(self, power_override, power_set): """ Sets SFP power level using power_override and power_set diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/thermal.py index be052a4e4b2a..08f372dc4dc1 100644 --- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/thermal.py +++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/thermal.py @@ -11,7 +11,7 @@ try: from sonic_platform_base.thermal_base import ThermalBase - from sonic_platform.ipmihelper import IpmiSensor, IpmiFru + from sonic_platform.ipmihelper import IpmiSensor except ImportError as e: raise ImportError(str(e) + "- required module not found") diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/watchdog.py index ec92eaeb577b..878d5f4f952d 100644 --- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/watchdog.py +++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/watchdog.py @@ -10,8 +10,6 @@ ######################################################################## try: - import sys - import struct import ctypes import subprocess from sonic_platform_base.watchdog_base import WatchdogBase @@ -139,8 +137,6 @@ def arm(self, seconds): self.timeout = seconds return seconds - return -1 - def disarm(self): """ Disarm the hardware watchdog