diff --git a/configs/Barreleye.py b/configs/Barreleye.py
index 5762a69..828236c 100644
--- a/configs/Barreleye.py
+++ b/configs/Barreleye.py
@@ -1,392 +1,669 @@
-## System states
-##   state can change to next state in 2 ways:
-##   - a process emits a GotoSystemState signal with state name to goto
-##   - objects specified in EXIT_STATE_DEPEND have started
+# System states
+#   state can change to next state in 2 ways:
+#   - a process emits a GotoSystemState signal with state name to goto
+#   - objects specified in EXIT_STATE_DEPEND have started
 SYSTEM_STATES = [
-	'BASE_APPS',
-	'BMC_STARTING',
-	'BMC_STARTING2',
-	'BMC_READY',
-	'HOST_POWERING_ON',
-	'HOST_POWERED_ON',
-	'INVENTORY_UPLOADED',
-	'HOST_BOOTING',
-	'HOST_BOOTED',
-	'HOST_POWERED_OFF',
+    "BASE_APPS",
+    "BMC_STARTING",
+    "BMC_STARTING2",
+    "BMC_READY",
+    "HOST_POWERING_ON",
+    "HOST_POWERED_ON",
+    "INVENTORY_UPLOADED",
+    "HOST_BOOTING",
+    "HOST_BOOTED",
+    "HOST_POWERED_OFF",
 ]
 
 EXIT_STATE_DEPEND = {
-	'BASE_APPS' : {
-		'/org/openbmc/sensors': 0,
-	},
-	'BMC_STARTING' : {
-		'/org/openbmc/control/power0' : 0,
-		'/org/openbmc/control/host0' : 0,
-		'/org/openbmc/control/flash/bios' : 0,
-	},
-	'BMC_STARTING2' : {
-		'/org/openbmc/control/fans' : 0,
-		'/org/openbmc/control/chassis0': 0,
-	},
+    "BASE_APPS": {
+        "/org/openbmc/sensors": 0,
+    },
+    "BMC_STARTING": {
+        "/org/openbmc/control/power0": 0,
+        "/org/openbmc/control/host0": 0,
+        "/org/openbmc/control/flash/bios": 0,
+    },
+    "BMC_STARTING2": {
+        "/org/openbmc/control/fans": 0,
+        "/org/openbmc/control/chassis0": 0,
+    },
 }
 
 FRU_INSTANCES = {
-	'<inventory_root>/system' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-	'<inventory_root>/system/bios' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-	'<inventory_root>/system/misc' : { 'fru_type' : 'SYSTEM','is_fru' : False, },
-
-	'<inventory_root>/system/chassis' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-
-	'<inventory_root>/system/chassis/motherboard' : { 'fru_type' : 'MAIN_PLANAR','is_fru' : True, },
-	'<inventory_root>/system/chassis/io_board' : { 'fru_type' : 'DAUGHTER_CARD','is_fru' : True, },
-	'<inventory_root>/system/chassis/sas_expander' : { 'fru_type' : 'DAUGHTER_CARD','is_fru' : True, },
-	'<inventory_root>/system/chassis/hdd_backplane' : { 'fru_type' : 'DAUGHTER_CARD','is_fru' : True, },
-
-	'<inventory_root>/system/systemevent'                  : { 'fru_type' : 'SYSTEM_EVENT', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/refclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/pcieclock': { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/todclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/apss'     : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-
-	'<inventory_root>/system/chassis/fan0' : { 'fru_type' : 'FAN','is_fru' : True, },
-	'<inventory_root>/system/chassis/fan1' : { 'fru_type' : 'FAN','is_fru' : True, },
-	'<inventory_root>/system/chassis/fan2' : { 'fru_type' : 'FAN','is_fru' : True, },
-	'<inventory_root>/system/chassis/fan3' : { 'fru_type' : 'FAN','is_fru' : True, },
-	'<inventory_root>/system/chassis/fan4' : { 'fru_type' : 'FAN','is_fru' : True, },
-	'<inventory_root>/system/chassis/fan5' : { 'fru_type' : 'FAN','is_fru' : True, },
-
-	'<inventory_root>/system/chassis/motherboard/bmc' : { 'fru_type' : 'BMC','is_fru' : False, 'manufacturer' : 'ASPEED' },
-
-	'<inventory_root>/system/chassis/motherboard/cpu0' : { 'fru_type' : 'CPU', 'is_fru' : True, },
-	'<inventory_root>/system/chassis/motherboard/cpu1' : { 'fru_type' : 'CPU', 'is_fru' : True, },
-
-	'<inventory_root>/system/chassis/motherboard/cpu0/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu0/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu0/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu0/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu0/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu0/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu0/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu0/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu0/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu0/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu0/core10': { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu0/core11': { 'fru_type' : 'CORE', 'is_fru' : False, },
-
-	'<inventory_root>/system/chassis/motherboard/cpu1/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu1/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu1/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu1/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu1/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu1/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu1/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu1/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu1/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu1/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu1/core10' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/cpu1/core11' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-
-	'<inventory_root>/system/chassis/motherboard/membuf0' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/membuf1' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/membuf2' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/membuf3' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/membuf4' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/membuf5' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/membuf6' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-	'<inventory_root>/system/chassis/motherboard/membuf7' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-
-	'<inventory_root>/system/chassis/motherboard/dimm0' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm1' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm2' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm3' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm4' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm5' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm6' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm7' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm8' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm9' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm10' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm11' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm12' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm13' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm14' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm15' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm16' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm17' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm18' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm19' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm20' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm21' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm22' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm23' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm24' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm25' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm26' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm27' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm28' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm29' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm30' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/motherboard/dimm31' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-
-	'<inventory_root>/system/chassis/io_board/pcie_slot0_riser' : { 'fru_type' : 'PCIE_RISER', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/io_board/pcie_slot1_riser' : { 'fru_type' : 'PCIE_RISER', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/io_board/pcie_slot2_riser' : { 'fru_type' : 'PCIE_RISER', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/io_board/pcie_slot0' : { 'fru_type' : 'PCIE_CARD', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/io_board/pcie_slot1' :	{ 'fru_type' : 'PCIE_CARD', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/io_board/pcie_slot2' :	{ 'fru_type' : 'PCIE_CARD', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/io_board/pcie_mezz0' :	{ 'fru_type' : 'PCIE_CARD', 'is_fru' : True,},
-	'<inventory_root>/system/chassis/io_board/pcie_mezz1' :	{ 'fru_type' : 'PCIE_CARD', 'is_fru' : True,},
+    "<inventory_root>/system": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/bios": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/misc": {
+        "fru_type": "SYSTEM",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/chassis/motherboard": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/io_board": {
+        "fru_type": "DAUGHTER_CARD",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/sas_expander": {
+        "fru_type": "DAUGHTER_CARD",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/hdd_backplane": {
+        "fru_type": "DAUGHTER_CARD",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/systemevent": {
+        "fru_type": "SYSTEM_EVENT",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/refclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/pcieclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/todclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/apss": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/fan0": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan1": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan2": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan3": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan4": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan5": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/bmc": {
+        "fru_type": "BMC",
+        "is_fru": False,
+        "manufacturer": "ASPEED",
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0": {
+        "fru_type": "CPU",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1": {
+        "fru_type": "CPU",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core0": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core1": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core2": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core3": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core4": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core5": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core6": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core7": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core8": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core9": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core10": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core11": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core0": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core1": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core2": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core3": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core4": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core5": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core6": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core7": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core8": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core9": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core10": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core11": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf0": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf1": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf2": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf3": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf4": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf5": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf6": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf7": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm0": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm1": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm2": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm3": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm4": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm5": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm6": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm7": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm8": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm9": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm10": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm11": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm12": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm13": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm14": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm15": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm16": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm17": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm18": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm19": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm20": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm21": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm22": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm23": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm24": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm25": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm26": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm27": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm28": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm29": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm30": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm31": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/io_board/pcie_slot0_riser": {
+        "fru_type": "PCIE_RISER",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/io_board/pcie_slot1_riser": {
+        "fru_type": "PCIE_RISER",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/io_board/pcie_slot2_riser": {
+        "fru_type": "PCIE_RISER",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/io_board/pcie_slot0": {
+        "fru_type": "PCIE_CARD",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/io_board/pcie_slot1": {
+        "fru_type": "PCIE_CARD",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/io_board/pcie_slot2": {
+        "fru_type": "PCIE_CARD",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/io_board/pcie_mezz0": {
+        "fru_type": "PCIE_CARD",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/io_board/pcie_mezz1": {
+        "fru_type": "PCIE_CARD",
+        "is_fru": True,
+    },
 }
 
 ID_LOOKUP = {
-	'FRU' : {
-		0x03 : '<inventory_root>/system/chassis/motherboard',
-		0x40 : '<inventory_root>/system/chassis/io_board',
-		0x01 : '<inventory_root>/system/chassis/motherboard/cpu0',
-                0x02 : '<inventory_root>/system/chassis/motherboard/cpu1',
-		0x04 : '<inventory_root>/system/chassis/motherboard/membuf0',
-                0x05 : '<inventory_root>/system/chassis/motherboard/membuf1',
-                0x06 : '<inventory_root>/system/chassis/motherboard/membuf2',
-                0x07 : '<inventory_root>/system/chassis/motherboard/membuf3',
-                0x08 : '<inventory_root>/system/chassis/motherboard/membuf4',
-                0x09 : '<inventory_root>/system/chassis/motherboard/membuf5',
-                0x0a : '<inventory_root>/system/chassis/motherboard/membuf6',
-                0x0b : '<inventory_root>/system/chassis/motherboard/membuf7',
-		0x0c : '<inventory_root>/system/chassis/motherboard/dimm0',
-		0x0d : '<inventory_root>/system/chassis/motherboard/dimm1',
-		0x0e : '<inventory_root>/system/chassis/motherboard/dimm2',
-		0x0f : '<inventory_root>/system/chassis/motherboard/dimm3',
-                0x10 : '<inventory_root>/system/chassis/motherboard/dimm4',
-                0x11 : '<inventory_root>/system/chassis/motherboard/dimm5',
-                0x12 : '<inventory_root>/system/chassis/motherboard/dimm6',
-                0x13 : '<inventory_root>/system/chassis/motherboard/dimm7',
-                0x14 : '<inventory_root>/system/chassis/motherboard/dimm8',
-                0x15 : '<inventory_root>/system/chassis/motherboard/dimm9',
-		0x16 : '<inventory_root>/system/chassis/motherboard/dimm10',
-		0x17 : '<inventory_root>/system/chassis/motherboard/dimm11',
-		0x18 : '<inventory_root>/system/chassis/motherboard/dimm12',
-		0x19 : '<inventory_root>/system/chassis/motherboard/dimm13',
-		0x1a : '<inventory_root>/system/chassis/motherboard/dimm14',
-		0x1b : '<inventory_root>/system/chassis/motherboard/dimm15',
-		0x1c : '<inventory_root>/system/chassis/motherboard/dimm16',
-		0x1d : '<inventory_root>/system/chassis/motherboard/dimm17',
-		0x1e : '<inventory_root>/system/chassis/motherboard/dimm18',
-		0x1f : '<inventory_root>/system/chassis/motherboard/dimm19',
-		0x20 : '<inventory_root>/system/chassis/motherboard/dimm20',
-                0x21 : '<inventory_root>/system/chassis/motherboard/dimm21',
-                0x22 : '<inventory_root>/system/chassis/motherboard/dimm22',
-                0x23 : '<inventory_root>/system/chassis/motherboard/dimm23',
-                0x24 : '<inventory_root>/system/chassis/motherboard/dimm24',
-                0x25 : '<inventory_root>/system/chassis/motherboard/dimm25',
-                0x26 : '<inventory_root>/system/chassis/motherboard/dimm26',
-                0x27 : '<inventory_root>/system/chassis/motherboard/dimm27',
-                0x28 : '<inventory_root>/system/chassis/motherboard/dimm28',
-                0x29 : '<inventory_root>/system/chassis/motherboard/dimm29',
-                0x2a : '<inventory_root>/system/chassis/motherboard/dimm30',
-                0x2b : '<inventory_root>/system/chassis/motherboard/dimm31',
-		0x33 : '<inventory_root>/system',
-	},
-	'FRU_STR' : {
-		'PRODUCT_0'  : '<inventory_root>/system/bios',
-		'BOARD_3'    : '<inventory_root>/system/misc',
-		'PRODUCT_51' : '<inventory_root>/system/misc',
-		'BOARD_100'  : '<inventory_root>/system/chassis/io_board',
-		'BOARD_101'  : '<inventory_root>/system/chassis/sas_expander',
-		'BOARD_102'  : '<inventory_root>/system/chassis/hdd_backplane',
-		'CHASSIS_3'  : '<inventory_root>/system/chassis/motherboard',
-		'BOARD_1'    : '<inventory_root>/system/chassis/motherboard/cpu0',
-		'BOARD_2'    : '<inventory_root>/system/chassis/motherboard/cpu1',
-		'BOARD_4'    : '<inventory_root>/system/chassis/motherboard/membuf0',
-		'BOARD_5'    : '<inventory_root>/system/chassis/motherboard/membuf1',
-		'BOARD_6'    : '<inventory_root>/system/chassis/motherboard/membuf2',
-		'BOARD_7'    : '<inventory_root>/system/chassis/motherboard/membuf3',
-		'BOARD_8'    : '<inventory_root>/system/chassis/motherboard/membuf4',
-		'BOARD_9'    : '<inventory_root>/system/chassis/motherboard/membuf5',
-		'BOARD_10'   : '<inventory_root>/system/chassis/motherboard/membuf6',
-		'BOARD_11'   : '<inventory_root>/system/chassis/motherboard/membuf7',
-		'PRODUCT_12'   : '<inventory_root>/system/chassis/motherboard/dimm0',
-		'PRODUCT_13'   : '<inventory_root>/system/chassis/motherboard/dimm1',
-		'PRODUCT_14'   : '<inventory_root>/system/chassis/motherboard/dimm2',
-		'PRODUCT_15'   : '<inventory_root>/system/chassis/motherboard/dimm3',
-		'PRODUCT_16'   : '<inventory_root>/system/chassis/motherboard/dimm4',
-		'PRODUCT_17'   : '<inventory_root>/system/chassis/motherboard/dimm5',
-		'PRODUCT_18'   : '<inventory_root>/system/chassis/motherboard/dimm6',
-		'PRODUCT_19'   : '<inventory_root>/system/chassis/motherboard/dimm7',
-		'PRODUCT_20'   : '<inventory_root>/system/chassis/motherboard/dimm8',
-		'PRODUCT_21'   : '<inventory_root>/system/chassis/motherboard/dimm9',
-		'PRODUCT_22'   : '<inventory_root>/system/chassis/motherboard/dimm10',
-		'PRODUCT_23'   : '<inventory_root>/system/chassis/motherboard/dimm11',
-		'PRODUCT_24'   : '<inventory_root>/system/chassis/motherboard/dimm12',
-		'PRODUCT_25'   : '<inventory_root>/system/chassis/motherboard/dimm13',
-		'PRODUCT_26'   : '<inventory_root>/system/chassis/motherboard/dimm14',
-		'PRODUCT_27'   : '<inventory_root>/system/chassis/motherboard/dimm15',
-		'PRODUCT_28'   : '<inventory_root>/system/chassis/motherboard/dimm16',
-		'PRODUCT_29'   : '<inventory_root>/system/chassis/motherboard/dimm17',
-		'PRODUCT_30'   : '<inventory_root>/system/chassis/motherboard/dimm18',
-		'PRODUCT_31'   : '<inventory_root>/system/chassis/motherboard/dimm19',
-		'PRODUCT_32'   : '<inventory_root>/system/chassis/motherboard/dimm20',
-		'PRODUCT_33'   : '<inventory_root>/system/chassis/motherboard/dimm21',
-		'PRODUCT_34'   : '<inventory_root>/system/chassis/motherboard/dimm22',
-		'PRODUCT_35'   : '<inventory_root>/system/chassis/motherboard/dimm23',
-		'PRODUCT_36'   : '<inventory_root>/system/chassis/motherboard/dimm24',
-		'PRODUCT_37'   : '<inventory_root>/system/chassis/motherboard/dimm25',
-		'PRODUCT_38'   : '<inventory_root>/system/chassis/motherboard/dimm26',
-		'PRODUCT_39'   : '<inventory_root>/system/chassis/motherboard/dimm27',
-		'PRODUCT_40'   : '<inventory_root>/system/chassis/motherboard/dimm28',
-		'PRODUCT_41'   : '<inventory_root>/system/chassis/motherboard/dimm29',
-		'PRODUCT_42'   : '<inventory_root>/system/chassis/motherboard/dimm30',
-		'PRODUCT_43'   : '<inventory_root>/system/chassis/motherboard/dimm31',
-	},
-	'SENSOR' : {
-		0x35 : '<inventory_root>/system/systemevent',
-		0x36 : '<inventory_root>/system/powerlimit',
-                0x34 : '<inventory_root>/system/chassis/motherboard',
-		0x31 : '<inventory_root>/system/chassis/motherboard/pcielink',
-		0x37 : '<inventory_root>/system/chassis/motherboard/refclock',
-		0x38 : '<inventory_root>/system/chassis/motherboard/pcieclock',
-		0x39 : '<inventory_root>/system/chassis/motherboard/todclock',
-		0x3A : '<inventory_root>/system/chassis/motherboard/apss',
-		0x0c : '<inventory_root>/system/chassis/motherboard/cpu0',
-                0x0e : '<inventory_root>/system/chassis/motherboard/cpu1',
-		0xc8 : '<inventory_root>/system/chassis/motherboard/cpu0/core0',
-		0xc9 : '<inventory_root>/system/chassis/motherboard/cpu0/core1',
-		0xca : '<inventory_root>/system/chassis/motherboard/cpu0/core2',
-		0xcb : '<inventory_root>/system/chassis/motherboard/cpu0/core3',
-		0xcc : '<inventory_root>/system/chassis/motherboard/cpu0/core4',
-		0xcd : '<inventory_root>/system/chassis/motherboard/cpu0/core5',
-		0xce : '<inventory_root>/system/chassis/motherboard/cpu0/core6',
-		0xcf : '<inventory_root>/system/chassis/motherboard/cpu0/core7',
-		0xd0 : '<inventory_root>/system/chassis/motherboard/cpu0/core8',
-		0xd1 : '<inventory_root>/system/chassis/motherboard/cpu0/core9',
-		0xd2 : '<inventory_root>/system/chassis/motherboard/cpu0/core10',
-		0xd3 : '<inventory_root>/system/chassis/motherboard/cpu0/core11',
-                0xd4 : '<inventory_root>/system/chassis/motherboard/cpu1/core0',
-                0xd5 : '<inventory_root>/system/chassis/motherboard/cpu1/core1',
-                0xd6 : '<inventory_root>/system/chassis/motherboard/cpu1/core2',
-                0xd7 : '<inventory_root>/system/chassis/motherboard/cpu1/core3',
-                0xd8 : '<inventory_root>/system/chassis/motherboard/cpu1/core4',
-                0xd9 : '<inventory_root>/system/chassis/motherboard/cpu1/core5',
-                0xda : '<inventory_root>/system/chassis/motherboard/cpu1/core6',
-                0xdb : '<inventory_root>/system/chassis/motherboard/cpu1/core7',
-                0xdc : '<inventory_root>/system/chassis/motherboard/cpu1/core8',
-                0xdd : '<inventory_root>/system/chassis/motherboard/cpu1/core9',
-                0xde : '<inventory_root>/system/chassis/motherboard/cpu1/core10',
-                0xdf : '<inventory_root>/system/chassis/motherboard/cpu1/core11',
-		0x40 : '<inventory_root>/system/chassis/motherboard/membuf0',
-    	        0x41 : '<inventory_root>/system/chassis/motherboard/membuf1',
-       		0x42 : '<inventory_root>/system/chassis/motherboard/membuf2',
-       		0x43 : '<inventory_root>/system/chassis/motherboard/membuf3',
-       		0x44 : '<inventory_root>/system/chassis/motherboard/membuf4',
-                0x45 : '<inventory_root>/system/chassis/motherboard/membuf5',
-                0x46 : '<inventory_root>/system/chassis/motherboard/membuf6',
-                0x47 : '<inventory_root>/system/chassis/motherboard/membuf7',
-		0x10 : '<inventory_root>/system/chassis/motherboard/dimm0',
-		0x11 : '<inventory_root>/system/chassis/motherboard/dimm1',
-		0x12 : '<inventory_root>/system/chassis/motherboard/dimm2',
-		0x13 : '<inventory_root>/system/chassis/motherboard/dimm3',
-                0x14 : '<inventory_root>/system/chassis/motherboard/dimm4',
-                0x15 : '<inventory_root>/system/chassis/motherboard/dimm5',
-                0x16 : '<inventory_root>/system/chassis/motherboard/dimm6',
-                0x17 : '<inventory_root>/system/chassis/motherboard/dimm7',
-                0x18 : '<inventory_root>/system/chassis/motherboard/dimm8',
-                0x19 : '<inventory_root>/system/chassis/motherboard/dimm9',
-                0x1a : '<inventory_root>/system/chassis/motherboard/dimm10',
-                0x1b : '<inventory_root>/system/chassis/motherboard/dimm11',
-                0x1c : '<inventory_root>/system/chassis/motherboard/dimm12',
-                0x1d : '<inventory_root>/system/chassis/motherboard/dimm13',
-                0x1e : '<inventory_root>/system/chassis/motherboard/dimm14',
-                0x1f : '<inventory_root>/system/chassis/motherboard/dimm15',
-                0x20 : '<inventory_root>/system/chassis/motherboard/dimm16',
-                0x21 : '<inventory_root>/system/chassis/motherboard/dimm17',
-                0x22 : '<inventory_root>/system/chassis/motherboard/dimm18',
-                0x23 : '<inventory_root>/system/chassis/motherboard/dimm19',
-                0x24 : '<inventory_root>/system/chassis/motherboard/dimm20',
-                0x25 : '<inventory_root>/system/chassis/motherboard/dimm21',
-                0x26 : '<inventory_root>/system/chassis/motherboard/dimm22',
-                0x27 : '<inventory_root>/system/chassis/motherboard/dimm23',
-                0x28 : '<inventory_root>/system/chassis/motherboard/dimm24',
-                0x29 : '<inventory_root>/system/chassis/motherboard/dimm25',
-                0x2a : '<inventory_root>/system/chassis/motherboard/dimm26',
-                0x2b : '<inventory_root>/system/chassis/motherboard/dimm27',
-                0x2c : '<inventory_root>/system/chassis/motherboard/dimm28',
-                0x2d : '<inventory_root>/system/chassis/motherboard/dimm29',
-                0x2e : '<inventory_root>/system/chassis/motherboard/dimm30',
-                0x2f : '<inventory_root>/system/chassis/motherboard/dimm31',
-		0x09 : '/org/openbmc/sensors/host/BootCount',
-		0x05 : '/org/openbmc/sensors/host/BootProgress',
-		0x04 : '/org/openbmc/sensors/host/HostStatus',
-		0x32 : '/org/openbmc/sensors/host/OperatingSystemStatus',
-	},
-	'GPIO_PRESENT' : {
-		'SLOT0_RISER_PRESENT' : '<inventory_root>/system/chassis/io_board/pcie_slot0_riser',
-		'SLOT1_RISER_PRESENT' : '<inventory_root>/system/chassis/io_board/pcie_slot1_riser',
-		'SLOT2_RISER_PRESENT' : '<inventory_root>/system/chassis/io_board/pcie_slot2_riser',
-		'SLOT0_PRESENT' : '<inventory_root>/system/chassis/io_board/pcie_slot0',
-		'SLOT1_PRESENT' : '<inventory_root>/system/chassis/io_board/pcie_slot1',
-		'SLOT2_PRESENT' : '<inventory_root>/system/chassis/io_board/pcie_slot2',
-		'MEZZ0_PRESENT' : '<inventory_root>/system/chassis/io_board/pcie_mezz0',
-		'MEZZ1_PRESENT' : '<inventory_root>/system/chassis/io_board/pcie_mezz1',
-	}
+    "FRU": {
+        0x03: "<inventory_root>/system/chassis/motherboard",
+        0x40: "<inventory_root>/system/chassis/io_board",
+        0x01: "<inventory_root>/system/chassis/motherboard/cpu0",
+        0x02: "<inventory_root>/system/chassis/motherboard/cpu1",
+        0x04: "<inventory_root>/system/chassis/motherboard/membuf0",
+        0x05: "<inventory_root>/system/chassis/motherboard/membuf1",
+        0x06: "<inventory_root>/system/chassis/motherboard/membuf2",
+        0x07: "<inventory_root>/system/chassis/motherboard/membuf3",
+        0x08: "<inventory_root>/system/chassis/motherboard/membuf4",
+        0x09: "<inventory_root>/system/chassis/motherboard/membuf5",
+        0x0A: "<inventory_root>/system/chassis/motherboard/membuf6",
+        0x0B: "<inventory_root>/system/chassis/motherboard/membuf7",
+        0x0C: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0x0D: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0x0E: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0x0F: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0x10: "<inventory_root>/system/chassis/motherboard/dimm4",
+        0x11: "<inventory_root>/system/chassis/motherboard/dimm5",
+        0x12: "<inventory_root>/system/chassis/motherboard/dimm6",
+        0x13: "<inventory_root>/system/chassis/motherboard/dimm7",
+        0x14: "<inventory_root>/system/chassis/motherboard/dimm8",
+        0x15: "<inventory_root>/system/chassis/motherboard/dimm9",
+        0x16: "<inventory_root>/system/chassis/motherboard/dimm10",
+        0x17: "<inventory_root>/system/chassis/motherboard/dimm11",
+        0x18: "<inventory_root>/system/chassis/motherboard/dimm12",
+        0x19: "<inventory_root>/system/chassis/motherboard/dimm13",
+        0x1A: "<inventory_root>/system/chassis/motherboard/dimm14",
+        0x1B: "<inventory_root>/system/chassis/motherboard/dimm15",
+        0x1C: "<inventory_root>/system/chassis/motherboard/dimm16",
+        0x1D: "<inventory_root>/system/chassis/motherboard/dimm17",
+        0x1E: "<inventory_root>/system/chassis/motherboard/dimm18",
+        0x1F: "<inventory_root>/system/chassis/motherboard/dimm19",
+        0x20: "<inventory_root>/system/chassis/motherboard/dimm20",
+        0x21: "<inventory_root>/system/chassis/motherboard/dimm21",
+        0x22: "<inventory_root>/system/chassis/motherboard/dimm22",
+        0x23: "<inventory_root>/system/chassis/motherboard/dimm23",
+        0x24: "<inventory_root>/system/chassis/motherboard/dimm24",
+        0x25: "<inventory_root>/system/chassis/motherboard/dimm25",
+        0x26: "<inventory_root>/system/chassis/motherboard/dimm26",
+        0x27: "<inventory_root>/system/chassis/motherboard/dimm27",
+        0x28: "<inventory_root>/system/chassis/motherboard/dimm28",
+        0x29: "<inventory_root>/system/chassis/motherboard/dimm29",
+        0x2A: "<inventory_root>/system/chassis/motherboard/dimm30",
+        0x2B: "<inventory_root>/system/chassis/motherboard/dimm31",
+        0x33: "<inventory_root>/system",
+    },
+    "FRU_STR": {
+        "PRODUCT_0": "<inventory_root>/system/bios",
+        "BOARD_3": "<inventory_root>/system/misc",
+        "PRODUCT_51": "<inventory_root>/system/misc",
+        "BOARD_100": "<inventory_root>/system/chassis/io_board",
+        "BOARD_101": "<inventory_root>/system/chassis/sas_expander",
+        "BOARD_102": "<inventory_root>/system/chassis/hdd_backplane",
+        "CHASSIS_3": "<inventory_root>/system/chassis/motherboard",
+        "BOARD_1": "<inventory_root>/system/chassis/motherboard/cpu0",
+        "BOARD_2": "<inventory_root>/system/chassis/motherboard/cpu1",
+        "BOARD_4": "<inventory_root>/system/chassis/motherboard/membuf0",
+        "BOARD_5": "<inventory_root>/system/chassis/motherboard/membuf1",
+        "BOARD_6": "<inventory_root>/system/chassis/motherboard/membuf2",
+        "BOARD_7": "<inventory_root>/system/chassis/motherboard/membuf3",
+        "BOARD_8": "<inventory_root>/system/chassis/motherboard/membuf4",
+        "BOARD_9": "<inventory_root>/system/chassis/motherboard/membuf5",
+        "BOARD_10": "<inventory_root>/system/chassis/motherboard/membuf6",
+        "BOARD_11": "<inventory_root>/system/chassis/motherboard/membuf7",
+        "PRODUCT_12": "<inventory_root>/system/chassis/motherboard/dimm0",
+        "PRODUCT_13": "<inventory_root>/system/chassis/motherboard/dimm1",
+        "PRODUCT_14": "<inventory_root>/system/chassis/motherboard/dimm2",
+        "PRODUCT_15": "<inventory_root>/system/chassis/motherboard/dimm3",
+        "PRODUCT_16": "<inventory_root>/system/chassis/motherboard/dimm4",
+        "PRODUCT_17": "<inventory_root>/system/chassis/motherboard/dimm5",
+        "PRODUCT_18": "<inventory_root>/system/chassis/motherboard/dimm6",
+        "PRODUCT_19": "<inventory_root>/system/chassis/motherboard/dimm7",
+        "PRODUCT_20": "<inventory_root>/system/chassis/motherboard/dimm8",
+        "PRODUCT_21": "<inventory_root>/system/chassis/motherboard/dimm9",
+        "PRODUCT_22": "<inventory_root>/system/chassis/motherboard/dimm10",
+        "PRODUCT_23": "<inventory_root>/system/chassis/motherboard/dimm11",
+        "PRODUCT_24": "<inventory_root>/system/chassis/motherboard/dimm12",
+        "PRODUCT_25": "<inventory_root>/system/chassis/motherboard/dimm13",
+        "PRODUCT_26": "<inventory_root>/system/chassis/motherboard/dimm14",
+        "PRODUCT_27": "<inventory_root>/system/chassis/motherboard/dimm15",
+        "PRODUCT_28": "<inventory_root>/system/chassis/motherboard/dimm16",
+        "PRODUCT_29": "<inventory_root>/system/chassis/motherboard/dimm17",
+        "PRODUCT_30": "<inventory_root>/system/chassis/motherboard/dimm18",
+        "PRODUCT_31": "<inventory_root>/system/chassis/motherboard/dimm19",
+        "PRODUCT_32": "<inventory_root>/system/chassis/motherboard/dimm20",
+        "PRODUCT_33": "<inventory_root>/system/chassis/motherboard/dimm21",
+        "PRODUCT_34": "<inventory_root>/system/chassis/motherboard/dimm22",
+        "PRODUCT_35": "<inventory_root>/system/chassis/motherboard/dimm23",
+        "PRODUCT_36": "<inventory_root>/system/chassis/motherboard/dimm24",
+        "PRODUCT_37": "<inventory_root>/system/chassis/motherboard/dimm25",
+        "PRODUCT_38": "<inventory_root>/system/chassis/motherboard/dimm26",
+        "PRODUCT_39": "<inventory_root>/system/chassis/motherboard/dimm27",
+        "PRODUCT_40": "<inventory_root>/system/chassis/motherboard/dimm28",
+        "PRODUCT_41": "<inventory_root>/system/chassis/motherboard/dimm29",
+        "PRODUCT_42": "<inventory_root>/system/chassis/motherboard/dimm30",
+        "PRODUCT_43": "<inventory_root>/system/chassis/motherboard/dimm31",
+    },
+    "SENSOR": {
+        0x35: "<inventory_root>/system/systemevent",
+        0x36: "<inventory_root>/system/powerlimit",
+        0x34: "<inventory_root>/system/chassis/motherboard",
+        0x31: "<inventory_root>/system/chassis/motherboard/pcielink",
+        0x37: "<inventory_root>/system/chassis/motherboard/refclock",
+        0x38: "<inventory_root>/system/chassis/motherboard/pcieclock",
+        0x39: "<inventory_root>/system/chassis/motherboard/todclock",
+        0x3A: "<inventory_root>/system/chassis/motherboard/apss",
+        0x0C: "<inventory_root>/system/chassis/motherboard/cpu0",
+        0x0E: "<inventory_root>/system/chassis/motherboard/cpu1",
+        0xC8: "<inventory_root>/system/chassis/motherboard/cpu0/core0",
+        0xC9: "<inventory_root>/system/chassis/motherboard/cpu0/core1",
+        0xCA: "<inventory_root>/system/chassis/motherboard/cpu0/core2",
+        0xCB: "<inventory_root>/system/chassis/motherboard/cpu0/core3",
+        0xCC: "<inventory_root>/system/chassis/motherboard/cpu0/core4",
+        0xCD: "<inventory_root>/system/chassis/motherboard/cpu0/core5",
+        0xCE: "<inventory_root>/system/chassis/motherboard/cpu0/core6",
+        0xCF: "<inventory_root>/system/chassis/motherboard/cpu0/core7",
+        0xD0: "<inventory_root>/system/chassis/motherboard/cpu0/core8",
+        0xD1: "<inventory_root>/system/chassis/motherboard/cpu0/core9",
+        0xD2: "<inventory_root>/system/chassis/motherboard/cpu0/core10",
+        0xD3: "<inventory_root>/system/chassis/motherboard/cpu0/core11",
+        0xD4: "<inventory_root>/system/chassis/motherboard/cpu1/core0",
+        0xD5: "<inventory_root>/system/chassis/motherboard/cpu1/core1",
+        0xD6: "<inventory_root>/system/chassis/motherboard/cpu1/core2",
+        0xD7: "<inventory_root>/system/chassis/motherboard/cpu1/core3",
+        0xD8: "<inventory_root>/system/chassis/motherboard/cpu1/core4",
+        0xD9: "<inventory_root>/system/chassis/motherboard/cpu1/core5",
+        0xDA: "<inventory_root>/system/chassis/motherboard/cpu1/core6",
+        0xDB: "<inventory_root>/system/chassis/motherboard/cpu1/core7",
+        0xDC: "<inventory_root>/system/chassis/motherboard/cpu1/core8",
+        0xDD: "<inventory_root>/system/chassis/motherboard/cpu1/core9",
+        0xDE: "<inventory_root>/system/chassis/motherboard/cpu1/core10",
+        0xDF: "<inventory_root>/system/chassis/motherboard/cpu1/core11",
+        0x40: "<inventory_root>/system/chassis/motherboard/membuf0",
+        0x41: "<inventory_root>/system/chassis/motherboard/membuf1",
+        0x42: "<inventory_root>/system/chassis/motherboard/membuf2",
+        0x43: "<inventory_root>/system/chassis/motherboard/membuf3",
+        0x44: "<inventory_root>/system/chassis/motherboard/membuf4",
+        0x45: "<inventory_root>/system/chassis/motherboard/membuf5",
+        0x46: "<inventory_root>/system/chassis/motherboard/membuf6",
+        0x47: "<inventory_root>/system/chassis/motherboard/membuf7",
+        0x10: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0x11: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0x12: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0x13: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0x14: "<inventory_root>/system/chassis/motherboard/dimm4",
+        0x15: "<inventory_root>/system/chassis/motherboard/dimm5",
+        0x16: "<inventory_root>/system/chassis/motherboard/dimm6",
+        0x17: "<inventory_root>/system/chassis/motherboard/dimm7",
+        0x18: "<inventory_root>/system/chassis/motherboard/dimm8",
+        0x19: "<inventory_root>/system/chassis/motherboard/dimm9",
+        0x1A: "<inventory_root>/system/chassis/motherboard/dimm10",
+        0x1B: "<inventory_root>/system/chassis/motherboard/dimm11",
+        0x1C: "<inventory_root>/system/chassis/motherboard/dimm12",
+        0x1D: "<inventory_root>/system/chassis/motherboard/dimm13",
+        0x1E: "<inventory_root>/system/chassis/motherboard/dimm14",
+        0x1F: "<inventory_root>/system/chassis/motherboard/dimm15",
+        0x20: "<inventory_root>/system/chassis/motherboard/dimm16",
+        0x21: "<inventory_root>/system/chassis/motherboard/dimm17",
+        0x22: "<inventory_root>/system/chassis/motherboard/dimm18",
+        0x23: "<inventory_root>/system/chassis/motherboard/dimm19",
+        0x24: "<inventory_root>/system/chassis/motherboard/dimm20",
+        0x25: "<inventory_root>/system/chassis/motherboard/dimm21",
+        0x26: "<inventory_root>/system/chassis/motherboard/dimm22",
+        0x27: "<inventory_root>/system/chassis/motherboard/dimm23",
+        0x28: "<inventory_root>/system/chassis/motherboard/dimm24",
+        0x29: "<inventory_root>/system/chassis/motherboard/dimm25",
+        0x2A: "<inventory_root>/system/chassis/motherboard/dimm26",
+        0x2B: "<inventory_root>/system/chassis/motherboard/dimm27",
+        0x2C: "<inventory_root>/system/chassis/motherboard/dimm28",
+        0x2D: "<inventory_root>/system/chassis/motherboard/dimm29",
+        0x2E: "<inventory_root>/system/chassis/motherboard/dimm30",
+        0x2F: "<inventory_root>/system/chassis/motherboard/dimm31",
+        0x09: "/org/openbmc/sensors/host/BootCount",
+        0x05: "/org/openbmc/sensors/host/BootProgress",
+        0x04: "/org/openbmc/sensors/host/HostStatus",
+        0x32: "/org/openbmc/sensors/host/OperatingSystemStatus",
+    },
+    "GPIO_PRESENT": {
+        "SLOT0_RISER_PRESENT":
+            "<inventory_root>/system/chassis/io_board/pcie_slot0_riser",
+        "SLOT1_RISER_PRESENT":
+            "<inventory_root>/system/chassis/io_board/pcie_slot1_riser",
+        "SLOT2_RISER_PRESENT":
+            "<inventory_root>/system/chassis/io_board/pcie_slot2_riser",
+        "SLOT0_PRESENT": "<inventory_root>/system/chassis/io_board/pcie_slot0",
+        "SLOT1_PRESENT": "<inventory_root>/system/chassis/io_board/pcie_slot1",
+        "SLOT2_PRESENT": "<inventory_root>/system/chassis/io_board/pcie_slot2",
+        "MEZZ0_PRESENT": "<inventory_root>/system/chassis/io_board/pcie_mezz0",
+        "MEZZ1_PRESENT": "<inventory_root>/system/chassis/io_board/pcie_mezz1",
+    },
 }
 
 GPIO_CONFIG = {}
-GPIO_CONFIG['FSI_CLK']    =   { 'gpio_pin': 'A4', 'direction': 'out' }
-GPIO_CONFIG['FSI_DATA']   =   { 'gpio_pin': 'A5', 'direction': 'out' }
-GPIO_CONFIG['FSI_ENABLE'] =   { 'gpio_pin': 'D0', 'direction': 'out' }
-GPIO_CONFIG['POWER_PIN']  =   { 'gpio_pin': 'E1', 'direction': 'out'  }
-GPIO_CONFIG['CRONUS_SEL'] =   { 'gpio_pin': 'A6', 'direction': 'out'  }
-GPIO_CONFIG['PGOOD']      =   { 'gpio_pin': 'C7', 'direction': 'in'  }
-GPIO_CONFIG['POWER_BUTTON'] = { 'gpio_pin': 'E0', 'direction': 'both' }
-GPIO_CONFIG['PCIE_RESET']   = { 'gpio_pin': 'B5', 'direction': 'out' }
-GPIO_CONFIG['USB_RESET']    = { 'gpio_pin': 'B6', 'direction': 'out' }
+GPIO_CONFIG["FSI_CLK"] = {"gpio_pin": "A4", "direction": "out"}
+GPIO_CONFIG["FSI_DATA"] = {"gpio_pin": "A5", "direction": "out"}
+GPIO_CONFIG["FSI_ENABLE"] = {"gpio_pin": "D0", "direction": "out"}
+GPIO_CONFIG["POWER_PIN"] = {"gpio_pin": "E1", "direction": "out"}
+GPIO_CONFIG["CRONUS_SEL"] = {"gpio_pin": "A6", "direction": "out"}
+GPIO_CONFIG["PGOOD"] = {"gpio_pin": "C7", "direction": "in"}
+GPIO_CONFIG["POWER_BUTTON"] = {"gpio_pin": "E0", "direction": "both"}
+GPIO_CONFIG["PCIE_RESET"] = {"gpio_pin": "B5", "direction": "out"}
+GPIO_CONFIG["USB_RESET"] = {"gpio_pin": "B6", "direction": "out"}
 
-GPIO_CONFIG['IDBTN']       = { 'gpio_pin': 'Q7', 'direction': 'out' }
-GPIO_CONFIG['BMC_THROTTLE']       = { 'gpio_pin': 'J3', 'direction': 'out' }
-GPIO_CONFIG['RESET_BUTTON']       = { 'gpio_pin': 'E2', 'direction': 'both' }
-GPIO_CONFIG['CPLD_TCK']    	  =   { 'gpio_pin': 'P0', 'direction': 'out' }
-GPIO_CONFIG['CPLD_TDO']    	  =   { 'gpio_pin': 'P1', 'direction': 'out' }
-GPIO_CONFIG['CPLD_TDI']    	  =   { 'gpio_pin': 'P2', 'direction': 'out' }
-GPIO_CONFIG['CPLD_TMS']    	  =   { 'gpio_pin': 'P3', 'direction': 'out' }
-GPIO_CONFIG['CHECKSTOP']   	  =   { 'gpio_pin': 'P5', 'direction': 'falling' }
+GPIO_CONFIG["IDBTN"] = {"gpio_pin": "Q7", "direction": "out"}
+GPIO_CONFIG["BMC_THROTTLE"] = {"gpio_pin": "J3", "direction": "out"}
+GPIO_CONFIG["RESET_BUTTON"] = {"gpio_pin": "E2", "direction": "both"}
+GPIO_CONFIG["CPLD_TCK"] = {"gpio_pin": "P0", "direction": "out"}
+GPIO_CONFIG["CPLD_TDO"] = {"gpio_pin": "P1", "direction": "out"}
+GPIO_CONFIG["CPLD_TDI"] = {"gpio_pin": "P2", "direction": "out"}
+GPIO_CONFIG["CPLD_TMS"] = {"gpio_pin": "P3", "direction": "out"}
+GPIO_CONFIG["CHECKSTOP"] = {"gpio_pin": "P5", "direction": "falling"}
 
-GPIO_CONFIG['SLOT0_RISER_PRESENT'] =   { 'gpio_pin': 'N0', 'direction': 'in' }
-GPIO_CONFIG['SLOT1_RISER_PRESENT'] =   { 'gpio_pin': 'N1', 'direction': 'in' }
-GPIO_CONFIG['SLOT2_RISER_PRESENT'] =   { 'gpio_pin': 'N2', 'direction': 'in' }
-GPIO_CONFIG['SLOT0_PRESENT'] =         { 'gpio_pin': 'N3', 'direction': 'in' }
-GPIO_CONFIG['SLOT1_PRESENT'] =         { 'gpio_pin': 'N4', 'direction': 'in' }
-GPIO_CONFIG['SLOT2_PRESENT'] =         { 'gpio_pin': 'N5', 'direction': 'in' }
-GPIO_CONFIG['MEZZ0_PRESENT'] =         { 'gpio_pin': 'O0', 'direction': 'in' }
-GPIO_CONFIG['MEZZ1_PRESENT'] =         { 'gpio_pin': 'O1', 'direction': 'in' }
+GPIO_CONFIG["SLOT0_RISER_PRESENT"] = {"gpio_pin": "N0", "direction": "in"}
+GPIO_CONFIG["SLOT1_RISER_PRESENT"] = {"gpio_pin": "N1", "direction": "in"}
+GPIO_CONFIG["SLOT2_RISER_PRESENT"] = {"gpio_pin": "N2", "direction": "in"}
+GPIO_CONFIG["SLOT0_PRESENT"] = {"gpio_pin": "N3", "direction": "in"}
+GPIO_CONFIG["SLOT1_PRESENT"] = {"gpio_pin": "N4", "direction": "in"}
+GPIO_CONFIG["SLOT2_PRESENT"] = {"gpio_pin": "N5", "direction": "in"}
+GPIO_CONFIG["MEZZ0_PRESENT"] = {"gpio_pin": "O0", "direction": "in"}
+GPIO_CONFIG["MEZZ1_PRESENT"] = {"gpio_pin": "O1", "direction": "in"}
 
 GPIO_CONFIGS = {
-    'power_config' : {
-        'power_good_in' : 'PGOOD',
-        'power_up_outs' : [
-            ('POWER_PIN', False),
+    "power_config": {
+        "power_good_in": "PGOOD",
+        "power_up_outs": [
+            ("POWER_PIN", False),
         ],
-        'reset_outs' : [
-            ('USB_RESET', False),
+        "reset_outs": [
+            ("USB_RESET", False),
         ],
-        'pci_reset_outs': [
+        "pci_reset_outs": [
             # net name, polarity, reset hold
-            ('PCIE_RESET', False, False),
+            ("PCIE_RESET", False, False),
         ],
     },
-    'hostctl_config' : {
-        'fsi_data' : 'FSI_DATA',
-        'fsi_clk' : 'FSI_CLK',
-        'fsi_enable' : 'FSI_ENABLE',
-        'cronus_sel' : 'CRONUS_SEL',
-        'optionals' : [
-            ('BMC_THROTTLE', True),
-            ('IDBTN', False),
+    "hostctl_config": {
+        "fsi_data": "FSI_DATA",
+        "fsi_clk": "FSI_CLK",
+        "fsi_enable": "FSI_ENABLE",
+        "cronus_sel": "CRONUS_SEL",
+        "optionals": [
+            ("BMC_THROTTLE", True),
+            ("IDBTN", False),
         ],
     },
 }
 
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
-MISC_SENSORS = {
-}
+MISC_SENSORS = {}
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/configs/Firestone.py b/configs/Firestone.py
index 7edc60d..d418dc0 100644
--- a/configs/Firestone.py
+++ b/configs/Firestone.py
@@ -1,372 +1,589 @@
-## System states
-##   state can change to next state in 2 ways:
-##   - a process emits a GotoSystemState signal with state name to goto
-##   - objects specified in EXIT_STATE_DEPEND have started
+# System states
+#   state can change to next state in 2 ways:
+#   - a process emits a GotoSystemState signal with state name to goto
+#   - objects specified in EXIT_STATE_DEPEND have started
 SYSTEM_STATES = [
-    'BASE_APPS',
-    'BMC_STARTING',
-    'BMC_READY',
-    'HOST_POWERING_ON',
-    'HOST_POWERED_ON',
-    'HOST_BOOTING',
-    'HOST_BOOTED',
-    'HOST_POWERED_OFF',
+    "BASE_APPS",
+    "BMC_STARTING",
+    "BMC_READY",
+    "HOST_POWERING_ON",
+    "HOST_POWERED_ON",
+    "HOST_BOOTING",
+    "HOST_BOOTED",
+    "HOST_POWERED_OFF",
 ]
 
 EXIT_STATE_DEPEND = {
-    'BASE_APPS' : {
-        '/org/openbmc/sensors': 0,
+    "BASE_APPS": {
+        "/org/openbmc/sensors": 0,
     },
-    'BMC_STARTING' : {
-        '/org/openbmc/control/chassis0': 0,
-        '/org/openbmc/control/power0' : 0,
-        '/org/openbmc/control/host0' : 0,
-        '/org/openbmc/control/flash/bios' : 0,
+    "BMC_STARTING": {
+        "/org/openbmc/control/chassis0": 0,
+        "/org/openbmc/control/power0": 0,
+        "/org/openbmc/control/host0": 0,
+        "/org/openbmc/control/flash/bios": 0,
     },
 }
 
 FRU_INSTANCES = {
-    '<inventory_root>/system' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-    '<inventory_root>/system/bios' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-    '<inventory_root>/system/misc' : { 'fru_type' : 'SYSTEM','is_fru' : False, },
-
-    '<inventory_root>/system/chassis' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-
-    '<inventory_root>/system/chassis/motherboard' : { 'fru_type' : 'MAIN_PLANAR','is_fru' : True, },
-
-    '<inventory_root>/system/systemevent'                  : { 'fru_type' : 'SYSTEM_EVENT', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/refclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/pcieclock': { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/todclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/apss'     : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/fan0' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan1' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan2' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan3' : { 'fru_type' : 'FAN','is_fru' : True, },
-
-    '<inventory_root>/system/chassis/motherboard/bmc' : { 'fru_type' : 'BMC','is_fru' : False, 'manufacturer' : 'ASPEED' },
-
-    '<inventory_root>/system/chassis/motherboard/cpu0' : { 'fru_type' : 'CPU', 'is_fru' : True, },
-    '<inventory_root>/system/chassis/motherboard/cpu1' : { 'fru_type' : 'CPU', 'is_fru' : True, },
-
-    '<inventory_root>/system/chassis/motherboard/cpu0/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core10': { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core11': { 'fru_type' : 'CORE', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/motherboard/cpu1/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core10' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core11' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/motherboard/membuf0' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf1' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf2' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf3' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf4' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf5' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf6' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf7' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/motherboard/dimm0' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm1' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm2' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm3' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm4' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm5' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm6' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm7' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm8' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm9' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm10' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm11' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm12' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm13' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm14' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm15' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm16' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm17' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm18' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm19' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm20' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm21' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm22' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm23' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm24' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm25' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm26' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm27' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm28' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm29' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm30' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm31' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+    "<inventory_root>/system": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/bios": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/misc": {
+        "fru_type": "SYSTEM",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/chassis/motherboard": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/systemevent": {
+        "fru_type": "SYSTEM_EVENT",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/refclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/pcieclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/todclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/apss": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/fan0": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan1": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan2": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan3": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/bmc": {
+        "fru_type": "BMC",
+        "is_fru": False,
+        "manufacturer": "ASPEED",
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0": {
+        "fru_type": "CPU",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1": {
+        "fru_type": "CPU",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core0": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core1": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core2": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core3": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core4": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core5": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core6": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core7": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core8": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core9": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core10": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core11": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core0": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core1": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core2": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core3": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core4": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core5": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core6": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core7": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core8": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core9": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core10": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core11": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf0": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf1": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf2": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf3": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf4": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf5": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf6": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf7": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm0": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm1": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm2": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm3": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm4": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm5": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm6": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm7": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm8": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm9": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm10": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm11": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm12": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm13": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm14": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm15": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm16": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm17": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm18": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm19": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm20": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm21": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm22": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm23": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm24": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm25": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm26": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm27": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm28": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm29": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm30": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm31": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
 }
 
 ID_LOOKUP = {
-    'FRU' : {
-        0x01 : '<inventory_root>/system/chassis/motherboard/cpu0',
-        0x02 : '<inventory_root>/system/chassis/motherboard/cpu1',
-        0x03 : '<inventory_root>/system/chassis/motherboard',
-        0x04 : '<inventory_root>/system/chassis/motherboard/membuf0',
-        0x05 : '<inventory_root>/system/chassis/motherboard/membuf1',
-        0x06 : '<inventory_root>/system/chassis/motherboard/membuf2',
-        0x07 : '<inventory_root>/system/chassis/motherboard/membuf3',
-        0x08 : '<inventory_root>/system/chassis/motherboard/membuf4',
-        0x09 : '<inventory_root>/system/chassis/motherboard/membuf5',
-        0x0c : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0x0d : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0x0e : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0x0f : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0x10 : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0x11 : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0x12 : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0x13 : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0x14 : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0x15 : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0x16 : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0x17 : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0x18 : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0x19 : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0x1a : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0x1b : '<inventory_root>/system/chassis/motherboard/dimm15',
-        0x1c : '<inventory_root>/system/chassis/motherboard/dimm16',
-        0x1d : '<inventory_root>/system/chassis/motherboard/dimm17',
-        0x1e : '<inventory_root>/system/chassis/motherboard/dimm18',
-        0x1f : '<inventory_root>/system/chassis/motherboard/dimm19',
-        0x20 : '<inventory_root>/system/chassis/motherboard/dimm20',
-        0x21 : '<inventory_root>/system/chassis/motherboard/dimm21',
-        0x22 : '<inventory_root>/system/chassis/motherboard/dimm22',
-        0x23 : '<inventory_root>/system/chassis/motherboard/dimm23',
-        0x24 : '<inventory_root>/system/chassis/motherboard/dimm24',
-        0x25 : '<inventory_root>/system/chassis/motherboard/dimm25',
-        0x26 : '<inventory_root>/system/chassis/motherboard/dimm26',
-        0x27 : '<inventory_root>/system/chassis/motherboard/dimm27',
-        0x28 : '<inventory_root>/system/chassis/motherboard/dimm28',
-        0x29 : '<inventory_root>/system/chassis/motherboard/dimm29',
-        0x2a : '<inventory_root>/system/chassis/motherboard/dimm30',
-        0x2b : '<inventory_root>/system/chassis/motherboard/dimm31',
+    "FRU": {
+        0x01: "<inventory_root>/system/chassis/motherboard/cpu0",
+        0x02: "<inventory_root>/system/chassis/motherboard/cpu1",
+        0x03: "<inventory_root>/system/chassis/motherboard",
+        0x04: "<inventory_root>/system/chassis/motherboard/membuf0",
+        0x05: "<inventory_root>/system/chassis/motherboard/membuf1",
+        0x06: "<inventory_root>/system/chassis/motherboard/membuf2",
+        0x07: "<inventory_root>/system/chassis/motherboard/membuf3",
+        0x08: "<inventory_root>/system/chassis/motherboard/membuf4",
+        0x09: "<inventory_root>/system/chassis/motherboard/membuf5",
+        0x0C: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0x0D: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0x0E: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0x0F: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0x10: "<inventory_root>/system/chassis/motherboard/dimm4",
+        0x11: "<inventory_root>/system/chassis/motherboard/dimm5",
+        0x12: "<inventory_root>/system/chassis/motherboard/dimm6",
+        0x13: "<inventory_root>/system/chassis/motherboard/dimm7",
+        0x14: "<inventory_root>/system/chassis/motherboard/dimm8",
+        0x15: "<inventory_root>/system/chassis/motherboard/dimm9",
+        0x16: "<inventory_root>/system/chassis/motherboard/dimm10",
+        0x17: "<inventory_root>/system/chassis/motherboard/dimm11",
+        0x18: "<inventory_root>/system/chassis/motherboard/dimm12",
+        0x19: "<inventory_root>/system/chassis/motherboard/dimm13",
+        0x1A: "<inventory_root>/system/chassis/motherboard/dimm14",
+        0x1B: "<inventory_root>/system/chassis/motherboard/dimm15",
+        0x1C: "<inventory_root>/system/chassis/motherboard/dimm16",
+        0x1D: "<inventory_root>/system/chassis/motherboard/dimm17",
+        0x1E: "<inventory_root>/system/chassis/motherboard/dimm18",
+        0x1F: "<inventory_root>/system/chassis/motherboard/dimm19",
+        0x20: "<inventory_root>/system/chassis/motherboard/dimm20",
+        0x21: "<inventory_root>/system/chassis/motherboard/dimm21",
+        0x22: "<inventory_root>/system/chassis/motherboard/dimm22",
+        0x23: "<inventory_root>/system/chassis/motherboard/dimm23",
+        0x24: "<inventory_root>/system/chassis/motherboard/dimm24",
+        0x25: "<inventory_root>/system/chassis/motherboard/dimm25",
+        0x26: "<inventory_root>/system/chassis/motherboard/dimm26",
+        0x27: "<inventory_root>/system/chassis/motherboard/dimm27",
+        0x28: "<inventory_root>/system/chassis/motherboard/dimm28",
+        0x29: "<inventory_root>/system/chassis/motherboard/dimm29",
+        0x2A: "<inventory_root>/system/chassis/motherboard/dimm30",
+        0x2B: "<inventory_root>/system/chassis/motherboard/dimm31",
     },
-    'FRU_STR' : {
-        'PRODUCT_0'  : '<inventory_root>/system/bios',
-        'BOARD_1'    : '<inventory_root>/system/chassis/motherboard/cpu0',
-        'BOARD_2'    : '<inventory_root>/system/chassis/motherboard/cpu1',
-        'CHASSIS_3'  : '<inventory_root>/system/chassis/motherboard',
-        'BOARD_3'    : '<inventory_root>/system/misc',
-        'BOARD_4'    : '<inventory_root>/system/chassis/motherboard/membuf0',
-        'BOARD_5'    : '<inventory_root>/system/chassis/motherboard/membuf1',
-        'BOARD_6'    : '<inventory_root>/system/chassis/motherboard/membuf2',
-        'BOARD_7'    : '<inventory_root>/system/chassis/motherboard/membuf3',
-        'BOARD_8'    : '<inventory_root>/system/chassis/motherboard/membuf4',
-        'BOARD_9'    : '<inventory_root>/system/chassis/motherboard/membuf5',
-        'BOARD_10'   : '<inventory_root>/system/chassis/motherboard/membuf6',
-        'BOARD_11'   : '<inventory_root>/system/chassis/motherboard/membuf7',
-        'PRODUCT_12'   : '<inventory_root>/system/chassis/motherboard/dimm0',
-        'PRODUCT_13'   : '<inventory_root>/system/chassis/motherboard/dimm1',
-        'PRODUCT_14'   : '<inventory_root>/system/chassis/motherboard/dimm2',
-        'PRODUCT_15'   : '<inventory_root>/system/chassis/motherboard/dimm3',
-        'PRODUCT_16'   : '<inventory_root>/system/chassis/motherboard/dimm4',
-        'PRODUCT_17'   : '<inventory_root>/system/chassis/motherboard/dimm5',
-        'PRODUCT_18'   : '<inventory_root>/system/chassis/motherboard/dimm6',
-        'PRODUCT_19'   : '<inventory_root>/system/chassis/motherboard/dimm7',
-        'PRODUCT_20'   : '<inventory_root>/system/chassis/motherboard/dimm8',
-        'PRODUCT_21'   : '<inventory_root>/system/chassis/motherboard/dimm9',
-        'PRODUCT_22'   : '<inventory_root>/system/chassis/motherboard/dimm10',
-        'PRODUCT_23'   : '<inventory_root>/system/chassis/motherboard/dimm11',
-        'PRODUCT_24'   : '<inventory_root>/system/chassis/motherboard/dimm12',
-        'PRODUCT_25'   : '<inventory_root>/system/chassis/motherboard/dimm13',
-        'PRODUCT_26'   : '<inventory_root>/system/chassis/motherboard/dimm14',
-        'PRODUCT_27'   : '<inventory_root>/system/chassis/motherboard/dimm15',
-        'PRODUCT_28'   : '<inventory_root>/system/chassis/motherboard/dimm16',
-        'PRODUCT_29'   : '<inventory_root>/system/chassis/motherboard/dimm17',
-        'PRODUCT_30'   : '<inventory_root>/system/chassis/motherboard/dimm18',
-        'PRODUCT_31'   : '<inventory_root>/system/chassis/motherboard/dimm19',
-        'PRODUCT_32'   : '<inventory_root>/system/chassis/motherboard/dimm20',
-        'PRODUCT_33'   : '<inventory_root>/system/chassis/motherboard/dimm21',
-        'PRODUCT_34'   : '<inventory_root>/system/chassis/motherboard/dimm22',
-        'PRODUCT_35'   : '<inventory_root>/system/chassis/motherboard/dimm23',
-        'PRODUCT_36'   : '<inventory_root>/system/chassis/motherboard/dimm24',
-        'PRODUCT_37'   : '<inventory_root>/system/chassis/motherboard/dimm25',
-        'PRODUCT_38'   : '<inventory_root>/system/chassis/motherboard/dimm26',
-        'PRODUCT_39'   : '<inventory_root>/system/chassis/motherboard/dimm27',
-        'PRODUCT_40'   : '<inventory_root>/system/chassis/motherboard/dimm28',
-        'PRODUCT_41'   : '<inventory_root>/system/chassis/motherboard/dimm29',
-        'PRODUCT_42'   : '<inventory_root>/system/chassis/motherboard/dimm30',
-        'PRODUCT_43'   : '<inventory_root>/system/chassis/motherboard/dimm31',
-        'PRODUCT_47'   : '<inventory_root>/system/misc',
+    "FRU_STR": {
+        "PRODUCT_0": "<inventory_root>/system/bios",
+        "BOARD_1": "<inventory_root>/system/chassis/motherboard/cpu0",
+        "BOARD_2": "<inventory_root>/system/chassis/motherboard/cpu1",
+        "CHASSIS_3": "<inventory_root>/system/chassis/motherboard",
+        "BOARD_3": "<inventory_root>/system/misc",
+        "BOARD_4": "<inventory_root>/system/chassis/motherboard/membuf0",
+        "BOARD_5": "<inventory_root>/system/chassis/motherboard/membuf1",
+        "BOARD_6": "<inventory_root>/system/chassis/motherboard/membuf2",
+        "BOARD_7": "<inventory_root>/system/chassis/motherboard/membuf3",
+        "BOARD_8": "<inventory_root>/system/chassis/motherboard/membuf4",
+        "BOARD_9": "<inventory_root>/system/chassis/motherboard/membuf5",
+        "BOARD_10": "<inventory_root>/system/chassis/motherboard/membuf6",
+        "BOARD_11": "<inventory_root>/system/chassis/motherboard/membuf7",
+        "PRODUCT_12": "<inventory_root>/system/chassis/motherboard/dimm0",
+        "PRODUCT_13": "<inventory_root>/system/chassis/motherboard/dimm1",
+        "PRODUCT_14": "<inventory_root>/system/chassis/motherboard/dimm2",
+        "PRODUCT_15": "<inventory_root>/system/chassis/motherboard/dimm3",
+        "PRODUCT_16": "<inventory_root>/system/chassis/motherboard/dimm4",
+        "PRODUCT_17": "<inventory_root>/system/chassis/motherboard/dimm5",
+        "PRODUCT_18": "<inventory_root>/system/chassis/motherboard/dimm6",
+        "PRODUCT_19": "<inventory_root>/system/chassis/motherboard/dimm7",
+        "PRODUCT_20": "<inventory_root>/system/chassis/motherboard/dimm8",
+        "PRODUCT_21": "<inventory_root>/system/chassis/motherboard/dimm9",
+        "PRODUCT_22": "<inventory_root>/system/chassis/motherboard/dimm10",
+        "PRODUCT_23": "<inventory_root>/system/chassis/motherboard/dimm11",
+        "PRODUCT_24": "<inventory_root>/system/chassis/motherboard/dimm12",
+        "PRODUCT_25": "<inventory_root>/system/chassis/motherboard/dimm13",
+        "PRODUCT_26": "<inventory_root>/system/chassis/motherboard/dimm14",
+        "PRODUCT_27": "<inventory_root>/system/chassis/motherboard/dimm15",
+        "PRODUCT_28": "<inventory_root>/system/chassis/motherboard/dimm16",
+        "PRODUCT_29": "<inventory_root>/system/chassis/motherboard/dimm17",
+        "PRODUCT_30": "<inventory_root>/system/chassis/motherboard/dimm18",
+        "PRODUCT_31": "<inventory_root>/system/chassis/motherboard/dimm19",
+        "PRODUCT_32": "<inventory_root>/system/chassis/motherboard/dimm20",
+        "PRODUCT_33": "<inventory_root>/system/chassis/motherboard/dimm21",
+        "PRODUCT_34": "<inventory_root>/system/chassis/motherboard/dimm22",
+        "PRODUCT_35": "<inventory_root>/system/chassis/motherboard/dimm23",
+        "PRODUCT_36": "<inventory_root>/system/chassis/motherboard/dimm24",
+        "PRODUCT_37": "<inventory_root>/system/chassis/motherboard/dimm25",
+        "PRODUCT_38": "<inventory_root>/system/chassis/motherboard/dimm26",
+        "PRODUCT_39": "<inventory_root>/system/chassis/motherboard/dimm27",
+        "PRODUCT_40": "<inventory_root>/system/chassis/motherboard/dimm28",
+        "PRODUCT_41": "<inventory_root>/system/chassis/motherboard/dimm29",
+        "PRODUCT_42": "<inventory_root>/system/chassis/motherboard/dimm30",
+        "PRODUCT_43": "<inventory_root>/system/chassis/motherboard/dimm31",
+        "PRODUCT_47": "<inventory_root>/system/misc",
     },
-    'SENSOR' : {
-        0x04 : '/org/openbmc/sensors/host/HostStatus',
-        0x05 : '/org/openbmc/sensors/host/BootProgress',
-        0x0c : '<inventory_root>/system/chassis/motherboard/cpu0',
-        0x0e : '<inventory_root>/system/chassis/motherboard/cpu1',
-        0x1e : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0x1f : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0x20 : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0x21 : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0x22 : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0x23 : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0x24 : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0x25 : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0x26 : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0x27 : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0x28 : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0x29 : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0x2a : '<inventory_root>/system/chassis/motherboard/dimm15',
-        0x2b : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0x2c : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0x2d : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0x2e : '<inventory_root>/system/chassis/motherboard/dimm19',
-        0x2f : '<inventory_root>/system/chassis/motherboard/dimm18',
-        0x30 : '<inventory_root>/system/chassis/motherboard/dimm17',
-        0x31 : '<inventory_root>/system/chassis/motherboard/dimm16',
-        0x32 : '<inventory_root>/system/chassis/motherboard/dimm23',
-        0x33 : '<inventory_root>/system/chassis/motherboard/dimm22',
-        0x34 : '<inventory_root>/system/chassis/motherboard/dimm21',
-        0x35 : '<inventory_root>/system/chassis/motherboard/dimm20',
-        0x36 : '<inventory_root>/system/chassis/motherboard/dimm27',
-        0x37 : '<inventory_root>/system/chassis/motherboard/dimm26',
-        0x38 : '<inventory_root>/system/chassis/motherboard/dimm25',
-        0x39 : '<inventory_root>/system/chassis/motherboard/dimm24',
-        0x3a : '<inventory_root>/system/chassis/motherboard/dimm31',
-        0x3b : '<inventory_root>/system/chassis/motherboard/dimm30',
-        0x3c : '<inventory_root>/system/chassis/motherboard/dimm29',
-        0x3d : '<inventory_root>/system/chassis/motherboard/dimm28',
-        0x3e : '<inventory_root>/system/chassis/motherboard/cpu0/core0',
-        0x3f : '<inventory_root>/system/chassis/motherboard/cpu0/core1',
-        0x40 : '<inventory_root>/system/chassis/motherboard/cpu0/core2',
-        0x41 : '<inventory_root>/system/chassis/motherboard/cpu0/core3',
-        0x42 : '<inventory_root>/system/chassis/motherboard/cpu0/core4',
-        0x43 : '<inventory_root>/system/chassis/motherboard/cpu0/core5',
-        0x44 : '<inventory_root>/system/chassis/motherboard/cpu0/core6',
-        0x45 : '<inventory_root>/system/chassis/motherboard/cpu0/core7',
-        0x46 : '<inventory_root>/system/chassis/motherboard/cpu0/core8',
-        0x47 : '<inventory_root>/system/chassis/motherboard/cpu0/core9',
-        0x48 : '<inventory_root>/system/chassis/motherboard/cpu0/core10',
-        0x49 : '<inventory_root>/system/chassis/motherboard/cpu0/core11',
-        0x4a : '<inventory_root>/system/chassis/motherboard/cpu1/core0',
-        0x4b : '<inventory_root>/system/chassis/motherboard/cpu1/core1',
-        0x4c : '<inventory_root>/system/chassis/motherboard/cpu1/core2',
-        0x4d : '<inventory_root>/system/chassis/motherboard/cpu1/core3',
-        0x4e : '<inventory_root>/system/chassis/motherboard/cpu1/core4',
-        0x4f : '<inventory_root>/system/chassis/motherboard/cpu1/core5',
-        0x50 : '<inventory_root>/system/chassis/motherboard/cpu1/core6',
-        0x51 : '<inventory_root>/system/chassis/motherboard/cpu1/core7',
-        0x52 : '<inventory_root>/system/chassis/motherboard/cpu1/core8',
-        0x53 : '<inventory_root>/system/chassis/motherboard/cpu1/core9',
-        0x54 : '<inventory_root>/system/chassis/motherboard/cpu1/core10',
-        0x55 : '<inventory_root>/system/chassis/motherboard/cpu1/core11',
-        0x56 : '<inventory_root>/system/chassis/motherboard/membuf0',
-        0x57 : '<inventory_root>/system/chassis/motherboard/membuf1',
-        0x58 : '<inventory_root>/system/chassis/motherboard/membuf2',
-        0x59 : '<inventory_root>/system/chassis/motherboard/membuf3',
-        0x5a : '<inventory_root>/system/chassis/motherboard/membuf4',
-        0x5b : '<inventory_root>/system/chassis/motherboard/membuf5',
-        0x5c : '<inventory_root>/system/chassis/motherboard/membuf6',
-        0x5d : '<inventory_root>/system/chassis/motherboard/membuf7',
-        0x5f : '/org/openbmc/sensors/host/BootCount',
-        0x60 : '<inventory_root>/system/chassis/motherboard',
-        0x61 : '<inventory_root>/system/systemevent',
-        0x62 : '<inventory_root>/system/powerlimit',
-        0x63 : '<inventory_root>/system/chassis/motherboard/refclock',
-        0x64 : '<inventory_root>/system/chassis/motherboard/pcieclock',
-        0xb1 : '<inventory_root>/system/chassis/motherboard/todclock',
-        0xb2 : '<inventory_root>/system/chassis/motherboard/apss',
-        0xb5 : '/org/openbmc/sensors/host/OperatingSystemStatus',
-        0xb6 : '<inventory_root>/system/chassis/motherboard/pcielink',
+    "SENSOR": {
+        0x04: "/org/openbmc/sensors/host/HostStatus",
+        0x05: "/org/openbmc/sensors/host/BootProgress",
+        0x0C: "<inventory_root>/system/chassis/motherboard/cpu0",
+        0x0E: "<inventory_root>/system/chassis/motherboard/cpu1",
+        0x1E: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0x1F: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0x20: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0x21: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0x22: "<inventory_root>/system/chassis/motherboard/dimm7",
+        0x23: "<inventory_root>/system/chassis/motherboard/dimm6",
+        0x24: "<inventory_root>/system/chassis/motherboard/dimm5",
+        0x25: "<inventory_root>/system/chassis/motherboard/dimm4",
+        0x26: "<inventory_root>/system/chassis/motherboard/dimm11",
+        0x27: "<inventory_root>/system/chassis/motherboard/dimm10",
+        0x28: "<inventory_root>/system/chassis/motherboard/dimm9",
+        0x29: "<inventory_root>/system/chassis/motherboard/dimm8",
+        0x2A: "<inventory_root>/system/chassis/motherboard/dimm15",
+        0x2B: "<inventory_root>/system/chassis/motherboard/dimm14",
+        0x2C: "<inventory_root>/system/chassis/motherboard/dimm13",
+        0x2D: "<inventory_root>/system/chassis/motherboard/dimm12",
+        0x2E: "<inventory_root>/system/chassis/motherboard/dimm19",
+        0x2F: "<inventory_root>/system/chassis/motherboard/dimm18",
+        0x30: "<inventory_root>/system/chassis/motherboard/dimm17",
+        0x31: "<inventory_root>/system/chassis/motherboard/dimm16",
+        0x32: "<inventory_root>/system/chassis/motherboard/dimm23",
+        0x33: "<inventory_root>/system/chassis/motherboard/dimm22",
+        0x34: "<inventory_root>/system/chassis/motherboard/dimm21",
+        0x35: "<inventory_root>/system/chassis/motherboard/dimm20",
+        0x36: "<inventory_root>/system/chassis/motherboard/dimm27",
+        0x37: "<inventory_root>/system/chassis/motherboard/dimm26",
+        0x38: "<inventory_root>/system/chassis/motherboard/dimm25",
+        0x39: "<inventory_root>/system/chassis/motherboard/dimm24",
+        0x3A: "<inventory_root>/system/chassis/motherboard/dimm31",
+        0x3B: "<inventory_root>/system/chassis/motherboard/dimm30",
+        0x3C: "<inventory_root>/system/chassis/motherboard/dimm29",
+        0x3D: "<inventory_root>/system/chassis/motherboard/dimm28",
+        0x3E: "<inventory_root>/system/chassis/motherboard/cpu0/core0",
+        0x3F: "<inventory_root>/system/chassis/motherboard/cpu0/core1",
+        0x40: "<inventory_root>/system/chassis/motherboard/cpu0/core2",
+        0x41: "<inventory_root>/system/chassis/motherboard/cpu0/core3",
+        0x42: "<inventory_root>/system/chassis/motherboard/cpu0/core4",
+        0x43: "<inventory_root>/system/chassis/motherboard/cpu0/core5",
+        0x44: "<inventory_root>/system/chassis/motherboard/cpu0/core6",
+        0x45: "<inventory_root>/system/chassis/motherboard/cpu0/core7",
+        0x46: "<inventory_root>/system/chassis/motherboard/cpu0/core8",
+        0x47: "<inventory_root>/system/chassis/motherboard/cpu0/core9",
+        0x48: "<inventory_root>/system/chassis/motherboard/cpu0/core10",
+        0x49: "<inventory_root>/system/chassis/motherboard/cpu0/core11",
+        0x4A: "<inventory_root>/system/chassis/motherboard/cpu1/core0",
+        0x4B: "<inventory_root>/system/chassis/motherboard/cpu1/core1",
+        0x4C: "<inventory_root>/system/chassis/motherboard/cpu1/core2",
+        0x4D: "<inventory_root>/system/chassis/motherboard/cpu1/core3",
+        0x4E: "<inventory_root>/system/chassis/motherboard/cpu1/core4",
+        0x4F: "<inventory_root>/system/chassis/motherboard/cpu1/core5",
+        0x50: "<inventory_root>/system/chassis/motherboard/cpu1/core6",
+        0x51: "<inventory_root>/system/chassis/motherboard/cpu1/core7",
+        0x52: "<inventory_root>/system/chassis/motherboard/cpu1/core8",
+        0x53: "<inventory_root>/system/chassis/motherboard/cpu1/core9",
+        0x54: "<inventory_root>/system/chassis/motherboard/cpu1/core10",
+        0x55: "<inventory_root>/system/chassis/motherboard/cpu1/core11",
+        0x56: "<inventory_root>/system/chassis/motherboard/membuf0",
+        0x57: "<inventory_root>/system/chassis/motherboard/membuf1",
+        0x58: "<inventory_root>/system/chassis/motherboard/membuf2",
+        0x59: "<inventory_root>/system/chassis/motherboard/membuf3",
+        0x5A: "<inventory_root>/system/chassis/motherboard/membuf4",
+        0x5B: "<inventory_root>/system/chassis/motherboard/membuf5",
+        0x5C: "<inventory_root>/system/chassis/motherboard/membuf6",
+        0x5D: "<inventory_root>/system/chassis/motherboard/membuf7",
+        0x5F: "/org/openbmc/sensors/host/BootCount",
+        0x60: "<inventory_root>/system/chassis/motherboard",
+        0x61: "<inventory_root>/system/systemevent",
+        0x62: "<inventory_root>/system/powerlimit",
+        0x63: "<inventory_root>/system/chassis/motherboard/refclock",
+        0x64: "<inventory_root>/system/chassis/motherboard/pcieclock",
+        0xB1: "<inventory_root>/system/chassis/motherboard/todclock",
+        0xB2: "<inventory_root>/system/chassis/motherboard/apss",
+        0xB5: "/org/openbmc/sensors/host/OperatingSystemStatus",
+        0xB6: "<inventory_root>/system/chassis/motherboard/pcielink",
     },
-    'GPIO_PRESENT' : {}
+    "GPIO_PRESENT": {},
 }
 
 GPIO_CONFIG = {}
-GPIO_CONFIG['BMC_POWER_UP'] = \
-        {'gpio_pin': 'D1', 'direction': 'out'}
-GPIO_CONFIG['SYS_PWROK_BUFF'] = \
-        {'gpio_pin': 'D2', 'direction': 'in'}
-GPIO_CONFIG['BMC_WD_CLEAR_PULSE_N'] = \
-        {'gpio_pin': 'N4', 'direction': 'out'}
-GPIO_CONFIG['CM1_OE_R_N'] = \
-        {'gpio_pin': 'Q6', 'direction': 'out'}
-GPIO_CONFIG['BMC_CP0_RESET_N'] = \
-        {'gpio_pin': 'O2', 'direction': 'out'}
-GPIO_CONFIG['BMC_CFAM_RESET_N_R'] = \
-        {'gpio_pin': 'J2', 'direction': 'out'}
-GPIO_CONFIG['PEX8718_DEVICES_RESET_N'] = \
-        {'gpio_pin': 'B6', 'direction': 'out'}
-GPIO_CONFIG['CP0_DEVICES_RESET_N'] = \
-        {'gpio_pin': 'N3', 'direction': 'out'}
-GPIO_CONFIG['CP1_DEVICES_RESET_N'] = \
-        {'gpio_pin': 'N5', 'direction': 'out'}
-GPIO_CONFIG['IDBTN']       = \
-        { 'gpio_pin': 'Q7', 'direction': 'out' }
-GPIO_CONFIG['FSI_DATA'] = \
-        {'gpio_pin': 'A5', 'direction': 'out'}
-GPIO_CONFIG['FSI_CLK'] = \
-        {'gpio_pin': 'A4', 'direction': 'out'}
-GPIO_CONFIG['FSI_ENABLE'] = \
-        {'gpio_pin': 'D0', 'direction': 'out'}
-GPIO_CONFIG['CRONUS_SEL'] = \
-        {'gpio_pin': 'A6', 'direction': 'out'}
-GPIO_CONFIG['BMC_THROTTLE'] = \
-        {'gpio_pin': 'J3', 'direction': 'out'}
+GPIO_CONFIG["BMC_POWER_UP"] = {"gpio_pin": "D1", "direction": "out"}
+GPIO_CONFIG["SYS_PWROK_BUFF"] = {"gpio_pin": "D2", "direction": "in"}
+GPIO_CONFIG["BMC_WD_CLEAR_PULSE_N"] = {"gpio_pin": "N4", "direction": "out"}
+GPIO_CONFIG["CM1_OE_R_N"] = {"gpio_pin": "Q6", "direction": "out"}
+GPIO_CONFIG["BMC_CP0_RESET_N"] = {"gpio_pin": "O2", "direction": "out"}
+GPIO_CONFIG["BMC_CFAM_RESET_N_R"] = {"gpio_pin": "J2", "direction": "out"}
+GPIO_CONFIG["PEX8718_DEVICES_RESET_N"] = {"gpio_pin": "B6", "direction": "out"}
+GPIO_CONFIG["CP0_DEVICES_RESET_N"] = {"gpio_pin": "N3", "direction": "out"}
+GPIO_CONFIG["CP1_DEVICES_RESET_N"] = {"gpio_pin": "N5", "direction": "out"}
+GPIO_CONFIG["IDBTN"] = {"gpio_pin": "Q7", "direction": "out"}
+GPIO_CONFIG["FSI_DATA"] = {"gpio_pin": "A5", "direction": "out"}
+GPIO_CONFIG["FSI_CLK"] = {"gpio_pin": "A4", "direction": "out"}
+GPIO_CONFIG["FSI_ENABLE"] = {"gpio_pin": "D0", "direction": "out"}
+GPIO_CONFIG["CRONUS_SEL"] = {"gpio_pin": "A6", "direction": "out"}
+GPIO_CONFIG["BMC_THROTTLE"] = {"gpio_pin": "J3", "direction": "out"}
 
-GPIO_CONFIG['POWER_BUTTON'] = \
-        {'gpio_pin': 'E0', 'direction': 'both'}
-GPIO_CONFIG['RESET_BUTTON'] = \
-        {'gpio_pin': 'E4', 'direction': 'both'}
-GPIO_CONFIG['CHECKSTOP'] = \
-        {'gpio_pin': 'H0', 'direction': 'falling'}
+GPIO_CONFIG["POWER_BUTTON"] = {"gpio_pin": "E0", "direction": "both"}
+GPIO_CONFIG["RESET_BUTTON"] = {"gpio_pin": "E4", "direction": "both"}
+GPIO_CONFIG["CHECKSTOP"] = {"gpio_pin": "H0", "direction": "falling"}
 
-GPIO_CONFIG['PS0_PRES_N'] = \
-        {'gpio_pin': 'P7', 'direction': 'in'}
-GPIO_CONFIG['PS1_PRES_N'] = \
-        {'gpio_pin': 'N0', 'direction': 'in'}
-GPIO_CONFIG['CARD_PRES_N'] = \
-        {'gpio_pin': 'J0', 'direction': 'in'}
+GPIO_CONFIG["PS0_PRES_N"] = {"gpio_pin": "P7", "direction": "in"}
+GPIO_CONFIG["PS1_PRES_N"] = {"gpio_pin": "N0", "direction": "in"}
+GPIO_CONFIG["CARD_PRES_N"] = {"gpio_pin": "J0", "direction": "in"}
 
 GPIO_CONFIGS = {
-    'power_config' : {
-        'power_good_in' : 'SYS_PWROK_BUFF',
-        'power_up_outs' : [
-            ('BMC_POWER_UP', True),
+    "power_config": {
+        "power_good_in": "SYS_PWROK_BUFF",
+        "power_up_outs": [
+            ("BMC_POWER_UP", True),
         ],
-        'reset_outs' : [
-            ('CM1_OE_R_N', True),
-            ('BMC_CP0_RESET_N', False),
-            ('BMC_CFAM_RESET_N_R', False),
+        "reset_outs": [
+            ("CM1_OE_R_N", True),
+            ("BMC_CP0_RESET_N", False),
+            ("BMC_CFAM_RESET_N_R", False),
         ],
-        'pci_reset_outs': [
+        "pci_reset_outs": [
             # net name, polarity, reset hold
-            # if 'reset hold' set to 'True', BMC will hold pci reset until host CPU ready to drive PCI
-            ('PEX8718_DEVICES_RESET_N', False, True),
-            ('CP0_DEVICES_RESET_N', False, True),
-            ('CP1_DEVICES_RESET_N', False, True),
+            # if 'reset hold' set to 'True', BMC will hold pci reset until
+            # host CPU ready to drive PCI
+            ("PEX8718_DEVICES_RESET_N", False, True),
+            ("CP0_DEVICES_RESET_N", False, True),
+            ("CP1_DEVICES_RESET_N", False, True),
         ],
     },
-    'hostctl_config' : {
-        'fsi_data' : 'FSI_DATA',
-        'fsi_clk' : 'FSI_CLK',
-        'fsi_enable' : 'FSI_ENABLE',
-        'cronus_sel' : 'CRONUS_SEL',
-        'optionals' : [
-            ('BMC_THROTTLE', True),
-            ('IDBTN', False),
+    "hostctl_config": {
+        "fsi_data": "FSI_DATA",
+        "fsi_clk": "FSI_CLK",
+        "fsi_enable": "FSI_ENABLE",
+        "cronus_sel": "CRONUS_SEL",
+        "optionals": [
+            ("BMC_THROTTLE", True),
+            ("IDBTN", False),
         ],
     },
 }
@@ -374,7 +591,6 @@
 
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
-MISC_SENSORS = {
-}
+MISC_SENSORS = {}
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/configs/Garrison.py b/configs/Garrison.py
index aff1964..1b384e4 100644
--- a/configs/Garrison.py
+++ b/configs/Garrison.py
@@ -1,373 +1,590 @@
-## System states
-##   state can change to next state in 2 ways:
-##   - a process emits a GotoSystemState signal with state name to goto
-##   - objects specified in EXIT_STATE_DEPEND have started
+# System states
+#   state can change to next state in 2 ways:
+#   - a process emits a GotoSystemState signal with state name to goto
+#   - objects specified in EXIT_STATE_DEPEND have started
 SYSTEM_STATES = [
-    'BASE_APPS',
-    'BMC_STARTING',
-    'BMC_READY',
-    'HOST_POWERING_ON',
-    'HOST_POWERED_ON',
-    'HOST_BOOTING',
-    'HOST_BOOTED',
-    'HOST_POWERED_OFF',
+    "BASE_APPS",
+    "BMC_STARTING",
+    "BMC_READY",
+    "HOST_POWERING_ON",
+    "HOST_POWERED_ON",
+    "HOST_BOOTING",
+    "HOST_BOOTED",
+    "HOST_POWERED_OFF",
 ]
 
 EXIT_STATE_DEPEND = {
-    'BASE_APPS' : {
-        '/org/openbmc/sensors': 0,
+    "BASE_APPS": {
+        "/org/openbmc/sensors": 0,
     },
-    'BMC_STARTING' : {
-        '/org/openbmc/control/chassis0': 0,
-        '/org/openbmc/control/power0' : 0,
-        '/org/openbmc/control/host0' : 0,
-        '/org/openbmc/control/flash/bios' : 0,
+    "BMC_STARTING": {
+        "/org/openbmc/control/chassis0": 0,
+        "/org/openbmc/control/power0": 0,
+        "/org/openbmc/control/host0": 0,
+        "/org/openbmc/control/flash/bios": 0,
     },
 }
 
 FRU_INSTANCES = {
-    '<inventory_root>/system' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-    '<inventory_root>/system/bios' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-    '<inventory_root>/system/misc' : { 'fru_type' : 'SYSTEM','is_fru' : False, },
-
-    '<inventory_root>/system/chassis' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-
-    '<inventory_root>/system/chassis/motherboard' : { 'fru_type' : 'MAIN_PLANAR','is_fru' : True, },
-
-    '<inventory_root>/system/systemevent'                  : { 'fru_type' : 'SYSTEM_EVENT', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/refclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/pcieclock': { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/todclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/apss'     : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/fan0' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan1' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan2' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan3' : { 'fru_type' : 'FAN','is_fru' : True, },
-
-    '<inventory_root>/system/chassis/motherboard/bmc' : { 'fru_type' : 'BMC','is_fru' : False, 'manufacturer' : 'ASPEED' },
-
-    '<inventory_root>/system/chassis/motherboard/cpu0' : { 'fru_type' : 'CPU', 'is_fru' : True, },
-    '<inventory_root>/system/chassis/motherboard/cpu1' : { 'fru_type' : 'CPU', 'is_fru' : True, },
-
-    '<inventory_root>/system/chassis/motherboard/cpu0/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core10': { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core11': { 'fru_type' : 'CORE', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/motherboard/cpu1/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core10' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core11' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/motherboard/membuf0' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf1' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf2' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf3' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf4' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf5' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf6' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf7' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/motherboard/dimm0' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm1' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm2' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm3' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm4' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm5' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm6' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm7' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm8' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm9' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm10' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm11' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm12' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm13' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm14' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm15' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm16' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm17' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm18' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm19' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm20' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm21' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm22' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm23' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm24' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm25' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm26' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm27' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm28' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm29' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm30' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm31' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+    "<inventory_root>/system": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/bios": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/misc": {
+        "fru_type": "SYSTEM",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/chassis/motherboard": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/systemevent": {
+        "fru_type": "SYSTEM_EVENT",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/refclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/pcieclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/todclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/apss": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/fan0": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan1": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan2": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan3": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/bmc": {
+        "fru_type": "BMC",
+        "is_fru": False,
+        "manufacturer": "ASPEED",
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0": {
+        "fru_type": "CPU",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1": {
+        "fru_type": "CPU",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core0": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core1": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core2": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core3": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core4": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core5": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core6": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core7": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core8": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core9": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core10": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core11": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core0": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core1": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core2": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core3": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core4": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core5": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core6": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core7": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core8": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core9": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core10": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core11": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf0": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf1": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf2": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf3": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf4": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf5": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf6": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf7": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm0": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm1": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm2": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm3": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm4": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm5": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm6": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm7": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm8": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm9": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm10": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm11": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm12": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm13": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm14": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm15": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm16": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm17": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm18": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm19": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm20": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm21": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm22": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm23": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm24": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm25": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm26": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm27": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm28": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm29": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm30": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm31": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
 }
 
 ID_LOOKUP = {
-    'FRU' : {
-        0x01 : '<inventory_root>/system/chassis/motherboard/cpu0',
-        0x02 : '<inventory_root>/system/chassis/motherboard/cpu1',
-        0x03 : '<inventory_root>/system/chassis/motherboard',
-        0x04 : '<inventory_root>/system/chassis/motherboard/membuf0',
-        0x05 : '<inventory_root>/system/chassis/motherboard/membuf1',
-        0x06 : '<inventory_root>/system/chassis/motherboard/membuf2',
-        0x07 : '<inventory_root>/system/chassis/motherboard/membuf3',
-        0x08 : '<inventory_root>/system/chassis/motherboard/membuf4',
-        0x09 : '<inventory_root>/system/chassis/motherboard/membuf5',
-        0x0c : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0x0d : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0x0e : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0x0f : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0x10 : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0x11 : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0x12 : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0x13 : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0x14 : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0x15 : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0x16 : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0x17 : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0x18 : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0x19 : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0x1a : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0x1b : '<inventory_root>/system/chassis/motherboard/dimm15',
-        0x1c : '<inventory_root>/system/chassis/motherboard/dimm16',
-        0x1d : '<inventory_root>/system/chassis/motherboard/dimm17',
-        0x1e : '<inventory_root>/system/chassis/motherboard/dimm18',
-        0x1f : '<inventory_root>/system/chassis/motherboard/dimm19',
-        0x20 : '<inventory_root>/system/chassis/motherboard/dimm20',
-        0x21 : '<inventory_root>/system/chassis/motherboard/dimm21',
-        0x22 : '<inventory_root>/system/chassis/motherboard/dimm22',
-        0x23 : '<inventory_root>/system/chassis/motherboard/dimm23',
-        0x24 : '<inventory_root>/system/chassis/motherboard/dimm24',
-        0x25 : '<inventory_root>/system/chassis/motherboard/dimm25',
-        0x26 : '<inventory_root>/system/chassis/motherboard/dimm26',
-        0x27 : '<inventory_root>/system/chassis/motherboard/dimm27',
-        0x28 : '<inventory_root>/system/chassis/motherboard/dimm28',
-        0x29 : '<inventory_root>/system/chassis/motherboard/dimm29',
-        0x2a : '<inventory_root>/system/chassis/motherboard/dimm30',
-        0x2b : '<inventory_root>/system/chassis/motherboard/dimm31',
+    "FRU": {
+        0x01: "<inventory_root>/system/chassis/motherboard/cpu0",
+        0x02: "<inventory_root>/system/chassis/motherboard/cpu1",
+        0x03: "<inventory_root>/system/chassis/motherboard",
+        0x04: "<inventory_root>/system/chassis/motherboard/membuf0",
+        0x05: "<inventory_root>/system/chassis/motherboard/membuf1",
+        0x06: "<inventory_root>/system/chassis/motherboard/membuf2",
+        0x07: "<inventory_root>/system/chassis/motherboard/membuf3",
+        0x08: "<inventory_root>/system/chassis/motherboard/membuf4",
+        0x09: "<inventory_root>/system/chassis/motherboard/membuf5",
+        0x0C: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0x0D: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0x0E: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0x0F: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0x10: "<inventory_root>/system/chassis/motherboard/dimm4",
+        0x11: "<inventory_root>/system/chassis/motherboard/dimm5",
+        0x12: "<inventory_root>/system/chassis/motherboard/dimm6",
+        0x13: "<inventory_root>/system/chassis/motherboard/dimm7",
+        0x14: "<inventory_root>/system/chassis/motherboard/dimm8",
+        0x15: "<inventory_root>/system/chassis/motherboard/dimm9",
+        0x16: "<inventory_root>/system/chassis/motherboard/dimm10",
+        0x17: "<inventory_root>/system/chassis/motherboard/dimm11",
+        0x18: "<inventory_root>/system/chassis/motherboard/dimm12",
+        0x19: "<inventory_root>/system/chassis/motherboard/dimm13",
+        0x1A: "<inventory_root>/system/chassis/motherboard/dimm14",
+        0x1B: "<inventory_root>/system/chassis/motherboard/dimm15",
+        0x1C: "<inventory_root>/system/chassis/motherboard/dimm16",
+        0x1D: "<inventory_root>/system/chassis/motherboard/dimm17",
+        0x1E: "<inventory_root>/system/chassis/motherboard/dimm18",
+        0x1F: "<inventory_root>/system/chassis/motherboard/dimm19",
+        0x20: "<inventory_root>/system/chassis/motherboard/dimm20",
+        0x21: "<inventory_root>/system/chassis/motherboard/dimm21",
+        0x22: "<inventory_root>/system/chassis/motherboard/dimm22",
+        0x23: "<inventory_root>/system/chassis/motherboard/dimm23",
+        0x24: "<inventory_root>/system/chassis/motherboard/dimm24",
+        0x25: "<inventory_root>/system/chassis/motherboard/dimm25",
+        0x26: "<inventory_root>/system/chassis/motherboard/dimm26",
+        0x27: "<inventory_root>/system/chassis/motherboard/dimm27",
+        0x28: "<inventory_root>/system/chassis/motherboard/dimm28",
+        0x29: "<inventory_root>/system/chassis/motherboard/dimm29",
+        0x2A: "<inventory_root>/system/chassis/motherboard/dimm30",
+        0x2B: "<inventory_root>/system/chassis/motherboard/dimm31",
     },
-    'FRU_STR' : {
-        'PRODUCT_0'  : '<inventory_root>/system/bios',
-        'BOARD_1'    : '<inventory_root>/system/chassis/motherboard/cpu0',
-        'BOARD_2'    : '<inventory_root>/system/chassis/motherboard/cpu1',
-        'CHASSIS_3'  : '<inventory_root>/system/chassis/motherboard',
-        'BOARD_3'    : '<inventory_root>/system/misc',
-        'BOARD_4'    : '<inventory_root>/system/chassis/motherboard/membuf0',
-        'BOARD_5'    : '<inventory_root>/system/chassis/motherboard/membuf1',
-        'BOARD_6'    : '<inventory_root>/system/chassis/motherboard/membuf2',
-        'BOARD_7'    : '<inventory_root>/system/chassis/motherboard/membuf3',
-        'BOARD_8'    : '<inventory_root>/system/chassis/motherboard/membuf4',
-        'BOARD_9'    : '<inventory_root>/system/chassis/motherboard/membuf5',
-        'BOARD_10'   : '<inventory_root>/system/chassis/motherboard/membuf6',
-        'BOARD_11'   : '<inventory_root>/system/chassis/motherboard/membuf7',
-        'PRODUCT_12'   : '<inventory_root>/system/chassis/motherboard/dimm0',
-        'PRODUCT_13'   : '<inventory_root>/system/chassis/motherboard/dimm1',
-        'PRODUCT_14'   : '<inventory_root>/system/chassis/motherboard/dimm2',
-        'PRODUCT_15'   : '<inventory_root>/system/chassis/motherboard/dimm3',
-        'PRODUCT_16'   : '<inventory_root>/system/chassis/motherboard/dimm4',
-        'PRODUCT_17'   : '<inventory_root>/system/chassis/motherboard/dimm5',
-        'PRODUCT_18'   : '<inventory_root>/system/chassis/motherboard/dimm6',
-        'PRODUCT_19'   : '<inventory_root>/system/chassis/motherboard/dimm7',
-        'PRODUCT_20'   : '<inventory_root>/system/chassis/motherboard/dimm8',
-        'PRODUCT_21'   : '<inventory_root>/system/chassis/motherboard/dimm9',
-        'PRODUCT_22'   : '<inventory_root>/system/chassis/motherboard/dimm10',
-        'PRODUCT_23'   : '<inventory_root>/system/chassis/motherboard/dimm11',
-        'PRODUCT_24'   : '<inventory_root>/system/chassis/motherboard/dimm12',
-        'PRODUCT_25'   : '<inventory_root>/system/chassis/motherboard/dimm13',
-        'PRODUCT_26'   : '<inventory_root>/system/chassis/motherboard/dimm14',
-        'PRODUCT_27'   : '<inventory_root>/system/chassis/motherboard/dimm15',
-        'PRODUCT_28'   : '<inventory_root>/system/chassis/motherboard/dimm16',
-        'PRODUCT_29'   : '<inventory_root>/system/chassis/motherboard/dimm17',
-        'PRODUCT_30'   : '<inventory_root>/system/chassis/motherboard/dimm18',
-        'PRODUCT_31'   : '<inventory_root>/system/chassis/motherboard/dimm19',
-        'PRODUCT_32'   : '<inventory_root>/system/chassis/motherboard/dimm20',
-        'PRODUCT_33'   : '<inventory_root>/system/chassis/motherboard/dimm21',
-        'PRODUCT_34'   : '<inventory_root>/system/chassis/motherboard/dimm22',
-        'PRODUCT_35'   : '<inventory_root>/system/chassis/motherboard/dimm23',
-        'PRODUCT_36'   : '<inventory_root>/system/chassis/motherboard/dimm24',
-        'PRODUCT_37'   : '<inventory_root>/system/chassis/motherboard/dimm25',
-        'PRODUCT_38'   : '<inventory_root>/system/chassis/motherboard/dimm26',
-        'PRODUCT_39'   : '<inventory_root>/system/chassis/motherboard/dimm27',
-        'PRODUCT_40'   : '<inventory_root>/system/chassis/motherboard/dimm28',
-        'PRODUCT_41'   : '<inventory_root>/system/chassis/motherboard/dimm29',
-        'PRODUCT_42'   : '<inventory_root>/system/chassis/motherboard/dimm30',
-        'PRODUCT_43'   : '<inventory_root>/system/chassis/motherboard/dimm31',
-        'PRODUCT_47'   : '<inventory_root>/system/misc',
+    "FRU_STR": {
+        "PRODUCT_0": "<inventory_root>/system/bios",
+        "BOARD_1": "<inventory_root>/system/chassis/motherboard/cpu0",
+        "BOARD_2": "<inventory_root>/system/chassis/motherboard/cpu1",
+        "CHASSIS_3": "<inventory_root>/system/chassis/motherboard",
+        "BOARD_3": "<inventory_root>/system/misc",
+        "BOARD_4": "<inventory_root>/system/chassis/motherboard/membuf0",
+        "BOARD_5": "<inventory_root>/system/chassis/motherboard/membuf1",
+        "BOARD_6": "<inventory_root>/system/chassis/motherboard/membuf2",
+        "BOARD_7": "<inventory_root>/system/chassis/motherboard/membuf3",
+        "BOARD_8": "<inventory_root>/system/chassis/motherboard/membuf4",
+        "BOARD_9": "<inventory_root>/system/chassis/motherboard/membuf5",
+        "BOARD_10": "<inventory_root>/system/chassis/motherboard/membuf6",
+        "BOARD_11": "<inventory_root>/system/chassis/motherboard/membuf7",
+        "PRODUCT_12": "<inventory_root>/system/chassis/motherboard/dimm0",
+        "PRODUCT_13": "<inventory_root>/system/chassis/motherboard/dimm1",
+        "PRODUCT_14": "<inventory_root>/system/chassis/motherboard/dimm2",
+        "PRODUCT_15": "<inventory_root>/system/chassis/motherboard/dimm3",
+        "PRODUCT_16": "<inventory_root>/system/chassis/motherboard/dimm4",
+        "PRODUCT_17": "<inventory_root>/system/chassis/motherboard/dimm5",
+        "PRODUCT_18": "<inventory_root>/system/chassis/motherboard/dimm6",
+        "PRODUCT_19": "<inventory_root>/system/chassis/motherboard/dimm7",
+        "PRODUCT_20": "<inventory_root>/system/chassis/motherboard/dimm8",
+        "PRODUCT_21": "<inventory_root>/system/chassis/motherboard/dimm9",
+        "PRODUCT_22": "<inventory_root>/system/chassis/motherboard/dimm10",
+        "PRODUCT_23": "<inventory_root>/system/chassis/motherboard/dimm11",
+        "PRODUCT_24": "<inventory_root>/system/chassis/motherboard/dimm12",
+        "PRODUCT_25": "<inventory_root>/system/chassis/motherboard/dimm13",
+        "PRODUCT_26": "<inventory_root>/system/chassis/motherboard/dimm14",
+        "PRODUCT_27": "<inventory_root>/system/chassis/motherboard/dimm15",
+        "PRODUCT_28": "<inventory_root>/system/chassis/motherboard/dimm16",
+        "PRODUCT_29": "<inventory_root>/system/chassis/motherboard/dimm17",
+        "PRODUCT_30": "<inventory_root>/system/chassis/motherboard/dimm18",
+        "PRODUCT_31": "<inventory_root>/system/chassis/motherboard/dimm19",
+        "PRODUCT_32": "<inventory_root>/system/chassis/motherboard/dimm20",
+        "PRODUCT_33": "<inventory_root>/system/chassis/motherboard/dimm21",
+        "PRODUCT_34": "<inventory_root>/system/chassis/motherboard/dimm22",
+        "PRODUCT_35": "<inventory_root>/system/chassis/motherboard/dimm23",
+        "PRODUCT_36": "<inventory_root>/system/chassis/motherboard/dimm24",
+        "PRODUCT_37": "<inventory_root>/system/chassis/motherboard/dimm25",
+        "PRODUCT_38": "<inventory_root>/system/chassis/motherboard/dimm26",
+        "PRODUCT_39": "<inventory_root>/system/chassis/motherboard/dimm27",
+        "PRODUCT_40": "<inventory_root>/system/chassis/motherboard/dimm28",
+        "PRODUCT_41": "<inventory_root>/system/chassis/motherboard/dimm29",
+        "PRODUCT_42": "<inventory_root>/system/chassis/motherboard/dimm30",
+        "PRODUCT_43": "<inventory_root>/system/chassis/motherboard/dimm31",
+        "PRODUCT_47": "<inventory_root>/system/misc",
     },
-    'SENSOR' : {
-        0x04 : '/org/openbmc/sensors/host/HostStatus',
-        0x05 : '/org/openbmc/sensors/host/BootProgress',
-        0x0c : '<inventory_root>/system/chassis/motherboard/cpu0',
-        0x0e : '<inventory_root>/system/chassis/motherboard/cpu1',
-        0x1e : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0x1f : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0x20 : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0x21 : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0x22 : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0x23 : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0x24 : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0x25 : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0x26 : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0x27 : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0x28 : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0x29 : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0x2a : '<inventory_root>/system/chassis/motherboard/dimm15',
-        0x2b : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0x2c : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0x2d : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0x2e : '<inventory_root>/system/chassis/motherboard/dimm19',
-        0x2f : '<inventory_root>/system/chassis/motherboard/dimm18',
-        0x30 : '<inventory_root>/system/chassis/motherboard/dimm17',
-        0x31 : '<inventory_root>/system/chassis/motherboard/dimm16',
-        0x32 : '<inventory_root>/system/chassis/motherboard/dimm23',
-        0x33 : '<inventory_root>/system/chassis/motherboard/dimm22',
-        0x34 : '<inventory_root>/system/chassis/motherboard/dimm21',
-        0x35 : '<inventory_root>/system/chassis/motherboard/dimm20',
-        0x36 : '<inventory_root>/system/chassis/motherboard/dimm27',
-        0x37 : '<inventory_root>/system/chassis/motherboard/dimm26',
-        0x38 : '<inventory_root>/system/chassis/motherboard/dimm25',
-        0x39 : '<inventory_root>/system/chassis/motherboard/dimm24',
-        0x3a : '<inventory_root>/system/chassis/motherboard/dimm31',
-        0x3b : '<inventory_root>/system/chassis/motherboard/dimm30',
-        0x3c : '<inventory_root>/system/chassis/motherboard/dimm29',
-        0x3d : '<inventory_root>/system/chassis/motherboard/dimm28',
-        0x3e : '<inventory_root>/system/chassis/motherboard/cpu0/core0',
-        0x3f : '<inventory_root>/system/chassis/motherboard/cpu0/core1',
-        0x40 : '<inventory_root>/system/chassis/motherboard/cpu0/core2',
-        0x41 : '<inventory_root>/system/chassis/motherboard/cpu0/core3',
-        0x42 : '<inventory_root>/system/chassis/motherboard/cpu0/core4',
-        0x43 : '<inventory_root>/system/chassis/motherboard/cpu0/core5',
-        0x44 : '<inventory_root>/system/chassis/motherboard/cpu0/core6',
-        0x45 : '<inventory_root>/system/chassis/motherboard/cpu0/core7',
-        0x46 : '<inventory_root>/system/chassis/motherboard/cpu0/core8',
-        0x47 : '<inventory_root>/system/chassis/motherboard/cpu0/core9',
-        0x48 : '<inventory_root>/system/chassis/motherboard/cpu0/core10',
-        0x49 : '<inventory_root>/system/chassis/motherboard/cpu0/core11',
-        0x4a : '<inventory_root>/system/chassis/motherboard/cpu1/core0',
-        0x4b : '<inventory_root>/system/chassis/motherboard/cpu1/core1',
-        0x4c : '<inventory_root>/system/chassis/motherboard/cpu1/core2',
-        0x4d : '<inventory_root>/system/chassis/motherboard/cpu1/core3',
-        0x4e : '<inventory_root>/system/chassis/motherboard/cpu1/core4',
-        0x4f : '<inventory_root>/system/chassis/motherboard/cpu1/core5',
-        0x50 : '<inventory_root>/system/chassis/motherboard/cpu1/core6',
-        0x51 : '<inventory_root>/system/chassis/motherboard/cpu1/core7',
-        0x52 : '<inventory_root>/system/chassis/motherboard/cpu1/core8',
-        0x53 : '<inventory_root>/system/chassis/motherboard/cpu1/core9',
-        0x54 : '<inventory_root>/system/chassis/motherboard/cpu1/core10',
-        0x55 : '<inventory_root>/system/chassis/motherboard/cpu1/core11',
-        0x56 : '<inventory_root>/system/chassis/motherboard/membuf0',
-        0x57 : '<inventory_root>/system/chassis/motherboard/membuf1',
-        0x58 : '<inventory_root>/system/chassis/motherboard/membuf2',
-        0x59 : '<inventory_root>/system/chassis/motherboard/membuf3',
-        0x5a : '<inventory_root>/system/chassis/motherboard/membuf4',
-        0x5b : '<inventory_root>/system/chassis/motherboard/membuf5',
-        0x5c : '<inventory_root>/system/chassis/motherboard/membuf6',
-        0x5d : '<inventory_root>/system/chassis/motherboard/membuf7',
-        0x5f : '/org/openbmc/sensors/host/BootCount',
-        0x60 : '<inventory_root>/system/chassis/motherboard',
-        0x61 : '<inventory_root>/system/systemevent',
-        0x62 : '<inventory_root>/system/powerlimit',
-        0x63 : '<inventory_root>/system/chassis/motherboard/refclock',
-        0x64 : '<inventory_root>/system/chassis/motherboard/pcieclock',
-        0xb1 : '<inventory_root>/system/chassis/motherboard/todclock',
-        0xb2 : '<inventory_root>/system/chassis/motherboard/apss',
-        0xb5 : '/org/openbmc/sensors/host/OperatingSystemStatus',
-        0xb6 : '<inventory_root>/system/chassis/motherboard/pcielink',
+    "SENSOR": {
+        0x04: "/org/openbmc/sensors/host/HostStatus",
+        0x05: "/org/openbmc/sensors/host/BootProgress",
+        0x0C: "<inventory_root>/system/chassis/motherboard/cpu0",
+        0x0E: "<inventory_root>/system/chassis/motherboard/cpu1",
+        0x1E: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0x1F: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0x20: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0x21: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0x22: "<inventory_root>/system/chassis/motherboard/dimm7",
+        0x23: "<inventory_root>/system/chassis/motherboard/dimm6",
+        0x24: "<inventory_root>/system/chassis/motherboard/dimm5",
+        0x25: "<inventory_root>/system/chassis/motherboard/dimm4",
+        0x26: "<inventory_root>/system/chassis/motherboard/dimm11",
+        0x27: "<inventory_root>/system/chassis/motherboard/dimm10",
+        0x28: "<inventory_root>/system/chassis/motherboard/dimm9",
+        0x29: "<inventory_root>/system/chassis/motherboard/dimm8",
+        0x2A: "<inventory_root>/system/chassis/motherboard/dimm15",
+        0x2B: "<inventory_root>/system/chassis/motherboard/dimm14",
+        0x2C: "<inventory_root>/system/chassis/motherboard/dimm13",
+        0x2D: "<inventory_root>/system/chassis/motherboard/dimm12",
+        0x2E: "<inventory_root>/system/chassis/motherboard/dimm19",
+        0x2F: "<inventory_root>/system/chassis/motherboard/dimm18",
+        0x30: "<inventory_root>/system/chassis/motherboard/dimm17",
+        0x31: "<inventory_root>/system/chassis/motherboard/dimm16",
+        0x32: "<inventory_root>/system/chassis/motherboard/dimm23",
+        0x33: "<inventory_root>/system/chassis/motherboard/dimm22",
+        0x34: "<inventory_root>/system/chassis/motherboard/dimm21",
+        0x35: "<inventory_root>/system/chassis/motherboard/dimm20",
+        0x36: "<inventory_root>/system/chassis/motherboard/dimm27",
+        0x37: "<inventory_root>/system/chassis/motherboard/dimm26",
+        0x38: "<inventory_root>/system/chassis/motherboard/dimm25",
+        0x39: "<inventory_root>/system/chassis/motherboard/dimm24",
+        0x3A: "<inventory_root>/system/chassis/motherboard/dimm31",
+        0x3B: "<inventory_root>/system/chassis/motherboard/dimm30",
+        0x3C: "<inventory_root>/system/chassis/motherboard/dimm29",
+        0x3D: "<inventory_root>/system/chassis/motherboard/dimm28",
+        0x3E: "<inventory_root>/system/chassis/motherboard/cpu0/core0",
+        0x3F: "<inventory_root>/system/chassis/motherboard/cpu0/core1",
+        0x40: "<inventory_root>/system/chassis/motherboard/cpu0/core2",
+        0x41: "<inventory_root>/system/chassis/motherboard/cpu0/core3",
+        0x42: "<inventory_root>/system/chassis/motherboard/cpu0/core4",
+        0x43: "<inventory_root>/system/chassis/motherboard/cpu0/core5",
+        0x44: "<inventory_root>/system/chassis/motherboard/cpu0/core6",
+        0x45: "<inventory_root>/system/chassis/motherboard/cpu0/core7",
+        0x46: "<inventory_root>/system/chassis/motherboard/cpu0/core8",
+        0x47: "<inventory_root>/system/chassis/motherboard/cpu0/core9",
+        0x48: "<inventory_root>/system/chassis/motherboard/cpu0/core10",
+        0x49: "<inventory_root>/system/chassis/motherboard/cpu0/core11",
+        0x4A: "<inventory_root>/system/chassis/motherboard/cpu1/core0",
+        0x4B: "<inventory_root>/system/chassis/motherboard/cpu1/core1",
+        0x4C: "<inventory_root>/system/chassis/motherboard/cpu1/core2",
+        0x4D: "<inventory_root>/system/chassis/motherboard/cpu1/core3",
+        0x4E: "<inventory_root>/system/chassis/motherboard/cpu1/core4",
+        0x4F: "<inventory_root>/system/chassis/motherboard/cpu1/core5",
+        0x50: "<inventory_root>/system/chassis/motherboard/cpu1/core6",
+        0x51: "<inventory_root>/system/chassis/motherboard/cpu1/core7",
+        0x52: "<inventory_root>/system/chassis/motherboard/cpu1/core8",
+        0x53: "<inventory_root>/system/chassis/motherboard/cpu1/core9",
+        0x54: "<inventory_root>/system/chassis/motherboard/cpu1/core10",
+        0x55: "<inventory_root>/system/chassis/motherboard/cpu1/core11",
+        0x56: "<inventory_root>/system/chassis/motherboard/membuf0",
+        0x57: "<inventory_root>/system/chassis/motherboard/membuf1",
+        0x58: "<inventory_root>/system/chassis/motherboard/membuf2",
+        0x59: "<inventory_root>/system/chassis/motherboard/membuf3",
+        0x5A: "<inventory_root>/system/chassis/motherboard/membuf4",
+        0x5B: "<inventory_root>/system/chassis/motherboard/membuf5",
+        0x5C: "<inventory_root>/system/chassis/motherboard/membuf6",
+        0x5D: "<inventory_root>/system/chassis/motherboard/membuf7",
+        0x5F: "/org/openbmc/sensors/host/BootCount",
+        0x60: "<inventory_root>/system/chassis/motherboard",
+        0x61: "<inventory_root>/system/systemevent",
+        0x62: "<inventory_root>/system/powerlimit",
+        0x63: "<inventory_root>/system/chassis/motherboard/refclock",
+        0x64: "<inventory_root>/system/chassis/motherboard/pcieclock",
+        0xB1: "<inventory_root>/system/chassis/motherboard/todclock",
+        0xB2: "<inventory_root>/system/chassis/motherboard/apss",
+        0xB5: "/org/openbmc/sensors/host/OperatingSystemStatus",
+        0xB6: "<inventory_root>/system/chassis/motherboard/pcielink",
     },
-    'GPIO_PRESENT' : {}
+    "GPIO_PRESENT": {},
 }
 
 GPIO_CONFIG = {}
-GPIO_CONFIG['BMC_POWER_UP'] = \
-        {'gpio_pin': 'D1', 'direction': 'out'}
-GPIO_CONFIG['SYS_PWROK_BUFF'] = \
-        {'gpio_pin': 'D2', 'direction': 'in'}
-GPIO_CONFIG['BMC_WD_CLEAR_PULSE_N'] = \
-        {'gpio_pin': 'N4', 'direction': 'out'}
-GPIO_CONFIG['CM1_OE_R_N'] = \
-        {'gpio_pin': 'Q6', 'direction': 'out'}
-GPIO_CONFIG['BMC_CP0_RESET_N'] = \
-        {'gpio_pin': 'O2', 'direction': 'out'}
-GPIO_CONFIG['BMC_CFAM_RESET_N_R'] = \
-        {'gpio_pin': 'J2', 'direction': 'out'}
-GPIO_CONFIG['PEX8718_DEVICES_RESET_N'] = \
-        {'gpio_pin': 'B6', 'direction': 'out'}
-GPIO_CONFIG['CP0_DEVICES_RESET_N'] = \
-        {'gpio_pin': 'N3', 'direction': 'out'}
-GPIO_CONFIG['CP1_DEVICES_RESET_N'] = \
-        {'gpio_pin': 'N5', 'direction': 'out'}
+GPIO_CONFIG["BMC_POWER_UP"] = {"gpio_pin": "D1", "direction": "out"}
+GPIO_CONFIG["SYS_PWROK_BUFF"] = {"gpio_pin": "D2", "direction": "in"}
+GPIO_CONFIG["BMC_WD_CLEAR_PULSE_N"] = {"gpio_pin": "N4", "direction": "out"}
+GPIO_CONFIG["CM1_OE_R_N"] = {"gpio_pin": "Q6", "direction": "out"}
+GPIO_CONFIG["BMC_CP0_RESET_N"] = {"gpio_pin": "O2", "direction": "out"}
+GPIO_CONFIG["BMC_CFAM_RESET_N_R"] = {"gpio_pin": "J2", "direction": "out"}
+GPIO_CONFIG["PEX8718_DEVICES_RESET_N"] = {"gpio_pin": "B6", "direction": "out"}
+GPIO_CONFIG["CP0_DEVICES_RESET_N"] = {"gpio_pin": "N3", "direction": "out"}
+GPIO_CONFIG["CP1_DEVICES_RESET_N"] = {"gpio_pin": "N5", "direction": "out"}
 
-GPIO_CONFIG['FSI_DATA'] = \
-        {'gpio_pin': 'A5', 'direction': 'out'}
-GPIO_CONFIG['FSI_CLK'] = \
-        {'gpio_pin': 'A4', 'direction': 'out'}
-GPIO_CONFIG['FSI_ENABLE'] = \
-        {'gpio_pin': 'D0', 'direction': 'out'}
-GPIO_CONFIG['CRONUS_SEL'] = \
-        {'gpio_pin': 'A6', 'direction': 'out'}
-GPIO_CONFIG['BMC_THROTTLE'] = \
-        {'gpio_pin': 'J3', 'direction': 'out'}
+GPIO_CONFIG["FSI_DATA"] = {"gpio_pin": "A5", "direction": "out"}
+GPIO_CONFIG["FSI_CLK"] = {"gpio_pin": "A4", "direction": "out"}
+GPIO_CONFIG["FSI_ENABLE"] = {"gpio_pin": "D0", "direction": "out"}
+GPIO_CONFIG["CRONUS_SEL"] = {"gpio_pin": "A6", "direction": "out"}
+GPIO_CONFIG["BMC_THROTTLE"] = {"gpio_pin": "J3", "direction": "out"}
 
-GPIO_CONFIG['IDBTN']       = \
-    { 'gpio_pin': 'Q7', 'direction': 'out' }
-GPIO_CONFIG['POWER_BUTTON'] = \
-        {'gpio_pin': 'E0', 'direction': 'both'}
-GPIO_CONFIG['RESET_BUTTON'] = \
-        {'gpio_pin': 'E4', 'direction': 'both'}
-GPIO_CONFIG['CHECKSTOP'] = \
-        {'gpio_pin': 'H0', 'direction': 'falling'}
+GPIO_CONFIG["IDBTN"] = {"gpio_pin": "Q7", "direction": "out"}
+GPIO_CONFIG["POWER_BUTTON"] = {"gpio_pin": "E0", "direction": "both"}
+GPIO_CONFIG["RESET_BUTTON"] = {"gpio_pin": "E4", "direction": "both"}
+GPIO_CONFIG["CHECKSTOP"] = {"gpio_pin": "H0", "direction": "falling"}
 
-GPIO_CONFIG['PS0_PRES_N'] = \
-        {'gpio_pin': 'P7', 'direction': 'in'}
-GPIO_CONFIG['PS1_PRES_N'] = \
-        {'gpio_pin': 'N0', 'direction': 'in'}
-GPIO_CONFIG['CARD_PRES_N'] = \
-        {'gpio_pin': 'J0', 'direction': 'in'}
+GPIO_CONFIG["PS0_PRES_N"] = {"gpio_pin": "P7", "direction": "in"}
+GPIO_CONFIG["PS1_PRES_N"] = {"gpio_pin": "N0", "direction": "in"}
+GPIO_CONFIG["CARD_PRES_N"] = {"gpio_pin": "J0", "direction": "in"}
 
 GPIO_CONFIGS = {
-    'power_config' : {
-        'power_good_in' : 'SYS_PWROK_BUFF',
-        'power_up_outs' : [
-            ('BMC_POWER_UP', True),
+    "power_config": {
+        "power_good_in": "SYS_PWROK_BUFF",
+        "power_up_outs": [
+            ("BMC_POWER_UP", True),
         ],
-        'reset_outs' : [
-            ('CM1_OE_R_N', True),
-            ('BMC_CP0_RESET_N', False),
-            ('BMC_CFAM_RESET_N_R', False),
+        "reset_outs": [
+            ("CM1_OE_R_N", True),
+            ("BMC_CP0_RESET_N", False),
+            ("BMC_CFAM_RESET_N_R", False),
         ],
-        'pci_reset_outs': [
+        "pci_reset_outs": [
             # net name, polarity, reset hold
-            # if 'reset hold' set to 'True', BMC will hold pci reset until host CPU ready to drive PCI
-            ('PEX8718_DEVICES_RESET_N', False, True),
-            ('CP0_DEVICES_RESET_N', False, True),
-            ('CP1_DEVICES_RESET_N', False, True),
+            # if 'reset hold' set to 'True', BMC will hold pci reset until
+            # host CPU ready to drive PCI
+            ("PEX8718_DEVICES_RESET_N", False, True),
+            ("CP0_DEVICES_RESET_N", False, True),
+            ("CP1_DEVICES_RESET_N", False, True),
         ],
     },
-    'hostctl_config' : {
-        'fsi_data' : 'FSI_DATA',
-        'fsi_clk' : 'FSI_CLK',
-        'fsi_enable' : 'FSI_ENABLE',
-        'cronus_sel' : 'CRONUS_SEL',
-        'optionals' : [
-            ('BMC_THROTTLE', True),
-            ('IDBTN', False),
+    "hostctl_config": {
+        "fsi_data": "FSI_DATA",
+        "fsi_clk": "FSI_CLK",
+        "fsi_enable": "FSI_ENABLE",
+        "cronus_sel": "CRONUS_SEL",
+        "optionals": [
+            ("BMC_THROTTLE", True),
+            ("IDBTN", False),
         ],
     },
 }
@@ -375,7 +592,6 @@
 
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
-MISC_SENSORS = {
-}
+MISC_SENSORS = {}
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/configs/Lanyang.py b/configs/Lanyang.py
index fcabc1f..837c607 100644
--- a/configs/Lanyang.py
+++ b/configs/Lanyang.py
@@ -1,320 +1,599 @@
-## System states
-##   state can change to next state in 2 ways:
-##   - a process emits a GotoSystemState signal with state name to goto
-##   - objects specified in EXIT_STATE_DEPEND have started
+# System states
+#   state can change to next state in 2 ways:
+#   - a process emits a GotoSystemState signal with state name to goto
+#   - objects specified in EXIT_STATE_DEPEND have started
 SYSTEM_STATES = [
-    'BASE_APPS',
-    'BMC_STARTING',
-    'BMC_READY',
-    'HOST_POWERING_ON',
-    'HOST_POWERED_ON',
-    'HOST_BOOTING',
-    'HOST_BOOTED',
-    'HOST_POWERED_OFF',
+    "BASE_APPS",
+    "BMC_STARTING",
+    "BMC_READY",
+    "HOST_POWERING_ON",
+    "HOST_POWERED_ON",
+    "HOST_BOOTING",
+    "HOST_BOOTED",
+    "HOST_POWERED_OFF",
 ]
 
 EXIT_STATE_DEPEND = {
-    'BASE_APPS' : {
-        '/org/openbmc/sensors': 0,
+    "BASE_APPS": {
+        "/org/openbmc/sensors": 0,
     },
-    'BMC_STARTING' : {
-        '/org/openbmc/control/chassis0': 0,
-        '/org/openbmc/control/power0' : 0,
-        '/org/openbmc/control/flash/bios' : 0,
+    "BMC_STARTING": {
+        "/org/openbmc/control/chassis0": 0,
+        "/org/openbmc/control/power0": 0,
+        "/org/openbmc/control/flash/bios": 0,
     },
 }
 
 FRU_INSTANCES = {
-    '<inventory_root>/system' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-    '<inventory_root>/system/bios' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-    '<inventory_root>/system/misc' : { 'fru_type' : 'SYSTEM','is_fru' : False, },
-
-    '<inventory_root>/system/chassis' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-
-    '<inventory_root>/system/chassis/motherboard' : { 'fru_type' : 'MAIN_PLANAR','is_fru' : True, },
-
-    '<inventory_root>/system/systemevent'                  : { 'fru_type' : 'SYSTEM_EVENT', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/refclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/pcieclock': { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/todclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/fan0' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan1' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan2' : { 'fru_type' : 'FAN','is_fru' : True, },
-
-    '<inventory_root>/system/chassis/motherboard/bmc' : { 'fru_type' : 'BMC','is_fru' : False, 'manufacturer' : 'ASPEED' },
-
-    '<inventory_root>/system/chassis/motherboard/cpu0' : { 'fru_type' : 'CPU', 'is_fru' : True, },
-    '<inventory_root>/system/chassis/motherboard/cpu1' : { 'fru_type' : 'CPU', 'is_fru' : True, },
-
-    '<inventory_root>/system/chassis/motherboard/cpu0/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core10': { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core11': { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core12' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core13' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core14' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core15' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core16' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core17' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core18' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core19' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core20' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core21' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core22': { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core23': { 'fru_type' : 'CORE', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/motherboard/cpu1/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core10' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core11' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core12' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core13' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core14' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core15' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core16' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core17' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core18' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core19' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core20' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core21' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core22' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core23' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/motherboard/dimm0' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm1' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm2' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm3' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm4' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm5' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm6' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm7' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm8' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm9' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm10' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm11' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm12' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm13' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm14' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm15' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm16' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm17' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm18' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm19' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm20' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm21' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm22' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm23' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm24' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm25' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm26' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm27' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm28' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm29' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm30' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm31' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+    "<inventory_root>/system": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/bios": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/misc": {
+        "fru_type": "SYSTEM",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/chassis/motherboard": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/systemevent": {
+        "fru_type": "SYSTEM_EVENT",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/refclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/pcieclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/todclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/fan0": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan1": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan2": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/bmc": {
+        "fru_type": "BMC",
+        "is_fru": False,
+        "manufacturer": "ASPEED",
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0": {
+        "fru_type": "CPU",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1": {
+        "fru_type": "CPU",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core0": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core1": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core2": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core3": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core4": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core5": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core6": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core7": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core8": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core9": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core10": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core11": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core12": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core13": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core14": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core15": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core16": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core17": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core18": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core19": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core20": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core21": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core22": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core23": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core0": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core1": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core2": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core3": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core4": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core5": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core6": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core7": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core8": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core9": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core10": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core11": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core12": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core13": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core14": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core15": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core16": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core17": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core18": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core19": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core20": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core21": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core22": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core23": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm0": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm1": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm2": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm3": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm4": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm5": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm6": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm7": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm8": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm9": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm10": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm11": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm12": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm13": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm14": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm15": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm16": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm17": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm18": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm19": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm20": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm21": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm22": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm23": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm24": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm25": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm26": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm27": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm28": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm29": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm30": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm31": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
 }
 
 ID_LOOKUP = {
-    'FRU' : {
-        0x01 : '<inventory_root>/system/chassis/motherboard/cpu0',
-        0x02 : '<inventory_root>/system/chassis/motherboard/cpu1',
-        0x03 : '<inventory_root>/system/chassis/motherboard',
-        0x04 : '<inventory_root>/system/chassis/motherboard/membuf0',
-        0x05 : '<inventory_root>/system/chassis/motherboard/membuf1',
-        0x06 : '<inventory_root>/system/chassis/motherboard/membuf2',
-        0x07 : '<inventory_root>/system/chassis/motherboard/membuf3',
-        0x08 : '<inventory_root>/system/chassis/motherboard/membuf4',
-        0x09 : '<inventory_root>/system/chassis/motherboard/membuf5',
-        0x0c : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0x0d : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0x0e : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0x0f : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0x10 : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0x11 : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0x12 : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0x13 : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0x14 : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0x15 : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0x16 : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0x17 : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0x18 : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0x19 : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0x1a : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0x1b : '<inventory_root>/system/chassis/motherboard/dimm15',
-        0x1c : '<inventory_root>/system/chassis/motherboard/dimm16',
-        0x1d : '<inventory_root>/system/chassis/motherboard/dimm17',
-        0x1e : '<inventory_root>/system/chassis/motherboard/dimm18',
-        0x1f : '<inventory_root>/system/chassis/motherboard/dimm19',
-        0x20 : '<inventory_root>/system/chassis/motherboard/dimm20',
-        0x21 : '<inventory_root>/system/chassis/motherboard/dimm21',
-        0x22 : '<inventory_root>/system/chassis/motherboard/dimm22',
-        0x23 : '<inventory_root>/system/chassis/motherboard/dimm23',
-        0x24 : '<inventory_root>/system/chassis/motherboard/dimm24',
-        0x25 : '<inventory_root>/system/chassis/motherboard/dimm25',
-        0x26 : '<inventory_root>/system/chassis/motherboard/dimm26',
-        0x27 : '<inventory_root>/system/chassis/motherboard/dimm27',
-        0x28 : '<inventory_root>/system/chassis/motherboard/dimm28',
-        0x29 : '<inventory_root>/system/chassis/motherboard/dimm29',
-        0x2a : '<inventory_root>/system/chassis/motherboard/dimm30',
-        0x2b : '<inventory_root>/system/chassis/motherboard/dimm31',
+    "FRU": {
+        0x01: "<inventory_root>/system/chassis/motherboard/cpu0",
+        0x02: "<inventory_root>/system/chassis/motherboard/cpu1",
+        0x03: "<inventory_root>/system/chassis/motherboard",
+        0x04: "<inventory_root>/system/chassis/motherboard/membuf0",
+        0x05: "<inventory_root>/system/chassis/motherboard/membuf1",
+        0x06: "<inventory_root>/system/chassis/motherboard/membuf2",
+        0x07: "<inventory_root>/system/chassis/motherboard/membuf3",
+        0x08: "<inventory_root>/system/chassis/motherboard/membuf4",
+        0x09: "<inventory_root>/system/chassis/motherboard/membuf5",
+        0x0C: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0x0D: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0x0E: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0x0F: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0x10: "<inventory_root>/system/chassis/motherboard/dimm4",
+        0x11: "<inventory_root>/system/chassis/motherboard/dimm5",
+        0x12: "<inventory_root>/system/chassis/motherboard/dimm6",
+        0x13: "<inventory_root>/system/chassis/motherboard/dimm7",
+        0x14: "<inventory_root>/system/chassis/motherboard/dimm8",
+        0x15: "<inventory_root>/system/chassis/motherboard/dimm9",
+        0x16: "<inventory_root>/system/chassis/motherboard/dimm10",
+        0x17: "<inventory_root>/system/chassis/motherboard/dimm11",
+        0x18: "<inventory_root>/system/chassis/motherboard/dimm12",
+        0x19: "<inventory_root>/system/chassis/motherboard/dimm13",
+        0x1A: "<inventory_root>/system/chassis/motherboard/dimm14",
+        0x1B: "<inventory_root>/system/chassis/motherboard/dimm15",
+        0x1C: "<inventory_root>/system/chassis/motherboard/dimm16",
+        0x1D: "<inventory_root>/system/chassis/motherboard/dimm17",
+        0x1E: "<inventory_root>/system/chassis/motherboard/dimm18",
+        0x1F: "<inventory_root>/system/chassis/motherboard/dimm19",
+        0x20: "<inventory_root>/system/chassis/motherboard/dimm20",
+        0x21: "<inventory_root>/system/chassis/motherboard/dimm21",
+        0x22: "<inventory_root>/system/chassis/motherboard/dimm22",
+        0x23: "<inventory_root>/system/chassis/motherboard/dimm23",
+        0x24: "<inventory_root>/system/chassis/motherboard/dimm24",
+        0x25: "<inventory_root>/system/chassis/motherboard/dimm25",
+        0x26: "<inventory_root>/system/chassis/motherboard/dimm26",
+        0x27: "<inventory_root>/system/chassis/motherboard/dimm27",
+        0x28: "<inventory_root>/system/chassis/motherboard/dimm28",
+        0x29: "<inventory_root>/system/chassis/motherboard/dimm29",
+        0x2A: "<inventory_root>/system/chassis/motherboard/dimm30",
+        0x2B: "<inventory_root>/system/chassis/motherboard/dimm31",
     },
-    'FRU_STR' : {
-        'PRODUCT_0'  : '<inventory_root>/system/bios',
-        'BOARD_1'    : '<inventory_root>/system/chassis/motherboard/cpu0',
-        'BOARD_2'    : '<inventory_root>/system/chassis/motherboard/cpu1',
-        'CHASSIS_3'  : '<inventory_root>/system/chassis/motherboard',
-        'BOARD_3'    : '<inventory_root>/system/misc',
-        'PRODUCT_12'   : '<inventory_root>/system/chassis/motherboard/dimm0',
-        'PRODUCT_13'   : '<inventory_root>/system/chassis/motherboard/dimm1',
-        'PRODUCT_14'   : '<inventory_root>/system/chassis/motherboard/dimm2',
-        'PRODUCT_15'   : '<inventory_root>/system/chassis/motherboard/dimm3',
-        'PRODUCT_16'   : '<inventory_root>/system/chassis/motherboard/dimm4',
-        'PRODUCT_17'   : '<inventory_root>/system/chassis/motherboard/dimm5',
-        'PRODUCT_18'   : '<inventory_root>/system/chassis/motherboard/dimm6',
-        'PRODUCT_19'   : '<inventory_root>/system/chassis/motherboard/dimm7',
-        'PRODUCT_20'   : '<inventory_root>/system/chassis/motherboard/dimm8',
-        'PRODUCT_21'   : '<inventory_root>/system/chassis/motherboard/dimm9',
-        'PRODUCT_22'   : '<inventory_root>/system/chassis/motherboard/dimm10',
-        'PRODUCT_23'   : '<inventory_root>/system/chassis/motherboard/dimm11',
-        'PRODUCT_24'   : '<inventory_root>/system/chassis/motherboard/dimm12',
-        'PRODUCT_25'   : '<inventory_root>/system/chassis/motherboard/dimm13',
-        'PRODUCT_26'   : '<inventory_root>/system/chassis/motherboard/dimm14',
-        'PRODUCT_27'   : '<inventory_root>/system/chassis/motherboard/dimm15',
-        'PRODUCT_28'   : '<inventory_root>/system/chassis/motherboard/dimm16',
-        'PRODUCT_29'   : '<inventory_root>/system/chassis/motherboard/dimm17',
-        'PRODUCT_30'   : '<inventory_root>/system/chassis/motherboard/dimm18',
-        'PRODUCT_31'   : '<inventory_root>/system/chassis/motherboard/dimm19',
-        'PRODUCT_32'   : '<inventory_root>/system/chassis/motherboard/dimm20',
-        'PRODUCT_33'   : '<inventory_root>/system/chassis/motherboard/dimm21',
-        'PRODUCT_34'   : '<inventory_root>/system/chassis/motherboard/dimm22',
-        'PRODUCT_35'   : '<inventory_root>/system/chassis/motherboard/dimm23',
-        'PRODUCT_36'   : '<inventory_root>/system/chassis/motherboard/dimm24',
-        'PRODUCT_37'   : '<inventory_root>/system/chassis/motherboard/dimm25',
-        'PRODUCT_38'   : '<inventory_root>/system/chassis/motherboard/dimm26',
-        'PRODUCT_39'   : '<inventory_root>/system/chassis/motherboard/dimm27',
-        'PRODUCT_40'   : '<inventory_root>/system/chassis/motherboard/dimm28',
-        'PRODUCT_41'   : '<inventory_root>/system/chassis/motherboard/dimm29',
-        'PRODUCT_42'   : '<inventory_root>/system/chassis/motherboard/dimm30',
-        'PRODUCT_43'   : '<inventory_root>/system/chassis/motherboard/dimm31',
-        'PRODUCT_47'   : '<inventory_root>/system/misc',
+    "FRU_STR": {
+        "PRODUCT_0": "<inventory_root>/system/bios",
+        "BOARD_1": "<inventory_root>/system/chassis/motherboard/cpu0",
+        "BOARD_2": "<inventory_root>/system/chassis/motherboard/cpu1",
+        "CHASSIS_3": "<inventory_root>/system/chassis/motherboard",
+        "BOARD_3": "<inventory_root>/system/misc",
+        "PRODUCT_12": "<inventory_root>/system/chassis/motherboard/dimm0",
+        "PRODUCT_13": "<inventory_root>/system/chassis/motherboard/dimm1",
+        "PRODUCT_14": "<inventory_root>/system/chassis/motherboard/dimm2",
+        "PRODUCT_15": "<inventory_root>/system/chassis/motherboard/dimm3",
+        "PRODUCT_16": "<inventory_root>/system/chassis/motherboard/dimm4",
+        "PRODUCT_17": "<inventory_root>/system/chassis/motherboard/dimm5",
+        "PRODUCT_18": "<inventory_root>/system/chassis/motherboard/dimm6",
+        "PRODUCT_19": "<inventory_root>/system/chassis/motherboard/dimm7",
+        "PRODUCT_20": "<inventory_root>/system/chassis/motherboard/dimm8",
+        "PRODUCT_21": "<inventory_root>/system/chassis/motherboard/dimm9",
+        "PRODUCT_22": "<inventory_root>/system/chassis/motherboard/dimm10",
+        "PRODUCT_23": "<inventory_root>/system/chassis/motherboard/dimm11",
+        "PRODUCT_24": "<inventory_root>/system/chassis/motherboard/dimm12",
+        "PRODUCT_25": "<inventory_root>/system/chassis/motherboard/dimm13",
+        "PRODUCT_26": "<inventory_root>/system/chassis/motherboard/dimm14",
+        "PRODUCT_27": "<inventory_root>/system/chassis/motherboard/dimm15",
+        "PRODUCT_28": "<inventory_root>/system/chassis/motherboard/dimm16",
+        "PRODUCT_29": "<inventory_root>/system/chassis/motherboard/dimm17",
+        "PRODUCT_30": "<inventory_root>/system/chassis/motherboard/dimm18",
+        "PRODUCT_31": "<inventory_root>/system/chassis/motherboard/dimm19",
+        "PRODUCT_32": "<inventory_root>/system/chassis/motherboard/dimm20",
+        "PRODUCT_33": "<inventory_root>/system/chassis/motherboard/dimm21",
+        "PRODUCT_34": "<inventory_root>/system/chassis/motherboard/dimm22",
+        "PRODUCT_35": "<inventory_root>/system/chassis/motherboard/dimm23",
+        "PRODUCT_36": "<inventory_root>/system/chassis/motherboard/dimm24",
+        "PRODUCT_37": "<inventory_root>/system/chassis/motherboard/dimm25",
+        "PRODUCT_38": "<inventory_root>/system/chassis/motherboard/dimm26",
+        "PRODUCT_39": "<inventory_root>/system/chassis/motherboard/dimm27",
+        "PRODUCT_40": "<inventory_root>/system/chassis/motherboard/dimm28",
+        "PRODUCT_41": "<inventory_root>/system/chassis/motherboard/dimm29",
+        "PRODUCT_42": "<inventory_root>/system/chassis/motherboard/dimm30",
+        "PRODUCT_43": "<inventory_root>/system/chassis/motherboard/dimm31",
+        "PRODUCT_47": "<inventory_root>/system/misc",
     },
-    'SENSOR' : {
-        0x02 : '/org/openbmc/sensors/host/HostStatus',
-        0x03 : '/org/openbmc/sensors/host/BootProgress',
-        0x21 : '<inventory_root>/system/chassis/motherboard/cpu0',
-        0x71 : '<inventory_root>/system/chassis/motherboard/cpu1',
-        0xc7 : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0xc5 : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0xc3 : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0xc1 : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0xcf : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0xcd : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0xcb : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0xc9 : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0xd7 : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0xd5 : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0xd3 : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0xd1 : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0xdf : '<inventory_root>/system/chassis/motherboard/dimm15',
-        0xdd : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0xdb : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0xd9 : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0xe7 : '<inventory_root>/system/chassis/motherboard/dimm19',
-        0xe5 : '<inventory_root>/system/chassis/motherboard/dimm18',
-        0xe3 : '<inventory_root>/system/chassis/motherboard/dimm17',
-        0xe1 : '<inventory_root>/system/chassis/motherboard/dimm16',
-        0xef : '<inventory_root>/system/chassis/motherboard/dimm23',
-        0xed : '<inventory_root>/system/chassis/motherboard/dimm22',
-        0xeb : '<inventory_root>/system/chassis/motherboard/dimm21',
-        0xe9 : '<inventory_root>/system/chassis/motherboard/dimm20',
-        0xf7 : '<inventory_root>/system/chassis/motherboard/dimm27',
-        0xf5 : '<inventory_root>/system/chassis/motherboard/dimm26',
-        0xf3 : '<inventory_root>/system/chassis/motherboard/dimm25',
-        0xf1 : '<inventory_root>/system/chassis/motherboard/dimm24',
-        0xff : '<inventory_root>/system/chassis/motherboard/dimm31',
-        0xfd : '<inventory_root>/system/chassis/motherboard/dimm30',
-        0xfb : '<inventory_root>/system/chassis/motherboard/dimm29',
-        0xf9 : '<inventory_root>/system/chassis/motherboard/dimm28',
-        0x23 : '<inventory_root>/system/chassis/motherboard/cpu0/core0',
-        0x26 : '<inventory_root>/system/chassis/motherboard/cpu0/core1',
-        0x29 : '<inventory_root>/system/chassis/motherboard/cpu0/core2',
-        0x2c : '<inventory_root>/system/chassis/motherboard/cpu0/core3',
-        0x2f : '<inventory_root>/system/chassis/motherboard/cpu0/core4',
-        0x32 : '<inventory_root>/system/chassis/motherboard/cpu0/core5',
-        0x35 : '<inventory_root>/system/chassis/motherboard/cpu0/core6',
-        0x38 : '<inventory_root>/system/chassis/motherboard/cpu0/core7',
-        0x3b : '<inventory_root>/system/chassis/motherboard/cpu0/core8',
-        0x3e : '<inventory_root>/system/chassis/motherboard/cpu0/core9',
-        0x41 : '<inventory_root>/system/chassis/motherboard/cpu0/core10',
-        0x44 : '<inventory_root>/system/chassis/motherboard/cpu0/core11',
-        0x47 : '<inventory_root>/system/chassis/motherboard/cpu0/core12',
-        0x4a : '<inventory_root>/system/chassis/motherboard/cpu0/core13',
-        0x4d : '<inventory_root>/system/chassis/motherboard/cpu0/core14',
-        0x50 : '<inventory_root>/system/chassis/motherboard/cpu0/core15',
-        0x53 : '<inventory_root>/system/chassis/motherboard/cpu0/core16',
-        0x56 : '<inventory_root>/system/chassis/motherboard/cpu0/core17',
-        0x59 : '<inventory_root>/system/chassis/motherboard/cpu0/core18',
-        0x5c : '<inventory_root>/system/chassis/motherboard/cpu0/core19',
-        0x5f : '<inventory_root>/system/chassis/motherboard/cpu0/core20',
-        0x62 : '<inventory_root>/system/chassis/motherboard/cpu0/core21',
-        0x65 : '<inventory_root>/system/chassis/motherboard/cpu1/core22',
-        0x68 : '<inventory_root>/system/chassis/motherboard/cpu1/core23',
-        0x73 : '<inventory_root>/system/chassis/motherboard/cpu1/core0',
-        0x76 : '<inventory_root>/system/chassis/motherboard/cpu1/core1',
-        0x79 : '<inventory_root>/system/chassis/motherboard/cpu1/core2',
-        0x7c : '<inventory_root>/system/chassis/motherboard/cpu1/core3',
-        0x7f : '<inventory_root>/system/chassis/motherboard/cpu1/core4',
-        0x82 : '<inventory_root>/system/chassis/motherboard/cpu1/core5',
-        0x85 : '<inventory_root>/system/chassis/motherboard/cpu1/core6',
-        0x88 : '<inventory_root>/system/chassis/motherboard/cpu1/core7',
-        0x8b : '<inventory_root>/system/chassis/motherboard/cpu1/core8',
-        0x8e : '<inventory_root>/system/chassis/motherboard/cpu1/core9',
-        0x91 : '<inventory_root>/system/chassis/motherboard/cpu1/core10',
-        0x94 : '<inventory_root>/system/chassis/motherboard/cpu1/core11',
-        0x97 : '<inventory_root>/system/chassis/motherboard/cpu1/core12',
-        0x9a : '<inventory_root>/system/chassis/motherboard/cpu1/core13',
-        0x9d : '<inventory_root>/system/chassis/motherboard/cpu1/core14',
-        0xa0 : '<inventory_root>/system/chassis/motherboard/cpu1/core15',
-        0xa3 : '<inventory_root>/system/chassis/motherboard/cpu1/core16',
-        0xa6 : '<inventory_root>/system/chassis/motherboard/cpu1/core17',
-        0xa9 : '<inventory_root>/system/chassis/motherboard/cpu1/core18',
-        0xac : '<inventory_root>/system/chassis/motherboard/cpu1/core19',
-        0xaf : '<inventory_root>/system/chassis/motherboard/cpu1/core20',
-        0xb2 : '<inventory_root>/system/chassis/motherboard/cpu1/core21',
-        0xb5 : '<inventory_root>/system/chassis/motherboard/cpu1/core22',
-        0xb8 : '<inventory_root>/system/chassis/motherboard/cpu1/core23',
-        0x07 : '/org/openbmc/sensors/host/BootCount',
-        0x10 : '<inventory_root>/system/chassis/motherboard',
-        0x01 : '<inventory_root>/system/systemevent',
-        0x11 : '<inventory_root>/system/chassis/motherboard/refclock',
-        0x12 : '<inventory_root>/system/chassis/motherboard/pcieclock',
-        0x13 : '<inventory_root>/system/chassis/motherboard/todclock',
-        0x02 : '/org/openbmc/sensors/host/OperatingSystemStatus',
-        0x04 : '<inventory_root>/system/chassis/motherboard/pcielink',
+    "SENSOR": {
+        0x02: "/org/openbmc/sensors/host/HostStatus",
+        0x03: "/org/openbmc/sensors/host/BootProgress",
+        0x21: "<inventory_root>/system/chassis/motherboard/cpu0",
+        0x71: "<inventory_root>/system/chassis/motherboard/cpu1",
+        0xC7: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0xC5: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0xC3: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0xC1: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0xCF: "<inventory_root>/system/chassis/motherboard/dimm7",
+        0xCD: "<inventory_root>/system/chassis/motherboard/dimm6",
+        0xCB: "<inventory_root>/system/chassis/motherboard/dimm5",
+        0xC9: "<inventory_root>/system/chassis/motherboard/dimm4",
+        0xD7: "<inventory_root>/system/chassis/motherboard/dimm11",
+        0xD5: "<inventory_root>/system/chassis/motherboard/dimm10",
+        0xD3: "<inventory_root>/system/chassis/motherboard/dimm9",
+        0xD1: "<inventory_root>/system/chassis/motherboard/dimm8",
+        0xDF: "<inventory_root>/system/chassis/motherboard/dimm15",
+        0xDD: "<inventory_root>/system/chassis/motherboard/dimm14",
+        0xDB: "<inventory_root>/system/chassis/motherboard/dimm13",
+        0xD9: "<inventory_root>/system/chassis/motherboard/dimm12",
+        0xE7: "<inventory_root>/system/chassis/motherboard/dimm19",
+        0xE5: "<inventory_root>/system/chassis/motherboard/dimm18",
+        0xE3: "<inventory_root>/system/chassis/motherboard/dimm17",
+        0xE1: "<inventory_root>/system/chassis/motherboard/dimm16",
+        0xEF: "<inventory_root>/system/chassis/motherboard/dimm23",
+        0xED: "<inventory_root>/system/chassis/motherboard/dimm22",
+        0xEB: "<inventory_root>/system/chassis/motherboard/dimm21",
+        0xE9: "<inventory_root>/system/chassis/motherboard/dimm20",
+        0xF7: "<inventory_root>/system/chassis/motherboard/dimm27",
+        0xF5: "<inventory_root>/system/chassis/motherboard/dimm26",
+        0xF3: "<inventory_root>/system/chassis/motherboard/dimm25",
+        0xF1: "<inventory_root>/system/chassis/motherboard/dimm24",
+        0xFF: "<inventory_root>/system/chassis/motherboard/dimm31",
+        0xFD: "<inventory_root>/system/chassis/motherboard/dimm30",
+        0xFB: "<inventory_root>/system/chassis/motherboard/dimm29",
+        0xF9: "<inventory_root>/system/chassis/motherboard/dimm28",
+        0x23: "<inventory_root>/system/chassis/motherboard/cpu0/core0",
+        0x26: "<inventory_root>/system/chassis/motherboard/cpu0/core1",
+        0x29: "<inventory_root>/system/chassis/motherboard/cpu0/core2",
+        0x2C: "<inventory_root>/system/chassis/motherboard/cpu0/core3",
+        0x2F: "<inventory_root>/system/chassis/motherboard/cpu0/core4",
+        0x32: "<inventory_root>/system/chassis/motherboard/cpu0/core5",
+        0x35: "<inventory_root>/system/chassis/motherboard/cpu0/core6",
+        0x38: "<inventory_root>/system/chassis/motherboard/cpu0/core7",
+        0x3B: "<inventory_root>/system/chassis/motherboard/cpu0/core8",
+        0x3E: "<inventory_root>/system/chassis/motherboard/cpu0/core9",
+        0x41: "<inventory_root>/system/chassis/motherboard/cpu0/core10",
+        0x44: "<inventory_root>/system/chassis/motherboard/cpu0/core11",
+        0x47: "<inventory_root>/system/chassis/motherboard/cpu0/core12",
+        0x4A: "<inventory_root>/system/chassis/motherboard/cpu0/core13",
+        0x4D: "<inventory_root>/system/chassis/motherboard/cpu0/core14",
+        0x50: "<inventory_root>/system/chassis/motherboard/cpu0/core15",
+        0x53: "<inventory_root>/system/chassis/motherboard/cpu0/core16",
+        0x56: "<inventory_root>/system/chassis/motherboard/cpu0/core17",
+        0x59: "<inventory_root>/system/chassis/motherboard/cpu0/core18",
+        0x5C: "<inventory_root>/system/chassis/motherboard/cpu0/core19",
+        0x5F: "<inventory_root>/system/chassis/motherboard/cpu0/core20",
+        0x62: "<inventory_root>/system/chassis/motherboard/cpu0/core21",
+        0x65: "<inventory_root>/system/chassis/motherboard/cpu1/core22",
+        0x68: "<inventory_root>/system/chassis/motherboard/cpu1/core23",
+        0x73: "<inventory_root>/system/chassis/motherboard/cpu1/core0",
+        0x76: "<inventory_root>/system/chassis/motherboard/cpu1/core1",
+        0x79: "<inventory_root>/system/chassis/motherboard/cpu1/core2",
+        0x7C: "<inventory_root>/system/chassis/motherboard/cpu1/core3",
+        0x7F: "<inventory_root>/system/chassis/motherboard/cpu1/core4",
+        0x82: "<inventory_root>/system/chassis/motherboard/cpu1/core5",
+        0x85: "<inventory_root>/system/chassis/motherboard/cpu1/core6",
+        0x88: "<inventory_root>/system/chassis/motherboard/cpu1/core7",
+        0x8B: "<inventory_root>/system/chassis/motherboard/cpu1/core8",
+        0x8E: "<inventory_root>/system/chassis/motherboard/cpu1/core9",
+        0x91: "<inventory_root>/system/chassis/motherboard/cpu1/core10",
+        0x94: "<inventory_root>/system/chassis/motherboard/cpu1/core11",
+        0x97: "<inventory_root>/system/chassis/motherboard/cpu1/core12",
+        0x9A: "<inventory_root>/system/chassis/motherboard/cpu1/core13",
+        0x9D: "<inventory_root>/system/chassis/motherboard/cpu1/core14",
+        0xA0: "<inventory_root>/system/chassis/motherboard/cpu1/core15",
+        0xA3: "<inventory_root>/system/chassis/motherboard/cpu1/core16",
+        0xA6: "<inventory_root>/system/chassis/motherboard/cpu1/core17",
+        0xA9: "<inventory_root>/system/chassis/motherboard/cpu1/core18",
+        0xAC: "<inventory_root>/system/chassis/motherboard/cpu1/core19",
+        0xAF: "<inventory_root>/system/chassis/motherboard/cpu1/core20",
+        0xB2: "<inventory_root>/system/chassis/motherboard/cpu1/core21",
+        0xB5: "<inventory_root>/system/chassis/motherboard/cpu1/core22",
+        0xB8: "<inventory_root>/system/chassis/motherboard/cpu1/core23",
+        0x07: "/org/openbmc/sensors/host/BootCount",
+        0x10: "<inventory_root>/system/chassis/motherboard",
+        0x01: "<inventory_root>/system/systemevent",
+        0x11: "<inventory_root>/system/chassis/motherboard/refclock",
+        0x12: "<inventory_root>/system/chassis/motherboard/pcieclock",
+        0x13: "<inventory_root>/system/chassis/motherboard/todclock",
+        0x02: "/org/openbmc/sensors/host/OperatingSystemStatus",
+        0x04: "<inventory_root>/system/chassis/motherboard/pcielink",
     },
-    'GPIO_PRESENT' : {}
+    "GPIO_PRESENT": {},
 }
 
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
-MISC_SENSORS = {
-}
+MISC_SENSORS = {}
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/configs/Palmetto.py b/configs/Palmetto.py
index b750530..769bf5a 100644
--- a/configs/Palmetto.py
+++ b/configs/Palmetto.py
@@ -1,91 +1,92 @@
-## System states
-##   state can change to next state in 2 ways:
-##   - a process emits a GotoSystemState signal with state name to goto
-##   - objects specified in EXIT_STATE_DEPEND have started
+# System states
+#   state can change to next state in 2 ways:
+#   - a process emits a GotoSystemState signal with state name to goto
+#   - objects specified in EXIT_STATE_DEPEND have started
 SYSTEM_STATES = [
-	'BASE_APPS',
-	'BMC_STARTING',
-	'BMC_READY',
-	'HOST_POWERING_ON',
-	'HOST_POWERED_ON',
-	'HOST_BOOTING',
-	'HOST_BOOTED',
-	'HOST_POWERED_OFF',
+    "BASE_APPS",
+    "BMC_STARTING",
+    "BMC_READY",
+    "HOST_POWERING_ON",
+    "HOST_POWERED_ON",
+    "HOST_BOOTING",
+    "HOST_BOOTED",
+    "HOST_POWERED_OFF",
 ]
 
 EXIT_STATE_DEPEND = {
-	'BASE_APPS' : {
-		'/org/openbmc/sensors': 0,
-	},
-	'BMC_STARTING' : {
-		'/org/openbmc/control/chassis0': 0,
-		'/org/openbmc/control/power0' : 0,
-		'/org/openbmc/control/led/identify' : 0,
-		'/org/openbmc/control/host0' : 0,
-		'/org/openbmc/control/flash/bios' : 0,
-	}
+    "BASE_APPS": {
+        "/org/openbmc/sensors": 0,
+    },
+    "BMC_STARTING": {
+        "/org/openbmc/control/chassis0": 0,
+        "/org/openbmc/control/power0": 0,
+        "/org/openbmc/control/led/identify": 0,
+        "/org/openbmc/control/host0": 0,
+        "/org/openbmc/control/flash/bios": 0,
+    },
 }
 
 ID_LOOKUP = {
-	'FRU' : {
-		0x0d : '<inventory_root>/system/chassis',
-		0x34 : '<inventory_root>/system/chassis/motherboard',
-		0x01 : '<inventory_root>/system/chassis/motherboard/cpu',
-		0x02 : '<inventory_root>/system/chassis/motherboard/membuf',
-		0x03 : '<inventory_root>/system/chassis/motherboard/dimm0',
-		0x04 : '<inventory_root>/system/chassis/motherboard/dimm1',
-		0x05 : '<inventory_root>/system/chassis/motherboard/dimm2',
-		0x06 : '<inventory_root>/system/chassis/motherboard/dimm3',
-		0x35 : '<inventory_root>/system',
-	},
-	'FRU_STR' : {
-		'PRODUCT_15' : '<inventory_root>/system',
-		'CHASSIS_2' : '<inventory_root>/system/chassis',
-		'BOARD_1'   : '<inventory_root>/system/chassis/motherboard/cpu',
-		'BOARD_2'   : '<inventory_root>/system/chassis/motherboard/membuf',
-		'BOARD_14'   : '<inventory_root>/system/chassis/motherboard',
-		'PRODUCT_3'   : '<inventory_root>/system/chassis/motherboard/dimm0',
-		'PRODUCT_4'   : '<inventory_root>/system/chassis/motherboard/dimm1',
-		'PRODUCT_5'   : '<inventory_root>/system/chassis/motherboard/dimm2',
-		'PRODUCT_6'   : '<inventory_root>/system/chassis/motherboard/dimm3',
-	},
-	'SENSOR' : {
-		0x34 : '<inventory_root>/system/chassis/motherboard',
-		0x37 : '<inventory_root>/system/chassis/motherboard/refclock',
-		0x38 : '<inventory_root>/system/chassis/motherboard/pcieclock',
-		0x39 : '<inventory_root>/system/chassis/motherboard/todclock',
-		0x3A : '<inventory_root>/system/chassis/apss',
-		0x2f : '<inventory_root>/system/chassis/motherboard/cpu',
-		0x22 : '<inventory_root>/system/chassis/motherboard/cpu/core1',
-		0x23 : '<inventory_root>/system/chassis/motherboard/cpu/core2',
-		0x24 : '<inventory_root>/system/chassis/motherboard/cpu/core3',
-		0x25 : '<inventory_root>/system/chassis/motherboard/cpu/core4',
-		0x26 : '<inventory_root>/system/chassis/motherboard/cpu/core5',
-		0x27 : '<inventory_root>/system/chassis/motherboard/cpu/core6',
-		0x28 : '<inventory_root>/system/chassis/motherboard/cpu/core9',
-		0x29 : '<inventory_root>/system/chassis/motherboard/cpu/core10',
-		0x2a : '<inventory_root>/system/chassis/motherboard/cpu/core11',
-		0x2b : '<inventory_root>/system/chassis/motherboard/cpu/core12',
-		0x2c : '<inventory_root>/system/chassis/motherboard/cpu/core13',
-		0x2d : '<inventory_root>/system/chassis/motherboard/cpu/core14',
-		0x2e : '<inventory_root>/system/chassis/motherboard/membuf',
-		0x1e : '<inventory_root>/system/chassis/motherboard/dimm0',
-		0x1f : '<inventory_root>/system/chassis/motherboard/dimm1',
-		0x20 : '<inventory_root>/system/chassis/motherboard/dimm2',
-		0x21 : '<inventory_root>/system/chassis/motherboard/dimm3',
-		0x09 : '/org/openbmc/sensors/host/BootCount',
-		0x05 : '/org/openbmc/sensors/host/BootProgress',
-		0x32 : '/org/openbmc/sensors/host/OperatingSystemStatus',
-	},
-	'GPIO_PRESENT' : {
-		'SLOT0_PRESENT' : '<inventory_root>/system/chassis/motherboard/pciecard_x16',
-		'SLOT1_PRESENT' : '<inventory_root>/system/chassis/motherboard/pciecard_x8',
-	}
+    "FRU": {
+        0x0D: "<inventory_root>/system/chassis",
+        0x34: "<inventory_root>/system/chassis/motherboard",
+        0x01: "<inventory_root>/system/chassis/motherboard/cpu",
+        0x02: "<inventory_root>/system/chassis/motherboard/membuf",
+        0x03: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0x04: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0x05: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0x06: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0x35: "<inventory_root>/system",
+    },
+    "FRU_STR": {
+        "PRODUCT_15": "<inventory_root>/system",
+        "CHASSIS_2": "<inventory_root>/system/chassis",
+        "BOARD_1": "<inventory_root>/system/chassis/motherboard/cpu",
+        "BOARD_2": "<inventory_root>/system/chassis/motherboard/membuf",
+        "BOARD_14": "<inventory_root>/system/chassis/motherboard",
+        "PRODUCT_3": "<inventory_root>/system/chassis/motherboard/dimm0",
+        "PRODUCT_4": "<inventory_root>/system/chassis/motherboard/dimm1",
+        "PRODUCT_5": "<inventory_root>/system/chassis/motherboard/dimm2",
+        "PRODUCT_6": "<inventory_root>/system/chassis/motherboard/dimm3",
+    },
+    "SENSOR": {
+        0x34: "<inventory_root>/system/chassis/motherboard",
+        0x37: "<inventory_root>/system/chassis/motherboard/refclock",
+        0x38: "<inventory_root>/system/chassis/motherboard/pcieclock",
+        0x39: "<inventory_root>/system/chassis/motherboard/todclock",
+        0x3A: "<inventory_root>/system/chassis/apss",
+        0x2F: "<inventory_root>/system/chassis/motherboard/cpu",
+        0x22: "<inventory_root>/system/chassis/motherboard/cpu/core1",
+        0x23: "<inventory_root>/system/chassis/motherboard/cpu/core2",
+        0x24: "<inventory_root>/system/chassis/motherboard/cpu/core3",
+        0x25: "<inventory_root>/system/chassis/motherboard/cpu/core4",
+        0x26: "<inventory_root>/system/chassis/motherboard/cpu/core5",
+        0x27: "<inventory_root>/system/chassis/motherboard/cpu/core6",
+        0x28: "<inventory_root>/system/chassis/motherboard/cpu/core9",
+        0x29: "<inventory_root>/system/chassis/motherboard/cpu/core10",
+        0x2A: "<inventory_root>/system/chassis/motherboard/cpu/core11",
+        0x2B: "<inventory_root>/system/chassis/motherboard/cpu/core12",
+        0x2C: "<inventory_root>/system/chassis/motherboard/cpu/core13",
+        0x2D: "<inventory_root>/system/chassis/motherboard/cpu/core14",
+        0x2E: "<inventory_root>/system/chassis/motherboard/membuf",
+        0x1E: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0x1F: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0x20: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0x21: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0x09: "/org/openbmc/sensors/host/BootCount",
+        0x05: "/org/openbmc/sensors/host/BootProgress",
+        0x32: "/org/openbmc/sensors/host/OperatingSystemStatus",
+    },
+    "GPIO_PRESENT": {
+        "SLOT0_PRESENT":
+            "<inventory_root>/system/chassis/motherboard/pciecard_x16",
+        "SLOT1_PRESENT":
+            "<inventory_root>/system/chassis/motherboard/pciecard_x8",
+    },
 }
 
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
-MISC_SENSORS = {
-}
+MISC_SENSORS = {}
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/configs/Romulus.py b/configs/Romulus.py
index 4460d74..13d3308 100644
--- a/configs/Romulus.py
+++ b/configs/Romulus.py
@@ -2,252 +2,489 @@
 #
 
 SYSTEM_STATES = [
-    'BASE_APPS',
-    'BMC_STARTING',
-    'BMC_READY',
-    'HOST_POWERING_ON',
-    'HOST_POWERED_ON',
-    'HOST_BOOTING',
-    'HOST_BOOTED',
-    'HOST_POWERED_OFF',
+    "BASE_APPS",
+    "BMC_STARTING",
+    "BMC_READY",
+    "HOST_POWERING_ON",
+    "HOST_POWERED_ON",
+    "HOST_BOOTING",
+    "HOST_BOOTED",
+    "HOST_POWERED_OFF",
 ]
 
 EXIT_STATE_DEPEND = {
-    'BASE_APPS' : {
-        '/org/openbmc/sensors': 0,
+    "BASE_APPS": {
+        "/org/openbmc/sensors": 0,
     },
-    'BMC_STARTING' : {
-        '/org/openbmc/control/chassis0': 0,
-        '/org/openbmc/control/power0' : 0,
-        '/org/openbmc/control/flash/bios' : 0,
+    "BMC_STARTING": {
+        "/org/openbmc/control/chassis0": 0,
+        "/org/openbmc/control/power0": 0,
+        "/org/openbmc/control/flash/bios": 0,
     },
 }
 
 FRU_INSTANCES = {
-    '<inventory_root>/system' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-    '<inventory_root>/system/bios' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-    '<inventory_root>/system/misc' : { 'fru_type' : 'SYSTEM','is_fru' : False, },
-
-    '<inventory_root>/system/chassis' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-
-    '<inventory_root>/system/chassis/motherboard' : { 'fru_type' : 'MAIN_PLANAR','is_fru' : True, },
-
-    '<inventory_root>/system/systemevent'                  : { 'fru_type' : 'SYSTEM_EVENT', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/refclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/pcieclock': { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/todclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/apss'     : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/fan0' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan1' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan2' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan3' : { 'fru_type' : 'FAN','is_fru' : True, },
-
-    '<inventory_root>/system/chassis/motherboard/bmc' : { 'fru_type' : 'BMC','is_fru' : False, 'manufacturer' : 'ASPEED' },
-
-    '<inventory_root>/system/chassis/motherboard/cpu0' : { 'fru_type' : 'CPU', 'is_fru' : True, },
-    '<inventory_root>/system/chassis/motherboard/cpu1' : { 'fru_type' : 'CPU', 'is_fru' : True, },
-
-    '<inventory_root>/system/chassis/motherboard/cpu0/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core10' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core11' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core12' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core13' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core14' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core15' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core16' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core17' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core18' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core19' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core20' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core21' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core22' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core23' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/motherboard/cpu1/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core10' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core11' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core12' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core13' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core14' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core15' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core16' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core17' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core18' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core19' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core20' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core21' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core22' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core23' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/motherboard/dimm0' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm1' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm2' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm3' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm4' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm5' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm6' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm7' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm8' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm9' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm10' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm11' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm12' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm13' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm14' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm15' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+    "<inventory_root>/system": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/bios": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/misc": {
+        "fru_type": "SYSTEM",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/chassis/motherboard": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/systemevent": {
+        "fru_type": "SYSTEM_EVENT",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/refclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/pcieclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/todclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/apss": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/fan0": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan1": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan2": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan3": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/bmc": {
+        "fru_type": "BMC",
+        "is_fru": False,
+        "manufacturer": "ASPEED",
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0": {
+        "fru_type": "CPU",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1": {
+        "fru_type": "CPU",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core0": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core1": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core2": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core3": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core4": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core5": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core6": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core7": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core8": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core9": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core10": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core11": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core12": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core13": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core14": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core15": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core16": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core17": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core18": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core19": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core20": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core21": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core22": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core23": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core0": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core1": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core2": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core3": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core4": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core5": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core6": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core7": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core8": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core9": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core10": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core11": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core12": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core13": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core14": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core15": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core16": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core17": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core18": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core19": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core20": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core21": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core22": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core23": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm0": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm1": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm2": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm3": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm4": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm5": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm6": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm7": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm8": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm9": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm10": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm11": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm12": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm13": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm14": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm15": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
 }
 
 ID_LOOKUP = {
-    'FRU' : {
-        0x01 : '<inventory_root>/system/chassis/motherboard/cpu0',
-        0x02 : '<inventory_root>/system/chassis/motherboard/cpu1',
-        0x03 : '<inventory_root>/system/chassis/motherboard',
-        0x04 : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0x05 : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0x06 : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0x07 : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0x08 : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0x09 : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0x0a : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0x0b : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0x0c : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0x0d : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0x0e : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0x0f : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0x10 : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0x11 : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0x12 : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0x13 : '<inventory_root>/system/chassis/motherboard/dimm15',
+    "FRU": {
+        0x01: "<inventory_root>/system/chassis/motherboard/cpu0",
+        0x02: "<inventory_root>/system/chassis/motherboard/cpu1",
+        0x03: "<inventory_root>/system/chassis/motherboard",
+        0x04: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0x05: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0x06: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0x07: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0x08: "<inventory_root>/system/chassis/motherboard/dimm4",
+        0x09: "<inventory_root>/system/chassis/motherboard/dimm5",
+        0x0A: "<inventory_root>/system/chassis/motherboard/dimm6",
+        0x0B: "<inventory_root>/system/chassis/motherboard/dimm7",
+        0x0C: "<inventory_root>/system/chassis/motherboard/dimm8",
+        0x0D: "<inventory_root>/system/chassis/motherboard/dimm9",
+        0x0E: "<inventory_root>/system/chassis/motherboard/dimm10",
+        0x0F: "<inventory_root>/system/chassis/motherboard/dimm11",
+        0x10: "<inventory_root>/system/chassis/motherboard/dimm12",
+        0x11: "<inventory_root>/system/chassis/motherboard/dimm13",
+        0x12: "<inventory_root>/system/chassis/motherboard/dimm14",
+        0x13: "<inventory_root>/system/chassis/motherboard/dimm15",
     },
-    'FRU_STR' : {
-        'PRODUCT_0'  : '<inventory_root>/system/bios',
-        'BOARD_1'    : '<inventory_root>/system/chassis/motherboard/cpu0',
-        'BOARD_2'    : '<inventory_root>/system/chassis/motherboard/cpu1',
-        'CHASSIS_3'  : '<inventory_root>/system/chassis/motherboard',
-        'BOARD_3'    : '<inventory_root>/system/misc',
-        'PRODUCT_12'   : '<inventory_root>/system/chassis/motherboard/dimm0',
-        'PRODUCT_13'   : '<inventory_root>/system/chassis/motherboard/dimm1',
-        'PRODUCT_14'   : '<inventory_root>/system/chassis/motherboard/dimm2',
-        'PRODUCT_15'   : '<inventory_root>/system/chassis/motherboard/dimm3',
-        'PRODUCT_16'   : '<inventory_root>/system/chassis/motherboard/dimm4',
-        'PRODUCT_17'   : '<inventory_root>/system/chassis/motherboard/dimm5',
-        'PRODUCT_18'   : '<inventory_root>/system/chassis/motherboard/dimm6',
-        'PRODUCT_19'   : '<inventory_root>/system/chassis/motherboard/dimm7',
-        'PRODUCT_20'   : '<inventory_root>/system/chassis/motherboard/dimm8',
-        'PRODUCT_21'   : '<inventory_root>/system/chassis/motherboard/dimm9',
-        'PRODUCT_22'   : '<inventory_root>/system/chassis/motherboard/dimm10',
-        'PRODUCT_23'   : '<inventory_root>/system/chassis/motherboard/dimm11',
-        'PRODUCT_24'   : '<inventory_root>/system/chassis/motherboard/dimm12',
-        'PRODUCT_25'   : '<inventory_root>/system/chassis/motherboard/dimm13',
-        'PRODUCT_26'   : '<inventory_root>/system/chassis/motherboard/dimm14',
-        'PRODUCT_27'   : '<inventory_root>/system/chassis/motherboard/dimm15',
-        'PRODUCT_47'   : '<inventory_root>/system/misc',
+    "FRU_STR": {
+        "PRODUCT_0": "<inventory_root>/system/bios",
+        "BOARD_1": "<inventory_root>/system/chassis/motherboard/cpu0",
+        "BOARD_2": "<inventory_root>/system/chassis/motherboard/cpu1",
+        "CHASSIS_3": "<inventory_root>/system/chassis/motherboard",
+        "BOARD_3": "<inventory_root>/system/misc",
+        "PRODUCT_12": "<inventory_root>/system/chassis/motherboard/dimm0",
+        "PRODUCT_13": "<inventory_root>/system/chassis/motherboard/dimm1",
+        "PRODUCT_14": "<inventory_root>/system/chassis/motherboard/dimm2",
+        "PRODUCT_15": "<inventory_root>/system/chassis/motherboard/dimm3",
+        "PRODUCT_16": "<inventory_root>/system/chassis/motherboard/dimm4",
+        "PRODUCT_17": "<inventory_root>/system/chassis/motherboard/dimm5",
+        "PRODUCT_18": "<inventory_root>/system/chassis/motherboard/dimm6",
+        "PRODUCT_19": "<inventory_root>/system/chassis/motherboard/dimm7",
+        "PRODUCT_20": "<inventory_root>/system/chassis/motherboard/dimm8",
+        "PRODUCT_21": "<inventory_root>/system/chassis/motherboard/dimm9",
+        "PRODUCT_22": "<inventory_root>/system/chassis/motherboard/dimm10",
+        "PRODUCT_23": "<inventory_root>/system/chassis/motherboard/dimm11",
+        "PRODUCT_24": "<inventory_root>/system/chassis/motherboard/dimm12",
+        "PRODUCT_25": "<inventory_root>/system/chassis/motherboard/dimm13",
+        "PRODUCT_26": "<inventory_root>/system/chassis/motherboard/dimm14",
+        "PRODUCT_27": "<inventory_root>/system/chassis/motherboard/dimm15",
+        "PRODUCT_47": "<inventory_root>/system/misc",
     },
-    'SENSOR' : {
-        0x01 : '/org/openbmc/sensors/host/HostStatus',
-        0x02 : '/org/openbmc/sensors/host/BootProgress',
-        0x08 : '<inventory_root>/system/chassis/motherboard/cpu0',
-        0x09 : '<inventory_root>/system/chassis/motherboard/cpu1',
-        0x0b : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0x0c : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0x0d : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0x0e : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0x0f : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0x10 : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0x11 : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0x12 : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0x13 : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0x14 : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0x15 : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0x16 : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0x17 : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0x18 : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0x19 : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0x1a : '<inventory_root>/system/chassis/motherboard/dimm15',
-        0x2b : '<inventory_root>/system/chassis/motherboard/cpu0/core0',
-        0x2c : '<inventory_root>/system/chassis/motherboard/cpu0/core1',
-        0x2d : '<inventory_root>/system/chassis/motherboard/cpu0/core2',
-        0x2e : '<inventory_root>/system/chassis/motherboard/cpu0/core3',
-        0x2f : '<inventory_root>/system/chassis/motherboard/cpu0/core4',
-        0x30 : '<inventory_root>/system/chassis/motherboard/cpu0/core5',
-        0x31 : '<inventory_root>/system/chassis/motherboard/cpu0/core6',
-        0x32 : '<inventory_root>/system/chassis/motherboard/cpu0/core7',
-        0x33 : '<inventory_root>/system/chassis/motherboard/cpu0/core8',
-        0x34 : '<inventory_root>/system/chassis/motherboard/cpu0/core9',
-        0x35 : '<inventory_root>/system/chassis/motherboard/cpu0/core10',
-        0x36 : '<inventory_root>/system/chassis/motherboard/cpu0/core11',
-        0x37 : '<inventory_root>/system/chassis/motherboard/cpu0/core12',
-        0x38 : '<inventory_root>/system/chassis/motherboard/cpu0/core13',
-        0x39 : '<inventory_root>/system/chassis/motherboard/cpu0/core14',
-        0x3a : '<inventory_root>/system/chassis/motherboard/cpu0/core15',
-        0x3b : '<inventory_root>/system/chassis/motherboard/cpu0/core16',
-        0x3c : '<inventory_root>/system/chassis/motherboard/cpu0/core17',
-        0x3d : '<inventory_root>/system/chassis/motherboard/cpu0/core18',
-        0x3e : '<inventory_root>/system/chassis/motherboard/cpu0/core19',
-        0x3f : '<inventory_root>/system/chassis/motherboard/cpu0/core20',
-        0x40 : '<inventory_root>/system/chassis/motherboard/cpu0/core21',
-        0x41 : '<inventory_root>/system/chassis/motherboard/cpu0/core22',
-        0x42 : '<inventory_root>/system/chassis/motherboard/cpu0/core23',
-        0x43 : '<inventory_root>/system/chassis/motherboard/cpu1/core0',
-        0x44 : '<inventory_root>/system/chassis/motherboard/cpu1/core1',
-        0x45 : '<inventory_root>/system/chassis/motherboard/cpu1/core2',
-        0x46 : '<inventory_root>/system/chassis/motherboard/cpu1/core3',
-        0x47 : '<inventory_root>/system/chassis/motherboard/cpu1/core4',
-        0x48 : '<inventory_root>/system/chassis/motherboard/cpu1/core5',
-        0x49 : '<inventory_root>/system/chassis/motherboard/cpu1/core6',
-        0x4a : '<inventory_root>/system/chassis/motherboard/cpu1/core7',
-        0x4b : '<inventory_root>/system/chassis/motherboard/cpu1/core8',
-        0x4c : '<inventory_root>/system/chassis/motherboard/cpu1/core9',
-        0x4d : '<inventory_root>/system/chassis/motherboard/cpu1/core10',
-        0x4e : '<inventory_root>/system/chassis/motherboard/cpu1/core11',
-        0x4f : '<inventory_root>/system/chassis/motherboard/cpu1/core12',
-        0x50 : '<inventory_root>/system/chassis/motherboard/cpu1/core13',
-        0x51 : '<inventory_root>/system/chassis/motherboard/cpu1/core14',
-        0x52 : '<inventory_root>/system/chassis/motherboard/cpu1/core15',
-        0x53 : '<inventory_root>/system/chassis/motherboard/cpu1/core16',
-        0x54 : '<inventory_root>/system/chassis/motherboard/cpu1/core17',
-        0x55 : '<inventory_root>/system/chassis/motherboard/cpu1/core18',
-        0x56 : '<inventory_root>/system/chassis/motherboard/cpu1/core19',
-        0x57 : '<inventory_root>/system/chassis/motherboard/cpu1/core20',
-        0x58 : '<inventory_root>/system/chassis/motherboard/cpu1/core21',
-        0x59 : '<inventory_root>/system/chassis/motherboard/cpu1/core22',
-        0x5a : '<inventory_root>/system/chassis/motherboard/cpu1/core23',
-        0x8b : '/org/openbmc/sensors/host/BootCount',
-        0x8c : '<inventory_root>/system/chassis/motherboard',
-        0x8d : '<inventory_root>/system/chassis/motherboard/refclock',
-        0x8e : '<inventory_root>/system/chassis/motherboard/pcieclock',
-        0x8f : '<inventory_root>/system/chassis/motherboard/todclock',
-        0x90 : '<inventory_root>/system/systemevent',
-        0x91 : '/org/openbmc/sensors/host/OperatingSystemStatus',
-        0x92 : '<inventory_root>/system/chassis/motherboard/pcielink',
-#        0x08 : '<inventory_root>/system/powerlimit',
-#        0x10 : '<inventory_root>/system/chassis/motherboard/apss',
+    "SENSOR": {
+        0x01: "/org/openbmc/sensors/host/HostStatus",
+        0x02: "/org/openbmc/sensors/host/BootProgress",
+        0x08: "<inventory_root>/system/chassis/motherboard/cpu0",
+        0x09: "<inventory_root>/system/chassis/motherboard/cpu1",
+        0x0B: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0x0C: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0x0D: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0x0E: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0x0F: "<inventory_root>/system/chassis/motherboard/dimm4",
+        0x10: "<inventory_root>/system/chassis/motherboard/dimm5",
+        0x11: "<inventory_root>/system/chassis/motherboard/dimm6",
+        0x12: "<inventory_root>/system/chassis/motherboard/dimm7",
+        0x13: "<inventory_root>/system/chassis/motherboard/dimm8",
+        0x14: "<inventory_root>/system/chassis/motherboard/dimm9",
+        0x15: "<inventory_root>/system/chassis/motherboard/dimm10",
+        0x16: "<inventory_root>/system/chassis/motherboard/dimm11",
+        0x17: "<inventory_root>/system/chassis/motherboard/dimm12",
+        0x18: "<inventory_root>/system/chassis/motherboard/dimm13",
+        0x19: "<inventory_root>/system/chassis/motherboard/dimm14",
+        0x1A: "<inventory_root>/system/chassis/motherboard/dimm15",
+        0x2B: "<inventory_root>/system/chassis/motherboard/cpu0/core0",
+        0x2C: "<inventory_root>/system/chassis/motherboard/cpu0/core1",
+        0x2D: "<inventory_root>/system/chassis/motherboard/cpu0/core2",
+        0x2E: "<inventory_root>/system/chassis/motherboard/cpu0/core3",
+        0x2F: "<inventory_root>/system/chassis/motherboard/cpu0/core4",
+        0x30: "<inventory_root>/system/chassis/motherboard/cpu0/core5",
+        0x31: "<inventory_root>/system/chassis/motherboard/cpu0/core6",
+        0x32: "<inventory_root>/system/chassis/motherboard/cpu0/core7",
+        0x33: "<inventory_root>/system/chassis/motherboard/cpu0/core8",
+        0x34: "<inventory_root>/system/chassis/motherboard/cpu0/core9",
+        0x35: "<inventory_root>/system/chassis/motherboard/cpu0/core10",
+        0x36: "<inventory_root>/system/chassis/motherboard/cpu0/core11",
+        0x37: "<inventory_root>/system/chassis/motherboard/cpu0/core12",
+        0x38: "<inventory_root>/system/chassis/motherboard/cpu0/core13",
+        0x39: "<inventory_root>/system/chassis/motherboard/cpu0/core14",
+        0x3A: "<inventory_root>/system/chassis/motherboard/cpu0/core15",
+        0x3B: "<inventory_root>/system/chassis/motherboard/cpu0/core16",
+        0x3C: "<inventory_root>/system/chassis/motherboard/cpu0/core17",
+        0x3D: "<inventory_root>/system/chassis/motherboard/cpu0/core18",
+        0x3E: "<inventory_root>/system/chassis/motherboard/cpu0/core19",
+        0x3F: "<inventory_root>/system/chassis/motherboard/cpu0/core20",
+        0x40: "<inventory_root>/system/chassis/motherboard/cpu0/core21",
+        0x41: "<inventory_root>/system/chassis/motherboard/cpu0/core22",
+        0x42: "<inventory_root>/system/chassis/motherboard/cpu0/core23",
+        0x43: "<inventory_root>/system/chassis/motherboard/cpu1/core0",
+        0x44: "<inventory_root>/system/chassis/motherboard/cpu1/core1",
+        0x45: "<inventory_root>/system/chassis/motherboard/cpu1/core2",
+        0x46: "<inventory_root>/system/chassis/motherboard/cpu1/core3",
+        0x47: "<inventory_root>/system/chassis/motherboard/cpu1/core4",
+        0x48: "<inventory_root>/system/chassis/motherboard/cpu1/core5",
+        0x49: "<inventory_root>/system/chassis/motherboard/cpu1/core6",
+        0x4A: "<inventory_root>/system/chassis/motherboard/cpu1/core7",
+        0x4B: "<inventory_root>/system/chassis/motherboard/cpu1/core8",
+        0x4C: "<inventory_root>/system/chassis/motherboard/cpu1/core9",
+        0x4D: "<inventory_root>/system/chassis/motherboard/cpu1/core10",
+        0x4E: "<inventory_root>/system/chassis/motherboard/cpu1/core11",
+        0x4F: "<inventory_root>/system/chassis/motherboard/cpu1/core12",
+        0x50: "<inventory_root>/system/chassis/motherboard/cpu1/core13",
+        0x51: "<inventory_root>/system/chassis/motherboard/cpu1/core14",
+        0x52: "<inventory_root>/system/chassis/motherboard/cpu1/core15",
+        0x53: "<inventory_root>/system/chassis/motherboard/cpu1/core16",
+        0x54: "<inventory_root>/system/chassis/motherboard/cpu1/core17",
+        0x55: "<inventory_root>/system/chassis/motherboard/cpu1/core18",
+        0x56: "<inventory_root>/system/chassis/motherboard/cpu1/core19",
+        0x57: "<inventory_root>/system/chassis/motherboard/cpu1/core20",
+        0x58: "<inventory_root>/system/chassis/motherboard/cpu1/core21",
+        0x59: "<inventory_root>/system/chassis/motherboard/cpu1/core22",
+        0x5A: "<inventory_root>/system/chassis/motherboard/cpu1/core23",
+        0x8B: "/org/openbmc/sensors/host/BootCount",
+        0x8C: "<inventory_root>/system/chassis/motherboard",
+        0x8D: "<inventory_root>/system/chassis/motherboard/refclock",
+        0x8E: "<inventory_root>/system/chassis/motherboard/pcieclock",
+        0x8F: "<inventory_root>/system/chassis/motherboard/todclock",
+        0x90: "<inventory_root>/system/systemevent",
+        0x91: "/org/openbmc/sensors/host/OperatingSystemStatus",
+        0x92: "<inventory_root>/system/chassis/motherboard/pcielink",
+        #        0x08 : '<inventory_root>/system/powerlimit',
+        #        0x10 : '<inventory_root>/system/chassis/motherboard/apss',
     },
-    'GPIO_PRESENT' : {}
+    "GPIO_PRESENT": {},
 }
 
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
-MISC_SENSORS = {
-}
+MISC_SENSORS = {}
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/configs/S2600wf.py b/configs/S2600wf.py
index 4d041a9..f71bb4c 100644
--- a/configs/S2600wf.py
+++ b/configs/S2600wf.py
@@ -1,10 +1,13 @@
-## System states
-##   state can change to next state in 2 ways:
-##   - a process emits a GotoSystemState signal with state name to goto
-##   - objects specified in EXIT_STATE_DEPEND have started
-SYSTEM_STATES = [
-]
+# System states
+#   state can change to next state in 2 ways:
+#   - a process emits a GotoSystemState signal with state name to goto
+#   - objects specified in EXIT_STATE_DEPEND have started
+SYSTEM_STATES = []
 
 FRU_INSTANCES = {
-        '<inventory_root>/system/chassis/motherboard/bmc' : { 'fru_type' : 'BMC','is_fru' : False, 'manufacturer' : 'ASPEED' },
+    "<inventory_root>/system/chassis/motherboard/bmc": {
+        "fru_type": "BMC",
+        "is_fru": False,
+        "manufacturer": "ASPEED",
+    },
 }
diff --git a/configs/Witherspoon.py b/configs/Witherspoon.py
index 75c8188..a10a89e 100644
--- a/configs/Witherspoon.py
+++ b/configs/Witherspoon.py
@@ -1,299 +1,536 @@
-## System states
-##   state can change to next state in 2 ways:
-##   - a process emits a GotoSystemState signal with state name to goto
-##   - objects specified in EXIT_STATE_DEPEND have started
+# System states
+#   state can change to next state in 2 ways:
+#   - a process emits a GotoSystemState signal with state name to goto
+#   - objects specified in EXIT_STATE_DEPEND have started
 SYSTEM_STATES = [
-    'BASE_APPS',
-    'BMC_STARTING',
-    'BMC_READY',
-    'HOST_POWERING_ON',
-    'HOST_POWERED_ON',
-    'HOST_BOOTING',
-    'HOST_BOOTED',
-    'HOST_POWERED_OFF',
+    "BASE_APPS",
+    "BMC_STARTING",
+    "BMC_READY",
+    "HOST_POWERING_ON",
+    "HOST_POWERED_ON",
+    "HOST_BOOTING",
+    "HOST_BOOTED",
+    "HOST_POWERED_OFF",
 ]
 
 EXIT_STATE_DEPEND = {
-    'BASE_APPS' : {
-        '/org/openbmc/sensors': 0,
+    "BASE_APPS": {
+        "/org/openbmc/sensors": 0,
     },
-    'BMC_STARTING' : {
-        '/org/openbmc/control/chassis0': 0,
-        '/org/openbmc/control/power0' : 0,
-        '/org/openbmc/control/flash/bios' : 0,
+    "BMC_STARTING": {
+        "/org/openbmc/control/chassis0": 0,
+        "/org/openbmc/control/power0": 0,
+        "/org/openbmc/control/flash/bios": 0,
     },
 }
 
 FRU_INSTANCES = {
-    '<inventory_root>/system' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-    '<inventory_root>/system/bios' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-    '<inventory_root>/system/misc' : { 'fru_type' : 'SYSTEM','is_fru' : False, },
-
-    '<inventory_root>/system/chassis' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-
-    '<inventory_root>/system/chassis/motherboard' : { 'fru_type' : 'MAIN_PLANAR','is_fru' : True, },
-
-    '<inventory_root>/system/systemevent'                  : { 'fru_type' : 'SYSTEM_EVENT', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/refclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/pcieclock': { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/todclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/apss'     : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/fan0' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan1' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan2' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan3' : { 'fru_type' : 'FAN','is_fru' : True, },
-
-    '<inventory_root>/system/chassis/motherboard/bmc' : { 'fru_type' : 'BMC','is_fru' : False, 'manufacturer' : 'ASPEED' },
-
-    '<inventory_root>/system/chassis/motherboard/cpu0' : { 'fru_type' : 'CPU', 'is_fru' : True, },
-    '<inventory_root>/system/chassis/motherboard/cpu1' : { 'fru_type' : 'CPU', 'is_fru' : True, },
-
-    '<inventory_root>/system/chassis/motherboard/cpu0/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core10': { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core11': { 'fru_type' : 'CORE', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/motherboard/cpu1/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core10' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core11' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/motherboard/membuf0' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf1' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf2' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf3' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf4' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf5' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf6' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf7' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/motherboard/dimm0' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm1' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm2' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm3' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm4' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm5' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm6' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm7' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm8' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm9' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm10' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm11' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm12' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm13' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm14' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm15' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm16' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm17' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm18' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm19' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm20' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm21' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm22' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm23' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm24' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm25' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm26' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm27' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm28' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm29' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm30' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm31' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+    "<inventory_root>/system": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/bios": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/misc": {
+        "fru_type": "SYSTEM",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/chassis/motherboard": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/systemevent": {
+        "fru_type": "SYSTEM_EVENT",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/refclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/pcieclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/todclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/apss": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/fan0": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan1": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan2": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan3": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/bmc": {
+        "fru_type": "BMC",
+        "is_fru": False,
+        "manufacturer": "ASPEED",
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0": {
+        "fru_type": "CPU",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1": {
+        "fru_type": "CPU",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core0": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core1": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core2": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core3": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core4": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core5": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core6": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core7": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core8": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core9": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core10": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core11": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core0": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core1": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core2": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core3": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core4": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core5": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core6": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core7": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core8": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core9": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core10": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core11": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf0": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf1": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf2": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf3": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf4": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf5": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf6": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/membuf7": {
+        "fru_type": "MEMORY_BUFFER",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm0": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm1": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm2": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm3": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm4": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm5": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm6": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm7": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm8": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm9": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm10": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm11": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm12": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm13": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm14": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm15": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm16": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm17": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm18": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm19": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm20": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm21": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm22": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm23": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm24": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm25": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm26": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm27": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm28": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm29": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm30": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm31": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
 }
 
 ID_LOOKUP = {
-    'FRU' : {
-        0x01 : '<inventory_root>/system/chassis/motherboard/cpu0',
-        0x02 : '<inventory_root>/system/chassis/motherboard/cpu1',
-        0x03 : '<inventory_root>/system/chassis/motherboard',
-        0x04 : '<inventory_root>/system/chassis/motherboard/membuf0',
-        0x05 : '<inventory_root>/system/chassis/motherboard/membuf1',
-        0x06 : '<inventory_root>/system/chassis/motherboard/membuf2',
-        0x07 : '<inventory_root>/system/chassis/motherboard/membuf3',
-        0x08 : '<inventory_root>/system/chassis/motherboard/membuf4',
-        0x09 : '<inventory_root>/system/chassis/motherboard/membuf5',
-        0x0c : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0x0d : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0x0e : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0x0f : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0x10 : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0x11 : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0x12 : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0x13 : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0x14 : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0x15 : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0x16 : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0x17 : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0x18 : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0x19 : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0x1a : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0x1b : '<inventory_root>/system/chassis/motherboard/dimm15',
-        0x1c : '<inventory_root>/system/chassis/motherboard/dimm16',
-        0x1d : '<inventory_root>/system/chassis/motherboard/dimm17',
-        0x1e : '<inventory_root>/system/chassis/motherboard/dimm18',
-        0x1f : '<inventory_root>/system/chassis/motherboard/dimm19',
-        0x20 : '<inventory_root>/system/chassis/motherboard/dimm20',
-        0x21 : '<inventory_root>/system/chassis/motherboard/dimm21',
-        0x22 : '<inventory_root>/system/chassis/motherboard/dimm22',
-        0x23 : '<inventory_root>/system/chassis/motherboard/dimm23',
-        0x24 : '<inventory_root>/system/chassis/motherboard/dimm24',
-        0x25 : '<inventory_root>/system/chassis/motherboard/dimm25',
-        0x26 : '<inventory_root>/system/chassis/motherboard/dimm26',
-        0x27 : '<inventory_root>/system/chassis/motherboard/dimm27',
-        0x28 : '<inventory_root>/system/chassis/motherboard/dimm28',
-        0x29 : '<inventory_root>/system/chassis/motherboard/dimm29',
-        0x2a : '<inventory_root>/system/chassis/motherboard/dimm30',
-        0x2b : '<inventory_root>/system/chassis/motherboard/dimm31',
+    "FRU": {
+        0x01: "<inventory_root>/system/chassis/motherboard/cpu0",
+        0x02: "<inventory_root>/system/chassis/motherboard/cpu1",
+        0x03: "<inventory_root>/system/chassis/motherboard",
+        0x04: "<inventory_root>/system/chassis/motherboard/membuf0",
+        0x05: "<inventory_root>/system/chassis/motherboard/membuf1",
+        0x06: "<inventory_root>/system/chassis/motherboard/membuf2",
+        0x07: "<inventory_root>/system/chassis/motherboard/membuf3",
+        0x08: "<inventory_root>/system/chassis/motherboard/membuf4",
+        0x09: "<inventory_root>/system/chassis/motherboard/membuf5",
+        0x0C: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0x0D: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0x0E: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0x0F: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0x10: "<inventory_root>/system/chassis/motherboard/dimm4",
+        0x11: "<inventory_root>/system/chassis/motherboard/dimm5",
+        0x12: "<inventory_root>/system/chassis/motherboard/dimm6",
+        0x13: "<inventory_root>/system/chassis/motherboard/dimm7",
+        0x14: "<inventory_root>/system/chassis/motherboard/dimm8",
+        0x15: "<inventory_root>/system/chassis/motherboard/dimm9",
+        0x16: "<inventory_root>/system/chassis/motherboard/dimm10",
+        0x17: "<inventory_root>/system/chassis/motherboard/dimm11",
+        0x18: "<inventory_root>/system/chassis/motherboard/dimm12",
+        0x19: "<inventory_root>/system/chassis/motherboard/dimm13",
+        0x1A: "<inventory_root>/system/chassis/motherboard/dimm14",
+        0x1B: "<inventory_root>/system/chassis/motherboard/dimm15",
+        0x1C: "<inventory_root>/system/chassis/motherboard/dimm16",
+        0x1D: "<inventory_root>/system/chassis/motherboard/dimm17",
+        0x1E: "<inventory_root>/system/chassis/motherboard/dimm18",
+        0x1F: "<inventory_root>/system/chassis/motherboard/dimm19",
+        0x20: "<inventory_root>/system/chassis/motherboard/dimm20",
+        0x21: "<inventory_root>/system/chassis/motherboard/dimm21",
+        0x22: "<inventory_root>/system/chassis/motherboard/dimm22",
+        0x23: "<inventory_root>/system/chassis/motherboard/dimm23",
+        0x24: "<inventory_root>/system/chassis/motherboard/dimm24",
+        0x25: "<inventory_root>/system/chassis/motherboard/dimm25",
+        0x26: "<inventory_root>/system/chassis/motherboard/dimm26",
+        0x27: "<inventory_root>/system/chassis/motherboard/dimm27",
+        0x28: "<inventory_root>/system/chassis/motherboard/dimm28",
+        0x29: "<inventory_root>/system/chassis/motherboard/dimm29",
+        0x2A: "<inventory_root>/system/chassis/motherboard/dimm30",
+        0x2B: "<inventory_root>/system/chassis/motherboard/dimm31",
     },
-    'FRU_STR' : {
-        'PRODUCT_0'  : '<inventory_root>/system/bios',
-        'BOARD_1'    : '<inventory_root>/system/chassis/motherboard/cpu0',
-        'BOARD_2'    : '<inventory_root>/system/chassis/motherboard/cpu1',
-        'CHASSIS_3'  : '<inventory_root>/system/chassis/motherboard',
-        'BOARD_3'    : '<inventory_root>/system/misc',
-        'BOARD_4'    : '<inventory_root>/system/chassis/motherboard/membuf0',
-        'BOARD_5'    : '<inventory_root>/system/chassis/motherboard/membuf1',
-        'BOARD_6'    : '<inventory_root>/system/chassis/motherboard/membuf2',
-        'BOARD_7'    : '<inventory_root>/system/chassis/motherboard/membuf3',
-        'BOARD_8'    : '<inventory_root>/system/chassis/motherboard/membuf4',
-        'BOARD_9'    : '<inventory_root>/system/chassis/motherboard/membuf5',
-        'BOARD_10'   : '<inventory_root>/system/chassis/motherboard/membuf6',
-        'BOARD_11'   : '<inventory_root>/system/chassis/motherboard/membuf7',
-        'PRODUCT_12'   : '<inventory_root>/system/chassis/motherboard/dimm0',
-        'PRODUCT_13'   : '<inventory_root>/system/chassis/motherboard/dimm1',
-        'PRODUCT_14'   : '<inventory_root>/system/chassis/motherboard/dimm2',
-        'PRODUCT_15'   : '<inventory_root>/system/chassis/motherboard/dimm3',
-        'PRODUCT_16'   : '<inventory_root>/system/chassis/motherboard/dimm4',
-        'PRODUCT_17'   : '<inventory_root>/system/chassis/motherboard/dimm5',
-        'PRODUCT_18'   : '<inventory_root>/system/chassis/motherboard/dimm6',
-        'PRODUCT_19'   : '<inventory_root>/system/chassis/motherboard/dimm7',
-        'PRODUCT_20'   : '<inventory_root>/system/chassis/motherboard/dimm8',
-        'PRODUCT_21'   : '<inventory_root>/system/chassis/motherboard/dimm9',
-        'PRODUCT_22'   : '<inventory_root>/system/chassis/motherboard/dimm10',
-        'PRODUCT_23'   : '<inventory_root>/system/chassis/motherboard/dimm11',
-        'PRODUCT_24'   : '<inventory_root>/system/chassis/motherboard/dimm12',
-        'PRODUCT_25'   : '<inventory_root>/system/chassis/motherboard/dimm13',
-        'PRODUCT_26'   : '<inventory_root>/system/chassis/motherboard/dimm14',
-        'PRODUCT_27'   : '<inventory_root>/system/chassis/motherboard/dimm15',
-        'PRODUCT_28'   : '<inventory_root>/system/chassis/motherboard/dimm16',
-        'PRODUCT_29'   : '<inventory_root>/system/chassis/motherboard/dimm17',
-        'PRODUCT_30'   : '<inventory_root>/system/chassis/motherboard/dimm18',
-        'PRODUCT_31'   : '<inventory_root>/system/chassis/motherboard/dimm19',
-        'PRODUCT_32'   : '<inventory_root>/system/chassis/motherboard/dimm20',
-        'PRODUCT_33'   : '<inventory_root>/system/chassis/motherboard/dimm21',
-        'PRODUCT_34'   : '<inventory_root>/system/chassis/motherboard/dimm22',
-        'PRODUCT_35'   : '<inventory_root>/system/chassis/motherboard/dimm23',
-        'PRODUCT_36'   : '<inventory_root>/system/chassis/motherboard/dimm24',
-        'PRODUCT_37'   : '<inventory_root>/system/chassis/motherboard/dimm25',
-        'PRODUCT_38'   : '<inventory_root>/system/chassis/motherboard/dimm26',
-        'PRODUCT_39'   : '<inventory_root>/system/chassis/motherboard/dimm27',
-        'PRODUCT_40'   : '<inventory_root>/system/chassis/motherboard/dimm28',
-        'PRODUCT_41'   : '<inventory_root>/system/chassis/motherboard/dimm29',
-        'PRODUCT_42'   : '<inventory_root>/system/chassis/motherboard/dimm30',
-        'PRODUCT_43'   : '<inventory_root>/system/chassis/motherboard/dimm31',
-        'PRODUCT_47'   : '<inventory_root>/system/misc',
+    "FRU_STR": {
+        "PRODUCT_0": "<inventory_root>/system/bios",
+        "BOARD_1": "<inventory_root>/system/chassis/motherboard/cpu0",
+        "BOARD_2": "<inventory_root>/system/chassis/motherboard/cpu1",
+        "CHASSIS_3": "<inventory_root>/system/chassis/motherboard",
+        "BOARD_3": "<inventory_root>/system/misc",
+        "BOARD_4": "<inventory_root>/system/chassis/motherboard/membuf0",
+        "BOARD_5": "<inventory_root>/system/chassis/motherboard/membuf1",
+        "BOARD_6": "<inventory_root>/system/chassis/motherboard/membuf2",
+        "BOARD_7": "<inventory_root>/system/chassis/motherboard/membuf3",
+        "BOARD_8": "<inventory_root>/system/chassis/motherboard/membuf4",
+        "BOARD_9": "<inventory_root>/system/chassis/motherboard/membuf5",
+        "BOARD_10": "<inventory_root>/system/chassis/motherboard/membuf6",
+        "BOARD_11": "<inventory_root>/system/chassis/motherboard/membuf7",
+        "PRODUCT_12": "<inventory_root>/system/chassis/motherboard/dimm0",
+        "PRODUCT_13": "<inventory_root>/system/chassis/motherboard/dimm1",
+        "PRODUCT_14": "<inventory_root>/system/chassis/motherboard/dimm2",
+        "PRODUCT_15": "<inventory_root>/system/chassis/motherboard/dimm3",
+        "PRODUCT_16": "<inventory_root>/system/chassis/motherboard/dimm4",
+        "PRODUCT_17": "<inventory_root>/system/chassis/motherboard/dimm5",
+        "PRODUCT_18": "<inventory_root>/system/chassis/motherboard/dimm6",
+        "PRODUCT_19": "<inventory_root>/system/chassis/motherboard/dimm7",
+        "PRODUCT_20": "<inventory_root>/system/chassis/motherboard/dimm8",
+        "PRODUCT_21": "<inventory_root>/system/chassis/motherboard/dimm9",
+        "PRODUCT_22": "<inventory_root>/system/chassis/motherboard/dimm10",
+        "PRODUCT_23": "<inventory_root>/system/chassis/motherboard/dimm11",
+        "PRODUCT_24": "<inventory_root>/system/chassis/motherboard/dimm12",
+        "PRODUCT_25": "<inventory_root>/system/chassis/motherboard/dimm13",
+        "PRODUCT_26": "<inventory_root>/system/chassis/motherboard/dimm14",
+        "PRODUCT_27": "<inventory_root>/system/chassis/motherboard/dimm15",
+        "PRODUCT_28": "<inventory_root>/system/chassis/motherboard/dimm16",
+        "PRODUCT_29": "<inventory_root>/system/chassis/motherboard/dimm17",
+        "PRODUCT_30": "<inventory_root>/system/chassis/motherboard/dimm18",
+        "PRODUCT_31": "<inventory_root>/system/chassis/motherboard/dimm19",
+        "PRODUCT_32": "<inventory_root>/system/chassis/motherboard/dimm20",
+        "PRODUCT_33": "<inventory_root>/system/chassis/motherboard/dimm21",
+        "PRODUCT_34": "<inventory_root>/system/chassis/motherboard/dimm22",
+        "PRODUCT_35": "<inventory_root>/system/chassis/motherboard/dimm23",
+        "PRODUCT_36": "<inventory_root>/system/chassis/motherboard/dimm24",
+        "PRODUCT_37": "<inventory_root>/system/chassis/motherboard/dimm25",
+        "PRODUCT_38": "<inventory_root>/system/chassis/motherboard/dimm26",
+        "PRODUCT_39": "<inventory_root>/system/chassis/motherboard/dimm27",
+        "PRODUCT_40": "<inventory_root>/system/chassis/motherboard/dimm28",
+        "PRODUCT_41": "<inventory_root>/system/chassis/motherboard/dimm29",
+        "PRODUCT_42": "<inventory_root>/system/chassis/motherboard/dimm30",
+        "PRODUCT_43": "<inventory_root>/system/chassis/motherboard/dimm31",
+        "PRODUCT_47": "<inventory_root>/system/misc",
     },
-    'SENSOR' : {
-        0x02 : '/org/openbmc/sensors/host/HostStatus',
-        0x03 : '/org/openbmc/sensors/host/BootProgress',
-        0x5a : '<inventory_root>/system/chassis/motherboard/cpu0',
-        0xa4 : '<inventory_root>/system/chassis/motherboard/cpu1',
-        0x1e : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0x1f : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0x20 : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0x21 : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0x22 : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0x23 : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0x24 : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0x25 : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0x26 : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0x27 : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0x28 : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0x29 : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0x2a : '<inventory_root>/system/chassis/motherboard/dimm15',
-        0x2b : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0x2c : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0x2d : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0x2e : '<inventory_root>/system/chassis/motherboard/dimm19',
-        0x2f : '<inventory_root>/system/chassis/motherboard/dimm18',
-        0x30 : '<inventory_root>/system/chassis/motherboard/dimm17',
-        0x31 : '<inventory_root>/system/chassis/motherboard/dimm16',
-        0x32 : '<inventory_root>/system/chassis/motherboard/dimm23',
-        0x33 : '<inventory_root>/system/chassis/motherboard/dimm22',
-        0x34 : '<inventory_root>/system/chassis/motherboard/dimm21',
-        0x35 : '<inventory_root>/system/chassis/motherboard/dimm20',
-        0x36 : '<inventory_root>/system/chassis/motherboard/dimm27',
-        0x37 : '<inventory_root>/system/chassis/motherboard/dimm26',
-        0x38 : '<inventory_root>/system/chassis/motherboard/dimm25',
-        0x39 : '<inventory_root>/system/chassis/motherboard/dimm24',
-        0x3a : '<inventory_root>/system/chassis/motherboard/dimm31',
-        0x3b : '<inventory_root>/system/chassis/motherboard/dimm30',
-        0x3c : '<inventory_root>/system/chassis/motherboard/dimm29',
-        0x3d : '<inventory_root>/system/chassis/motherboard/dimm28',
-        0x3e : '<inventory_root>/system/chassis/motherboard/cpu0/core0',
-        0x3f : '<inventory_root>/system/chassis/motherboard/cpu0/core1',
-        0x40 : '<inventory_root>/system/chassis/motherboard/cpu0/core2',
-        0x41 : '<inventory_root>/system/chassis/motherboard/cpu0/core3',
-        0x42 : '<inventory_root>/system/chassis/motherboard/cpu0/core4',
-        0x43 : '<inventory_root>/system/chassis/motherboard/cpu0/core5',
-        0x44 : '<inventory_root>/system/chassis/motherboard/cpu0/core6',
-        0x45 : '<inventory_root>/system/chassis/motherboard/cpu0/core7',
-        0x46 : '<inventory_root>/system/chassis/motherboard/cpu0/core8',
-        0x47 : '<inventory_root>/system/chassis/motherboard/cpu0/core9',
-        0x48 : '<inventory_root>/system/chassis/motherboard/cpu0/core10',
-        0x49 : '<inventory_root>/system/chassis/motherboard/cpu0/core11',
-        0x4a : '<inventory_root>/system/chassis/motherboard/cpu1/core0',
-        0x4b : '<inventory_root>/system/chassis/motherboard/cpu1/core1',
-        0x4c : '<inventory_root>/system/chassis/motherboard/cpu1/core2',
-        0x4d : '<inventory_root>/system/chassis/motherboard/cpu1/core3',
-        0x4e : '<inventory_root>/system/chassis/motherboard/cpu1/core4',
-        0x4f : '<inventory_root>/system/chassis/motherboard/cpu1/core5',
-        0x50 : '<inventory_root>/system/chassis/motherboard/cpu1/core6',
-        0x51 : '<inventory_root>/system/chassis/motherboard/cpu1/core7',
-        0x52 : '<inventory_root>/system/chassis/motherboard/cpu1/core8',
-        0x53 : '<inventory_root>/system/chassis/motherboard/cpu1/core9',
-        0x54 : '<inventory_root>/system/chassis/motherboard/cpu1/core10',
-        0x55 : '<inventory_root>/system/chassis/motherboard/cpu1/core11',
-        0x56 : '<inventory_root>/system/chassis/motherboard/membuf0',
-        0x57 : '<inventory_root>/system/chassis/motherboard/membuf1',
-        0x58 : '<inventory_root>/system/chassis/motherboard/membuf2',
-        0x59 : '<inventory_root>/system/chassis/motherboard/membuf3',
-        0x5a : '<inventory_root>/system/chassis/motherboard/membuf4',
-        0x5b : '<inventory_root>/system/chassis/motherboard/membuf5',
-        0x5c : '<inventory_root>/system/chassis/motherboard/membuf6',
-        0x5d : '<inventory_root>/system/chassis/motherboard/membuf7',
-        0x07 : '/org/openbmc/sensors/host/BootCount',
-        0x0c : '<inventory_root>/system/chassis/motherboard',
-        0x01 : '<inventory_root>/system/systemevent',
-        0x08 : '<inventory_root>/system/powerlimit',
-        0x0d : '<inventory_root>/system/chassis/motherboard/refclock',
-        0x0e : '<inventory_root>/system/chassis/motherboard/pcieclock',
-        0x0f : '<inventory_root>/system/chassis/motherboard/todclock',
-        0x10 : '<inventory_root>/system/chassis/motherboard/apss',
-        0x02 : '/org/openbmc/sensors/host/OperatingSystemStatus',
-        0x04 : '<inventory_root>/system/chassis/motherboard/pcielink',
-        0x0b : '/xyz/openbmc_project/sensors/chassis/PowerSupplyRedundancy',
-        0xda : '/org/openbmc/sensors/host/TurboAllowed',
-        0xD8 : '/org/openbmc/sensors/host/PowerSupplyDerating',
+    "SENSOR": {
+        0x02: "/org/openbmc/sensors/host/HostStatus",
+        0x03: "/org/openbmc/sensors/host/BootProgress",
+        0x5A: "<inventory_root>/system/chassis/motherboard/cpu0",
+        0xA4: "<inventory_root>/system/chassis/motherboard/cpu1",
+        0x1E: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0x1F: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0x20: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0x21: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0x22: "<inventory_root>/system/chassis/motherboard/dimm7",
+        0x23: "<inventory_root>/system/chassis/motherboard/dimm6",
+        0x24: "<inventory_root>/system/chassis/motherboard/dimm5",
+        0x25: "<inventory_root>/system/chassis/motherboard/dimm4",
+        0x26: "<inventory_root>/system/chassis/motherboard/dimm11",
+        0x27: "<inventory_root>/system/chassis/motherboard/dimm10",
+        0x28: "<inventory_root>/system/chassis/motherboard/dimm9",
+        0x29: "<inventory_root>/system/chassis/motherboard/dimm8",
+        0x2A: "<inventory_root>/system/chassis/motherboard/dimm15",
+        0x2B: "<inventory_root>/system/chassis/motherboard/dimm14",
+        0x2C: "<inventory_root>/system/chassis/motherboard/dimm13",
+        0x2D: "<inventory_root>/system/chassis/motherboard/dimm12",
+        0x2E: "<inventory_root>/system/chassis/motherboard/dimm19",
+        0x2F: "<inventory_root>/system/chassis/motherboard/dimm18",
+        0x30: "<inventory_root>/system/chassis/motherboard/dimm17",
+        0x31: "<inventory_root>/system/chassis/motherboard/dimm16",
+        0x32: "<inventory_root>/system/chassis/motherboard/dimm23",
+        0x33: "<inventory_root>/system/chassis/motherboard/dimm22",
+        0x34: "<inventory_root>/system/chassis/motherboard/dimm21",
+        0x35: "<inventory_root>/system/chassis/motherboard/dimm20",
+        0x36: "<inventory_root>/system/chassis/motherboard/dimm27",
+        0x37: "<inventory_root>/system/chassis/motherboard/dimm26",
+        0x38: "<inventory_root>/system/chassis/motherboard/dimm25",
+        0x39: "<inventory_root>/system/chassis/motherboard/dimm24",
+        0x3A: "<inventory_root>/system/chassis/motherboard/dimm31",
+        0x3B: "<inventory_root>/system/chassis/motherboard/dimm30",
+        0x3C: "<inventory_root>/system/chassis/motherboard/dimm29",
+        0x3D: "<inventory_root>/system/chassis/motherboard/dimm28",
+        0x3E: "<inventory_root>/system/chassis/motherboard/cpu0/core0",
+        0x3F: "<inventory_root>/system/chassis/motherboard/cpu0/core1",
+        0x40: "<inventory_root>/system/chassis/motherboard/cpu0/core2",
+        0x41: "<inventory_root>/system/chassis/motherboard/cpu0/core3",
+        0x42: "<inventory_root>/system/chassis/motherboard/cpu0/core4",
+        0x43: "<inventory_root>/system/chassis/motherboard/cpu0/core5",
+        0x44: "<inventory_root>/system/chassis/motherboard/cpu0/core6",
+        0x45: "<inventory_root>/system/chassis/motherboard/cpu0/core7",
+        0x46: "<inventory_root>/system/chassis/motherboard/cpu0/core8",
+        0x47: "<inventory_root>/system/chassis/motherboard/cpu0/core9",
+        0x48: "<inventory_root>/system/chassis/motherboard/cpu0/core10",
+        0x49: "<inventory_root>/system/chassis/motherboard/cpu0/core11",
+        0x4A: "<inventory_root>/system/chassis/motherboard/cpu1/core0",
+        0x4B: "<inventory_root>/system/chassis/motherboard/cpu1/core1",
+        0x4C: "<inventory_root>/system/chassis/motherboard/cpu1/core2",
+        0x4D: "<inventory_root>/system/chassis/motherboard/cpu1/core3",
+        0x4E: "<inventory_root>/system/chassis/motherboard/cpu1/core4",
+        0x4F: "<inventory_root>/system/chassis/motherboard/cpu1/core5",
+        0x50: "<inventory_root>/system/chassis/motherboard/cpu1/core6",
+        0x51: "<inventory_root>/system/chassis/motherboard/cpu1/core7",
+        0x52: "<inventory_root>/system/chassis/motherboard/cpu1/core8",
+        0x53: "<inventory_root>/system/chassis/motherboard/cpu1/core9",
+        0x54: "<inventory_root>/system/chassis/motherboard/cpu1/core10",
+        0x55: "<inventory_root>/system/chassis/motherboard/cpu1/core11",
+        0x56: "<inventory_root>/system/chassis/motherboard/membuf0",
+        0x57: "<inventory_root>/system/chassis/motherboard/membuf1",
+        0x58: "<inventory_root>/system/chassis/motherboard/membuf2",
+        0x59: "<inventory_root>/system/chassis/motherboard/membuf3",
+        0x5A: "<inventory_root>/system/chassis/motherboard/membuf4",
+        0x5B: "<inventory_root>/system/chassis/motherboard/membuf5",
+        0x5C: "<inventory_root>/system/chassis/motherboard/membuf6",
+        0x5D: "<inventory_root>/system/chassis/motherboard/membuf7",
+        0x07: "/org/openbmc/sensors/host/BootCount",
+        0x0C: "<inventory_root>/system/chassis/motherboard",
+        0x01: "<inventory_root>/system/systemevent",
+        0x08: "<inventory_root>/system/powerlimit",
+        0x0D: "<inventory_root>/system/chassis/motherboard/refclock",
+        0x0E: "<inventory_root>/system/chassis/motherboard/pcieclock",
+        0x0F: "<inventory_root>/system/chassis/motherboard/todclock",
+        0x10: "<inventory_root>/system/chassis/motherboard/apss",
+        0x02: "/org/openbmc/sensors/host/OperatingSystemStatus",
+        0x04: "<inventory_root>/system/chassis/motherboard/pcielink",
+        0x0B: "/xyz/openbmc_project/sensors/chassis/PowerSupplyRedundancy",
+        0xDA: "/org/openbmc/sensors/host/TurboAllowed",
+        0xD8: "/org/openbmc/sensors/host/PowerSupplyDerating",
     },
-    'GPIO_PRESENT' : {}
+    "GPIO_PRESENT": {},
 }
 
 
diff --git a/configs/Zaius.py b/configs/Zaius.py
index fcabc1f..837c607 100644
--- a/configs/Zaius.py
+++ b/configs/Zaius.py
@@ -1,320 +1,599 @@
-## System states
-##   state can change to next state in 2 ways:
-##   - a process emits a GotoSystemState signal with state name to goto
-##   - objects specified in EXIT_STATE_DEPEND have started
+# System states
+#   state can change to next state in 2 ways:
+#   - a process emits a GotoSystemState signal with state name to goto
+#   - objects specified in EXIT_STATE_DEPEND have started
 SYSTEM_STATES = [
-    'BASE_APPS',
-    'BMC_STARTING',
-    'BMC_READY',
-    'HOST_POWERING_ON',
-    'HOST_POWERED_ON',
-    'HOST_BOOTING',
-    'HOST_BOOTED',
-    'HOST_POWERED_OFF',
+    "BASE_APPS",
+    "BMC_STARTING",
+    "BMC_READY",
+    "HOST_POWERING_ON",
+    "HOST_POWERED_ON",
+    "HOST_BOOTING",
+    "HOST_BOOTED",
+    "HOST_POWERED_OFF",
 ]
 
 EXIT_STATE_DEPEND = {
-    'BASE_APPS' : {
-        '/org/openbmc/sensors': 0,
+    "BASE_APPS": {
+        "/org/openbmc/sensors": 0,
     },
-    'BMC_STARTING' : {
-        '/org/openbmc/control/chassis0': 0,
-        '/org/openbmc/control/power0' : 0,
-        '/org/openbmc/control/flash/bios' : 0,
+    "BMC_STARTING": {
+        "/org/openbmc/control/chassis0": 0,
+        "/org/openbmc/control/power0": 0,
+        "/org/openbmc/control/flash/bios": 0,
     },
 }
 
 FRU_INSTANCES = {
-    '<inventory_root>/system' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-    '<inventory_root>/system/bios' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-    '<inventory_root>/system/misc' : { 'fru_type' : 'SYSTEM','is_fru' : False, },
-
-    '<inventory_root>/system/chassis' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-
-    '<inventory_root>/system/chassis/motherboard' : { 'fru_type' : 'MAIN_PLANAR','is_fru' : True, },
-
-    '<inventory_root>/system/systemevent'                  : { 'fru_type' : 'SYSTEM_EVENT', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/refclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/pcieclock': { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/todclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/fan0' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan1' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan2' : { 'fru_type' : 'FAN','is_fru' : True, },
-
-    '<inventory_root>/system/chassis/motherboard/bmc' : { 'fru_type' : 'BMC','is_fru' : False, 'manufacturer' : 'ASPEED' },
-
-    '<inventory_root>/system/chassis/motherboard/cpu0' : { 'fru_type' : 'CPU', 'is_fru' : True, },
-    '<inventory_root>/system/chassis/motherboard/cpu1' : { 'fru_type' : 'CPU', 'is_fru' : True, },
-
-    '<inventory_root>/system/chassis/motherboard/cpu0/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core10': { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core11': { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core12' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core13' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core14' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core15' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core16' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core17' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core18' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core19' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core20' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core21' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core22': { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core23': { 'fru_type' : 'CORE', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/motherboard/cpu1/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core10' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core11' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core12' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core13' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core14' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core15' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core16' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core17' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core18' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core19' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core20' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core21' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core22' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core23' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-
-    '<inventory_root>/system/chassis/motherboard/dimm0' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm1' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm2' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm3' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm4' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm5' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm6' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm7' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm8' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm9' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm10' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm11' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm12' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm13' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm14' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm15' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm16' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm17' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm18' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm19' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm20' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm21' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm22' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm23' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm24' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm25' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm26' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm27' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm28' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm29' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm30' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm31' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+    "<inventory_root>/system": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/bios": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/misc": {
+        "fru_type": "SYSTEM",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis": {
+        "fru_type": "SYSTEM",
+        "is_fru": True,
+        "present": "True",
+    },
+    "<inventory_root>/system/chassis/motherboard": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/systemevent": {
+        "fru_type": "SYSTEM_EVENT",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/refclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/pcieclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/todclock": {
+        "fru_type": "MAIN_PLANAR",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/fan0": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan1": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/fan2": {
+        "fru_type": "FAN",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/bmc": {
+        "fru_type": "BMC",
+        "is_fru": False,
+        "manufacturer": "ASPEED",
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0": {
+        "fru_type": "CPU",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1": {
+        "fru_type": "CPU",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core0": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core1": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core2": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core3": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core4": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core5": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core6": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core7": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core8": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core9": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core10": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core11": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core12": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core13": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core14": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core15": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core16": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core17": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core18": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core19": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core20": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core21": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core22": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu0/core23": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core0": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core1": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core2": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core3": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core4": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core5": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core6": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core7": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core8": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core9": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core10": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core11": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core12": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core13": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core14": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core15": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core16": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core17": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core18": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core19": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core20": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core21": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core22": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/cpu1/core23": {
+        "fru_type": "CORE",
+        "is_fru": False,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm0": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm1": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm2": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm3": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm4": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm5": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm6": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm7": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm8": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm9": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm10": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm11": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm12": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm13": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm14": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm15": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm16": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm17": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm18": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm19": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm20": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm21": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm22": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm23": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm24": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm25": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm26": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm27": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm28": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm29": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm30": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
+    "<inventory_root>/system/chassis/motherboard/dimm31": {
+        "fru_type": "DIMM",
+        "is_fru": True,
+    },
 }
 
 ID_LOOKUP = {
-    'FRU' : {
-        0x01 : '<inventory_root>/system/chassis/motherboard/cpu0',
-        0x02 : '<inventory_root>/system/chassis/motherboard/cpu1',
-        0x03 : '<inventory_root>/system/chassis/motherboard',
-        0x04 : '<inventory_root>/system/chassis/motherboard/membuf0',
-        0x05 : '<inventory_root>/system/chassis/motherboard/membuf1',
-        0x06 : '<inventory_root>/system/chassis/motherboard/membuf2',
-        0x07 : '<inventory_root>/system/chassis/motherboard/membuf3',
-        0x08 : '<inventory_root>/system/chassis/motherboard/membuf4',
-        0x09 : '<inventory_root>/system/chassis/motherboard/membuf5',
-        0x0c : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0x0d : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0x0e : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0x0f : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0x10 : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0x11 : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0x12 : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0x13 : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0x14 : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0x15 : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0x16 : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0x17 : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0x18 : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0x19 : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0x1a : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0x1b : '<inventory_root>/system/chassis/motherboard/dimm15',
-        0x1c : '<inventory_root>/system/chassis/motherboard/dimm16',
-        0x1d : '<inventory_root>/system/chassis/motherboard/dimm17',
-        0x1e : '<inventory_root>/system/chassis/motherboard/dimm18',
-        0x1f : '<inventory_root>/system/chassis/motherboard/dimm19',
-        0x20 : '<inventory_root>/system/chassis/motherboard/dimm20',
-        0x21 : '<inventory_root>/system/chassis/motherboard/dimm21',
-        0x22 : '<inventory_root>/system/chassis/motherboard/dimm22',
-        0x23 : '<inventory_root>/system/chassis/motherboard/dimm23',
-        0x24 : '<inventory_root>/system/chassis/motherboard/dimm24',
-        0x25 : '<inventory_root>/system/chassis/motherboard/dimm25',
-        0x26 : '<inventory_root>/system/chassis/motherboard/dimm26',
-        0x27 : '<inventory_root>/system/chassis/motherboard/dimm27',
-        0x28 : '<inventory_root>/system/chassis/motherboard/dimm28',
-        0x29 : '<inventory_root>/system/chassis/motherboard/dimm29',
-        0x2a : '<inventory_root>/system/chassis/motherboard/dimm30',
-        0x2b : '<inventory_root>/system/chassis/motherboard/dimm31',
+    "FRU": {
+        0x01: "<inventory_root>/system/chassis/motherboard/cpu0",
+        0x02: "<inventory_root>/system/chassis/motherboard/cpu1",
+        0x03: "<inventory_root>/system/chassis/motherboard",
+        0x04: "<inventory_root>/system/chassis/motherboard/membuf0",
+        0x05: "<inventory_root>/system/chassis/motherboard/membuf1",
+        0x06: "<inventory_root>/system/chassis/motherboard/membuf2",
+        0x07: "<inventory_root>/system/chassis/motherboard/membuf3",
+        0x08: "<inventory_root>/system/chassis/motherboard/membuf4",
+        0x09: "<inventory_root>/system/chassis/motherboard/membuf5",
+        0x0C: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0x0D: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0x0E: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0x0F: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0x10: "<inventory_root>/system/chassis/motherboard/dimm4",
+        0x11: "<inventory_root>/system/chassis/motherboard/dimm5",
+        0x12: "<inventory_root>/system/chassis/motherboard/dimm6",
+        0x13: "<inventory_root>/system/chassis/motherboard/dimm7",
+        0x14: "<inventory_root>/system/chassis/motherboard/dimm8",
+        0x15: "<inventory_root>/system/chassis/motherboard/dimm9",
+        0x16: "<inventory_root>/system/chassis/motherboard/dimm10",
+        0x17: "<inventory_root>/system/chassis/motherboard/dimm11",
+        0x18: "<inventory_root>/system/chassis/motherboard/dimm12",
+        0x19: "<inventory_root>/system/chassis/motherboard/dimm13",
+        0x1A: "<inventory_root>/system/chassis/motherboard/dimm14",
+        0x1B: "<inventory_root>/system/chassis/motherboard/dimm15",
+        0x1C: "<inventory_root>/system/chassis/motherboard/dimm16",
+        0x1D: "<inventory_root>/system/chassis/motherboard/dimm17",
+        0x1E: "<inventory_root>/system/chassis/motherboard/dimm18",
+        0x1F: "<inventory_root>/system/chassis/motherboard/dimm19",
+        0x20: "<inventory_root>/system/chassis/motherboard/dimm20",
+        0x21: "<inventory_root>/system/chassis/motherboard/dimm21",
+        0x22: "<inventory_root>/system/chassis/motherboard/dimm22",
+        0x23: "<inventory_root>/system/chassis/motherboard/dimm23",
+        0x24: "<inventory_root>/system/chassis/motherboard/dimm24",
+        0x25: "<inventory_root>/system/chassis/motherboard/dimm25",
+        0x26: "<inventory_root>/system/chassis/motherboard/dimm26",
+        0x27: "<inventory_root>/system/chassis/motherboard/dimm27",
+        0x28: "<inventory_root>/system/chassis/motherboard/dimm28",
+        0x29: "<inventory_root>/system/chassis/motherboard/dimm29",
+        0x2A: "<inventory_root>/system/chassis/motherboard/dimm30",
+        0x2B: "<inventory_root>/system/chassis/motherboard/dimm31",
     },
-    'FRU_STR' : {
-        'PRODUCT_0'  : '<inventory_root>/system/bios',
-        'BOARD_1'    : '<inventory_root>/system/chassis/motherboard/cpu0',
-        'BOARD_2'    : '<inventory_root>/system/chassis/motherboard/cpu1',
-        'CHASSIS_3'  : '<inventory_root>/system/chassis/motherboard',
-        'BOARD_3'    : '<inventory_root>/system/misc',
-        'PRODUCT_12'   : '<inventory_root>/system/chassis/motherboard/dimm0',
-        'PRODUCT_13'   : '<inventory_root>/system/chassis/motherboard/dimm1',
-        'PRODUCT_14'   : '<inventory_root>/system/chassis/motherboard/dimm2',
-        'PRODUCT_15'   : '<inventory_root>/system/chassis/motherboard/dimm3',
-        'PRODUCT_16'   : '<inventory_root>/system/chassis/motherboard/dimm4',
-        'PRODUCT_17'   : '<inventory_root>/system/chassis/motherboard/dimm5',
-        'PRODUCT_18'   : '<inventory_root>/system/chassis/motherboard/dimm6',
-        'PRODUCT_19'   : '<inventory_root>/system/chassis/motherboard/dimm7',
-        'PRODUCT_20'   : '<inventory_root>/system/chassis/motherboard/dimm8',
-        'PRODUCT_21'   : '<inventory_root>/system/chassis/motherboard/dimm9',
-        'PRODUCT_22'   : '<inventory_root>/system/chassis/motherboard/dimm10',
-        'PRODUCT_23'   : '<inventory_root>/system/chassis/motherboard/dimm11',
-        'PRODUCT_24'   : '<inventory_root>/system/chassis/motherboard/dimm12',
-        'PRODUCT_25'   : '<inventory_root>/system/chassis/motherboard/dimm13',
-        'PRODUCT_26'   : '<inventory_root>/system/chassis/motherboard/dimm14',
-        'PRODUCT_27'   : '<inventory_root>/system/chassis/motherboard/dimm15',
-        'PRODUCT_28'   : '<inventory_root>/system/chassis/motherboard/dimm16',
-        'PRODUCT_29'   : '<inventory_root>/system/chassis/motherboard/dimm17',
-        'PRODUCT_30'   : '<inventory_root>/system/chassis/motherboard/dimm18',
-        'PRODUCT_31'   : '<inventory_root>/system/chassis/motherboard/dimm19',
-        'PRODUCT_32'   : '<inventory_root>/system/chassis/motherboard/dimm20',
-        'PRODUCT_33'   : '<inventory_root>/system/chassis/motherboard/dimm21',
-        'PRODUCT_34'   : '<inventory_root>/system/chassis/motherboard/dimm22',
-        'PRODUCT_35'   : '<inventory_root>/system/chassis/motherboard/dimm23',
-        'PRODUCT_36'   : '<inventory_root>/system/chassis/motherboard/dimm24',
-        'PRODUCT_37'   : '<inventory_root>/system/chassis/motherboard/dimm25',
-        'PRODUCT_38'   : '<inventory_root>/system/chassis/motherboard/dimm26',
-        'PRODUCT_39'   : '<inventory_root>/system/chassis/motherboard/dimm27',
-        'PRODUCT_40'   : '<inventory_root>/system/chassis/motherboard/dimm28',
-        'PRODUCT_41'   : '<inventory_root>/system/chassis/motherboard/dimm29',
-        'PRODUCT_42'   : '<inventory_root>/system/chassis/motherboard/dimm30',
-        'PRODUCT_43'   : '<inventory_root>/system/chassis/motherboard/dimm31',
-        'PRODUCT_47'   : '<inventory_root>/system/misc',
+    "FRU_STR": {
+        "PRODUCT_0": "<inventory_root>/system/bios",
+        "BOARD_1": "<inventory_root>/system/chassis/motherboard/cpu0",
+        "BOARD_2": "<inventory_root>/system/chassis/motherboard/cpu1",
+        "CHASSIS_3": "<inventory_root>/system/chassis/motherboard",
+        "BOARD_3": "<inventory_root>/system/misc",
+        "PRODUCT_12": "<inventory_root>/system/chassis/motherboard/dimm0",
+        "PRODUCT_13": "<inventory_root>/system/chassis/motherboard/dimm1",
+        "PRODUCT_14": "<inventory_root>/system/chassis/motherboard/dimm2",
+        "PRODUCT_15": "<inventory_root>/system/chassis/motherboard/dimm3",
+        "PRODUCT_16": "<inventory_root>/system/chassis/motherboard/dimm4",
+        "PRODUCT_17": "<inventory_root>/system/chassis/motherboard/dimm5",
+        "PRODUCT_18": "<inventory_root>/system/chassis/motherboard/dimm6",
+        "PRODUCT_19": "<inventory_root>/system/chassis/motherboard/dimm7",
+        "PRODUCT_20": "<inventory_root>/system/chassis/motherboard/dimm8",
+        "PRODUCT_21": "<inventory_root>/system/chassis/motherboard/dimm9",
+        "PRODUCT_22": "<inventory_root>/system/chassis/motherboard/dimm10",
+        "PRODUCT_23": "<inventory_root>/system/chassis/motherboard/dimm11",
+        "PRODUCT_24": "<inventory_root>/system/chassis/motherboard/dimm12",
+        "PRODUCT_25": "<inventory_root>/system/chassis/motherboard/dimm13",
+        "PRODUCT_26": "<inventory_root>/system/chassis/motherboard/dimm14",
+        "PRODUCT_27": "<inventory_root>/system/chassis/motherboard/dimm15",
+        "PRODUCT_28": "<inventory_root>/system/chassis/motherboard/dimm16",
+        "PRODUCT_29": "<inventory_root>/system/chassis/motherboard/dimm17",
+        "PRODUCT_30": "<inventory_root>/system/chassis/motherboard/dimm18",
+        "PRODUCT_31": "<inventory_root>/system/chassis/motherboard/dimm19",
+        "PRODUCT_32": "<inventory_root>/system/chassis/motherboard/dimm20",
+        "PRODUCT_33": "<inventory_root>/system/chassis/motherboard/dimm21",
+        "PRODUCT_34": "<inventory_root>/system/chassis/motherboard/dimm22",
+        "PRODUCT_35": "<inventory_root>/system/chassis/motherboard/dimm23",
+        "PRODUCT_36": "<inventory_root>/system/chassis/motherboard/dimm24",
+        "PRODUCT_37": "<inventory_root>/system/chassis/motherboard/dimm25",
+        "PRODUCT_38": "<inventory_root>/system/chassis/motherboard/dimm26",
+        "PRODUCT_39": "<inventory_root>/system/chassis/motherboard/dimm27",
+        "PRODUCT_40": "<inventory_root>/system/chassis/motherboard/dimm28",
+        "PRODUCT_41": "<inventory_root>/system/chassis/motherboard/dimm29",
+        "PRODUCT_42": "<inventory_root>/system/chassis/motherboard/dimm30",
+        "PRODUCT_43": "<inventory_root>/system/chassis/motherboard/dimm31",
+        "PRODUCT_47": "<inventory_root>/system/misc",
     },
-    'SENSOR' : {
-        0x02 : '/org/openbmc/sensors/host/HostStatus',
-        0x03 : '/org/openbmc/sensors/host/BootProgress',
-        0x21 : '<inventory_root>/system/chassis/motherboard/cpu0',
-        0x71 : '<inventory_root>/system/chassis/motherboard/cpu1',
-        0xc7 : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0xc5 : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0xc3 : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0xc1 : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0xcf : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0xcd : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0xcb : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0xc9 : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0xd7 : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0xd5 : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0xd3 : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0xd1 : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0xdf : '<inventory_root>/system/chassis/motherboard/dimm15',
-        0xdd : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0xdb : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0xd9 : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0xe7 : '<inventory_root>/system/chassis/motherboard/dimm19',
-        0xe5 : '<inventory_root>/system/chassis/motherboard/dimm18',
-        0xe3 : '<inventory_root>/system/chassis/motherboard/dimm17',
-        0xe1 : '<inventory_root>/system/chassis/motherboard/dimm16',
-        0xef : '<inventory_root>/system/chassis/motherboard/dimm23',
-        0xed : '<inventory_root>/system/chassis/motherboard/dimm22',
-        0xeb : '<inventory_root>/system/chassis/motherboard/dimm21',
-        0xe9 : '<inventory_root>/system/chassis/motherboard/dimm20',
-        0xf7 : '<inventory_root>/system/chassis/motherboard/dimm27',
-        0xf5 : '<inventory_root>/system/chassis/motherboard/dimm26',
-        0xf3 : '<inventory_root>/system/chassis/motherboard/dimm25',
-        0xf1 : '<inventory_root>/system/chassis/motherboard/dimm24',
-        0xff : '<inventory_root>/system/chassis/motherboard/dimm31',
-        0xfd : '<inventory_root>/system/chassis/motherboard/dimm30',
-        0xfb : '<inventory_root>/system/chassis/motherboard/dimm29',
-        0xf9 : '<inventory_root>/system/chassis/motherboard/dimm28',
-        0x23 : '<inventory_root>/system/chassis/motherboard/cpu0/core0',
-        0x26 : '<inventory_root>/system/chassis/motherboard/cpu0/core1',
-        0x29 : '<inventory_root>/system/chassis/motherboard/cpu0/core2',
-        0x2c : '<inventory_root>/system/chassis/motherboard/cpu0/core3',
-        0x2f : '<inventory_root>/system/chassis/motherboard/cpu0/core4',
-        0x32 : '<inventory_root>/system/chassis/motherboard/cpu0/core5',
-        0x35 : '<inventory_root>/system/chassis/motherboard/cpu0/core6',
-        0x38 : '<inventory_root>/system/chassis/motherboard/cpu0/core7',
-        0x3b : '<inventory_root>/system/chassis/motherboard/cpu0/core8',
-        0x3e : '<inventory_root>/system/chassis/motherboard/cpu0/core9',
-        0x41 : '<inventory_root>/system/chassis/motherboard/cpu0/core10',
-        0x44 : '<inventory_root>/system/chassis/motherboard/cpu0/core11',
-        0x47 : '<inventory_root>/system/chassis/motherboard/cpu0/core12',
-        0x4a : '<inventory_root>/system/chassis/motherboard/cpu0/core13',
-        0x4d : '<inventory_root>/system/chassis/motherboard/cpu0/core14',
-        0x50 : '<inventory_root>/system/chassis/motherboard/cpu0/core15',
-        0x53 : '<inventory_root>/system/chassis/motherboard/cpu0/core16',
-        0x56 : '<inventory_root>/system/chassis/motherboard/cpu0/core17',
-        0x59 : '<inventory_root>/system/chassis/motherboard/cpu0/core18',
-        0x5c : '<inventory_root>/system/chassis/motherboard/cpu0/core19',
-        0x5f : '<inventory_root>/system/chassis/motherboard/cpu0/core20',
-        0x62 : '<inventory_root>/system/chassis/motherboard/cpu0/core21',
-        0x65 : '<inventory_root>/system/chassis/motherboard/cpu1/core22',
-        0x68 : '<inventory_root>/system/chassis/motherboard/cpu1/core23',
-        0x73 : '<inventory_root>/system/chassis/motherboard/cpu1/core0',
-        0x76 : '<inventory_root>/system/chassis/motherboard/cpu1/core1',
-        0x79 : '<inventory_root>/system/chassis/motherboard/cpu1/core2',
-        0x7c : '<inventory_root>/system/chassis/motherboard/cpu1/core3',
-        0x7f : '<inventory_root>/system/chassis/motherboard/cpu1/core4',
-        0x82 : '<inventory_root>/system/chassis/motherboard/cpu1/core5',
-        0x85 : '<inventory_root>/system/chassis/motherboard/cpu1/core6',
-        0x88 : '<inventory_root>/system/chassis/motherboard/cpu1/core7',
-        0x8b : '<inventory_root>/system/chassis/motherboard/cpu1/core8',
-        0x8e : '<inventory_root>/system/chassis/motherboard/cpu1/core9',
-        0x91 : '<inventory_root>/system/chassis/motherboard/cpu1/core10',
-        0x94 : '<inventory_root>/system/chassis/motherboard/cpu1/core11',
-        0x97 : '<inventory_root>/system/chassis/motherboard/cpu1/core12',
-        0x9a : '<inventory_root>/system/chassis/motherboard/cpu1/core13',
-        0x9d : '<inventory_root>/system/chassis/motherboard/cpu1/core14',
-        0xa0 : '<inventory_root>/system/chassis/motherboard/cpu1/core15',
-        0xa3 : '<inventory_root>/system/chassis/motherboard/cpu1/core16',
-        0xa6 : '<inventory_root>/system/chassis/motherboard/cpu1/core17',
-        0xa9 : '<inventory_root>/system/chassis/motherboard/cpu1/core18',
-        0xac : '<inventory_root>/system/chassis/motherboard/cpu1/core19',
-        0xaf : '<inventory_root>/system/chassis/motherboard/cpu1/core20',
-        0xb2 : '<inventory_root>/system/chassis/motherboard/cpu1/core21',
-        0xb5 : '<inventory_root>/system/chassis/motherboard/cpu1/core22',
-        0xb8 : '<inventory_root>/system/chassis/motherboard/cpu1/core23',
-        0x07 : '/org/openbmc/sensors/host/BootCount',
-        0x10 : '<inventory_root>/system/chassis/motherboard',
-        0x01 : '<inventory_root>/system/systemevent',
-        0x11 : '<inventory_root>/system/chassis/motherboard/refclock',
-        0x12 : '<inventory_root>/system/chassis/motherboard/pcieclock',
-        0x13 : '<inventory_root>/system/chassis/motherboard/todclock',
-        0x02 : '/org/openbmc/sensors/host/OperatingSystemStatus',
-        0x04 : '<inventory_root>/system/chassis/motherboard/pcielink',
+    "SENSOR": {
+        0x02: "/org/openbmc/sensors/host/HostStatus",
+        0x03: "/org/openbmc/sensors/host/BootProgress",
+        0x21: "<inventory_root>/system/chassis/motherboard/cpu0",
+        0x71: "<inventory_root>/system/chassis/motherboard/cpu1",
+        0xC7: "<inventory_root>/system/chassis/motherboard/dimm3",
+        0xC5: "<inventory_root>/system/chassis/motherboard/dimm2",
+        0xC3: "<inventory_root>/system/chassis/motherboard/dimm1",
+        0xC1: "<inventory_root>/system/chassis/motherboard/dimm0",
+        0xCF: "<inventory_root>/system/chassis/motherboard/dimm7",
+        0xCD: "<inventory_root>/system/chassis/motherboard/dimm6",
+        0xCB: "<inventory_root>/system/chassis/motherboard/dimm5",
+        0xC9: "<inventory_root>/system/chassis/motherboard/dimm4",
+        0xD7: "<inventory_root>/system/chassis/motherboard/dimm11",
+        0xD5: "<inventory_root>/system/chassis/motherboard/dimm10",
+        0xD3: "<inventory_root>/system/chassis/motherboard/dimm9",
+        0xD1: "<inventory_root>/system/chassis/motherboard/dimm8",
+        0xDF: "<inventory_root>/system/chassis/motherboard/dimm15",
+        0xDD: "<inventory_root>/system/chassis/motherboard/dimm14",
+        0xDB: "<inventory_root>/system/chassis/motherboard/dimm13",
+        0xD9: "<inventory_root>/system/chassis/motherboard/dimm12",
+        0xE7: "<inventory_root>/system/chassis/motherboard/dimm19",
+        0xE5: "<inventory_root>/system/chassis/motherboard/dimm18",
+        0xE3: "<inventory_root>/system/chassis/motherboard/dimm17",
+        0xE1: "<inventory_root>/system/chassis/motherboard/dimm16",
+        0xEF: "<inventory_root>/system/chassis/motherboard/dimm23",
+        0xED: "<inventory_root>/system/chassis/motherboard/dimm22",
+        0xEB: "<inventory_root>/system/chassis/motherboard/dimm21",
+        0xE9: "<inventory_root>/system/chassis/motherboard/dimm20",
+        0xF7: "<inventory_root>/system/chassis/motherboard/dimm27",
+        0xF5: "<inventory_root>/system/chassis/motherboard/dimm26",
+        0xF3: "<inventory_root>/system/chassis/motherboard/dimm25",
+        0xF1: "<inventory_root>/system/chassis/motherboard/dimm24",
+        0xFF: "<inventory_root>/system/chassis/motherboard/dimm31",
+        0xFD: "<inventory_root>/system/chassis/motherboard/dimm30",
+        0xFB: "<inventory_root>/system/chassis/motherboard/dimm29",
+        0xF9: "<inventory_root>/system/chassis/motherboard/dimm28",
+        0x23: "<inventory_root>/system/chassis/motherboard/cpu0/core0",
+        0x26: "<inventory_root>/system/chassis/motherboard/cpu0/core1",
+        0x29: "<inventory_root>/system/chassis/motherboard/cpu0/core2",
+        0x2C: "<inventory_root>/system/chassis/motherboard/cpu0/core3",
+        0x2F: "<inventory_root>/system/chassis/motherboard/cpu0/core4",
+        0x32: "<inventory_root>/system/chassis/motherboard/cpu0/core5",
+        0x35: "<inventory_root>/system/chassis/motherboard/cpu0/core6",
+        0x38: "<inventory_root>/system/chassis/motherboard/cpu0/core7",
+        0x3B: "<inventory_root>/system/chassis/motherboard/cpu0/core8",
+        0x3E: "<inventory_root>/system/chassis/motherboard/cpu0/core9",
+        0x41: "<inventory_root>/system/chassis/motherboard/cpu0/core10",
+        0x44: "<inventory_root>/system/chassis/motherboard/cpu0/core11",
+        0x47: "<inventory_root>/system/chassis/motherboard/cpu0/core12",
+        0x4A: "<inventory_root>/system/chassis/motherboard/cpu0/core13",
+        0x4D: "<inventory_root>/system/chassis/motherboard/cpu0/core14",
+        0x50: "<inventory_root>/system/chassis/motherboard/cpu0/core15",
+        0x53: "<inventory_root>/system/chassis/motherboard/cpu0/core16",
+        0x56: "<inventory_root>/system/chassis/motherboard/cpu0/core17",
+        0x59: "<inventory_root>/system/chassis/motherboard/cpu0/core18",
+        0x5C: "<inventory_root>/system/chassis/motherboard/cpu0/core19",
+        0x5F: "<inventory_root>/system/chassis/motherboard/cpu0/core20",
+        0x62: "<inventory_root>/system/chassis/motherboard/cpu0/core21",
+        0x65: "<inventory_root>/system/chassis/motherboard/cpu1/core22",
+        0x68: "<inventory_root>/system/chassis/motherboard/cpu1/core23",
+        0x73: "<inventory_root>/system/chassis/motherboard/cpu1/core0",
+        0x76: "<inventory_root>/system/chassis/motherboard/cpu1/core1",
+        0x79: "<inventory_root>/system/chassis/motherboard/cpu1/core2",
+        0x7C: "<inventory_root>/system/chassis/motherboard/cpu1/core3",
+        0x7F: "<inventory_root>/system/chassis/motherboard/cpu1/core4",
+        0x82: "<inventory_root>/system/chassis/motherboard/cpu1/core5",
+        0x85: "<inventory_root>/system/chassis/motherboard/cpu1/core6",
+        0x88: "<inventory_root>/system/chassis/motherboard/cpu1/core7",
+        0x8B: "<inventory_root>/system/chassis/motherboard/cpu1/core8",
+        0x8E: "<inventory_root>/system/chassis/motherboard/cpu1/core9",
+        0x91: "<inventory_root>/system/chassis/motherboard/cpu1/core10",
+        0x94: "<inventory_root>/system/chassis/motherboard/cpu1/core11",
+        0x97: "<inventory_root>/system/chassis/motherboard/cpu1/core12",
+        0x9A: "<inventory_root>/system/chassis/motherboard/cpu1/core13",
+        0x9D: "<inventory_root>/system/chassis/motherboard/cpu1/core14",
+        0xA0: "<inventory_root>/system/chassis/motherboard/cpu1/core15",
+        0xA3: "<inventory_root>/system/chassis/motherboard/cpu1/core16",
+        0xA6: "<inventory_root>/system/chassis/motherboard/cpu1/core17",
+        0xA9: "<inventory_root>/system/chassis/motherboard/cpu1/core18",
+        0xAC: "<inventory_root>/system/chassis/motherboard/cpu1/core19",
+        0xAF: "<inventory_root>/system/chassis/motherboard/cpu1/core20",
+        0xB2: "<inventory_root>/system/chassis/motherboard/cpu1/core21",
+        0xB5: "<inventory_root>/system/chassis/motherboard/cpu1/core22",
+        0xB8: "<inventory_root>/system/chassis/motherboard/cpu1/core23",
+        0x07: "/org/openbmc/sensors/host/BootCount",
+        0x10: "<inventory_root>/system/chassis/motherboard",
+        0x01: "<inventory_root>/system/systemevent",
+        0x11: "<inventory_root>/system/chassis/motherboard/refclock",
+        0x12: "<inventory_root>/system/chassis/motherboard/pcieclock",
+        0x13: "<inventory_root>/system/chassis/motherboard/todclock",
+        0x02: "/org/openbmc/sensors/host/OperatingSystemStatus",
+        0x04: "<inventory_root>/system/chassis/motherboard/pcielink",
     },
-    'GPIO_PRESENT' : {}
+    "GPIO_PRESENT": {},
 }
 
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
-MISC_SENSORS = {
-}
+MISC_SENSORS = {}
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/pychassisctl/chassis_control.py b/pychassisctl/chassis_control.py
index fbe0f72..b5528c8 100644
--- a/pychassisctl/chassis_control.py
+++ b/pychassisctl/chassis_control.py
@@ -10,11 +10,11 @@
 import dbus.mainloop.glib
 from obmc.dbuslib.bindings import get_dbus, DbusProperties, DbusObjectManager
 
-DBUS_NAME = 'org.openbmc.control.Chassis'
-OBJ_NAME = '/org/openbmc/control/chassis0'
-CONTROL_INTF = 'org.openbmc.Control'
+DBUS_NAME = "org.openbmc.control.Chassis"
+OBJ_NAME = "/org/openbmc/control/chassis0"
+CONTROL_INTF = "org.openbmc.Control"
 
-MACHINE_ID = '/etc/machine-id'
+MACHINE_ID = "/etc/machine-id"
 
 POWER_OFF = 0
 POWER_ON = 1
@@ -27,8 +27,8 @@
         uuid = ""
         try:
             with open(MACHINE_ID) as f:
-                data = f.readline().rstrip('\n')
-                if (len(data) == 32):
+                data = f.readline().rstrip("\n")
+                if len(data) == 32:
                     uuid = data
                 else:
                     print("ERROR:  UUID is not formatted correctly: " + data)
@@ -38,25 +38,23 @@
         return uuid
 
     def __init__(self, bus, name):
-        super(ChassisControlObject, self).__init__(
-            conn=bus,
-            object_path=name)
+        super(ChassisControlObject, self).__init__(conn=bus, object_path=name)
         # load utilized objects
         self.dbus_objects = {
-            'power_control': {
-                'bus_name': 'org.openbmc.control.Power',
-                'object_name': '/org/openbmc/control/power0',
-                'interface_name': 'org.openbmc.control.Power'
+            "power_control": {
+                "bus_name": "org.openbmc.control.Power",
+                "object_name": "/org/openbmc/control/power0",
+                "interface_name": "org.openbmc.control.Power",
             },
-            'host_services': {
-                'bus_name': 'org.openbmc.HostServices',
-                'object_name': '/org/openbmc/HostServices',
-                'interface_name': 'org.openbmc.HostServices'
+            "host_services": {
+                "bus_name": "org.openbmc.HostServices",
+                "object_name": "/org/openbmc/HostServices",
+                "interface_name": "org.openbmc.HostServices",
             },
-            'systemd': {
-                'bus_name': 'org.freedesktop.systemd1',
-                'object_name': '/org/freedesktop/systemd1',
-                'interface_name': 'org.freedesktop.systemd1.Manager'
+            "systemd": {
+                "bus_name": "org.freedesktop.systemd1",
+                "object_name": "/org/freedesktop/systemd1",
+                "interface_name": "org.freedesktop.systemd1.Manager",
             },
         }
 
@@ -64,59 +62,62 @@
         self.Set(DBUS_NAME, "uuid", self.getUuid())
         self.Set(DBUS_NAME, "reboot", 0)
 
-        bus.add_signal_receiver(self.power_button_signal_handler,
-                                dbus_interface="org.openbmc.Button",
-                                signal_name="Released",
-                                path="/org/openbmc/buttons/power0")
-        bus.add_signal_receiver(self.long_power_button_signal_handler,
-                                dbus_interface="org.openbmc.Button",
-                                signal_name="PressedLong",
-                                path="/org/openbmc/buttons/power0")
-        bus.add_signal_receiver(self.softreset_button_signal_handler,
-                                dbus_interface="org.openbmc.Button",
-                                signal_name="Released",
-                                path="/org/openbmc/buttons/reset0")
+        bus.add_signal_receiver(
+            self.power_button_signal_handler,
+            dbus_interface="org.openbmc.Button",
+            signal_name="Released",
+            path="/org/openbmc/buttons/power0",
+        )
+        bus.add_signal_receiver(
+            self.long_power_button_signal_handler,
+            dbus_interface="org.openbmc.Button",
+            signal_name="PressedLong",
+            path="/org/openbmc/buttons/power0",
+        )
+        bus.add_signal_receiver(
+            self.softreset_button_signal_handler,
+            dbus_interface="org.openbmc.Button",
+            signal_name="Released",
+            path="/org/openbmc/buttons/reset0",
+        )
 
-        bus.add_signal_receiver(self.host_watchdog_signal_handler,
-                                dbus_interface="org.openbmc.Watchdog",
-                                signal_name="WatchdogError")
-
+        bus.add_signal_receiver(
+            self.host_watchdog_signal_handler,
+            dbus_interface="org.openbmc.Watchdog",
+            signal_name="WatchdogError",
+        )
 
     def getInterface(self, name):
         o = self.dbus_objects[name]
-        obj = bus.get_object(o['bus_name'], o['object_name'], introspect=False)
-        return dbus.Interface(obj, o['interface_name'])
+        obj = bus.get_object(o["bus_name"], o["object_name"], introspect=False)
+        return dbus.Interface(obj, o["interface_name"])
 
-    @dbus.service.method(DBUS_NAME,
-                         in_signature='', out_signature='')
+    @dbus.service.method(DBUS_NAME, in_signature="", out_signature="")
     def powerOn(self):
         print("Turn on power and boot")
         self.Set(DBUS_NAME, "reboot", 0)
-        intf = self.getInterface('systemd')
-        f = getattr(intf, 'StartUnit')
-        f.call_async('obmc-host-start@0.target', 'replace')
+        intf = self.getInterface("systemd")
+        f = getattr(intf, "StartUnit")
+        f.call_async("obmc-host-start@0.target", "replace")
         return None
 
-    @dbus.service.method(DBUS_NAME,
-                         in_signature='', out_signature='')
+    @dbus.service.method(DBUS_NAME, in_signature="", out_signature="")
     def powerOff(self):
         print("Turn off power")
-        intf = self.getInterface('systemd')
-        f = getattr(intf, 'StartUnit')
-        f.call_async('obmc-chassis-hard-poweroff@0.target', 'replace')
+        intf = self.getInterface("systemd")
+        f = getattr(intf, "StartUnit")
+        f.call_async("obmc-chassis-hard-poweroff@0.target", "replace")
         return None
 
-    @dbus.service.method(DBUS_NAME,
-                         in_signature='', out_signature='')
+    @dbus.service.method(DBUS_NAME, in_signature="", out_signature="")
     def softPowerOff(self):
         print("Soft off power")
-        intf = self.getInterface('systemd')
-        f = getattr(intf, 'StartUnit')
-        f.call_async('obmc-host-shutdown@0.target', 'replace')
+        intf = self.getInterface("systemd")
+        f = getattr(intf, "StartUnit")
+        f.call_async("obmc-host-shutdown@0.target", "replace")
         return None
 
-    @dbus.service.method(DBUS_NAME,
-                         in_signature='', out_signature='')
+    @dbus.service.method(DBUS_NAME, in_signature="", out_signature="")
     def reboot(self):
         print("Rebooting")
         if self.getPowerState() != POWER_OFF:
@@ -124,8 +125,7 @@
             self.powerOff()
         return None
 
-    @dbus.service.method(DBUS_NAME,
-                         in_signature='', out_signature='')
+    @dbus.service.method(DBUS_NAME, in_signature="", out_signature="")
     def softReboot(self):
         print("Soft Rebooting")
         if self.getPowerState() != POWER_OFF:
@@ -133,18 +133,16 @@
             self.softPowerOff()
         return None
 
-    @dbus.service.method(DBUS_NAME,
-                         in_signature='', out_signature='')
+    @dbus.service.method(DBUS_NAME, in_signature="", out_signature="")
     def quiesce(self):
-        intf = self.getInterface('systemd')
-        f = getattr(intf, 'StartUnit')
-        f.call_async('obmc-host-quiesce@0.target', 'replace')
+        intf = self.getInterface("systemd")
+        f = getattr(intf, "StartUnit")
+        f.call_async("obmc-host-quiesce@0.target", "replace")
         return None
 
-    @dbus.service.method(DBUS_NAME,
-                         in_signature='', out_signature='i')
+    @dbus.service.method(DBUS_NAME, in_signature="", out_signature="i")
     def getPowerState(self):
-        intf = self.getInterface('power_control')
+        intf = self.getInterface("power_control")
         return intf.getPowerState()
 
     # Signal handler
@@ -169,7 +167,7 @@
         self.quiesce()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
     bus = get_dbus()
diff --git a/pychassisctl/setup.py b/pychassisctl/setup.py
index b86c7e8..54ba423 100644
--- a/pychassisctl/setup.py
+++ b/pychassisctl/setup.py
@@ -1,6 +1,7 @@
 from distutils.core import setup
 
-setup(name='pychassisctl',
-      version='1.0',
-      scripts=['chassis_control.py'],
-      )
+setup(
+    name="pychassisctl",
+    version="1.0",
+    scripts=["chassis_control.py"],
+)
diff --git a/pydownloadmgr/download_manager.py b/pydownloadmgr/download_manager.py
index 7fb600f..799044c 100644
--- a/pydownloadmgr/download_manager.py
+++ b/pydownloadmgr/download_manager.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import os
+
 # TODO: openbmc/openbmc#2994 remove python 2 support
 try:  # python 2
     import gobject
@@ -13,9 +14,9 @@
 from obmc.dbuslib.bindings import get_dbus
 
 
-FLASH_DOWNLOAD_PATH = '/tmp'
-DBUS_NAME = 'org.openbmc.managers.Download'
-OBJ_NAME = '/org/openbmc/managers/Download'
+FLASH_DOWNLOAD_PATH = "/tmp"
+DBUS_NAME = "org.openbmc.managers.Download"
+OBJ_NAME = "/org/openbmc/managers/Download"
 TFTP_PORT = 69
 
 
@@ -26,35 +27,38 @@
             self.DownloadHandler,
             dbus_interface="org.openbmc.Flash",
             signal_name="Download",
-            path_keyword="path")
+            path_keyword="path",
+        )
         bus.add_signal_receiver(
             self.TftpDownloadHandler,
             signal_name="TftpDownload",
-            path_keyword="path")
+            path_keyword="path",
+        )
 
-    @dbus.service.signal(DBUS_NAME, signature='ss')
+    @dbus.service.signal(DBUS_NAME, signature="ss")
     def DownloadComplete(self, outfile, filename):
-        print("Download Complete: "+outfile)
+        print("Download Complete: " + outfile)
         return outfile
 
-    @dbus.service.signal(DBUS_NAME, signature='s')
+    @dbus.service.signal(DBUS_NAME, signature="s")
     def DownloadError(self, filename):
         pass
 
     def TftpDownloadHandler(self, ip, filename, path=None):
         try:
             filename = str(filename)
-            print("Downloading: "+filename+" from "+ip)
-            outfile = FLASH_DOWNLOAD_PATH+"/"+os.path.basename(filename)
+            print("Downloading: " + filename + " from " + ip)
+            outfile = FLASH_DOWNLOAD_PATH + "/" + os.path.basename(filename)
             rc = subprocess.call(
-                ["tftp", "-l", outfile, "-r", filename, "-g", ip])
-            if (rc == 0):
+                ["tftp", "-l", outfile, "-r", filename, "-g", ip]
+            )
+            if rc == 0:
                 self.DownloadComplete(outfile, filename)
             else:
                 self.DownloadError(filename)
 
         except Exception as e:
-            print("ERROR DownloadManager: "+str(e))
+            print("ERROR DownloadManager: " + str(e))
             self.DownloadError(filename)
 
     # TODO: this needs to be deprecated.
@@ -62,22 +66,21 @@
     def DownloadHandler(self, url, filename, path=None):
         try:
             filename = str(filename)
-            print("Downloading: "+filename+" from "+url)
-            outfile = FLASH_DOWNLOAD_PATH+"/"+os.path.basename(filename)
-            subprocess.call(
-                ["tftp", "-l", outfile, "-r", filename, "-g", url])
+            print("Downloading: " + filename + " from " + url)
+            outfile = FLASH_DOWNLOAD_PATH + "/" + os.path.basename(filename)
+            subprocess.call(["tftp", "-l", outfile, "-r", filename, "-g", url])
             obj = bus.get_object("org.openbmc.control.Flash", path)
             intf = dbus.Interface(obj, "org.openbmc.Flash")
             intf.update(outfile)
 
         except Exception as e:
-            print("ERROR DownloadManager: "+str(e))
+            print("ERROR DownloadManager: " + str(e))
             obj = bus.get_object("org.openbmc.control.Flash", path)
             intf = dbus.Interface(obj, "org.openbmc.Flash")
-            intf.error("Download Error: "+filename)
+            intf.error("Download Error: " + filename)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
     bus = get_dbus()
     obj = DownloadManagerObject(bus, OBJ_NAME)
diff --git a/pydownloadmgr/setup.py b/pydownloadmgr/setup.py
index 35c8b6d..5506c9e 100644
--- a/pydownloadmgr/setup.py
+++ b/pydownloadmgr/setup.py
@@ -1,6 +1,7 @@
 from distutils.core import setup
 
-setup(name='pydownloadmgr',
-      version='1.0',
-      scripts=['download_manager.py'],
-      )
+setup(
+    name="pydownloadmgr",
+    version="1.0",
+    scripts=["download_manager.py"],
+)
diff --git a/pyflashbmc/bmc_update.py b/pyflashbmc/bmc_update.py
index 98c3ca6..c2046e4 100644
--- a/pyflashbmc/bmc_update.py
+++ b/pyflashbmc/bmc_update.py
@@ -15,14 +15,14 @@
 import os
 from obmc.dbuslib.bindings import get_dbus, DbusProperties, DbusObjectManager
 
-DBUS_NAME = 'org.openbmc.control.BmcFlash'
-OBJ_NAME = '/org/openbmc/control/flash/bmc'
-DOWNLOAD_INTF = 'org.openbmc.managers.Download'
+DBUS_NAME = "org.openbmc.control.BmcFlash"
+OBJ_NAME = "/org/openbmc/control/flash/bmc"
+DOWNLOAD_INTF = "org.openbmc.managers.Download"
 
-BMC_DBUS_NAME = 'xyz.openbmc_project.State.BMC'
-BMC_OBJ_NAME = '/xyz/openbmc_project/state/bmc0'
+BMC_DBUS_NAME = "xyz.openbmc_project.State.BMC"
+BMC_OBJ_NAME = "/xyz/openbmc_project/state/bmc0"
 
-UPDATE_PATH = '/run/initramfs'
+UPDATE_PATH = "/run/initramfs"
 
 
 def doExtract(members, files):
@@ -35,29 +35,27 @@
     fw_env = "/etc/fw_env.config"
     lines = 0
     files = []
-    envcfg = open(fw_env, 'r')
+    envcfg = open(fw_env, "r")
     try:
         for line in envcfg.readlines():
             # ignore lines that are blank or start with #
-            if (line.startswith("#")):
+            if line.startswith("#"):
                 continue
-            if (not len(line.strip())):
+            if not len(line.strip()):
                 continue
             fn = line.partition("\t")[0]
             files.append(fn)
             lines += 1
     finally:
         envcfg.close()
-    if (lines < 1 or lines > 2 or (lines == 2 and files[0] != files[1])):
-            raise Exception("Error parsing %s\n" % fw_env)
+    if lines < 1 or lines > 2 or (lines == 2 and files[0] != files[1]):
+        raise Exception("Error parsing %s\n" % fw_env)
     shutil.copyfile(files[0], os.path.join(UPDATE_PATH, "image-u-boot-env"))
 
 
 class BmcFlashControl(DbusProperties, DbusObjectManager):
     def __init__(self, bus, name):
-        super(BmcFlashControl, self).__init__(
-            conn=bus,
-            object_path=name)
+        super(BmcFlashControl, self).__init__(conn=bus, object_path=name)
 
         self.Set(DBUS_NAME, "status", "Idle")
         self.Set(DBUS_NAME, "filename", "")
@@ -68,38 +66,38 @@
         self.Set(DBUS_NAME, "auto_apply", False)
 
         bus.add_signal_receiver(
-            self.download_error_handler, signal_name="DownloadError")
+            self.download_error_handler, signal_name="DownloadError"
+        )
         bus.add_signal_receiver(
-            self.download_complete_handler, signal_name="DownloadComplete")
+            self.download_complete_handler, signal_name="DownloadComplete"
+        )
 
         self.update_process = None
         self.progress_name = None
 
-    @dbus.service.method(
-        DBUS_NAME, in_signature='ss', out_signature='')
+    @dbus.service.method(DBUS_NAME, in_signature="ss", out_signature="")
     def updateViaTftp(self, ip, filename):
         self.Set(DBUS_NAME, "status", "Downloading")
         self.TftpDownload(ip, filename)
 
-    @dbus.service.method(
-        DBUS_NAME, in_signature='s', out_signature='')
+    @dbus.service.method(DBUS_NAME, in_signature="s", out_signature="")
     def update(self, filename):
         self.Set(DBUS_NAME, "filename", filename)
         self.download_complete_handler(filename, filename)
 
-    @dbus.service.signal(DOWNLOAD_INTF, signature='ss')
+    @dbus.service.signal(DOWNLOAD_INTF, signature="ss")
     def TftpDownload(self, ip, filename):
         self.Set(DBUS_NAME, "filename", filename)
         pass
 
     # Signal handler
     def download_error_handler(self, filename):
-        if (filename == self.Get(DBUS_NAME, "filename")):
+        if filename == self.Get(DBUS_NAME, "filename"):
             self.Set(DBUS_NAME, "status", "Download Error")
 
     def download_complete_handler(self, outfile, filename):
         # do update
-        if (filename != self.Get(DBUS_NAME, "filename")):
+        if filename != self.Get(DBUS_NAME, "filename"):
             return
 
         print("Download complete. Updating...")
@@ -127,7 +125,8 @@
             for f in list(copy_files.keys()):
                 if f not in files:
                     raise Exception(
-                        "ERROR: File not found in update archive: "+f)
+                        "ERROR: File not found in update archive: " + f
+                    )
 
         except Exception as e:
             print(str(e))
@@ -142,11 +141,11 @@
             if self.Get(DBUS_NAME, "clear_persistent_files"):
                 print("Removing persistent files")
                 try:
-                    os.unlink(UPDATE_PATH+"/whitelist")
+                    os.unlink(UPDATE_PATH + "/whitelist")
                 except OSError as e:
-                    if (e.errno == errno.EISDIR):
+                    if e.errno == errno.EISDIR:
                         pass
-                    elif (e.errno == errno.ENOENT):
+                    elif e.errno == errno.ENOENT:
                         pass
                     else:
                         raise
@@ -157,7 +156,7 @@
                     for file in os.listdir(wldir):
                         os.unlink(os.path.join(wldir, file))
                 except OSError as e:
-                    if (e.errno == errno.EISDIR):
+                    if e.errno == errno.EISDIR:
                         pass
                     else:
                         raise
@@ -175,37 +174,46 @@
     def Verify(self):
         self.Set(DBUS_NAME, "status", "Checking Image")
         try:
-            subprocess.check_call([
-                "/run/initramfs/update",
-                "--no-flash",
-                "--no-save-files",
-                "--no-restore-files",
-                "--no-clean-saved-files"])
+            subprocess.check_call(
+                [
+                    "/run/initramfs/update",
+                    "--no-flash",
+                    "--no-save-files",
+                    "--no-restore-files",
+                    "--no-clean-saved-files",
+                ]
+            )
 
             self.Set(DBUS_NAME, "status", "Image ready to apply.")
-            if (self.Get(DBUS_NAME, "auto_apply")):
+            if self.Get(DBUS_NAME, "auto_apply"):
                 self.Apply()
         except Exception:
             self.Set(DBUS_NAME, "auto_apply", False)
             try:
-                subprocess.check_output([
-                    "/run/initramfs/update",
-                    "--no-flash",
-                    "--ignore-mount",
-                    "--no-save-files",
-                    "--no-restore-files",
-                    "--no-clean-saved-files"],
-                    stderr=subprocess.STDOUT)
+                subprocess.check_output(
+                    [
+                        "/run/initramfs/update",
+                        "--no-flash",
+                        "--ignore-mount",
+                        "--no-save-files",
+                        "--no-restore-files",
+                        "--no-clean-saved-files",
+                    ],
+                    stderr=subprocess.STDOUT,
+                )
                 self.Set(
-                    DBUS_NAME, "status",
-                    "Deferred for mounted filesystem. reboot BMC to apply.")
+                    DBUS_NAME,
+                    "status",
+                    "Deferred for mounted filesystem. reboot BMC to apply.",
+                )
             except subprocess.CalledProcessError as e:
-                self.Set(
-                    DBUS_NAME, "status", "Verify error: %s" % e.output)
+                self.Set(DBUS_NAME, "status", "Verify error: %s" % e.output)
             except OSError as e:
                 self.Set(
-                    DBUS_NAME, "status",
-                    "Verify error: problem calling update: %s" % e.strerror)
+                    DBUS_NAME,
+                    "status",
+                    "Verify error: problem calling update: %s" % e.strerror,
+                )
 
     def Cleanup(self):
         if self.progress_name:
@@ -219,8 +227,7 @@
         self.update_process = None
         self.Set(DBUS_NAME, "status", "Idle")
 
-    @dbus.service.method(
-        DBUS_NAME, in_signature='', out_signature='')
+    @dbus.service.method(DBUS_NAME, in_signature="", out_signature="")
     def Abort(self):
         if self.update_process:
             try:
@@ -228,29 +235,28 @@
             except Exception:
                 pass
         for file in os.listdir(UPDATE_PATH):
-            if file.startswith('image-'):
+            if file.startswith("image-"):
                 os.unlink(os.path.join(UPDATE_PATH, file))
 
         self.Cleanup()
 
-    @dbus.service.method(
-        DBUS_NAME, in_signature='', out_signature='s')
+    @dbus.service.method(DBUS_NAME, in_signature="", out_signature="s")
     def GetUpdateProgress(self):
         msg = ""
 
         if self.update_process and self.update_process.returncode is None:
             self.update_process.poll()
 
-        if (self.update_process is None):
+        if self.update_process is None:
             pass
-        elif (self.update_process.returncode > 0):
+        elif self.update_process.returncode > 0:
             self.Set(DBUS_NAME, "status", "Apply failed")
-        elif (self.update_process.returncode is None):
+        elif self.update_process.returncode is None:
             pass
-        else:            # (self.update_process.returncode == 0)
+        else:  # (self.update_process.returncode == 0)
             files = ""
             for file in os.listdir(UPDATE_PATH):
-                if file.startswith('image-'):
+                if file.startswith("image-"):
                     files = files + file
             if files == "":
                 msg = "Apply Complete.  Reboot to take effect."
@@ -261,32 +267,33 @@
         msg = self.Get(DBUS_NAME, "status") + "\n"
         if self.progress_name:
             try:
-                prog = open(self.progress_name, 'r')
+                prog = open(self.progress_name, "r")
                 for line in prog:
                     # strip off initial sets of xxx\r here
                     # ignore crlf at the end
                     # cr will be -1 if no '\r' is found
                     cr = line.rfind("\r", 0, -2)
-                    msg = msg + line[cr + 1:]
+                    msg = msg + line[(cr + 1):]
             except OSError as e:
-                if (e.error == EEXIST):
+                if e.error == EEXIST:
                     pass
                 raise
         return msg
 
-    @dbus.service.method(
-        DBUS_NAME, in_signature='', out_signature='')
+    @dbus.service.method(DBUS_NAME, in_signature="", out_signature="")
     def Apply(self):
         progress = None
         self.Set(DBUS_NAME, "status", "Writing images to flash")
         try:
             progress = tempfile.NamedTemporaryFile(
-                delete=False, prefix="progress.")
+                delete=False, prefix="progress."
+            )
             self.progress_name = progress.name
-            self.update_process = subprocess.Popen([
-                "/run/initramfs/update"],
+            self.update_process = subprocess.Popen(
+                ["/run/initramfs/update"],
                 stdout=progress.file,
-                stderr=subprocess.STDOUT)
+                stderr=subprocess.STDOUT,
+            )
         except Exception as e:
             try:
                 progress.close()
@@ -301,29 +308,36 @@
         except Exception:
             pass
 
-    @dbus.service.method(
-        DBUS_NAME, in_signature='', out_signature='')
+    @dbus.service.method(DBUS_NAME, in_signature="", out_signature="")
     def PrepareForUpdate(self):
-        subprocess.call([
-            "fw_setenv",
-            "openbmconce",
-            "copy-files-to-ram copy-base-filesystem-to-ram"])
+        subprocess.call(
+            [
+                "fw_setenv",
+                "openbmconce",
+                "copy-files-to-ram copy-base-filesystem-to-ram",
+            ]
+        )
         # Set the variable twice so that it is written to both environments of
         # the u-boot redundant environment variables since initramfs can only
         # read one of the environments.
-        subprocess.call([
-            "fw_setenv",
-            "openbmconce",
-            "copy-files-to-ram copy-base-filesystem-to-ram"])
+        subprocess.call(
+            [
+                "fw_setenv",
+                "openbmconce",
+                "copy-files-to-ram copy-base-filesystem-to-ram",
+            ]
+        )
         self.Set(DBUS_NAME, "status", "Switch to update mode in progress")
         o = bus.get_object(BMC_DBUS_NAME, BMC_OBJ_NAME)
         intf = dbus.Interface(o, "org.freedesktop.DBus.Properties")
-        intf.Set(BMC_DBUS_NAME,
-                 "RequestedBMCTransition",
-                 "xyz.openbmc_project.State.BMC.Transition.Reboot")
+        intf.Set(
+            BMC_DBUS_NAME,
+            "RequestedBMCTransition",
+            "xyz.openbmc_project.State.BMC.Transition.Reboot",
+        )
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
     bus = get_dbus()
diff --git a/pyflashbmc/setup.py b/pyflashbmc/setup.py
index ed86cbb..9aeaf71 100644
--- a/pyflashbmc/setup.py
+++ b/pyflashbmc/setup.py
@@ -1,6 +1,7 @@
 from distutils.core import setup
 
-setup(name='pyflashbmc',
-      version='1.0',
-      scripts=['bmc_update.py'],
-      )
+setup(
+    name="pyflashbmc",
+    version="1.0",
+    scripts=["bmc_update.py"],
+)
diff --git a/pyinventorymgr/inventory_items.py b/pyinventorymgr/inventory_items.py
index 168e3d6..1c0a5f7 100644
--- a/pyinventorymgr/inventory_items.py
+++ b/pyinventorymgr/inventory_items.py
@@ -2,6 +2,7 @@
 
 import os
 import sys
+
 # TODO: openbmc/openbmc#2994 remove python 2 support
 try:  # python 2
     import gobject
@@ -14,81 +15,76 @@
 from obmc.dbuslib.bindings import get_dbus, DbusProperties, DbusObjectManager
 
 
-INTF_NAME = 'org.openbmc.InventoryItem'
-DBUS_NAME = 'org.openbmc.Inventory'
+INTF_NAME = "org.openbmc.InventoryItem"
+DBUS_NAME = "org.openbmc.Inventory"
 
 FRUS = {}
 
 
 class Inventory(DbusProperties, DbusObjectManager):
     def __init__(self, bus, name):
-        super(Inventory, self).__init__(
-            conn=bus,
-            object_path=name)
+        super(Inventory, self).__init__(conn=bus, object_path=name)
 
 
 class InventoryItem(DbusProperties):
     def __init__(self, bus, name, data):
-        super(InventoryItem, self).__init__(
-            conn=bus,
-            object_path=name)
+        super(InventoryItem, self).__init__(conn=bus, object_path=name)
 
         self.name = name
 
-        if 'present' not in data:
-            data['present'] = 'False'
-        if 'fault' not in data:
-            data['fault'] = 'False'
-        if 'version' not in data:
-            data['version'] = ''
+        if "present" not in data:
+            data["present"] = "False"
+        if "fault" not in data:
+            data["fault"] = "False"
+        if "version" not in data:
+            data["version"] = ""
 
         self.SetMultiple(INTF_NAME, data)
 
         # this will load properties from cache
         PropertyCacher.load(name, INTF_NAME, self.properties)
 
-    @dbus.service.method(
-        INTF_NAME, in_signature='a{sv}', out_signature='')
+    @dbus.service.method(INTF_NAME, in_signature="a{sv}", out_signature="")
     def update(self, data):
         self.SetMultiple(INTF_NAME, data)
         PropertyCacher.save(self.name, INTF_NAME, self.properties)
 
-    @dbus.service.method(
-        INTF_NAME, in_signature='s', out_signature='')
+    @dbus.service.method(INTF_NAME, in_signature="s", out_signature="")
     def setPresent(self, present):
-        self.Set(INTF_NAME, 'present', present)
+        self.Set(INTF_NAME, "present", present)
         PropertyCacher.save(self.name, INTF_NAME, self.properties)
 
-    @dbus.service.method(
-        INTF_NAME, in_signature='s', out_signature='')
+    @dbus.service.method(INTF_NAME, in_signature="s", out_signature="")
     def setFault(self, fault):
-        self.Set(INTF_NAME, 'fault', fault)
+        self.Set(INTF_NAME, "fault", fault)
         PropertyCacher.save(self.name, INTF_NAME, self.properties)
 
 
 def getVersion():
     version = "Error"
-    with open('/etc/os-release', 'r') as f:
+    with open("/etc/os-release", "r") as f:
         for line in f:
-            p = line.rstrip('\n')
-            parts = line.rstrip('\n').split('=')
-            if (parts[0] == "VERSION_ID"):
+            p = line.rstrip("\n")
+            parts = line.rstrip("\n").split("=")
+            if parts[0] == "VERSION_ID":
                 version = parts[1]
                 version = version.strip('"')
     return version
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
     bus = get_dbus()
     mainloop = gobject.MainLoop()
-    obj_parent = Inventory(bus, '/org/openbmc/inventory')
-    INVENTORY_FILE = os.path.join(sys.prefix, 'share',
-                                  'inventory', 'inventory.json')
+    obj_parent = Inventory(bus, "/org/openbmc/inventory")
+    INVENTORY_FILE = os.path.join(
+        sys.prefix, "share", "inventory", "inventory.json"
+    )
 
     if os.path.exists(INVENTORY_FILE):
         import json
-        with open(INVENTORY_FILE, 'r') as f:
+
+        with open(INVENTORY_FILE, "r") as f:
             try:
                 inv = json.load(f)
             except ValueError:
@@ -98,21 +94,23 @@
     else:
         try:
             import obmc_system_config as System
+
             FRUS = System.FRU_INSTANCES
         except ImportError:
             pass
 
     for f in list(FRUS.keys()):
         import obmc.inventory
+
         obj_path = f.replace("<inventory_root>", obmc.inventory.INVENTORY_ROOT)
         obj = InventoryItem(bus, obj_path, FRUS[f])
         obj_parent.add(obj_path, obj)
 
         # TODO:  this is a hack to update bmc inventory item with version
         # should be done by flash object
-        if (FRUS[f]['fru_type'] == "BMC"):
+        if FRUS[f]["fru_type"] == "BMC":
             version = getVersion()
-            obj.update({'version': version})
+            obj.update({"version": version})
 
     obj_parent.unmask_signals()
     name = dbus.service.BusName(DBUS_NAME, bus)
diff --git a/pyinventorymgr/obmc/inventory/__init__.py b/pyinventorymgr/obmc/inventory/__init__.py
index e9a1f83..90ae277 100644
--- a/pyinventorymgr/obmc/inventory/__init__.py
+++ b/pyinventorymgr/obmc/inventory/__init__.py
@@ -1 +1 @@
-INVENTORY_ROOT = '/org/openbmc/inventory'
+INVENTORY_ROOT = "/org/openbmc/inventory"
diff --git a/pyinventorymgr/setup.py b/pyinventorymgr/setup.py
index 6493ccb..bb068c0 100644
--- a/pyinventorymgr/setup.py
+++ b/pyinventorymgr/setup.py
@@ -1,7 +1,8 @@
 from distutils.core import setup
 
-setup(name='pyinventorymgr',
-      version='1.0',
-      packages=['obmc.inventory'],
-      scripts=['sync_inventory_items.py'],
-      )
+setup(
+    name="pyinventorymgr",
+    version="1.0",
+    packages=["obmc.inventory"],
+    scripts=["sync_inventory_items.py"],
+)
diff --git a/pyinventorymgr/sync_inventory_items.py b/pyinventorymgr/sync_inventory_items.py
index a96c015..7a5635a 100644
--- a/pyinventorymgr/sync_inventory_items.py
+++ b/pyinventorymgr/sync_inventory_items.py
@@ -24,17 +24,17 @@
 import obmc.mapper
 import shutil
 
-INV_INTF_NAME = 'xyz.openbmc_project.Inventory.Item.NetworkInterface'
-NET_DBUS_NAME = 'org.openbmc.NetworkManager'
-NET_OBJ_NAME = '/org/openbmc/NetworkManager/Interface'
-CHS_DBUS_NAME = 'org.openbmc.control.Chassis'
-CHS_INTF_NAME = 'xyz.openbmc_project.Common.UUID'
-CHS_OBJ_NAME = '/org/openbmc/control/chassis0'
-PROP_INTF_NAME = 'org.freedesktop.DBus.Properties'
-INVENTORY_ROOT = '/xyz/openbmc_project/inventory'
-NETWORK_ROOT = '/xyz/openbmc_project/network'
-ETHERNET_INTF_NAME = 'xyz.openbmc_project.Network.EthernetInterface'
-MAC_INTF_NAME = 'xyz.openbmc_project.Network.MACAddress'
+INV_INTF_NAME = "xyz.openbmc_project.Inventory.Item.NetworkInterface"
+NET_DBUS_NAME = "org.openbmc.NetworkManager"
+NET_OBJ_NAME = "/org/openbmc/NetworkManager/Interface"
+CHS_DBUS_NAME = "org.openbmc.control.Chassis"
+CHS_INTF_NAME = "xyz.openbmc_project.Common.UUID"
+CHS_OBJ_NAME = "/org/openbmc/control/chassis0"
+PROP_INTF_NAME = "org.freedesktop.DBus.Properties"
+INVENTORY_ROOT = "/xyz/openbmc_project/inventory"
+NETWORK_ROOT = "/xyz/openbmc_project/network"
+ETHERNET_INTF_NAME = "xyz.openbmc_project.Network.EthernetInterface"
+MAC_INTF_NAME = "xyz.openbmc_project.Network.MACAddress"
 
 FRUS = {}
 
@@ -50,26 +50,25 @@
 
     # Get the inventory subtree, limited
     # to objects that implement NetworkInterface.
-    for path, info in \
-        mapper.get_subtree(
-            path=INVENTORY_ROOT,
-            interfaces=[INV_INTF_NAME]).iteritems():
+    for path, info in mapper.get_subtree(
+        path=INVENTORY_ROOT, interfaces=[INV_INTF_NAME]
+    ).iteritems():
 
-            # Find a NetworkInterface with 'bmc' in the path.
-            if 'bmc' not in path:
-                continue
+        # Find a NetworkInterface with 'bmc' in the path.
+        if "bmc" not in path:
+            continue
 
-            # Only expecting a single service to implement
-            # NetworkInterface.  Get the service connection
-            # from the mapper response
-            conn = info.keys()[0]
+        # Only expecting a single service to implement
+        # NetworkInterface.  Get the service connection
+        # from the mapper response
+        conn = info.keys()[0]
 
-            # Get the inventory object implementing NetworkInterface.
-            obj = bus.get_object(conn, path)
+        # Get the inventory object implementing NetworkInterface.
+        obj = bus.get_object(conn, path)
 
-            # Get the MAC address
-            mproxy = obj.get_dbus_method('Get', PROP_INTF_NAME)
-            return mproxy(INV_INTF_NAME, prop)
+        # Get the MAC address
+        mproxy = obj.get_dbus_method("Get", PROP_INTF_NAME)
+        return mproxy(INV_INTF_NAME, prop)
 
 
 # Get Network Interface object.
@@ -78,15 +77,14 @@
 
     # Get the network subtree, limited
     # to objects that implements EthernetInterface.
-    for path, info in \
-        mapper.get_subtree(
-            path=NETWORK_ROOT,
-            interfaces=[ETHERNET_INTF_NAME]).iteritems():
+    for path, info in mapper.get_subtree(
+        path=NETWORK_ROOT, interfaces=[ETHERNET_INTF_NAME]
+    ).iteritems():
 
         # Find the one which is having physical interface,it may happen
         # that vlan interface is there and we want the physical
         # interface here.
-        if path.split('/')[-1].find('_') < 0:
+        if path.split("/")[-1].find("_") < 0:
             service = info.keys()[0]
             net_obj = bus.get_object(service, path)
             return net_obj
@@ -98,9 +96,7 @@
 
     # Get the inventory subtree, limited
     # to objects that implement UUID.
-    resp = mapper.get_subtree(
-        path=INVENTORY_ROOT,
-        interfaces=[CHS_INTF_NAME])
+    resp = mapper.get_subtree(path=INVENTORY_ROOT, interfaces=[CHS_INTF_NAME])
 
     # Only expecting a single object to implement UUID.
     try:
@@ -117,13 +113,13 @@
     obj = bus.get_object(conn, path)
 
     # Get the uuid
-    mproxy = obj.get_dbus_method('Get', PROP_INTF_NAME)
+    mproxy = obj.get_dbus_method("Get", PROP_INTF_NAME)
     return mproxy(CHS_INTF_NAME, prop)
 
 
 # Get the value of the mac on the system (from u-boot) without ':' separators
 def get_sys_mac(obj):
-    sys_mac = ''
+    sys_mac = ""
     try:
         sys_mac = subprocess.check_output(["fw_printenv", "-n", "ethaddr"])
     except Exception:
@@ -153,18 +149,18 @@
 def set_sys_uuid(uuid):
     rc = subprocess.call(["fw_setenv", "uuid", uuid])
     if rc == 0:
-        print "Rebooting BMC to set uuid"
+        print("Rebooting BMC to set uuid")
         # TODO Uncomment once sync from u-boot to /etc/machine-id is in place
         # Issue openbmc/openbmc#479
         # rc = subprocess.call(["reboot"])
     else:
-        print "Error setting uuid"
+        print("Error setting uuid")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     arg = argparse.ArgumentParser()
-    arg.add_argument('-p')
-    arg.add_argument('-s')
+    arg.add_argument("-p")
+    arg.add_argument("-s")
 
     opt = arg.parse_args()
     prop_name = opt.p
@@ -177,19 +173,19 @@
             sys.exit(1)
         net_obj = get_network_interface_object(bus)
         if not net_obj:
-            print "Unable to get the network object"
+            print("Unable to get the network object")
             sys.exit(1)
         sys_mac = get_sys_mac(net_obj)
         if inv_mac != sys_mac:
-            print "Inventory MAC=%s,System MAC=%s" % (inv_mac, sys_mac)
+            print("Inventory MAC=%s,System MAC=%s" % (inv_mac, sys_mac))
             sync_mac(net_obj, inv_mac, sys_mac)
     elif sync_type == "uuid":
-            inv_uuid = get_uuid(bus, prop_name)
-            if inv_uuid:
-                inv_uuid = uuid.UUID(inv_uuid)
-                chs_obj = bus.get_object(CHS_DBUS_NAME, CHS_OBJ_NAME)
-                chs_uuid = get_sys_uuid(chs_obj)
-                if inv_uuid != sys_uuid:
-                    set_sys_uuid(inv_uuid)
+        inv_uuid = get_uuid(bus, prop_name)
+        if inv_uuid:
+            inv_uuid = uuid.UUID(inv_uuid)
+            chs_obj = bus.get_object(CHS_DBUS_NAME, CHS_OBJ_NAME)
+            chs_uuid = get_sys_uuid(chs_obj)
+            if inv_uuid != sys_uuid:
+                set_sys_uuid(inv_uuid)
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/pyipmitest/ipmi_debug.py b/pyipmitest/ipmi_debug.py
index a8b1001..537bb19 100644
--- a/pyipmitest/ipmi_debug.py
+++ b/pyipmitest/ipmi_debug.py
@@ -11,28 +11,32 @@
 import dbus.service
 import dbus.mainloop.glib
 
-DBUS_NAME = 'org.openbmc.HostIpmi'
-OBJ_NAME = '/org/openbmc/HostIpmi/1'
+DBUS_NAME = "org.openbmc.HostIpmi"
+OBJ_NAME = "/org/openbmc/HostIpmi/1"
 
 
 def header(seq, netfn, lun, cmd):
-    return (
-        'seq:   0x%02x\nnetfn: 0x%02x\n\nlun: 0x%02d\ncmd:   0x%02x\n') % (
-            seq, netfn, lun, cmd)
+    return ("seq:   0x%02x\nnetfn: 0x%02x\n\nlun: 0x%02d\ncmd:   0x%02x\n") % (
+        seq,
+        netfn,
+        lun,
+        cmd,
+    )
 
 
 def print_request(seq, netfn, lun, cmd, data):
     str = header(seq, netfn, lun, cmd)
-    str += 'data:  [%s]' % ', '.join(['0x%02x' % x for x in data])
-    print str
+    str += "data:  [%s]" % ", ".join(["0x%02x" % x for x in data])
+    print(str)
 
 
 def print_response(seq, netfn, lun, cmd, cc, data):
     str = header(seq, netfn, lun, cmd)
-    str += 'cc:    0x%02x\ndata:  [%s]' % (
-                cc, ', '.join(['0x%02x' % x for x in data])
-            )
-    print str
+    str += "cc:    0x%02x\ndata:  [%s]" % (
+        cc,
+        ", ".join(["0x%02x" % x for x in data]),
+    )
+    print(str)
 
 
 class IpmiDebug(dbus.service.Object):
@@ -41,23 +45,23 @@
 
     @dbus.service.signal(DBUS_NAME, "yyyyay")
     def ReceivedMessage(self, seq, netfn, lun, cmd, data):
-        print "IPMI packet from host:"
+        print("IPMI packet from host:")
         print_request(seq, netfn, lun, cmd, data)
 
     @dbus.service.method(DBUS_NAME, "yyyyyay", "x")
     def sendMessage(self, seq, netfn, lun, cmd, ccode, data):
-        print "IPMI packet sent to host:"
+        print("IPMI packet sent to host:")
         print_response(seq, netfn, lun, cmd, ccode, data)
         return 0
 
     @dbus.service.method(DBUS_NAME)
     def setAttention(self):
-        print "IPMI SMS_ATN set"
+        print("IPMI SMS_ATN set")
 
 
 class ConsoleReader(object):
     def __init__(self, ipmi_obj):
-        self.buffer = ''
+        self.buffer = ""
         self.seq = 0
         self.ipmi_obj = ipmi_obj
         flags = fcntl.fcntl(sys.stdin.fileno(), fcntl.F_GETFL)
@@ -69,16 +73,16 @@
         chunk = fd.read()
         for char in chunk:
             self.buffer += char
-            if char == '\n':
+            if char == "\n":
                 self.line(self.buffer)
-                self.buffer = ''
+                self.buffer = ""
 
         return True
 
     def line(self, data):
-        s = data.split(' ')
+        s = data.split(" ")
         if len(s) < 2:
-            print "Not enough bytes to form a valid IPMI packet"
+            print("Not enough bytes to form a valid IPMI packet")
             return
         try:
             data = [int(c, 16) for c in s]
@@ -98,12 +102,14 @@
     obj.unmask_signals()
     name = dbus.service.BusName(DBUS_NAME, bus)
 
-    print ("Enter IPMI packet as hex values. First three bytes will be used"
-           "as netfn and cmd.\nlun will be zero.")
+    print(
+        "Enter IPMI packet as hex values. First three bytes will be used"
+        "as netfn and cmd.\nlun will be zero."
+    )
     mainloop.run()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     sys.exit(main())
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/pyipmitest/setup.py b/pyipmitest/setup.py
index 37957b8..35c9439 100644
--- a/pyipmitest/setup.py
+++ b/pyipmitest/setup.py
@@ -1,6 +1,7 @@
 from distutils.core import setup
 
-setup(name='pyipmitest',
-      version='1.0',
-      scripts=['ipmi_debug.py'],
-      )
+setup(
+    name="pyipmitest",
+    version="1.0",
+    scripts=["ipmi_debug.py"],
+)
diff --git a/pystatemgr/discover_system_state.py b/pystatemgr/discover_system_state.py
index 9324eba..8c39e8b 100644
--- a/pystatemgr/discover_system_state.py
+++ b/pystatemgr/discover_system_state.py
@@ -4,103 +4,117 @@
 
 
 dbus_objects = {
-    'power': {
-        'bus_name': 'org.openbmc.control.Power',
-        'object_name': '/org/openbmc/control/power0',
-        'interface_name': 'org.openbmc.control.Power'
+    "power": {
+        "bus_name": "org.openbmc.control.Power",
+        "object_name": "/org/openbmc/control/power0",
+        "interface_name": "org.openbmc.control.Power",
     },
-    'occstatus0': {
-        'bus_name': 'org.openbmc.Sensors',
-        'object_name': '/org/openbmc/sensors/host/cpu0/OccStatus',
-        'interface_name': 'org.openbmc.SensorValue'
+    "occstatus0": {
+        "bus_name": "org.openbmc.Sensors",
+        "object_name": "/org/openbmc/sensors/host/cpu0/OccStatus",
+        "interface_name": "org.openbmc.SensorValue",
     },
-    'occstatus1': {
-        'bus_name': 'org.openbmc.Sensors',
-        'object_name': '/org/openbmc/sensors/host/cpu1/OccStatus',
-        'interface_name': 'org.openbmc.SensorValue'
+    "occstatus1": {
+        "bus_name": "org.openbmc.Sensors",
+        "object_name": "/org/openbmc/sensors/host/cpu1/OccStatus",
+        "interface_name": "org.openbmc.SensorValue",
     },
-    'bootprogress': {
-        'bus_name': 'org.openbmc.Sensors',
-        'object_name': '/org/openbmc/sensors/host/BootProgress',
-        'interface_name': 'org.openbmc.SensorValue'
+    "bootprogress": {
+        "bus_name": "org.openbmc.Sensors",
+        "object_name": "/org/openbmc/sensors/host/BootProgress",
+        "interface_name": "org.openbmc.SensorValue",
     },
-    'host': {
-        'bus_name': 'xyz.openbmc_project.State.Host',
-        'object_name': '/xyz/openbmc_project/state/host0',
-        'interface_name': 'xyz.openbmc_project.State.Host'
+    "host": {
+        "bus_name": "xyz.openbmc_project.State.Host",
+        "object_name": "/xyz/openbmc_project/state/host0",
+        "interface_name": "xyz.openbmc_project.State.Host",
     },
-    'settings': {
-        'bus_name': 'org.openbmc.settings.Host',
-        'object_name': '/org/openbmc/settings/host0',
-        'interface_name': 'org.freedesktop.DBus.Properties'
+    "settings": {
+        "bus_name": "org.openbmc.settings.Host",
+        "object_name": "/org/openbmc/settings/host0",
+        "interface_name": "org.freedesktop.DBus.Properties",
     },
-    'system': {
-        'bus_name': 'org.openbmc.managers.System',
-        'object_name': '/org/openbmc/managers/System',
-        'interface_name': 'org.freedesktop.DBus.Properties'
+    "system": {
+        "bus_name": "org.openbmc.managers.System",
+        "object_name": "/org/openbmc/managers/System",
+        "interface_name": "org.freedesktop.DBus.Properties",
     },
-    'powersupplyredundancy': {
-        'bus_name': 'org.openbmc.Sensors',
-        'object_name': '/org/openbmc/sensors/host/PowerSupplyRedundancy',
-        'interface_name': 'org.openbmc.SensorValue'
+    "powersupplyredundancy": {
+        "bus_name": "org.openbmc.Sensors",
+        "object_name": "/org/openbmc/sensors/host/PowerSupplyRedundancy",
+        "interface_name": "org.openbmc.SensorValue",
     },
-    'turboallowed': {
-        'bus_name': 'org.openbmc.Sensors',
-        'object_name': '/org/openbmc/sensors/host/TurboAllowed',
-        'interface_name': 'org.openbmc.SensorValue'
+    "turboallowed": {
+        "bus_name": "org.openbmc.Sensors",
+        "object_name": "/org/openbmc/sensors/host/TurboAllowed",
+        "interface_name": "org.openbmc.SensorValue",
     },
-    'powersupplyderating': {
-        'bus_name': 'org.openbmc.Sensors',
-        'object_name': '/org/openbmc/sensors/host/PowerSupplyDerating',
-        'interface_name': 'org.openbmc.SensorValue'
+    "powersupplyderating": {
+        "bus_name": "org.openbmc.Sensors",
+        "object_name": "/org/openbmc/sensors/host/PowerSupplyDerating",
+        "interface_name": "org.openbmc.SensorValue",
     },
 }
 
 
 def getInterface(bus, objs, key):
     obj = bus.get_object(
-        objs[key]['bus_name'], objs[key]['object_name'], introspect=False)
-    return dbus.Interface(obj, objs[key]['interface_name'])
+        objs[key]["bus_name"], objs[key]["object_name"], introspect=False
+    )
+    return dbus.Interface(obj, objs[key]["interface_name"])
 
 
 def getProperty(bus, objs, key, prop):
     obj = bus.get_object(
-        objs[key]['bus_name'], objs[key]['object_name'], introspect=False)
+        objs[key]["bus_name"], objs[key]["object_name"], introspect=False
+    )
     intf = dbus.Interface(obj, dbus.PROPERTIES_IFACE)
-    return intf.Get(objs[key]['interface_name'], prop)
+    return intf.Get(objs[key]["interface_name"], prop)
 
 
 def setProperty(bus, objs, key, prop, prop_value):
-    obj = bus.get_object(
-        objs[key]['bus_name'], objs[key]['object_name'])
+    obj = bus.get_object(objs[key]["bus_name"], objs[key]["object_name"])
     intf = dbus.Interface(obj, dbus.PROPERTIES_IFACE)
-    return intf.Set(objs[key]['interface_name'], prop, prop_value)
+    return intf.Set(objs[key]["interface_name"], prop, prop_value)
 
 
 bus = dbus.SystemBus()
-pgood = getProperty(bus, dbus_objects, 'power', 'pgood')
+pgood = getProperty(bus, dbus_objects, "power", "pgood")
 
-if (pgood == 1):
-    intf = getInterface(bus, dbus_objects, 'bootprogress')
+if pgood == 1:
+    intf = getInterface(bus, dbus_objects, "bootprogress")
     intf.setValue("FW Progress, Starting OS")
-    intf = getInterface(bus, dbus_objects, 'occstatus0')
+    intf = getInterface(bus, dbus_objects, "occstatus0")
     intf.setValue("Enabled")
-    intf = getInterface(bus, dbus_objects, 'occstatus1')
+    intf = getInterface(bus, dbus_objects, "occstatus1")
     intf.setValue("Enabled")
 else:
     # Power is off, so check power policy
-    settings_intf = getInterface(bus, dbus_objects, 'settings')
-    system_intf = getInterface(bus, dbus_objects, 'system')
-    system_last_state = system_intf.Get("org.openbmc.managers.System",
-                                        "system_last_state")
-    power_policy = settings_intf.Get("org.openbmc.settings.Host",
-                                     "power_policy")
-    print "Last System State:"+system_last_state+"Power Policy:"+power_policy
+    settings_intf = getInterface(bus, dbus_objects, "settings")
+    system_intf = getInterface(bus, dbus_objects, "system")
+    system_last_state = system_intf.Get(
+        "org.openbmc.managers.System", "system_last_state"
+    )
+    power_policy = settings_intf.Get(
+        "org.openbmc.settings.Host", "power_policy"
+    )
+    print(
+        "Last System State:"
+        + system_last_state
+        + "Power Policy:"
+        + power_policy
+    )
 
-    if (power_policy == "ALWAYS_POWER_ON" or
-       (power_policy == "RESTORE_LAST_STATE" and
-            system_last_state == "HOST_POWERED_ON")):
-        setProperty(bus, dbus_objects, 'host', 'RequestedHostTransition',
-                    'xyz.openbmc_project.State.Host.Transition.On')
+    if power_policy == "ALWAYS_POWER_ON" or (
+        power_policy == "RESTORE_LAST_STATE"
+        and system_last_state == "HOST_POWERED_ON"
+    ):
+        setProperty(
+            bus,
+            dbus_objects,
+            "host",
+            "RequestedHostTransition",
+            "xyz.openbmc_project.State.Host.Transition.On",
+        )
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/pystatemgr/setup.py b/pystatemgr/setup.py
index 24874ae..be48d3a 100644
--- a/pystatemgr/setup.py
+++ b/pystatemgr/setup.py
@@ -1,6 +1,7 @@
 from distutils.core import setup
 
-setup(name='pystatemgr',
-      version='1.0',
-      scripts=['discover_system_state.py'],
-      )
+setup(
+    name="pystatemgr",
+    version="1.0",
+    scripts=["discover_system_state.py"],
+)
diff --git a/pysystemmgr/obmc/system/__init__.py b/pysystemmgr/obmc/system/__init__.py
index 7bcea9e..2d5b752 100644
--- a/pysystemmgr/obmc/system/__init__.py
+++ b/pysystemmgr/obmc/system/__init__.py
@@ -18,9 +18,9 @@
 
 
 def convertGpio(name):
-    offset = int(''.join(list(filter(str.isdigit, name))))
+    offset = int("".join(list(filter(str.isdigit, name))))
     port = list(filter(str.isalpha, name.upper()))
-    a = ord(port[-1]) - ord('A')
+    a = ord(port[-1]) - ord("A")
     if len(port) > 1:
         a += 26
     base = a * 8 + GPIO_BASE
diff --git a/pysystemmgr/setup.py b/pysystemmgr/setup.py
index a921e9c..adfa4a2 100644
--- a/pysystemmgr/setup.py
+++ b/pysystemmgr/setup.py
@@ -1,7 +1,8 @@
 from distutils.core import setup
 
-setup(name='pysystemmgr',
-      version='1.0',
-      packages=['obmc.system'],
-      scripts=['system_manager.py'],
-      )
+setup(
+    name="pysystemmgr",
+    version="1.0",
+    packages=["obmc.system"],
+    scripts=["system_manager.py"],
+)
diff --git a/pysystemmgr/system_manager.py b/pysystemmgr/system_manager.py
index d9761b5..82ab903 100644
--- a/pysystemmgr/system_manager.py
+++ b/pysystemmgr/system_manager.py
@@ -15,15 +15,14 @@
 import obmc.inventory
 import obmc.system
 
-DBUS_NAME = 'org.openbmc.managers.System'
-OBJ_NAME = '/org/openbmc/managers/System'
-INTF_SENSOR = 'org.openbmc.SensorValue'
+DBUS_NAME = "org.openbmc.managers.System"
+OBJ_NAME = "/org/openbmc/managers/System"
+INTF_SENSOR = "org.openbmc.SensorValue"
+
 
 class SystemManager(DbusProperties, DbusObjectManager):
     def __init__(self, bus, obj_name):
-        super(SystemManager, self).__init__(
-            conn=bus,
-            object_path=obj_name)
+        super(SystemManager, self).__init__(conn=bus, object_path=obj_name)
         self.bus = bus
 
         # replace symbolic path in ID_LOOKUP
@@ -31,7 +30,8 @@
             for key in System.ID_LOOKUP[category]:
                 val = System.ID_LOOKUP[category][key]
                 new_val = val.replace(
-                    "<inventory_root>", obmc.inventory.INVENTORY_ROOT)
+                    "<inventory_root>", obmc.inventory.INVENTORY_ROOT
+                )
                 System.ID_LOOKUP[category][key] = new_val
 
         print("SystemManager Init Done")
@@ -41,75 +41,87 @@
         intf_name = INTF_SENSOR
         try:
             obj_path = System.ID_LOOKUP[category][key]
-            parts = obj_path.split('/')
-            if (parts[3] != 'sensors'):
-                print ("ERROR SystemManager: SENSOR only supported type")
+            parts = obj_path.split("/")
+            if parts[3] != "sensors":
+                print("ERROR SystemManager: SENSOR only supported type")
                 intf_name = ""
         except Exception as e:
-            print ("ERROR SystemManager: "+str(e)+" not found in lookup")
+            print("ERROR SystemManager: " + str(e) + " not found in lookup")
 
         return [obj_path, intf_name]
 
-    @dbus.service.method(DBUS_NAME, in_signature='ss', out_signature='(ss)')
+    @dbus.service.method(DBUS_NAME, in_signature="ss", out_signature="(ss)")
     def getObjectFromId(self, category, key):
         return self.doObjectLookup(category, key)
 
-    @dbus.service.method(DBUS_NAME, in_signature='sy', out_signature='(ss)')
+    @dbus.service.method(DBUS_NAME, in_signature="sy", out_signature="(ss)")
     def getObjectFromByteId(self, category, key):
         byte = int(key)
         return self.doObjectLookup(category, byte)
 
-    @dbus.service.method(DBUS_NAME, in_signature='s', out_signature='sis')
+    @dbus.service.method(DBUS_NAME, in_signature="s", out_signature="sis")
     def gpioInit(self, name):
-        gpio_path = ''
+        gpio_path = ""
         gpio_num = -1
-        r = ['', gpio_num, '']
+        r = ["", gpio_num, ""]
         if name not in System.GPIO_CONFIG:
             # TODO: Better error handling
-            msg = "ERROR: "+name+" not found in GPIO config table"
+            msg = "ERROR: " + name + " not found in GPIO config table"
             print(msg)
             raise Exception(msg)
         else:
 
             gpio_num = -1
             gpio = System.GPIO_CONFIG[name]
-            if 'gpio_num' in System.GPIO_CONFIG[name]:
-                gpio_num = gpio['gpio_num']
+            if "gpio_num" in System.GPIO_CONFIG[name]:
+                gpio_num = gpio["gpio_num"]
             else:
-                if 'gpio_pin' in System.GPIO_CONFIG[name]:
-                    gpio_num = obmc.system.convertGpio(gpio['gpio_pin'])
+                if "gpio_pin" in System.GPIO_CONFIG[name]:
+                    gpio_num = obmc.system.convertGpio(gpio["gpio_pin"])
                 else:
-                    msg = "ERROR: SystemManager - GPIO lookup failed for "+name
+                    msg = (
+                        "ERROR: SystemManager - GPIO lookup failed for " + name
+                    )
                     print(msg)
                     raise Exception(msg)
 
-            if (gpio_num != -1):
-                r = [obmc.enums.GPIO_DEV, gpio_num, gpio['direction']]
+            if gpio_num != -1:
+                r = [obmc.enums.GPIO_DEV, gpio_num, gpio["direction"]]
         return r
 
-    @dbus.service.method(DBUS_NAME, in_signature='',
-                         out_signature='ssa(sb)a(sb)a(sbb)ssssa(sb)')
+    @dbus.service.method(
+        DBUS_NAME, in_signature="", out_signature="ssa(sb)a(sb)a(sbb)ssssa(sb)"
+    )
     def getGpioConfiguration(self):
-        power_config = System.GPIO_CONFIGS.get('power_config', {})
-        power_good_in = power_config.get('power_good_in', '')
-        latch_out = power_config.get('latch_out', '')
-        power_up_outs = power_config.get('power_up_outs', [])
-        reset_outs = power_config.get('reset_outs', [])
-        pci_reset_outs = power_config.get('pci_reset_outs', [])
-        hostctl_config = System.GPIO_CONFIGS.get('hostctl_config', {})
-        fsi_data = hostctl_config.get('fsi_data', '')
-        fsi_clk = hostctl_config.get('fsi_clk', '')
-        fsi_enable = hostctl_config.get('fsi_enable', '')
-        cronus_sel = hostctl_config.get('cronus_sel', '')
-        optionals = hostctl_config.get('optionals', [])
-        r = [power_good_in, latch_out, power_up_outs, reset_outs,
-             pci_reset_outs, fsi_data, fsi_clk, fsi_enable, cronus_sel,
-             optionals]
+        power_config = System.GPIO_CONFIGS.get("power_config", {})
+        power_good_in = power_config.get("power_good_in", "")
+        latch_out = power_config.get("latch_out", "")
+        power_up_outs = power_config.get("power_up_outs", [])
+        reset_outs = power_config.get("reset_outs", [])
+        pci_reset_outs = power_config.get("pci_reset_outs", [])
+        hostctl_config = System.GPIO_CONFIGS.get("hostctl_config", {})
+        fsi_data = hostctl_config.get("fsi_data", "")
+        fsi_clk = hostctl_config.get("fsi_clk", "")
+        fsi_enable = hostctl_config.get("fsi_enable", "")
+        cronus_sel = hostctl_config.get("cronus_sel", "")
+        optionals = hostctl_config.get("optionals", [])
+        r = [
+            power_good_in,
+            latch_out,
+            power_up_outs,
+            reset_outs,
+            pci_reset_outs,
+            fsi_data,
+            fsi_clk,
+            fsi_enable,
+            cronus_sel,
+            optionals,
+        ]
         print("Power GPIO config: " + str(r))
         return r
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
     bus = get_dbus()
     obj = SystemManager(bus, OBJ_NAME)
diff --git a/pytools/setup.py b/pytools/setup.py
index 673bd3b..da8f757 100644
--- a/pytools/setup.py
+++ b/pytools/setup.py
@@ -1,6 +1,7 @@
 from distutils.core import setup
 
-setup(name='pytools',
-      version='1.0',
-      scripts=['gpioutil'],
-      )
+setup(
+    name="pytools",
+    version="1.0",
+    scripts=["gpioutil"],
+)