-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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
Added PSU util for Mellanox platforms, added PSU CLI to SNMP #1170
Changes from all commits
1da68a1
62a0d93
f141965
c76d7e0
114346b
bc2945d
3751083
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
#!/usr/bin/env python | ||
|
||
############################################################################# | ||
# Mellanox | ||
# | ||
# Module contains an implementation of SONiC PSU Base API and | ||
# provides the PSUs status which are available in the platform | ||
# | ||
############################################################################# | ||
|
||
import os.path | ||
|
||
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) | ||
|
||
self.psu_path = "/sys/bus/i2c/devices/2-0060/" | ||
self.psu_presence = "psu{}_status" | ||
self.psu_oper_status = "psu{}_pg_status" | ||
|
||
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 | ||
|
||
status = 0 | ||
try: | ||
with open(self.psu_path + self.psu_oper_status.format(index), 'r') as power_status: | ||
status = int(power_status.read()) | ||
except IOError: | ||
return False | ||
|
||
return status == 1 | ||
|
||
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 | ||
""" | ||
return isinstance(index, int) and index > 0 and index <= self.get_num_psus() |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
#!/usr/bin/env python | ||
|
||
############################################################################# | ||
# Mellanox | ||
# | ||
# Module contains an implementation of SONiC PSU Base API and | ||
# provides the PSUs status which are available in the platform | ||
# | ||
############################################################################# | ||
|
||
import os.path | ||
|
||
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) | ||
|
||
self.psu_path = "/sys/bus/i2c/devices/2-0060/" | ||
self.psu_presence = "psu{}_status" | ||
self.psu_oper_status = "psu{}_pg_status" | ||
|
||
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 | ||
|
||
status = 0 | ||
try: | ||
with open(self.psu_path + self.psu_oper_status.format(index), 'r') as power_status: | ||
status = int(power_status.read()) | ||
except IOError: | ||
return False | ||
|
||
return status == 1 | ||
|
||
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 | ||
|
||
status = 0 | ||
try: | ||
with open(self.psu_path + self.psu_presence.format(index), 'r') as presence_status: | ||
status = int(presence_status.read()) | ||
except IOError: | ||
return False | ||
|
||
return status == 1 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
#!/usr/bin/env python | ||
|
||
############################################################################# | ||
# Mellanox | ||
# | ||
# Module contains an implementation of SONiC PSU Base API and | ||
# provides the PSUs status which are available in the platform | ||
# | ||
############################################################################# | ||
|
||
import os.path | ||
|
||
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) | ||
|
||
self.psu_path = "/sys/bus/i2c/devices/2-0060/" | ||
self.psu_presence = "psu{}_status" | ||
self.psu_oper_status = "psu{}_pg_status" | ||
|
||
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 | ||
|
||
status = 0 | ||
try: | ||
with open(self.psu_path + self.psu_oper_status.format(index), 'r') as power_status: | ||
status = int(power_status.read()) | ||
except IOError: | ||
return False | ||
|
||
return status == 1 | ||
|
||
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 | ||
|
||
status = 0 | ||
try: | ||
with open(self.psu_path + self.psu_presence.format(index), 'r') as presence_status: | ||
status = int(presence_status.read()) | ||
except IOError: | ||
return False | ||
|
||
return status == 1 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
#!/usr/bin/env python | ||
|
||
############################################################################# | ||
# Mellanox | ||
# | ||
# Module contains an implementation of SONiC PSU Base API and | ||
# provides the PSUs status which are available in the platform | ||
# | ||
############################################################################# | ||
|
||
import os.path | ||
|
||
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) | ||
|
||
self.psu_path = "/sys/bus/i2c/devices/2-0060/" | ||
self.psu_presence = "psu{}_status" | ||
self.psu_oper_status = "psu{}_pg_status" | ||
|
||
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 | ||
|
||
status = 0 | ||
try: | ||
with open(self.psu_path + self.psu_oper_status.format(index), 'r') as power_status: | ||
status = int(power_status.read()) | ||
except IOError: | ||
return False | ||
|
||
return status == 1 | ||
|
||
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 | ||
|
||
status = 0 | ||
try: | ||
with open(self.psu_path + self.psu_presence.format(index), 'r') as presence_status: | ||
status = int(presence_status.read()) | ||
except IOError: | ||
return False | ||
|
||
return status == 1 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
FROM docker-config-engine | ||
|
||
RUN echo 'deb [arch=amd64] http://packages.microsoft.com/repos/sonic-dev/ jessie main' >> /etc/apt/sources.list | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Why you need sonic-dev repo? #Closed There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. sonic-dev repo is necessary to download python-click and python-tabulate packages which are dependencies of sonic-utilities. This can all be removed in the future once this uses the PSU plugin directly (see my comment above). There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is it possible to install them by pip? #Closed There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unfortunately, dependency issues arise when we have Debian packages that rely on Python packages and vice-versa (for example: sonic-net/sonic-utilities#124). |
||
|
||
COPY [ \ | ||
{% for deb in docker_snmp_sv2_debs.split(' ') -%} | ||
"debs/{{ deb }}", | ||
|
@@ -22,9 +24,12 @@ ENV DEBIAN_FRONTEND=noninteractive | |
# TODO: remove libpython3.6-dev, its and pip's dependencies if we can get pip3 directly | ||
# install subagent | ||
# clean up | ||
RUN apt-get update && apt-get install -y libperl5.20 libpci3 libwrap0 \ | ||
libexpat1-dev \ | ||
curl gcc && \ | ||
## TODO: remove grub2-common, bash-completion, python-pip, python-click-default-group, | ||
# python-click, python-natsort and python-tabulate once we no longer need to install | ||
# sonic-utilities for PSU plugin support | ||
RUN apt-get update && apt-get install -y --force-yes libperl5.20 libpci3 libwrap0 \ | ||
libexpat1-dev grub2-common bash-completion curl gcc \ | ||
python-pip python-click-default-group python-click python-natsort python-tabulate && \ | ||
dpkg -i \ | ||
{% for deb in docker_snmp_sv2_debs.split(' ') -%} | ||
debs/{{ deb }}{{' '}} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Exactly same file as msn2410. Please use a symbol link. #Closed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Replaced to a symbol link.