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

[Mellanox]Remove the dependency on sysfs for sfputil #2967

Merged
merged 2 commits into from
Jun 7, 2019
Merged

[Mellanox]Remove the dependency on sysfs for sfputil #2967

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4828d49
[sfputil]Remove the dependency on sysfs for sfputil, mainly get_prese…
Jun 4, 2019
e48af8c
[sfputil.py]
Jun 4, 2019
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
38 changes: 19 additions & 19 deletions device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,12 @@ class SfpUtil(SfpUtilBase):
PORTS_IN_BLOCK = 0
EEPROM_OFFSET = 0

_port_to_eeprom_mapping = {}

db_sel = None
db_sel_timeout = None
db_sel_object = None
db_sel_tbl = None
state_db = None
sfpd_status_tbl = None
qsfp_sysfs_path = "/var/run/hw-management/qsfp/"

@property
def port_start(self):
Expand All @@ -61,7 +58,8 @@ def qsfp_ports(self):

@property
def port_to_eeprom_mapping(self):
return self._port_to_eeprom_mapping
print "dependency on sysfs has been removed"
raise Exception()

def get_port_position_tuple_by_sku_name(self):
p = subprocess.Popen(GET_HWSKU_CMD, shell=True, stdout=subprocess.PIPE)
Expand All @@ -77,29 +75,31 @@ def __init__(self):
self.PORTS_IN_BLOCK = port_position_tuple[3]
self.EEPROM_OFFSET = port_position_tuple[4]

for x in range(0, self.port_end + 1):
self._port_to_eeprom_mapping[x] = self.qsfp_sysfs_path + "qsfp{}".format(x + self.EEPROM_OFFSET)

SfpUtilBase.__init__(self)

def get_presence(self, port_num):
presence = False

# Check for invalid port_num
if port_num < self.port_start or port_num > self.port_end:
return False
return presence

try:
reg_file = open(self.qsfp_sysfs_path + "qsfp{}_status".format(port_num + 1))
except IOError as e:
print "Error: unable to open file: %s" % str(e)
return False
port_num += SFP_PORT_NAME_OFFSET
sfpname = SFP_PORT_NAME_CONVENTION.format(port_num)

content = reg_file.readline().rstrip()
ethtool_cmd = "ethtool -m {} 2>/dev/null".format(sfpname)
try:
proc = subprocess.Popen(ethtool_cmd, stdout=subprocess.PIPE, shell=True, stderr=subprocess.STDOUT)
stdout = proc.communicate()[0]
proc.wait()
result = stdout.rstrip('\n')
if result != '':
presence = True

# content is a string with the qsfp status
if content == SFP_STATUS_INSERTED:
return True
except OSError, e:
return presence

return False
return presence

def get_low_power_mode(self, port_num):
# Check for invalid port_num
Expand Down Expand Up @@ -405,7 +405,7 @@ def get_transceiver_info_dict(self, port_num):
def get_transceiver_dom_info_dict(self, port_num):
transceiver_dom_info_dict = {}

# Below part is added to avoid fail xcvrd
# Below part is added to avoid failing xcvrd
# Currently, the way in which dom data is read has been changed from
# using sysfs to using ethtool.
# The ethtool returns None for ports without dom support, resulting in
Expand Down