7f4ab8fbd8
Submodule updates include the following commits: * src/sonic-utilities 9dc58ea...f9eb739 (18): > Remove unnecessary calls to str.encode() now that the package is Python 3; Fix deprecation warning (#1260) > [generate_dump] Ignoring file/directory not found Errors (#1201) > Fixed porstat rate and util issues (#1140) > fix error: interface counters is mismatch after warm-reboot (#1099) > Remove unnecessary calls to str.decode() now that the package is Python 3 (#1255) > [acl-loader] Make list sorting compliant with Python 3 (#1257) > Replace hard-coded fast-reboot with variable. And some typo corrections (#1254) > [configlet][portconfig] Remove calls to dict.has_key() which is not available in Python 3 (#1247) > Remove unnecessary conversions to list() and calls to dict.keys() (#1243) > Clean up LGTM alerts (#1239) > Add 'requests' as install dependency in setup.py (#1240) > Convert to Python 3 (#1128) > Fix mock SonicV2Connector in python3: use decode_responses mode so caller code will be the same as python2 (#1238) > [tests] Do not trim from PATH if we did not append to it; Clean up/fix shebangs in scripts (#1233) > Updates to bgp config and show commands with BGP_INTERNAL_NEIGHBOR table (#1224) > [cli]: NAT show commands newline issue after migrated to Python3 (#1204) > [doc]: Update Command-Reference.md (#1231) > Added 'import sys' in feature.py file (#1232) * src/sonic-py-swsssdk 9d9f0c6...1664be9 (2): > Fix: no need to decode() after redis client scan, so it will work for both python2 and python3 (#96) > FieldValueMap `contains`(`in`) will also work when migrated to libswsscommon(C++ with SWIG wrapper) (#94) - Also fix Python 3-related issues: - Use integer (floor) division in config_samples.py (sonic-config-engine) - Replace print statement with print function in eeprom.py plugin for x86_64-kvm_x86_64-r0 platform - Update all platform plugins to be compatible with both Python 2 and Python 3 - Remove shebangs from plugins files which are not intended to be executable - Replace tabs with spaces in Python plugin files and fix alignment, because Python 3 is more strict - Remove trailing whitespace from plugins files
103 lines
2.8 KiB
Python
103 lines
2.8 KiB
Python
#
|
|
# psuutil.py
|
|
# Platform-specific PSU status interface for SONiC
|
|
#
|
|
|
|
|
|
import logging
|
|
import sys
|
|
|
|
if sys.version_info[0] < 3:
|
|
import commands
|
|
else:
|
|
import subprocess as commands
|
|
|
|
|
|
S5296F_MAX_PSUS = 2
|
|
IPMI_PSU_DATA = "docker exec -it pmon ipmitool sdr list"
|
|
IPMI_PSU_DATA_DOCKER = "ipmitool sdr list"
|
|
PSU_PRESENCE = "PSU{0}_stat"
|
|
# Use this for older firmware
|
|
# PSU_PRESENCE="PSU{0}_prsnt"
|
|
ipmi_sdr_list = ""
|
|
|
|
|
|
try:
|
|
from sonic_psu.psu_base import PsuBase
|
|
except ImportError as e:
|
|
raise ImportError(str(e) + "- required module not found")
|
|
|
|
|
|
class PsuUtil(PsuBase):
|
|
"""Platform-specific PSUutil class"""
|
|
|
|
def __init__(self):
|
|
PsuBase.__init__(self)
|
|
|
|
def isDockerEnv(self):
|
|
num_docker = open('/proc/self/cgroup', 'r').read().count(":/docker")
|
|
if num_docker > 0:
|
|
return True
|
|
else:
|
|
return False
|
|
|
|
# Fetch a BMC register
|
|
def get_pmc_register(self, reg_name):
|
|
|
|
global ipmi_sdr_list
|
|
ipmi_cmd = IPMI_PSU_DATA
|
|
dockerenv = self.isDockerEnv()
|
|
if dockerenv == True:
|
|
ipmi_cmd = IPMI_PSU_DATA_DOCKER
|
|
|
|
status, ipmi_sdr_list = commands.getstatusoutput(ipmi_cmd)
|
|
|
|
if status:
|
|
logging.error('Failed to execute:' + ipmi_sdr_list)
|
|
sys.exit(0)
|
|
|
|
for item in ipmi_sdr_list.split("\n"):
|
|
if reg_name in item:
|
|
output = item.strip()
|
|
|
|
if not output:
|
|
print('\nFailed to fetch: ' + reg_name + ' sensor ')
|
|
sys.exit(0)
|
|
|
|
output = output.split('|')[1]
|
|
|
|
logging.basicConfig(level=logging.DEBUG)
|
|
return output
|
|
|
|
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
|
|
"""
|
|
S5296F_MAX_PSUS = 2
|
|
return S5296F_MAX_PSUS
|
|
|
|
def get_psu_status(self, index):
|
|
"""
|
|
Retrieves the oprational status of power supply unit (PSU) defined
|
|
by index <index>
|
|
:param index: An integer, index of the PSU of which to query status
|
|
:return: Boolean, True if PSU is operating properly, False if PSU is\
|
|
faulty
|
|
"""
|
|
# Until psu_status is implemented this is hardcoded temporarily
|
|
|
|
status = 1
|
|
return status
|
|
|
|
def get_psu_presence(self, index):
|
|
"""
|
|
Retrieves the presence status of power supply unit (PSU) defined
|
|
by index <index>
|
|
:param index: An integer, index of the PSU of which to query status
|
|
:return: Boolean, True if PSU is plugged, False if not
|
|
"""
|
|
cmd_status, psu_status = commands.getstatusoutput(
|
|
'ipmitool raw 0x04 0x2d ' + hex(0x30 + index) + " | awk '{print substr($0,9,1)}'")
|
|
return 1 if psu_status == '1' else 0
|