Skip to content

Commit

Permalink
[device/celestica]: update psuutil follow new platform api (#3537)
Browse files Browse the repository at this point in the history
Fixes #3518

Update psuutil API to detect PSU GPIO base from label
  • Loading branch information
Wirut Getbamrung authored and lguohan committed Oct 7, 2019
1 parent e9a0c57 commit 50cfa77
Showing 1 changed file with 34 additions and 43 deletions.
77 changes: 34 additions & 43 deletions device/celestica/x86_64-cel_seastone-r0/plugins/psuutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,49 +12,51 @@
raise ImportError(str(e) + "- required module not found")


GPIO_DIR = "/sys/class/gpio"
GPIO_LABEL = "pca9505"
DX010_MAX_PSUS = 2


class PsuUtil(PsuBase):
"""Platform-specific PSUutil class"""

def __init__(self):
PsuBase.__init__(self)
# DX010 PSU pin mapping
self.psu = [
{'base': self.get_gpio_base()},
{'abs':27, 'power':22},
{'abs':28, 'power':25}
self.dx010_psu_gpio = [
{'base': self.__get_gpio_base()},
{'prs': 27, 'status': 22},
{'prs': 28, 'status': 25}
]

def get_gpio_base(self):
sys_gpio_dir = "/sys/class/gpio"
for r in os.listdir(sys_gpio_dir):
if "gpiochip" in r:
return int(r[8:],10)
return 216 #Reserve


# Get a psu status and presence
def read_psu_statuses(self, pinnum):
sys_gpio_dir = "/sys/class/gpio"
gpio_base = self.psu[0]['base']

gpio_dir = sys_gpio_dir + '/gpio' + str(gpio_base+pinnum)
gpio_file = gpio_dir + "/value"

def __read_txt_file(self, file_path):
try:
with open(gpio_file, 'r') as fd:
retval = fd.read()
with open(file_path, 'r') as fd:
data = fd.read()
return data.strip()
except IOError:
raise IOError("Unable to open " + gpio_file + "file !")

retval = retval.rstrip('\r\n')
return retval
pass
return ""

def __get_gpio_base(self):
for r in os.listdir(GPIO_DIR):
label_path = os.path.join(GPIO_DIR, r, "label")
if "gpiochip" in r and GPIO_LABEL in self.__read_txt_file(label_path):
return int(r[8:], 10)
return 216 # Reserve

def __get_gpio_value(self, pinnum):
gpio_base = self.dx010_psu_gpio[0]['base']
gpio_dir = GPIO_DIR + '/gpio' + str(gpio_base+pinnum)
gpio_file = gpio_dir + "/value"
retval = self.__read_txt_file(gpio_file)
return retval.rstrip('\r\n')

def get_num_psus(self):
"""
Retrieves the number of PSUs available on the device
:return: An integer, the number of PSUs available on the device
"""
DX010_MAX_PSUS = 2
return DX010_MAX_PSUS

def get_psu_status(self, index):
Expand All @@ -65,14 +67,9 @@ def get_psu_status(self, index):
:return: Boolean, True if PSU is operating properly, False if PSU is\
faulty
"""
status = 0
psu_status = self.read_psu_statuses(self.psu[index]['power'])
psu_status = int(psu_status, 10)
# Check for PSU status
if (psu_status == 1):
status = 1

return status
raw = self.__get_gpio_value(
self.dx010_psu_gpio[index]['status'])
return int(raw, 10) == 1

def get_psu_presence(self, index):
"""
Expand All @@ -81,11 +78,5 @@ def get_psu_presence(self, index):
:param index: An integer, index of the PSU of which to query status
:return: Boolean, True if PSU is plugged, False if not
"""
status = 0
psu_absence = self.read_psu_statuses(self.psu[index]['abs'])
psu_absence = (int(psu_absence, 10))
# Check for PSU presence
if (psu_absence == 0):
status = 1

return status
raw = self.__get_gpio_value(self.dx010_psu_gpio[index]['prs'])
return int(raw, 10) == 0

0 comments on commit 50cfa77

Please sign in to comment.