Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

psusutil sysfs attribute changes for hwmon #1264

Merged
merged 2 commits into from
Jan 10, 2018
Merged

psusutil sysfs attribute changes for hwmon #1264

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4658dc
psusutil sysfs attribute changes for hwmon
Dec 23, 2017
0fd712b
Reverting , with as as in psuutilscripts for Python 2.7 aand 3 compat…
Jan 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions device/dell/x86_64-dell_s6100_c2538-r0/plugins/psuutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

try:
from sonic_psu.psu_base import PsuBase
except ImportError as e:
except ImportError, e:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why change from as to comma? The "comma variable" is no longer supported by Python 3.x, and this plugin is imported by both Python 2.7 and 3.6 scripts. Please change back to as.

raise ImportError(str(e) + "- required module not found")


Expand All @@ -20,10 +20,11 @@ def __init__(self):

# Get a mailbox register
def get_pmc_register(self, reg_name):
mailbox_dir = "/sys/devices/platform/dell_s6100_lpc"
mailbox_dir = "/sys/devices/platform/SMF.512/hwmon/hwmon1"
retval = 'ERR'
mb_reg_file = mailbox_dir+'/' + reg_name
if (not os.path.isfile(mb_reg_file)):
print mb_reg_file, 'not found !'
return retval

try:
Expand Down Expand Up @@ -52,7 +53,7 @@ def get_psu_status(self, index):
faulty
"""
status = 0
psu_status = self.get_pmc_register('psu_'+str(index)+'_status')
psu_status = self.get_pmc_register('psu'+str(index)+'_presence')
if (psu_status != 'ERR'):
psu_status = int(psu_status, 16)
# Check for PSU statuse
Expand All @@ -69,7 +70,7 @@ def get_psu_presence(self, index):
:return: Boolean, True if PSU is plugged, False if not
"""
status = 0
psu_presence = self.get_pmc_register('psu_'+str(index)+'_status')
psu_presence = self.get_pmc_register('psu'+str(index)+'_presence')
if (psu_presence != 'ERR'):
psu_presence = int(psu_presence, 16)
# Check for PSU presence
Expand Down
9 changes: 5 additions & 4 deletions device/dell/x86_64-dell_z9100_c2538-r0/plugins/psuutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

try:
from sonic_psu.psu_base import PsuBase
except ImportError as e:
except ImportError, e:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why change from as to comma? The "comma variable" is no longer supported by Python 3.x, and this plugin is imported by both Python 2.7 and 3.6 scripts. Please change back to as.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jileveque, thanks for the information. Will do the change accordingly.

raise ImportError(str(e) + "- required module not found")


Expand All @@ -20,10 +20,11 @@ def __init__(self):

# Get a mailbox register
def get_pmc_register(self, reg_name):
mailbox_dir = "/sys/devices/platform/dell_mailbox"
mailbox_dir = "/sys/devices/platform/SMF.512/hwmon/hwmon1"
retval = 'ERR'
mb_reg_file = mailbox_dir+'/' + reg_name
if (not os.path.isfile(mb_reg_file)):
print mb_reg_file, 'not found !'
return retval

try:
Expand Down Expand Up @@ -52,7 +53,7 @@ def get_psu_status(self, index):
faulty
"""
status = 0
psu_status = self.get_pmc_register('psu_'+str(index)+'_status')
psu_status = self.get_pmc_register('psu'+str(index)+'_presence')
if (psu_status != 'ERR'):
psu_status = int(psu_status, 16)
# Check for PSU statuse
Expand All @@ -69,7 +70,7 @@ def get_psu_presence(self, index):
:return: Boolean, True if PSU is plugged, False if not
"""
status = 0
psu_presence = self.get_pmc_register('psu_'+str(index)+'_status')
psu_presence = self.get_pmc_register('psu'+str(index)+'_presence')
if (psu_presence != 'ERR'):
psu_presence = int(psu_presence, 16)
# Check for PSU presence
Expand Down