Skip to content

[pull] master from Azure:master #71

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

Merged
pull merged 1 commit into from
May 18, 2019
Merged

[pull] master from Azure:master #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions platform/mellanox/mlnx-sfpd/scripts/mlnx-sfpd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class MlnxSfpd:
raise RuntimeError("sx_api_host_ifc_open exited with error, rc {}".format(rc))

self.user_channel_p.type = SX_USER_CHANNEL_TYPE_FD
self.user_channel_p.fd = self.rx_fd_p
self.user_channel_p.channel.fd = self.rx_fd_p

rc = sx_api_host_ifc_trap_id_register_set(self.handle,
SX_ACCESS_CMD_REGISTER,
Expand Down Expand Up @@ -170,8 +170,8 @@ class MlnxSfpd:

for fd in read:
if fd == self.rx_fd_p.fd:
rc, port_list, module_state = self.on_pmpe(self.rx_fd_p)
if rc != SX_STATUS_SUCCESS:
success, port_list, module_state = self.on_pmpe(self.rx_fd_p)
if not success:
raise RuntimeError("failed to read from {}".format(fd))

sfp_state = sfp_value_status_dict.get(module_state, STATUS_UNKNOWN)
Expand All @@ -187,7 +187,7 @@ class MlnxSfpd:

def send_sfp_notification(self, port, state):
sfp_notify = [port, state]
msg = json.dumps(sfp_notify, seperators=(',', ':'))
msg = json.dumps(sfp_notify, separators=(',', ':'))
self.state_db.publish('STATE_DB', 'TRANSCEIVER_NOTIFY', msg)

def update_sfpd_liveness_key(self, timeout_secs):
Expand Down