From 4760db2c5b87a9de09f7b20f34bbe010d561b9fd Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Tue, 23 Feb 2021 04:10:28 +0000 Subject: [PATCH] [DellEMC] Ensure concrete platform API classes call base class initializer --- .../s5232f/sonic_platform/component.py | 1 + .../sonic-platform-modules-dell/s5232f/sonic_platform/fan.py | 1 + .../s5232f/sonic_platform/watchdog.py | 1 + .../s6000/sonic_platform/component.py | 1 + .../sonic-platform-modules-dell/s6000/sonic_platform/fan.py | 1 + .../sonic-platform-modules-dell/s6000/sonic_platform/thermal.py | 1 + .../s6100/sonic_platform/component.py | 1 + .../sonic-platform-modules-dell/s6100/sonic_platform/fan.py | 1 + .../sonic-platform-modules-dell/s6100/sonic_platform/thermal.py | 1 + .../sonic-platform-modules-dell/s6100/sonic_platform/watchdog.py | 1 + .../z9100/sonic_platform/component.py | 1 + .../sonic-platform-modules-dell/z9100/sonic_platform/fan.py | 1 + .../sonic-platform-modules-dell/z9100/sonic_platform/psu.py | 1 + .../sonic-platform-modules-dell/z9100/sonic_platform/thermal.py | 1 + .../z9264f/sonic_platform/component.py | 1 + .../sonic-platform-modules-dell/z9264f/sonic_platform/fan.py | 1 + .../z9264f/sonic_platform/watchdog.py | 1 + .../z9332f/sonic_platform/component.py | 1 + .../sonic-platform-modules-dell/z9332f/sonic_platform/fan.py | 1 + .../z9332f/sonic_platform/watchdog.py | 1 + 20 files changed, 20 insertions(+) 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 f7fcc94662c..52f2bacd70a 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 @@ -82,6 +82,7 @@ class Component(ComponentBase): ] def __init__(self, component_index = 0): + ComponentBase.__init__(self) self.index = component_index self.name = self.CHASSIS_COMPONENTS[self.index][0] self.description = self.CHASSIS_COMPONENTS[self.index][1] diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/fan.py index 1b624cb76ed..c634dc7d0d1 100644 --- a/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/fan.py +++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/fan.py @@ -41,6 +41,7 @@ class Fan(FanBase): def __init__(self, fantray_index=1, fan_index=1, psu_fan=False, dependency=None): + FanBase.__init__(self) self.is_psu_fan = psu_fan if not self.is_psu_fan: # API index is starting from 0, DellEMC platform index is 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 878d5f4f952..f363f02efb5 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 @@ -36,6 +36,7 @@ class Watchdog(WatchdogBase): CLOCK_MONOTONIC = 1 def __init__(self): + WatchdogBase.__init__(self) self._librt = ctypes.CDLL('librt.so.1', use_errno=True) self._clock_gettime = self._librt.clock_gettime self._clock_gettime.argtypes=[ctypes.c_int, ctypes.POINTER(_timespec)] diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/component.py index d9459be47c4..92ae95fae4f 100644 --- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/component.py +++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/component.py @@ -34,6 +34,7 @@ class Component(ComponentBase): ] def __init__(self, component_index): + ComponentBase.__init__(self) self.index = component_index self.name = self.CHASSIS_COMPONENTS[self.index][0] self.description = self.CHASSIS_COMPONENTS[self.index][1] diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan.py index d5a4f379e90..940c70cebed 100644 --- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan.py +++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/fan.py @@ -33,6 +33,7 @@ class Fan(FanBase): def __init__(self, fantray_index=1, fan_index=1, psu_index=1, psu_fan=False, dependency=None): + FanBase.__init__(self) self.is_psu_fan = psu_fan self.is_driver_initialized = True diff --git a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/thermal.py index ad089a8946a..bfb1385a9f0 100644 --- a/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/thermal.py +++ b/platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/thermal.py @@ -35,6 +35,7 @@ class Thermal(ThermalBase): def __init__(self, thermal_index, psu_index=1, psu_thermal=False, dependency=None): + ThermalBase.__init__(self) self.is_psu_thermal = psu_thermal self.dependency = dependency self.is_driver_initialized = True diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/component.py index bea180d440b..2e916488123 100644 --- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/component.py +++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/component.py @@ -41,6 +41,7 @@ class Component(ComponentBase): def __init__(self, component_index=0, is_module=False, iom_index=0, i2c_line=0, dependency=None): + ComponentBase.__init__(self) self.is_module_component = is_module self.dependency = dependency diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan.py index 5b3c8977ac0..e95fceaff91 100644 --- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan.py +++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/fan.py @@ -27,6 +27,7 @@ class Fan(FanBase): MAILBOX_DIR = HWMON_DIR + HWMON_NODE def __init__(self, fantray_index=1, psu_index=1, psu_fan=False, dependency=None): + FanBase.__init__(self) self.is_psu_fan = psu_fan if not self.is_psu_fan: self.fantrayindex = fantray_index diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/thermal.py index cac17f4b83a..6b8ce0954c9 100644 --- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/thermal.py +++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/thermal.py @@ -26,6 +26,7 @@ class Thermal(ThermalBase): ) def __init__(self, thermal_index): + ThermalBase.__init__(self) self.is_cpu_thermal = False self.index = thermal_index + 1 diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/watchdog.py index 0e5e102b7b5..177315ef180 100644 --- a/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/watchdog.py +++ b/platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/watchdog.py @@ -41,6 +41,7 @@ class Watchdog(WatchdogBase): CLOCK_MONOTONIC = 1 def __init__(self): + WatchdogBase.__init__(self) self._librt = ctypes.CDLL('librt.so.1', use_errno=True) self._clock_gettime = self._librt.clock_gettime self._clock_gettime.argtypes=[ctypes.c_int, ctypes.POINTER(_timespec)] diff --git a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/component.py index 52dee31a524..d3822307e24 100644 --- a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/component.py +++ b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/component.py @@ -39,6 +39,7 @@ class Component(ComponentBase): ] def __init__(self, component_index=0): + ComponentBase.__init__(self) self.index = component_index self.name = self.CHASSIS_COMPONENTS[self.index][0] self.description = self.CHASSIS_COMPONENTS[self.index][1] diff --git a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/fan.py index 31bda2f4cef..e85f614a82e 100755 --- a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/fan.py +++ b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/fan.py @@ -27,6 +27,7 @@ class Fan(FanBase): MAILBOX_DIR = HWMON_DIR + HWMON_NODE def __init__(self, fantray_index=1, fan_index=1, psu_fan=False): + FanBase.__init__(self) self.is_psu_fan = psu_fan if not self.is_psu_fan: # API index is starting from 0, DellEMC platform index is starting diff --git a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/psu.py index f76d0ac1bec..d32cb8f7f3a 100644 --- a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/psu.py +++ b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/psu.py @@ -25,6 +25,7 @@ class Psu(PsuBase): MAILBOX_DIR = HWMON_DIR + HWMON_NODE def __init__(self, psu_index): + PsuBase.__init__(self) # PSU is 1-based in DellEMC platforms self.index = psu_index + 1 self.psu_presence_reg = "psu{}_presence".format(self.index) diff --git a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/thermal.py index 942934ed763..72e6fff1e16 100644 --- a/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/thermal.py +++ b/platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/thermal.py @@ -26,6 +26,7 @@ class Thermal(ThermalBase): ) def __init__(self, thermal_index): + ThermalBase.__init__(self) self.is_cpu_thermal = False self.index = thermal_index + 1 diff --git a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/component.py index 6ead7ef524f..1aeecaa9d42 100644 --- a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/component.py +++ b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/component.py @@ -36,6 +36,7 @@ class Component(ComponentBase): "port transceivers (65 and 66)")], ] def __init__(self, component_index=0): + ComponentBase.__init__(self) self.index = component_index self.name = self.CHASSIS_COMPONENTS[self.index][0] self.description = self.CHASSIS_COMPONENTS[self.index][1] diff --git a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/fan.py index 39307d45348..b7d990877da 100644 --- a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/fan.py +++ b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/fan.py @@ -43,6 +43,7 @@ class Fan(FanBase): def __init__(self, fantray_index=1, fan_index=1, psu_fan=False, dependency=None): + FanBase.__init__(self) self.is_psu_fan = psu_fan if not self.is_psu_fan: # API index is starting from 0, DellEMC platform index is diff --git a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/watchdog.py index d3363067db6..375727d1e5e 100644 --- a/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/watchdog.py +++ b/platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/watchdog.py @@ -38,6 +38,7 @@ class Watchdog(WatchdogBase): CLOCK_MONOTONIC = 1 def __init__(self): + WatchdogBase.__init__(self) self._librt = ctypes.CDLL('librt.so.1', use_errno=True) self._clock_gettime = self._librt.clock_gettime self._clock_gettime.argtypes=[ctypes.c_int, ctypes.POINTER(_timespec)] diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py index 58c944cd6eb..b564c166453 100644 --- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py +++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py @@ -81,6 +81,7 @@ class Component(ComponentBase): ] def __init__(self, component_index = 0): + ComponentBase.__init__(self) self.index = component_index self.name = self.CHASSIS_COMPONENTS[self.index][0] self.description = self.CHASSIS_COMPONENTS[self.index][1] diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py index ff7a08bdd1a..d7bc0fdd392 100755 --- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py +++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/fan.py @@ -38,6 +38,7 @@ class Fan(FanBase): PSU_FRU_MAPPING = { 1: 3, 2: 4 } def __init__(self, fantray_index=1, fan_index=1, psu_fan=False, dependency=None): + FanBase.__init__(self) self.is_psu_fan = psu_fan if not self.is_psu_fan: # API index is starting from 0, DellEMC platform index is diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/watchdog.py b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/watchdog.py index 265fab66d92..76a7584e91a 100644 --- a/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/watchdog.py +++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/watchdog.py @@ -36,6 +36,7 @@ class Watchdog(WatchdogBase): CLOCK_MONOTONIC = 1 def __init__(self): + WatchdogBase.__init__(self) self._librt = ctypes.CDLL('librt.so.1', use_errno=True) self._clock_gettime = self._librt.clock_gettime self._clock_gettime.argtypes=[ctypes.c_int, ctypes.POINTER(_timespec)]