diff --git a/device/accton/x86_64-accton_as7726_32x-r0/platform.json b/device/accton/x86_64-accton_as7726_32x-r0/platform.json index 222ea329b3..896d9d1b57 100644 --- a/device/accton/x86_64-accton_as7726_32x-r0/platform.json +++ b/device/accton/x86_64-accton_as7726_32x-r0/platform.json @@ -3,19 +3,19 @@ "name": "7726-32X", "components": [ { - "name": "MB CPLD1" - }, - { - "name": "MB CPLD2" + "name": "MB_CPLD1" }, { - "name": "MB CPLD3" + "name": "MB_CPLD2" }, { - "name": "FAN CPLD" + "name": "MB_CPLD3" }, { - "name": "CPU CPLD" + "name": "FAN_CPLD" + }, + { + "name": "CPU_CPLD" }, { "name": "BIOS" diff --git a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/sonic_platform/component.py b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/sonic_platform/component.py index ce01079a78..7bda9206f9 100644 --- a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/sonic_platform/component.py +++ b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/sonic_platform/component.py @@ -12,20 +12,20 @@ except ImportError as e: raise ImportError(str(e) + "- required module not found") CPLD_ADDR_MAPPING = { - "MB CPLD1": ['11', '0x60'], - "MB CPLD2": ['12', '0x62'], - "MB CPLD3": ['13', '0x64'], - "FAN CPLD": ['54', '0x66'], - "CPU CPLD": ['0', '0x65'], + "MB_CPLD1": ['11', '0x60'], + "MB_CPLD2": ['12', '0x62'], + "MB_CPLD3": ['13', '0x64'], + "FAN_CPLD": ['54', '0x66'], + "CPU_CPLD": ['0', '0x65'], } SYSFS_PATH = "/sys/bus/i2c/devices/" BIOS_VERSION_PATH = "/sys/class/dmi/id/bios_version" COMPONENT_LIST= [ - ("MB CPLD1", "Mainboard CPLD 1"), - ("MB CPLD2", "Mainboard CPLD 2"), - ("MB CPLD3", "Mainboard CPLD 3"), - ("FAN CPLD", "Fan board CPLD"), - ("CPU CPLD", "CPU CPLD"), + ("MB_CPLD1", "Mainboard CPLD(0x60)"), + ("MB_CPLD2", "Mainboard CPLD(0x62)"), + ("MB_CPLD3", "Mainboard CPLD(0x64)"), + ("FAN_CPLD", "Fan board CPLD(0x66)"), + ("CPU_CPLD", "CPU CPLD(0x65)"), ("BIOS", "Basic Input/Output System") ] diff --git a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/sonic_platform/helper.py b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/sonic_platform/helper.py index 5162803fb5..09c2af7a87 100644 --- a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/sonic_platform/helper.py +++ b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/sonic_platform/helper.py @@ -37,7 +37,9 @@ class APIHelper(): try: with open(file_path, 'r', errors='replace') as fd: data = fd.read() - return data.strip() + ret = data.strip() + if len(ret) > 0: + return ret except IOError: pass return None