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
90 lines
2.7 KiB
Python
90 lines
2.7 KiB
Python
import os.path
|
|
import subprocess
|
|
import sys
|
|
import re
|
|
|
|
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):
|
|
self.ipmi_raw = "docker exec -ti pmon ipmitool raw 0x4 0x2d"
|
|
self.psu1_id = "0x2f"
|
|
self.psu2_id = "0x39"
|
|
PsuBase.__init__(self)
|
|
|
|
def run_command(self, command):
|
|
proc = subprocess.Popen(command, shell=True, universal_newlines=True, stdout=subprocess.PIPE)
|
|
(out, err) = proc.communicate()
|
|
|
|
if proc.returncode != 0:
|
|
sys.exit(proc.returncode)
|
|
|
|
return out
|
|
|
|
def find_value(self, in_string):
|
|
result = re.search("^.+ ([0-9a-f]{2}) .+$", in_string)
|
|
if result:
|
|
return result.group(1)
|
|
else:
|
|
return result
|
|
|
|
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
|
|
"""
|
|
return 2
|
|
|
|
def get_psu_status(self, index):
|
|
"""
|
|
Retrieves the oprational status of power supply unit (PSU) defined
|
|
by 1-based index <index>
|
|
:param index: An integer, 1-based index of the PSU of which to query status
|
|
:return: Boolean, True if PSU is operating properly, False if PSU is faulty
|
|
"""
|
|
if index is None:
|
|
return False
|
|
|
|
psu_id = self.psu1_id if index == 1 else self.psu2_id
|
|
res_string = self.run_command(self.ipmi_raw + ' ' + psu_id)
|
|
status_byte = self.find_value(res_string)
|
|
|
|
if status_byte is None:
|
|
return False
|
|
|
|
failure_detected = (int(status_byte, 16) >> 1) & 1
|
|
input_lost = (int(status_byte, 16) >> 3) & 1
|
|
if failure_detected or input_lost:
|
|
return False
|
|
else:
|
|
return True
|
|
|
|
def get_psu_presence(self, index):
|
|
"""
|
|
Retrieves the presence status of power supply unit (PSU) defined
|
|
by 1-based index <index>
|
|
:param index: An integer, 1-based index of the PSU of which to query status
|
|
:return: Boolean, True if PSU is plugged, False if not
|
|
"""
|
|
if index is None:
|
|
return False
|
|
|
|
psu_id = self.psu1_id if index == 1 else self.psu2_id
|
|
res_string = self.run_command(self.ipmi_raw + ' ' + psu_id)
|
|
status_byte = self.find_value(res_string)
|
|
|
|
if status_byte is None:
|
|
return False
|
|
|
|
presence = (int(status_byte, 16) >> 0) & 1
|
|
if presence:
|
|
return True
|
|
else:
|
|
return False
|