diff --git a/sonic_y_cable/credo/y_cable_credo.py b/sonic_y_cable/credo/y_cable_credo.py index cea520989..f9e149807 100644 --- a/sonic_y_cable/credo/y_cable_credo.py +++ b/sonic_y_cable/credo/y_cable_credo.py @@ -9,6 +9,7 @@ import struct from ctypes import c_int8 from sonic_y_cable.y_cable_base import YCableBase + try: import sonic_platform.platform except ImportError as e: @@ -189,14 +190,14 @@ def read_mmap(self, page, byte, len=1): ret = self.platform_chassis.get_sfp(self.port).read_eeprom(linear_addr, len) - if ret == None: + if ret is None: self.log_error('Read Nack! page:%2X byte:%2X' % (page, byte)) return 0xFF else: if len == 1: try: return ret[0] - except: + except Exception as e: self.log_error('Unknown read_mmap error') return 0xFF else: @@ -434,9 +435,8 @@ def get_mux_direction(self): self.log_info("mux pointing to TOR B") return YCableBase.TARGET_TOR_B else: - self.log_error("Error: unknown status for mux direction regval = {} ".format(result)) - return YCableBase.TARGET_UNKNOWN + self.log_error("Error: unknown status for mux direction regval = {} ".format(result)) return YCableBase.TARGET_UNKNOWN def get_active_linked_tor_side(self): @@ -491,10 +491,8 @@ def get_active_linked_tor_side(self): elif regval_read[0] == 0: self.log_info("Nothing linked for routing") return YCableBase.TARGET_NIC - else: - self.log_error("Error: unknown status for active TOR regval = {} ".format(result)) - return YCableBase.TARGET_UNKNOWN + self.log_error("Error: unknown status for active TOR regval = {} ".format(result)) return YCableBase.TARGET_UNKNOWN def is_link_active(self, target): @@ -862,7 +860,7 @@ def get_firmware_version(self, target): vsc_req_form = [None] * (YCable.VSC_CMD_ATTRIBUTE_LENGTH) vsc_req_form[YCable.VSC_BYTE_OPCODE] = YCable.VSC_OPCODE_FWUPD vsc_req_form[YCable.VSC_BYTE_OPTION] = YCable.FWUPD_OPTION_GET_INFO - status = self.send_vsc_cmd(vsc_req_form) + self.send_vsc_cmd(vsc_req_form) data = bytearray(YCable.FIRMWARE_INFO_PAYLOAD_SIZE) @@ -1027,9 +1025,9 @@ def download_firmware(self, fwfile): return YCableBase.FIRMWARE_DOWNLOAD_FAILURE busy = self.read_mmap(YCable.MIS_PAGE_FC, 128) - percentNIC = self.read_mmap(YCable.MIS_PAGE_FC, 129) - percentTOR1 = self.read_mmap(YCable.MIS_PAGE_FC, 130) - percentTOR2 = self.read_mmap(YCable.MIS_PAGE_FC, 131) + self.read_mmap(YCable.MIS_PAGE_FC, 129) + self.read_mmap(YCable.MIS_PAGE_FC, 130) + self.read_mmap(YCable.MIS_PAGE_FC, 131) while busy != 0: vsc_req_form = [None] * (YCable.VSC_CMD_ATTRIBUTE_LENGTH) @@ -1043,9 +1041,9 @@ def download_firmware(self, fwfile): time.sleep(0.2) busy = self.read_mmap(YCable.MIS_PAGE_FC, 128) - percentNIC = self.read_mmap(YCable.MIS_PAGE_FC, 129) - percentTOR1 = self.read_mmap(YCable.MIS_PAGE_FC, 130) - percentTOR2 = self.read_mmap(YCable.MIS_PAGE_FC, 131) + self.read_mmap(YCable.MIS_PAGE_FC, 129) + self.read_mmap(YCable.MIS_PAGE_FC, 130) + self.read_mmap(YCable.MIS_PAGE_FC, 131) return YCableBase.FIRMWARE_DOWNLOAD_SUCCESS @@ -1509,7 +1507,7 @@ def get_event_log(self, clear_on_read=False): vsc_req_form = [None] * (YCable.VSC_CMD_ATTRIBUTE_LENGTH) vsc_req_form[YCable.VSC_BYTE_OPCODE] = YCable.VSC_OPCODE_EVENTLOG vsc_req_form[YCable.VSC_BYTE_OPTION] = YCable.EVENTLOG_OPTION_CLEAR - status = self.send_vsc_cmd(vsc_req_form) + self.send_vsc_cmd(vsc_req_form) last_read_id = -1 result = []