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
77 lines
2.0 KiB
Python
Executable File
77 lines
2.0 KiB
Python
Executable File
import sys
|
|
import os.path
|
|
if sys.version_info[0] < 3:
|
|
import commands
|
|
else:
|
|
import subprocess as commands
|
|
|
|
smbus_present = 1
|
|
try:
|
|
import smbus
|
|
except ImportError as e:
|
|
smbus_present = 0
|
|
|
|
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)
|
|
MAX_PSUS = 2
|
|
|
|
def get_num_psus(self):
|
|
MAX_PSUS = 2
|
|
return MAX_PSUS
|
|
|
|
def get_psu_status(self, index):
|
|
if index is None:
|
|
return False
|
|
if smbus_present == 0:
|
|
cmdstatus, psustatus = commands.getstatusoutput(
|
|
'i2cget -y 0 0x41 0xa') # need to verify the cpld register logic
|
|
psustatus = int(psustatus, 16)
|
|
else:
|
|
bus = smbus.SMBus(0)
|
|
DEVICE_ADDRESS = 0x41
|
|
DEVICE_REG = 0xa
|
|
psustatus = bus.read_byte_data(DEVICE_ADDRESS, DEVICE_REG)
|
|
if index == 1:
|
|
psustatus = psustatus & 4
|
|
if psustatus == 4:
|
|
return True
|
|
if index == 2:
|
|
psustatus = psustatus & 8
|
|
if psustatus == 8:
|
|
return True
|
|
|
|
return False
|
|
|
|
def get_psu_presence(self, index):
|
|
if index is None:
|
|
return False
|
|
|
|
if smbus_present == 0:
|
|
cmdstatus, psustatus = commands.getstatusoutput(
|
|
'i2cget -y 0 0x41 0xa') # need to verify the cpld register logic
|
|
psustatus = int(psustatus, 16)
|
|
else:
|
|
bus = smbus.SMBus(0)
|
|
DEVICE_ADDRESS = 0x41
|
|
DEVICE_REG = 0xa
|
|
psustatus = bus.read_byte_data(DEVICE_ADDRESS, DEVICE_REG)
|
|
|
|
if index == 1:
|
|
psustatus = psustatus & 1
|
|
if psustatus == 1:
|
|
return True
|
|
if index == 2:
|
|
psustatus = psustatus & 2
|
|
if psustatus == 2:
|
|
return True
|
|
return False
|