diff --git a/data/Palmetto.py b/data/Palmetto.py
index 02c9a44..24842de 100755
--- a/data/Palmetto.py
+++ b/data/Palmetto.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-HOME_PATH = "./"
-CACHE_PATH = "/var/cache/obmc/"
+HOME_PATH = './'
+CACHE_PATH = '/var/cache/obmc/'
 FLASH_DOWNLOAD_PATH = "/tmp"
 GPIO_BASE = 320
 SYSTEM_NAME = "Palmetto"
@@ -12,375 +12,298 @@
 # - 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/led/identify": 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/led/identify': 0,
+        '/org/openbmc/control/host0': 0,
+        '/org/openbmc/control/flash/bios': 0,
+    }
 }
 
 # method will be called when state is entered
 ENTER_STATE_CALLBACK = {
-    "HOST_POWERED_ON": {
-        "boot": {
-            "bus_name": "org.openbmc.control.Host",
-            "obj_name": "/org/openbmc/control/host0",
-            "interface_name": "org.openbmc.control.Host",
+    'HOST_POWERED_ON': {
+        'boot': {
+            'bus_name': 'org.openbmc.control.Host',
+            'obj_name': '/org/openbmc/control/host0',
+            'interface_name': 'org.openbmc.control.Host',
         }
     },
-    "BMC_READY": {
-        "setOn": {
-            "bus_name": "org.openbmc.control.led",
-            "obj_name": "/org/openbmc/control/led/identify",
-            "interface_name": "org.openbmc.Led",
+    'BMC_READY': {
+        'setOn': {
+            'bus_name': 'org.openbmc.control.led',
+            'obj_name': '/org/openbmc/control/led/identify',
+            'interface_name': 'org.openbmc.Led',
         },
-        "init": {
-            "bus_name": "org.openbmc.control.Flash",
-            "obj_name": "/org/openbmc/control/flash/bios",
-            "interface_name": "org.openbmc.Flash",
+        'init': {
+            'bus_name': 'org.openbmc.control.Flash',
+            'obj_name': '/org/openbmc/control/flash/bios',
+            'interface_name': 'org.openbmc.Flash',
         },
-    },
+    }
 }
 
 APPS = {
-    "startup_hacks": {
-        "system_state": "BASE_APPS",
-        "start_process": True,
-        "monitor_process": False,
-        "process_name": "startup_hacks.sh",
+    'startup_hacks': {
+        'system_state': 'BASE_APPS',
+        'start_process': True,
+        'monitor_process': False,
+        'process_name': 'startup_hacks.sh',
     },
-    "inventory": {
-        "system_state": "BMC_STARTING",
-        "start_process": True,
-        "monitor_process": True,
-        "process_name": "inventory_items.py",
-        "args": [SYSTEM_NAME],
+    'inventory': {
+        'system_state': 'BMC_STARTING',
+        'start_process': True,
+        'monitor_process': True,
+        'process_name': 'inventory_items.py',
+        'args': [SYSTEM_NAME]
     },
-    "pcie_present": {
-        "system_state": "HOST_POWERED_ON",
-        "start_process": False,
-        "monitor_process": False,
-        "process_name": "pcie_slot_present.exe",
+    'pcie_present': {
+        'system_state': 'HOST_POWERED_ON',
+        'start_process': False,
+        'monitor_process': False,
+        'process_name': 'pcie_slot_present.exe',
     },
-    "virtual_sensors": {
-        "system_state": "BMC_STARTING",
-        "start_process": True,
-        "monitor_process": True,
-        "process_name": "hwmon.py",
-        "args": [SYSTEM_NAME],
+    'virtual_sensors': {
+        'system_state': 'BMC_STARTING',
+        'start_process': True,
+        'monitor_process': True,
+        'process_name': 'hwmon.py',
+        'args': [SYSTEM_NAME]
     },
-    "sensor_manager": {
-        "system_state": "BASE_APPS",
-        "start_process": True,
-        "monitor_process": True,
-        "process_name": "sensor_manager2.py",
-        "args": [SYSTEM_NAME],
+    'sensor_manager': {
+        'system_state': 'BASE_APPS',
+        'start_process': True,
+        'monitor_process': True,
+        'process_name': 'sensor_manager2.py',
+        'args': [SYSTEM_NAME]
     },
-    "host_watchdog": {
-        "system_state": "BMC_STARTING",
-        "start_process": True,
-        "monitor_process": True,
-        "process_name": "host_watchdog.exe",
+    'host_watchdog': {
+        'system_state': 'BMC_STARTING',
+        'start_process': True,
+        'monitor_process': True,
+        'process_name': 'host_watchdog.exe',
     },
-    "power_control": {
-        "system_state": "BMC_STARTING",
-        "start_process": True,
-        "monitor_process": True,
-        "process_name": "power_control.exe",
-        "args": ["3000", "10"],
+    'power_control': {
+        'system_state': 'BMC_STARTING',
+        'start_process': True,
+        'monitor_process': True,
+        'process_name': 'power_control.exe',
+        'args': ['3000', '10']
     },
-    "power_button": {
-        "system_state": "BMC_STARTING",
-        "start_process": False,
-        "monitor_process": False,
-        "process_name": "button_power.exe",
+    'power_button': {
+        'system_state': 'BMC_STARTING',
+        'start_process': False,
+        'monitor_process': False,
+        'process_name': 'button_power.exe',
     },
-    "led_control": {
-        "system_state": "BMC_STARTING",
-        "start_process": True,
-        "monitor_process": True,
-        "process_name": "led_controller.exe",
+    'led_control': {
+        'system_state': 'BMC_STARTING',
+        'start_process': True,
+        'monitor_process': True,
+        'process_name': 'led_controller.exe',
     },
-    "flash_control": {
-        "system_state": "BMC_STARTING",
-        "start_process": True,
-        "monitor_process": True,
-        "process_name": "flash_bios.exe",
+    'flash_control': {
+        'system_state': 'BMC_STARTING',
+        'start_process': True,
+        'monitor_process': True,
+        'process_name': 'flash_bios.exe',
     },
-    "bmc_flash_control": {
-        "system_state": "BMC_STARTING",
-        "start_process": True,
-        "monitor_process": True,
-        "process_name": "bmc_update.py",
+    'bmc_flash_control': {
+        'system_state': 'BMC_STARTING',
+        'start_process': True,
+        'monitor_process': True,
+        'process_name': 'bmc_update.py',
     },
-    "download_manager": {
-        "system_state": "BMC_STARTING",
-        "start_process": True,
-        "monitor_process": True,
-        "process_name": "download_manager.py",
-        "args": [SYSTEM_NAME],
+    'download_manager': {
+        'system_state': 'BMC_STARTING',
+        'start_process': True,
+        'monitor_process': True,
+        'process_name': 'download_manager.py',
+        'args': [SYSTEM_NAME]
     },
-    "host_control": {
-        "system_state": "BMC_STARTING",
-        "start_process": True,
-        "monitor_process": True,
-        "process_name": "control_host.exe",
+    'host_control': {
+        'system_state': 'BMC_STARTING',
+        'start_process': True,
+        'monitor_process': True,
+        'process_name': 'control_host.exe',
     },
-    "chassis_control": {
-        "system_state": "BMC_STARTING",
-        "start_process": True,
-        "monitor_process": True,
-        "process_name": "chassis_control.py",
+    'chassis_control': {
+        'system_state': 'BMC_STARTING',
+        'start_process': True,
+        'monitor_process': True,
+        'process_name': 'chassis_control.py',
     },
-    "bmc_control": {
-        "system_state": "BMC_STARTING",
-        "start_process": True,
-        "monitor_process": True,
-        "process_name": "control_bmc.exe",
-    },
+    'bmc_control': {
+        'system_state': 'BMC_STARTING',
+        'start_process': True,
+        'monitor_process': True,
+        'process_name': 'control_bmc.exe',
+    }
 }
 
 CACHED_INTERFACES = {
     "org.openbmc.InventoryItem": True,
     "org.openbmc.control.Chassis": True,
 }
-INVENTORY_ROOT = "/org/openbmc/inventory"
+INVENTORY_ROOT = '/org/openbmc/inventory'
 
 FRU_INSTANCES = {
-    "<inventory_root>/system": {
-        "fru_type": "SYSTEM",
-        "is_fru": True,
-    },
-    "<inventory_root>/system/chassis": {
-        "fru_type": "SYSTEM",
-        "is_fru": True,
-    },
-    "<inventory_root>/system/chassis/motherboard": {
-        "fru_type": "MAIN_PLANAR",
-        "is_fru": True,
-    },
-    "<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/motherboard/bmc": {
-        "fru_type": "BMC",
-        "is_fru": False,
-        "manufacturer": "ASPEED",
-    },
-    "<inventory_root>/system/chassis/motherboard/cpu": {
-        "fru_type": "CPU",
-        "is_fru": True,
-    },
-    "<inventory_root>/system/chassis/motherboard/cpu/core0": {
-        "fru_type": "CORE",
-        "is_fru": False,
-    },
-    "<inventory_root>/system/chassis/motherboard/cpu/core1": {
-        "fru_type": "CORE",
-        "is_fru": False,
-    },
-    "<inventory_root>/system/chassis/motherboard/cpu/core2": {
-        "fru_type": "CORE",
-        "is_fru": False,
-    },
-    "<inventory_root>/system/chassis/motherboard/cpu/core3": {
-        "fru_type": "CORE",
-        "is_fru": False,
-    },
-    "<inventory_root>/system/chassis/motherboard/cpu/core4": {
-        "fru_type": "CORE",
-        "is_fru": False,
-    },
-    "<inventory_root>/system/chassis/motherboard/cpu/core5": {
-        "fru_type": "CORE",
-        "is_fru": False,
-    },
-    "<inventory_root>/system/chassis/motherboard/cpu/core6": {
-        "fru_type": "CORE",
-        "is_fru": False,
-    },
-    "<inventory_root>/system/chassis/motherboard/cpu/core7": {
-        "fru_type": "CORE",
-        "is_fru": False,
-    },
-    "<inventory_root>/system/chassis/motherboard/cpu/core8": {
-        "fru_type": "CORE",
-        "is_fru": False,
-    },
-    "<inventory_root>/system/chassis/motherboard/cpu/core9": {
-        "fru_type": "CORE",
-        "is_fru": False,
-    },
-    "<inventory_root>/system/chassis/motherboard/cpu/core10": {
-        "fru_type": "CORE",
-        "is_fru": False,
-    },
-    "<inventory_root>/system/chassis/motherboard/cpu/core11": {
-        "fru_type": "CORE",
-        "is_fru": False,
-    },
-    "<inventory_root>/system/chassis/motherboard/membuf": {
-        "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/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/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': {'fru_type': 'SYSTEM', 'is_fru': True, },
+    '<inventory_root>/system/chassis': {'fru_type': 'SYSTEM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard': {'fru_type': 'MAIN_PLANAR', 'is_fru': True, },
+
+    '<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/motherboard/bmc': {'fru_type': 'BMC', 'is_fru': False,
+                                                        'manufacturer': 'ASPEED'},
+    '<inventory_root>/system/chassis/motherboard/cpu': {'fru_type': 'CPU', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core0': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core1': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core2': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core3': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core4': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core5': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core6': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core7': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core8': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core9': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core10': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core11': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+
+    '<inventory_root>/system/chassis/motherboard/membuf': {'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/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/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, },
 }
 
 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': {
+        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",
+    '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",
-        0x08: "/org/openbmc/sensors/host/cpu0/OccStatus",
-        0x32: "/org/openbmc/sensors/host/OperatingSystemStatus",
-        0x33: "/org/openbmc/sensors/host/PowerCap",
+    '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',
+        0x08: '/org/openbmc/sensors/host/cpu0/OccStatus',
+        0x32: '/org/openbmc/sensors/host/OperatingSystemStatus',
+        0x33: '/org/openbmc/sensors/host/PowerCap',
     },
-    "GPIO_PRESENT": {
-        "SLOT0_PRESENT": "<inventory_root>/system/chassis/io_board/pcie_slot0",
-        "SLOT1_PRESENT": "<inventory_root>/system/chassis/io_board/pcie_slot1",
-    },
+    'GPIO_PRESENT': {
+        'SLOT0_PRESENT': '<inventory_root>/system/chassis/io_board/pcie_slot0',
+        'SLOT1_PRESENT': '<inventory_root>/system/chassis/io_board/pcie_slot1',
+    }
 }
 
 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["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["PCIE_RESET"] = {"gpio_pin": "B5", "direction": "out"}
-GPIO_CONFIG["USB_RESET"] = {"gpio_pin": "B6", "direction": "out"}
-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['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['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['PCIE_RESET'] = {'gpio_pin': 'B5', 'direction': 'out'}
+GPIO_CONFIG['USB_RESET'] = {'gpio_pin': 'B6', 'direction': 'out'}
+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'}
 
 
 def convertGpio(name):
@@ -393,70 +316,38 @@
 
 
 HWMON_CONFIG = {
-    "2-004c": {
-        "names": {
-            "temp1_input": {
-                "object_path": "temperature/ambient",
-                "poll_interval": 5000,
-                "scale": 1000,
-                "units": "C",
-            },
+    '2-004c': {
+        'names': {
+            'temp1_input': {'object_path': 'temperature/ambient', 'poll_interval': 5000,
+                            'scale': 1000, 'units': 'C'},
         }
     },
-    "3-0050": {
-        "names": {
-            "caps_curr_powercap": {
-                "object_path": "powercap/curr_cap",
-                "poll_interval": 10000,
-                "scale": 1,
-                "units": "W",
-            },
-            "caps_curr_powerreading": {
-                "object_path": "powercap/system_power",
-                "poll_interval": 10000,
-                "scale": 1,
-                "units": "W",
-            },
-            "caps_max_powercap": {
-                "object_path": "powercap/max_cap",
-                "poll_interval": 10000,
-                "scale": 1,
-                "units": "W",
-            },
-            "caps_min_powercap": {
-                "object_path": "powercap/min_cap",
-                "poll_interval": 10000,
-                "scale": 1,
-                "units": "W",
-            },
-            "caps_norm_powercap": {
-                "object_path": "powercap/n_cap",
-                "poll_interval": 10000,
-                "scale": 1,
-                "units": "W",
-            },
-            "caps_user_powerlimit": {
-                "object_path": "powercap/user_cap",
-                "poll_interval": 10000,
-                "scale": 1,
-                "units": "W",
-            },
+    '3-0050': {
+        'names': {
+            'caps_curr_powercap': {'object_path': 'powercap/curr_cap', 'poll_interval': 10000,
+                                   'scale': 1, 'units': 'W'},
+            'caps_curr_powerreading': {'object_path': 'powercap/system_power',
+                                       'poll_interval': 10000, 'scale': 1, 'units': 'W'},
+            'caps_max_powercap': {'object_path': 'powercap/max_cap', 'poll_interval': 10000,
+                                  'scale': 1, 'units': 'W'},
+            'caps_min_powercap': {'object_path': 'powercap/min_cap', 'poll_interval': 10000,
+                                  'scale': 1, 'units': 'W'},
+            'caps_norm_powercap': {'object_path': 'powercap/n_cap', 'poll_interval': 10000,
+                                   'scale': 1, 'units': 'W'},
+            'caps_user_powerlimit': {'object_path': 'powercap/user_cap', 'poll_interval': 10000,
+                                     'scale': 1, 'units': 'W'},
         }
-    },
+    }
 }
 
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
 MISC_SENSORS = {
-    0x09: {"class": "BootCountSensor"},
-    0x05: {"class": "BootProgressSensor"},
-    0x08: {
-        "class": "OccStatusSensor",
-        "os_path": "/sys/class/i2c-adapter/i2c-3/3-0050/online",
-    },
-    0x32: {"class": "OperatingSystemStatusSensor"},
-    0x33: {
-        "class": "PowerCap",
-        "os_path": "/sys/class/hwmon/hwmon1/user_powercap",
-    },
+    0x09: {'class': 'BootCountSensor'},
+    0x05: {'class': 'BootProgressSensor'},
+    0x08: {'class': 'OccStatusSensor',
+           'os_path': '/sys/class/i2c-adapter/i2c-3/3-0050/online'},
+    0x32: {'class': 'OperatingSystemStatusSensor'},
+    0x33: {'class': 'PowerCap',
+           'os_path': '/sys/class/hwmon/hwmon1/user_powercap'},
 }
diff --git a/data/Romulus.py b/data/Romulus.py
index 6b753d6..13c405c 100644
--- a/data/Romulus.py
+++ b/data/Romulus.py
@@ -2,943 +2,470 @@
 #
 
 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,
     },
 }
 
-INVENTORY_ROOT = "/org/openbmc/inventory"
+INVENTORY_ROOT = '/org/openbmc/inventory'
 
 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",
-        0x03: "/org/openbmc/sensors/host/cpu0/OccStatus",
-        0x04: "/org/openbmc/sensors/host/cpu1/OccStatus",
-        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",
+    'SENSOR': {
+        0x01: '/org/openbmc/sensors/host/HostStatus',
+        0x02: '/org/openbmc/sensors/host/BootProgress',
+        0x03: '/org/openbmc/sensors/host/cpu0/OccStatus',
+        0x04: '/org/openbmc/sensors/host/cpu1/OccStatus',
+        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',
         #        0x06 : '/org/openbmc/sensors/host/powercap',
     },
-    "GPIO_PRESENT": {},
+    'GPIO_PRESENT': {}
 }
 
 GPIO_CONFIG = {}
-GPIO_CONFIG["SOFTWARE_PGOOD"] = {"gpio_pin": "R1", "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": "N5", "direction": "out"}
-GPIO_CONFIG["CHECKSTOP"] = {"gpio_pin": "J2", "direction": "falling"}
-GPIO_CONFIG["BMC_CP0_RESET_N"] = {"gpio_pin": "A1", "direction": "out"}
-GPIO_CONFIG["BMC_CP0_PERST_ENABLE_R"] = {"gpio_pin": "A3", "direction": "out"}
-GPIO_CONFIG["FSI_DATA"] = {"gpio_pin": "AA2", "direction": "out"}
-GPIO_CONFIG["FSI_CLK"] = {"gpio_pin": "AA0", "direction": "out"}
-GPIO_CONFIG["FSI_ENABLE"] = {"gpio_pin": "D0", "direction": "out"}
+GPIO_CONFIG['SOFTWARE_PGOOD'] = \
+    {'gpio_pin': 'R1', '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': 'N5', 'direction': 'out'}
+GPIO_CONFIG['CHECKSTOP'] = \
+    {'gpio_pin': 'J2', 'direction': 'falling'}
+GPIO_CONFIG['BMC_CP0_RESET_N'] = \
+    {'gpio_pin': 'A1', 'direction': 'out'}
+GPIO_CONFIG['BMC_CP0_PERST_ENABLE_R'] = \
+    {'gpio_pin': 'A3', 'direction': 'out'}
+GPIO_CONFIG['FSI_DATA'] = \
+    {'gpio_pin': 'AA2', 'direction': 'out'}
+GPIO_CONFIG['FSI_CLK'] = \
+    {'gpio_pin': 'AA0', 'direction': 'out'}
+GPIO_CONFIG['FSI_ENABLE'] = \
+    {'gpio_pin': 'D0', 'direction': 'out'}
 
 # DBG_CP0_MUX_SEL
-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['CRONUS_SEL'] = \
+    {'gpio_pin': 'A6', 'direction': 'out'}
+GPIO_CONFIG['BMC_THROTTLE'] = \
+    {'gpio_pin': 'J3', 'direction': 'out'}
+GPIO_CONFIG['IDBTN'] = \
+    {'gpio_pin': 'Q7', 'direction': 'out'}
 
 # PM_FP_PWRBTN_IN_L
-GPIO_CONFIG["POWER_BUTTON"] = {"gpio_pin": "I3", "direction": "both"}
+GPIO_CONFIG['POWER_BUTTON'] = \
+    {'gpio_pin': 'I3', 'direction': 'both'}
 
 # PM_NMIBTN_IN_L
-GPIO_CONFIG["RESET_BUTTON"] = {"gpio_pin": "J1", "direction": "both"}
+GPIO_CONFIG['RESET_BUTTON'] = \
+    {'gpio_pin': 'J1', 'direction': 'both'}
 
 HWMON_CONFIG = {
-    "4-0050": {
-        "names": {
-            "caps_curr_powercap": {
-                "object_path": "powercap/curr_cap",
-                "poll_interval": 10000,
-                "scale": 1,
-                "units": "W",
-            },
-            "caps_curr_powerreading": {
-                "object_path": "powercap/system_power",
-                "poll_interval": 10000,
-                "scale": 1,
-                "units": "W",
-            },
-            "caps_max_powercap": {
-                "object_path": "powercap/max_cap",
-                "poll_interval": 10000,
-                "scale": 1,
-                "units": "W",
-            },
-            "caps_min_powercap": {
-                "object_path": "powercap/min_cap",
-                "poll_interval": 10000,
-                "scale": 1,
-                "units": "W",
-            },
-            "caps_norm_powercap": {
-                "object_path": "powercap/n_cap",
-                "poll_interval": 10000,
-                "scale": 1,
-                "units": "W",
-            },
-            "caps_user_powerlimit": {
-                "object_path": "powercap/user_cap",
-                "poll_interval": 10000,
-                "scale": 1,
-                "units": "W",
-            },
+    '4-0050': {
+        'names': {
+            'caps_curr_powercap': {'object_path': 'powercap/curr_cap', 'poll_interval': 10000,
+                                   'scale': 1, 'units': 'W'},
+            'caps_curr_powerreading': {'object_path': 'powercap/system_power',
+                                       'poll_interval': 10000, 'scale': 1, 'units': 'W'},
+            'caps_max_powercap': {'object_path': 'powercap/max_cap', 'poll_interval': 10000,
+                                  'scale': 1, 'units': 'W'},
+            'caps_min_powercap': {'object_path': 'powercap/min_cap', 'poll_interval': 10000,
+                                  'scale': 1, 'units': 'W'},
+            'caps_norm_powercap': {'object_path': 'powercap/n_cap', 'poll_interval': 10000,
+                                   'scale': 1, 'units': 'W'},
+            'caps_user_powerlimit': {'object_path': 'powercap/user_cap', 'poll_interval': 10000,
+                                     'scale': 1, 'units': 'W'},
         },
-        "labels": {
-            "176": {
-                "object_path": "temperature/cpu0/core0",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "177": {
-                "object_path": "temperature/cpu0/core1",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "178": {
-                "object_path": "temperature/cpu0/core2",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "179": {
-                "object_path": "temperature/cpu0/core3",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "180": {
-                "object_path": "temperature/cpu0/core4",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "181": {
-                "object_path": "temperature/cpu0/core5",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "182": {
-                "object_path": "temperature/cpu0/core6",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "183": {
-                "object_path": "temperature/cpu0/core7",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "184": {
-                "object_path": "temperature/cpu0/core8",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "185": {
-                "object_path": "temperature/cpu0/core9",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "186": {
-                "object_path": "temperature/cpu0/core10",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "187": {
-                "object_path": "temperature/cpu0/core11",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "102": {
-                "object_path": "temperature/dimm0",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
-            "103": {
-                "object_path": "temperature/dimm1",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
-            "104": {
-                "object_path": "temperature/dimm2",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
-            "105": {
-                "object_path": "temperature/dimm3",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
-            "106": {
-                "object_path": "temperature/dimm4",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
-            "107": {
-                "object_path": "temperature/dimm5",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
-            "108": {
-                "object_path": "temperature/dimm6",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
-            "109": {
-                "object_path": "temperature/dimm7",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
-        },
+        'labels': {
+            '176': {'object_path': 'temperature/cpu0/core0', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '177': {'object_path': 'temperature/cpu0/core1', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '178': {'object_path': 'temperature/cpu0/core2', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '179': {'object_path': 'temperature/cpu0/core3', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '180': {'object_path': 'temperature/cpu0/core4', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '181': {'object_path': 'temperature/cpu0/core5', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '182': {'object_path': 'temperature/cpu0/core6', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '183': {'object_path': 'temperature/cpu0/core7', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '184': {'object_path': 'temperature/cpu0/core8', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '185': {'object_path': 'temperature/cpu0/core9', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '186': {'object_path': 'temperature/cpu0/core10', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '187': {'object_path': 'temperature/cpu0/core11', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '102': {'object_path': 'temperature/dimm0', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '103': {'object_path': 'temperature/dimm1', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '104': {'object_path': 'temperature/dimm2', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '105': {'object_path': 'temperature/dimm3', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '106': {'object_path': 'temperature/dimm4', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '107': {'object_path': 'temperature/dimm5', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '108': {'object_path': 'temperature/dimm6', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '109': {'object_path': 'temperature/dimm7', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+        }
     },
-    "5-0050": {
-        "labels": {
-            "188": {
-                "object_path": "temperature/cpu1/core0",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "189": {
-                "object_path": "temperature/cpu1/core1",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "190": {
-                "object_path": "temperature/cpu1/core2",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "191": {
-                "object_path": "temperature/cpu1/core3",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "192": {
-                "object_path": "temperature/cpu1/core4",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "193": {
-                "object_path": "temperature/cpu1/core5",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "194": {
-                "object_path": "temperature/cpu1/core6",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "195": {
-                "object_path": "temperature/cpu1/core7",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "196": {
-                "object_path": "temperature/cpu1/core8",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "197": {
-                "object_path": "temperature/cpu1/core9",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "198": {
-                "object_path": "temperature/cpu1/core10",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "199": {
-                "object_path": "temperature/cpu1/core11",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-                "critical_upper": 100,
-                "critical_lower": -100,
-                "warning_upper": 90,
-                "warning_lower": -99,
-                "emergency_enabled": True,
-            },
-            "110": {
-                "object_path": "temperature/dimm8",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
-            "111": {
-                "object_path": "temperature/dimm9",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
-            "112": {
-                "object_path": "temperature/dimm10",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
-            "113": {
-                "object_path": "temperature/dimm11",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
-            "114": {
-                "object_path": "temperature/dimm12",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
-            "115": {
-                "object_path": "temperature/dimm13",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
-            "116": {
-                "object_path": "temperature/dimm14",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
-            "117": {
-                "object_path": "temperature/dimm15",
-                "poll_interval": 5000,
-                "scale": -3,
-                "units": "C",
-            },
+    '5-0050': {
+        'labels': {
+            '188': {'object_path': 'temperature/cpu1/core0', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '189': {'object_path': 'temperature/cpu1/core1', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '190': {'object_path': 'temperature/cpu1/core2', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '191': {'object_path': 'temperature/cpu1/core3', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '192': {'object_path': 'temperature/cpu1/core4', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '193': {'object_path': 'temperature/cpu1/core5', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '194': {'object_path': 'temperature/cpu1/core6', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '195': {'object_path': 'temperature/cpu1/core7', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '196': {'object_path': 'temperature/cpu1/core8', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '197': {'object_path': 'temperature/cpu1/core9', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '198': {'object_path': 'temperature/cpu1/core10', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '199': {'object_path': 'temperature/cpu1/core11', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '110': {'object_path': 'temperature/dimm8', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '111': {'object_path': 'temperature/dimm9', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '112': {'object_path': 'temperature/dimm10', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '113': {'object_path': 'temperature/dimm11', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '114': {'object_path': 'temperature/dimm12', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '115': {'object_path': 'temperature/dimm13', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '116': {'object_path': 'temperature/dimm14', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '117': {'object_path': 'temperature/dimm15', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
         }
     },
 }
 
 
 GPIO_CONFIGS = {
-    "power_config": {
-        "power_good_in": "SYS_PWROK_BUFF",
-        "power_up_outs": [
-            ("SOFTWARE_PGOOD", True),
-            ("BMC_POWER_UP", True),
+    'power_config': {
+        'power_good_in': 'SYS_PWROK_BUFF',
+        'power_up_outs': [
+            ('SOFTWARE_PGOOD', True),
+            ('BMC_POWER_UP', True),
         ],
-        "reset_outs": [
-            ("BMC_CP0_RESET_N", False),
-            ("BMC_CP0_PERST_ENABLE_R", False),
+        'reset_outs': [
+            ('BMC_CP0_RESET_N', False),
+            ('BMC_CP0_PERST_ENABLE_R', False),
         ],
     },
-    "hostctl_config": {
-        "fsi_data": "FSI_DATA",
-        "fsi_clk": "FSI_CLK",
-        "fsi_enable": "FSI_ENABLE",
-        "cronus_sel": "CRONUS_SEL",
-        "optionals": [],
+    'hostctl_config': {
+        'fsi_data': 'FSI_DATA',
+        'fsi_clk': 'FSI_CLK',
+        'fsi_enable': 'FSI_ENABLE',
+        'cronus_sel': 'CRONUS_SEL',
+        'optionals': [
+        ],
     },
 }
 
@@ -946,18 +473,14 @@
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
 MISC_SENSORS = {
-    0x8B: {"class": "BootCountSensor"},
-    0x02: {"class": "BootProgressSensor"},
+    0x8b: {'class': 'BootCountSensor'},
+    0x02: {'class': 'BootProgressSensor'},
     # OCC active sensors aren't in the P9 XML yet.  These are wrong.
-    0x03: {
-        "class": "OccStatusSensor",
-        "os_path": "/sys/bus/i2c/devices/3-0050/online",
-    },
-    0x04: {
-        "class": "OccStatusSensor",
-        "os_path": "/sys/bus/i2c/devices/3-0051/online",
-    },
-    0x91: {"class": "OperatingSystemStatusSensor"},
+    0x03: {'class': 'OccStatusSensor',
+           'os_path': '/sys/bus/i2c/devices/3-0050/online'},
+    0x04: {'class': 'OccStatusSensor',
+           'os_path': '/sys/bus/i2c/devices/3-0051/online'},
+    0x91: {'class': 'OperatingSystemStatusSensor'},
     # 0x06 : { 'class' : 'PowerCap',
     #    'os_path' : '/sys/class/hwmon/hwmon3/user_powercap' },
 }
diff --git a/data/Witherspoon.py b/data/Witherspoon.py
index a33293c..e106eb9 100755
--- a/data/Witherspoon.py
+++ b/data/Witherspoon.py
@@ -5,584 +5,363 @@
 # - 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': {}
 }
 
 GPIO_CONFIG = {}
-GPIO_CONFIG["BMC_POWER_UP"] = {"gpio_pin": "D1", "direction": "out"}
-GPIO_CONFIG["SOFTWARE_PGOOD"] = {"gpio_pin": "R1", "direction": "out"}
-GPIO_CONFIG["SYS_PWROK_BUFF"] = {"gpio_pin": "D2", "direction": "in"}
+GPIO_CONFIG['BMC_POWER_UP'] = \
+    {'gpio_pin': 'D1', 'direction': 'out'}
+GPIO_CONFIG['SOFTWARE_PGOOD'] = \
+    {'gpio_pin': 'R1', 'direction': 'out'}
+GPIO_CONFIG['SYS_PWROK_BUFF'] = \
+    {'gpio_pin': 'D2', 'direction': 'in'}
 
 # PV_CP_MD_JTAG_ATTENTION_N
-GPIO_CONFIG["CHECKSTOP"] = {"gpio_pin": "J2", "direction": "falling"}
+GPIO_CONFIG['CHECKSTOP'] = \
+    {'gpio_pin': 'J2', 'direction': 'falling'}
 
-GPIO_CONFIG["BMC_CP0_RESET_N"] = {"gpio_pin": "A1", "direction": "out"}
+GPIO_CONFIG['BMC_CP0_RESET_N'] = \
+    {'gpio_pin': 'A1', 'direction': 'out'}
 # pcie switch reset
-GPIO_CONFIG["BMC_VS1_PERST_N"] = {"gpio_pin": "B7", "direction": "out"}
+GPIO_CONFIG['BMC_VS1_PERST_N'] = \
+    {'gpio_pin': 'B7', 'direction': 'out'}
 # pcie slots reset - not connected?
-GPIO_CONFIG["BMC_CP0_PERST_ENABLE_R"] = {"gpio_pin": "A3", "direction": "out"}
+GPIO_CONFIG['BMC_CP0_PERST_ENABLE_R'] = \
+    {'gpio_pin': 'A3', 'direction': 'out'}
 
 # SOFT_FSI_DAT
-GPIO_CONFIG["FSI_DATA"] = {"gpio_pin": "E0", "direction": "out"}
+GPIO_CONFIG['FSI_DATA'] = \
+    {'gpio_pin': 'E0', 'direction': 'out'}
 # SOFT_FSI_CLK
-GPIO_CONFIG["FSI_CLK"] = {"gpio_pin": "AA0", "direction": "out"}
+GPIO_CONFIG['FSI_CLK'] = \
+    {'gpio_pin': 'AA0', 'direction': 'out'}
 # BMC_FSI_IN_ENA
-GPIO_CONFIG["FSI_ENABLE"] = {"gpio_pin": "D0", "direction": "out"}
+GPIO_CONFIG['FSI_ENABLE'] = \
+    {'gpio_pin': 'D0', 'direction': 'out'}
 # FSI_JMFG0_PRSNT_N
-GPIO_CONFIG["CRONUS_SEL"] = {"gpio_pin": "A6", "direction": "out"}
+GPIO_CONFIG['CRONUS_SEL'] = \
+    {'gpio_pin': 'A6', 'direction': 'out'}
 
 # FP_PWR_BTN_N
-GPIO_CONFIG["POWER_BUTTON"] = {"gpio_pin": "I3", "direction": "both"}
+GPIO_CONFIG['POWER_BUTTON'] = \
+    {'gpio_pin': 'I3', 'direction': 'both'}
 # BMC_NMIBTN_IN_N
-GPIO_CONFIG["RESET_BUTTON"] = {"gpio_pin": "J1", "direction": "both"}
+GPIO_CONFIG['RESET_BUTTON'] = \
+    {'gpio_pin': 'J1', 'direction': 'both'}
 
 # FP_ID_BTN_N
-GPIO_CONFIG["IDBTN"] = {"gpio_pin": "Q7", "direction": "out"}
+GPIO_CONFIG['IDBTN'] = \
+    {'gpio_pin': 'Q7', 'direction': 'out'}
 
 GPIO_CONFIGS = {
-    "power_config": {
-        "power_good_in": "SYS_PWROK_BUFF",
-        "power_up_outs": [
-            ("SOFTWARE_PGOOD", True),
-            ("BMC_POWER_UP", True),
+    'power_config': {
+        'power_good_in': 'SYS_PWROK_BUFF',
+        'power_up_outs': [
+            ('SOFTWARE_PGOOD', True),
+            ('BMC_POWER_UP', True),
         ],
-        "reset_outs": [
-            ("BMC_CP0_RESET_N", False),
+        'reset_outs': [
+            ('BMC_CP0_RESET_N', False),
         ],
     },
-    "hostctl_config": {
-        "fsi_data": "FSI_DATA",
-        "fsi_clk": "FSI_CLK",
-        "fsi_enable": "FSI_ENABLE",
-        "cronus_sel": "CRONUS_SEL",
-        "optionals": [],
+    'hostctl_config': {
+        'fsi_data': 'FSI_DATA',
+        'fsi_clk': 'FSI_CLK',
+        'fsi_enable': 'FSI_ENABLE',
+        'cronus_sel': 'CRONUS_SEL',
+        'optionals': [
+        ],
     },
 }
 
@@ -590,13 +369,13 @@
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
 MISC_SENSORS = {
-    0x07: {"class": "BootCountSensor"},
-    0x03: {"class": "BootProgressSensor"},
-    0x02: {"class": "OperatingSystemStatusSensor"},
+    0x07: {'class': 'BootCountSensor'},
+    0x03: {'class': 'BootProgressSensor'},
+    0x02: {'class': 'OperatingSystemStatusSensor'},
     # Garrison value is used, Not in P9 XML yet.
-    0x0B: {"class": "PowerSupplyRedundancySensor"},
-    0xDA: {"class": "TurboAllowedSensor"},
-    0xD8: {"class": "PowerSupplyDeratingSensor"},
+    0x0b: {'class': 'PowerSupplyRedundancySensor'},
+    0xda: {'class': 'TurboAllowedSensor'},
+    0xD8: {'class': 'PowerSupplyDeratingSensor'},
 }
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/data/inventory.py b/data/inventory.py
index 6e3bc64..00de1dd 100644
--- a/data/inventory.py
+++ b/data/inventory.py
@@ -1,7 +1,20 @@
 inventory_dict = {
-    "core": ["PrettyName", "Present", "Functional"],
-    "fan": ["PrettyName", "Present", "MeetsMinimumShipLevel", "Functional"],
-    "fan_wc": ["PrettyName", "Present", "MeetsMinimumShipLevel"],
+    "core": [
+        "PrettyName",
+        "Present",
+        "Functional"
+    ],
+    "fan": [
+        "PrettyName",
+        "Present",
+        "MeetsMinimumShipLevel",
+        "Functional"
+    ],
+    "fan_wc": [
+        "PrettyName",
+        "Present",
+        "MeetsMinimumShipLevel"
+    ],
     "fru": [
         "PrettyName",
         "Present",
@@ -13,7 +26,12 @@
         "Version",
         "FieldReplaceable",
         "Cached",
-        "Functional",
+        "Functional"
     ],
-    "gpu": ["PrettyName", "Present", "FieldReplaceable", "Functional"],
+    "gpu": [
+        "PrettyName",
+        "Present",
+        "FieldReplaceable",
+        "Functional"
+    ]
 }
diff --git a/data/ipmi_raw_cmd_table.py b/data/ipmi_raw_cmd_table.py
index 4df9872..729e968 100644
--- a/data/ipmi_raw_cmd_table.py
+++ b/data/ipmi_raw_cmd_table.py
@@ -11,14 +11,16 @@
 # Refer:
 # openbmc/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipe
 # s-phosphor/ipmi/phosphor-ipmi-host/cipher_list.json
-valid_ciphers = ["17"]
-unsupported_ciphers = ["1", "2", "15", "16"]
+valid_ciphers = ['17']
+unsupported_ciphers = ['1', '2', '15', '16']
 
 IPMI_RAW_CMD = {
     # Interface name
-    "power_supply_redundancy": {
+    'power_supply_redundancy':
+    {
         # Command action type
-        "Get": [
+        'Get':
+        [
             # raw command, expected output(s), comment
             "0x04 0x2d 0x0b",
             "00 00 01 00",
@@ -28,61 +30,73 @@
             "00 40 02 00",
             "40 is scanning enabled and 02 indicates redundancy enabled",
         ],
-        "Enabled": [
+        'Enabled':
+        [
             # raw command, expected output, comment
             "0x04 0x30 0x0b 0x00 0x00 0x02 0x00 0x00 0x00 0x00 0x00 0x00",
             "none",
             "Enabled nibble position 6th LSB e.g. 0x2",
         ],
-        "Disabled": [
+        'Disabled':
+        [
             # raw command, expected output, comment
             "0x04 0x30 0x0b 0x00 0x00 0x01 0x00 0x00 0x00 0x00 0x00 0x00",
             "none",
             "Enabled nibble position 6th LSB e.g. 0x1",
         ],
     },
-    "power_reading": {
-        "Get": [
+    'power_reading':
+    {
+        'Get':
+        [
             # raw command, expected output(s), comment
             "0x2c 0x02 0xdc 0x01 0x01 0x00",
             "dc d5 00 d5 00 d5 00 d5 00 00 00 00 00 00 00 00 00 00",
             "Byte position 2nd LSB e.g. d5 Instantaneous power readings",
         ],
     },
-    "conf_param": {
-        "Enabled": [
+    'conf_param':
+    {
+        'Enabled':
+        [
             # raw command, expected output, comment
             "0x2c 0x12 0xdc 0x02 0x00 0x01",
             "dc",
             "Enabled nibble position 6th LSB e.g. 0x01",
         ],
-        "Disabled": [
+        'Disabled':
+        [
             # raw command, expected output, comment
             "0x2c 0x12 0xdc 0x02 0x00 0x00",
             "dc",
             "Disable nibble position 6th LSB e.g. 0x00",
-        ],
+        ]
     },
-    "SEL_entry": {
-        "Reserve": [
+    'SEL_entry':
+    {
+        'Reserve':
+        [
             # raw command, expected output, comment
             "0x0a 0x42",
             "27 00",
             "27 is Reservation ID, LSB, 00 Reservation ID, MSB ",
         ],
-        "Get_SEL_Time": [
+        'Get_SEL_Time':
+        [
             # raw command
-            "0x0a 0x48",
+            '0x0a 0x48',
         ],
-        "Set_SEL_Time": [
+        'Set_SEL_Time':
+        [
             # raw command, expected output(s)
-            "0x0a 0x49",
-            "rsp=0xd5",
-            "not supported in present state",
-            "rsp=0xc7",
-            "Request data length invalid",
+            '0x0a 0x49',
+            'rsp=0xd5',
+            'not supported in present state',
+            'rsp=0xc7',
+            'Request data length invalid',
         ],
-        "Clear_SEL": [
+        'Clear_SEL':
+        [
             # raw command, expected output(s)
             "0x0a 0x47",
             "0x43 0x4c 0x52 0xaa",
@@ -92,48 +106,56 @@
             "Reservation cancelled or invalid",
             "0x43 0x4c 0x52 0x00",
         ],
-        "SEL_info": [
+        'SEL_info':
+        [
             # raw command
             "0x0a 0x40"
         ],
-        "Create_SEL": [
+        'Create_SEL':
+        [
             # raw command
             "0x0a 0x44 0x00 0x00 0x02 0x00 0x00 0x00 0x00 0x00 0x00 0x04",
             "0x00 0xa0 0x04 0x07",
         ],
-        "Get_SEL_Entry": [
+        'Get_SEL_Entry':
+        [
             # raw command
             "0x0a 0x43 0x00 0x00",
             "0x00 0xff",
         ],
     },
-    "Self_Test_Results": {
-        "Get": [
+    'Self_Test_Results':
+    {
+        'Get':
+        [
             # raw command, expected output(s), comment
             "0x06 0x04",
             "56 00",
             "56h = Self Test function not implemented in this controller.",
         ]
     },
-    "Device GUID": {
-        "Get": [
+    'Device GUID':
+    {
+        'Get':
+        [
             # raw command, expected output(s), comment
             "0x06 0x08",
             "01 70 9b ae da 6f dd 9c b4 4c 36 be 66 c8 49 28",
             "Get GUID bytes 1 through 16.",
+
         ]
     },
-    "LAN_Config_Params": {
-        "Get": [
+    'LAN_Config_Params':
+    {
+        'Get':
+        [
             # raw command, expected output, comment
             "0x0c 0x02",
             "11 02",
-            (
-                "11 is Parameter revision, 02 is Configuration parameter data"
-                " e.g. Cipher Suite Entry count"
-            ),
+            "11 is Parameter revision, 02 is Configuration parameter data e.g. Cipher Suite Entry count",
         ],
-        "Set": [
+        'Set':
+        [
             # raw command, expected output, error response
             "0x0c 0x01",
             "11 00",
@@ -141,116 +163,135 @@
             "Invalid data field in request",
         ],
     },
-    "Payload": {
-        "Get_Payload_Activation_Status": [
+    'Payload':
+    {
+        'Get_Payload_Activation_Status':
+        [
             # raw command, expected output(s), comment
             "0x06 0x4a 0x01",
             "01 00 00",
-            (
-                "1st byte is instance capacity, last two bytes is activation"
-                " status of instances"
-            ),
+            "1st byte is instance capacity, last two bytes is activation status of instances",
         ],
-        "Activate_Payload": [
+        'Activate_Payload':
+        [
             # raw command, expected output(s), comment
             "0x06 0x48 0x01 0x01 0xc6 0x00 0x00 0x00",
             "00 00 00 00 ff 00 ff 00 6f 02 ff ff",
-            (
-                "Last two bits are payload vlan number, - FFFFh if VLAN"
-                " addressing is not used"
-            ),
+            "Last two bits are payload vlan number, - FFFFh if VLAN addressing is not used",
         ],
-        "Deactivate_Payload": [
+        'Deactivate_Payload':
+        [
             # raw command, expected output(s), comment
             "0x06 0x49 0x01 0x01 0x00 0x00 0x00 0x00",
             "",
             "Line feed only",
         ],
-        "Get_Payload_Instance_Info": [
+        'Get_Payload_Instance_Info':
+        [
             # raw command, expected output(s), comment
             "0x06 0x4b 0x01 0x01",
             "00 00 00 00 00 00 00 00 00 00 00 00",
-            (
-                "When the payload is activated, the first four bytes are the"
-                " session ID,otherwise it should be 00."
-            ),
+            "When the payload is activated, the first four bytes are the session ID,"
+            "otherwise it should be 00."
         ],
-        "Get_User_Access_Payload": [
+        'Get_User_Access_Payload':
+        [
             # raw command,
             "0x06 0x4d"
         ],
-        "Set_User_Access_Payload": [
+        'Set_User_Access_Payload':
+        [
             # raw command,
             "0x06 0x4c"
         ],
-        "Get_Channel_Payload_Version": [
+        'Get_Channel_Payload_Version':
+        [
             # raw command,
             "0x06 0x4F"
         ],
-        "Get_Channel_Payload_Support": [
+        'Get_Channel_Payload_Support':
+        [
             # raw command,
             "0x06 0x4E"
         ],
     },
-    "BIOS_POST_Code": {
-        "Get": [
+    'BIOS_POST_Code':
+    {
+        'Get':
+        [
             # raw command, expected output, comment
             "0x30 0xe9",
             "",
             "Response bytes will vary in length depending on state of system",
             "0x89",
-            "error response byte when host is powered off",
+            "error response byte when host is powered off"
         ]
     },
-    "Device ID": {
-        "Get": [
+    'Device ID':
+    {
+        'Get':
+        [
             # raw command, error response, error code
             "0x06 0x01",
             "Error: Unable to establish IPMI v2 / RMCP+ session",
             "0xc7",
         ]
     },
-    "Cold Reset": {
-        "reset": [
+    'Cold Reset':
+    {
+        'reset':
+        [
             # raw command
             "0x06 0x02"
         ]
     },
-    "lan_parameters": {
-        "get_ip": [
+    'lan_parameters':
+    {
+        'get_ip':
+        [
             # raw command
             "0x0c 0x02 0x01 0x03 0 0"
         ],
-        "get_ip_src": [
+        'get_ip_src':
+        [
             # raw command
             "0x0c 0x02 0x01 0x04 0 0"
         ],
-        "get_dot1q": [
+        'get_dot1q':
+        [
             # raw command
             "0x0c 0x02 0x01 0x14 0 0"
-        ],
+        ]
     },
-    "SDR_Info": {
-        "get": [
+    'SDR_Info':
+    {
+        'get':
+        [
             # raw command
             "0x04 0x20 1"
         ]
     },
-    "Chassis_status": {
-        "get": [
+    'Chassis_status':
+    {
+        'get':
+        [
             # raw command
             "0x00 0x01"
         ]
     },
-    "SEL_Info": {
-        "get": [
+    'SEL_Info':
+    {
+        'get':
+        [
             # raw command
             "0x0a 0x40"
         ]
     },
-    "Watchdog": {
+    'Watchdog':
+    {
         # Command action type
-        "Get": [
+        'Get':
+        [
             # raw command, expected output(s), comment
             "0x06 0x25",
             "05 00 00 00 64 00",
@@ -300,7 +341,8 @@
             "0x06 0x25 0x00",
             "Get with one extra byte",
         ],
-        "Set": [
+        'Set':
+        [
             # raw command, expected output, comment
             "0x06 0x24 0x05 0x00 0x00 0x00 0x64 0x00",
             "none",
@@ -393,7 +435,8 @@
             "none",
             "Set with one extra byte",
         ],
-        "Reset": [
+        'Reset':
+        [
             # raw command, expected output, comment
             "0x06 0x22",
             "none",
@@ -404,17 +447,21 @@
             "0x06 0x22",
             "none",
             "Reset watchdog timer without initialized watchdog",
-        ],
-    },
-    "SOL": {
-        "Set_SOL": [
-            # raw command, expected output(s), comment
-            "Invalid value",
-            "Valid values are serial, 9.6 19.2, 38.4, 57.6 and 115.2",
         ]
     },
-    "Get SDR": {
-        "Get": [
+    'SOL':
+    {
+        'Set_SOL':
+        [
+            # raw command, expected output(s), comment
+            'Invalid value',
+            'Valid values are serial, 9.6 19.2, 38.4, 57.6 and 115.2',
+        ]
+    },
+    'Get SDR':
+    {
+        'Get':
+        [
             # Get SDR raw command without Reservation ID.
             "0x0a 0x23 0x00 0x00 0x00 0x00 0x00 0xff",
             # Netfunction and cmd.
@@ -422,18 +469,22 @@
             # Record ID offset and bytes to read.
             "0x01 0x0f",
             #  Raw command To Get SDR Partial without Reservation ID.
-            "0x0a 0x23 0x00 0x00 0x00 0x00 0x01 0x0f",
+            "0x0a 0x23 0x00 0x00 0x00 0x00 0x01 0x0f"
         ],
     },
-    "Get": {
-        "POH_Counter": [
+    'Get':
+    {
+        'POH_Counter':
+        [
             # raw command, error response
-            "0x00 0x0f",
-            "Error: Unable to establish IPMI v2 / RMCP+ session",
+            '0x00 0x0f',
+            'Error: Unable to establish IPMI v2 / RMCP+ session'
         ]
     },
-    "Device_SDR": {
-        "Get_Info": [
+    'Device_SDR':
+    {
+        'Get_Info':
+        [
             # raw command, expected output(s), comment
             "0x04 0x20 0x00",
             "0x04 0x20 0x01",
@@ -442,14 +493,16 @@
             "rsp=0xd4",
             "Insufficient privilege level",
         ],
-        "Get": [
+        'Get':
+        [
             # raw command, expected output(s), comment
             "0x04 0x21",
             "0x00 0x00 0x00 0xff",
             "rsp=0xc7",
             "Request data length invalid",
         ],
-        "Reserve_Repository": [
+        'Reserve_Repository':
+        [
             # raw command, expected output(s), comment
             "0x04 0x22",
             "rsp=0xc7",
@@ -457,91 +510,114 @@
             "rsp=0xd4",
             "Insufficient privilege level",
             "Reservation cancelled or invalid",
-        ],
+        ]
     },
-    "System_Info": {
-        "param0_Set_In_Progress": {
-            "Get": [
+    'System_Info':
+    {
+        'param0_Set_In_Progress':
+        {
+            'Get':
+            [
                 # raw command, expected output(s)
                 "0x06 0x59 0x00 0x00 0x00 0x00",
                 "Request data length invalid",
             ],
-            "Set": [
+            'Set':
+            [
                 # raw command, expected output(s)
                 "0x06 0x58 0x00",
                 "Request data length invalid",
                 "Invalid data field in request",
             ],
         },
-        "param1_System_Firmware_Version": {
-            "Get": [
+        'param1_System_Firmware_Version':
+        {
+            'Get':
+            [
                 # raw command, expected output(s)
                 "0x06 0x59 0x00 0x01 0x00 0x00",
                 "Request data length invalid",
             ],
-            "Set": [
+            'Set':
+            [
                 # raw command, expected output(s)
                 "0x06 0x58 0x01 0x00 0x00 0x0e",
                 "Invalid data field in request",
             ],
         },
-        "param2_System_Name": {
-            "Get": [
+        'param2_System_Name':
+        {
+            'Get':
+            [
                 # raw command, expected output(s)
                 "0x06 0x59 0x00 0x02 0x00 0x00",
                 "Request data length invalid",
             ],
-            "Set": [
+            'Set':
+            [
                 # raw command, expected output(s)
                 "0x06 0x58 0x02 0x00 0x00 0x0e",
                 "Invalid data field in request",
             ],
         },
-        "param3_Primary_Operating_System_Name": {
-            "Get": [
+        'param3_Primary_Operating_System_Name':
+        {
+            'Get':
+            [
                 # raw command, expected output(s)
                 "0x06 0x59 0x00 0x03 0x00 0x00",
                 "Request data length invalid",
             ],
-            "Set": [
+            'Set':
+            [
                 # raw command, expected output(s)
                 "0x06 0x58 0x03 0x00 0x00 0x0e",
                 "Invalid data field in request",
             ],
         },
-        "param4_Operating_System_Name": {
-            "Get": [
+        'param4_Operating_System_Name':
+        {
+            'Get':
+            [
                 # raw command, expected output(s)
                 "0x06 0x59 0x00 0x04 0x00 0x00",
                 "Request data length invalid",
             ],
-            "Set": [
+            'Set':
+            [
                 # raw command, expected output(s)
                 "0x06 0x58 0x04 0x00 0x00 0x0e",
                 "Invalid data field in request",
             ],
         },
-        "param5_Present_OS_Version_number": {
-            "Get": [
+        'param5_Present_OS_Version_number':
+        {
+            'Get':
+            [
                 # raw command, expected output(s)
                 "0x06 0x59 0x00 0x05 0x00 0x00",
                 "Request data length invalid",
             ],
-            "Set": [
+            'Set':
+            [
                 # raw command, expected output(s)
                 "0x06 0x58 0x05 0x00 0x00 0x0e",
                 "Invalid data field in request",
-            ],
-        },
+            ]
+        }
     },
-    "Get Channel Auth Cap": {
-        "get": [
+    'Get Channel Auth Cap':
+    {
+        'get':
+        [
             # raw command
             "0x06 0x38",
         ]
     },
-    "Cipher Suite": {
-        "get": [
+    'Cipher Suite':
+    {
+        'get':
+        [
             # raw command, supported algorithm
             "0x06 0x54",
             "03 44 81",
@@ -550,8 +626,10 @@
             # 81 - aes_cbc_128
         ]
     },
-    "SDR": {
-        "Get": [
+    'SDR':
+    {
+        'Get':
+        [
             # Get SDR raw command without Reservation ID.
             "0x0a 0x23 0x00 0x00 0x00 0x00 0x00 0xff",
             # Netfunction and command.
@@ -559,41 +637,50 @@
             # Record ID offset and bytes to read.
             "0x00 0x00 0x01 0x0f",
             #  Raw command To Get SDR Partial without reservation ID.
-            "0x0a 0x23 0x00 0x00 0x00 0x00 0x01 0x0f",
+            "0x0a 0x23 0x00 0x00 0x00 0x00 0x01 0x0f"
         ],
-        "Reserve SDR Repository": [
+        'Reserve SDR Repository':
+        [
             # raw command, expected output(s), comment
             "0x0a 0x22",
         ],
-        "SDR Repository Info": [
+        'SDR Repository Info':
+        [
             # raw command.
             "0x0a 0x20",
         ],
-        "Get SDR allocation Info": [
+        'Get SDR allocation Info':
+        [
             # raw command.
             "0x0a 0x21"
         ],
-        "Delete SDR": [
+        'Delete SDR':
+        [
             # raw command.
             "0x0a 0x26"
         ],
-        "Partially Add SDR": [
+        'Partially Add SDR':
+        [
             # raw command.
             "0x0a 0x25"
-        ],
+        ]
     },
-    "FRU": {
-        "Inventory_Area_Info": [
+    'FRU':
+    {
+        'Inventory_Area_Info':
+        [
             # raw command, expected output(s), comment
             "0x0a 0x10",
             "Invalid data field in request",
-            "Request data length invalid",
+            "Request data length invalid"
         ],
-        "Read": [
+        'Read':
+        [
             # raw command
             "0x0a 0x11",
         ],
-        "Write": [
+        'Write':
+        [
             # raw command
             "0x0a 0x12",
         ],
diff --git a/data/ipmi_rest_fru_field_map.py b/data/ipmi_rest_fru_field_map.py
index a0acfd7..0ada176 100644
--- a/data/ipmi_rest_fru_field_map.py
+++ b/data/ipmi_rest_fru_field_map.py
@@ -13,40 +13,42 @@
         "board_mfg": "Manufacturer",
         "board_product": "PrettyName",
         "board_serial": "SerialNumber",
-        "board_part_number": "PartNumber",
+        "board_part_number": "PartNumber"
     },
     "system": {
         "chassis_part_number": "Model",
-        "chassis_serial": "SerialNumber",
+        "chassis_serial": "SerialNumber"
     },
     "motherboard": {
         "board_mfg": "Manufacturer",
         "board_product": "PrettyName",
         "board_serial": "SerialNumber",
-        "board_part_number": "PartNumber",
+        "board_part_number": "PartNumber"
     },
     "dimm": {
         "product_manufacturer": "Manufacturer",
         "product_name": "PrettyName",
         "product_part_number": "Model",
         "product_version": "Version",
-        "product_serial": "SerialNumber",
+        "product_serial": "SerialNumber"
     },
-    "fan": {"product_name": "PrettyName"},
+    "fan": {
+        "product_name": "PrettyName"
+    },
     "bmc": {
         # "board_mfg_date": "BuildDate",
         "board_mfg": "Manufacturer",
         "board_product": "PrettyName",
         "board_serial": "SerialNumber",
-        "board_part_number": "PartNumber",
+        "board_part_number": "PartNumber"
     },
     "powersupply": {
         # "board_mfg_date": "BuildDate",
         "board_product": "PrettyName",
         "board_serial": "SerialNumber",
-        "board_part_number": "PartNumber",
+        "board_part_number": "PartNumber"
     },
     "gv100card": {
         # "board_mfg_date": "BuildDate",
-    },
+    }
 }
diff --git a/data/ipmi_variable.py b/data/ipmi_variable.py
index a9f2166..b9958ed 100644
--- a/data/ipmi_variable.py
+++ b/data/ipmi_variable.py
@@ -17,7 +17,7 @@
     "SMBus v2.0": "smbus-v2.0",
     "USB 1.x": "usb-1x",
     "USB 2.x": "usb-2x",
-    "System Interface": "system-interface",
+    "System Interface": "system-interface"
 }
 
 
diff --git a/data/model.py b/data/model.py
index 8134c99..de5ca9a 100755
--- a/data/model.py
+++ b/data/model.py
@@ -1,52 +1,55 @@
 #!/usr/bin/env python3 -u
+import sys
+from robot.libraries.BuiltIn import BuiltIn
 import imp
 import string
-import sys
-
-from robot.libraries.BuiltIn import BuiltIn
 
 
 def get_sensor(module_name, value):
-    m = imp.load_source("module.name", module_name)
+    m = imp.load_source('module.name', module_name)
 
-    for i in m.ID_LOOKUP["SENSOR"]:
-        if m.ID_LOOKUP["SENSOR"][i] == value:
+    for i in m.ID_LOOKUP['SENSOR']:
+
+        if m.ID_LOOKUP['SENSOR'][i] == value:
             return i
 
     return 0xFF
 
 
 def get_inventory_sensor(module_name, value):
-    m = imp.load_source("module.name", module_name)
+    m = imp.load_source('module.name', module_name)
 
-    value = string.replace(value, m.INVENTORY_ROOT, "<inventory_root>")
+    value = string.replace(value, m.INVENTORY_ROOT, '<inventory_root>')
 
-    for i in m.ID_LOOKUP["SENSOR"]:
-        if m.ID_LOOKUP["SENSOR"][i] == value:
+    for i in m.ID_LOOKUP['SENSOR']:
+
+        if m.ID_LOOKUP['SENSOR'][i] == value:
             return i
 
     return 0xFF
 
 
 def get_inventory_list(module_name):
-    inventory_list = []
-    m = imp.load_source("module.name", module_name)
 
-    for i in m.ID_LOOKUP["FRU"]:
-        s = m.ID_LOOKUP["FRU"][i]
-        s = s.replace("<inventory_root>", m.INVENTORY_ROOT)
+    inventory_list = []
+    m = imp.load_source('module.name', module_name)
+
+    for i in m.ID_LOOKUP['FRU']:
+        s = m.ID_LOOKUP['FRU'][i]
+        s = s.replace('<inventory_root>', m.INVENTORY_ROOT)
         inventory_list.append(s)
 
     return inventory_list
 
 
 def get_inventory_fru_type_list(module_name, fru_type):
+
     inventory_list = []
-    m = imp.load_source("module.name", module_name)
+    m = imp.load_source('module.name', module_name)
 
     for i in m.FRU_INSTANCES.keys():
-        if m.FRU_INSTANCES[i]["fru_type"] == fru_type:
-            s = i.replace("<inventory_root>", m.INVENTORY_ROOT)
+        if m.FRU_INSTANCES[i]['fru_type'] == fru_type:
+            s = i.replace('<inventory_root>', m.INVENTORY_ROOT)
             inventory_list.append(s)
 
     return inventory_list
@@ -58,7 +61,7 @@
 
 def get_FRU_component_name_list(module_name):
     name_list = []
-    m = imp.load_source("module.name", module_name)
+    m = imp.load_source('module.name', module_name)
 
     for name in m.FRU_COMPONENT_NAME:
         name_list.append(name)
@@ -68,7 +71,8 @@
 
 
 def get_ipmi_rest_fru_field_map(module_name):
-    m = imp.load_source("module.name", module_name)
+
+    m = imp.load_source('module.name', module_name)
 
     ipmi_rest_fru_field_map = dict.copy(m.ipmi_rest_fru_field_map)
 
diff --git a/data/pel_variables.py b/data/pel_variables.py
index e5c3d6f..7c0c823 100644
--- a/data/pel_variables.py
+++ b/data/pel_variables.py
@@ -5,72 +5,41 @@
 """
 
 PEL_DETAILS = {
-    "CreatorID": "BMC",
-    "CompID": "0x1000",
-    "Subsystem": "Platform Firmware",
-    "Message": "This is a test error",
-    "SRC": "BD8D1002",
-    "Sev": "Unrecoverable Error",
-}
+    'CreatorID': 'BMC',
+    'CompID': '0x1000',
+    'Subsystem': 'Platform Firmware',
+    'Message': 'This is a test error',
+    'SRC': 'BD8D1002',
+    'Sev': 'Unrecoverable Error'}
 
-ERROR_LOG_CREATE_BASE_CMD = (
-    "busctl call xyz.openbmc_project.Logging /xyz/openbmc_project/logging    "
-    " xyz.openbmc_project.Logging.Create Create ssa{ss} "
-)
+ERROR_LOG_CREATE_BASE_CMD = 'busctl call xyz.openbmc_project.Logging /xyz/openbmc_project/logging \
+    xyz.openbmc_project.Logging.Create Create ssa{ss} '
 
-CMD_INTERNAL_FAILURE = (
-    ERROR_LOG_CREATE_BASE_CMD
-    + "xyz.openbmc_project.Common.Error.InternalFailure    "
-    " xyz.openbmc_project.Logging.Entry.Level.Error 0"
-)
+CMD_INTERNAL_FAILURE = ERROR_LOG_CREATE_BASE_CMD + 'xyz.openbmc_project.Common.Error.InternalFailure \
+    xyz.openbmc_project.Logging.Entry.Level.Error 0'
 
-CMD_FRU_CALLOUT = (
-    ERROR_LOG_CREATE_BASE_CMD
-    + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure    "
-    ' xyz.openbmc_project.Logging.Entry.Level.Error 2 "TIMEOUT_IN_MSEC" "5"'
-    ' "CALLOUT_INVENTORY_PATH"    '
-    ' "/xyz/openbmc_project/inventory/system/chassis/motherboard"'
-)
+CMD_FRU_CALLOUT = ERROR_LOG_CREATE_BASE_CMD + 'xyz.openbmc_project.Sensor.Device.Error.ReadFailure \
+    xyz.openbmc_project.Logging.Entry.Level.Error 2 "TIMEOUT_IN_MSEC" "5" "CALLOUT_INVENTORY_PATH" \
+    "/xyz/openbmc_project/inventory/system/chassis/motherboard"'
 
-CMD_PROCEDURAL_SYMBOLIC_FRU_CALLOUT = (
-    ERROR_LOG_CREATE_BASE_CMD
-    + "org.open_power.Logging.Error.TestError1    "
-    " xyz.openbmc_project.Logging.Entry.Level.Error 0"
-)
+CMD_PROCEDURAL_SYMBOLIC_FRU_CALLOUT = ERROR_LOG_CREATE_BASE_CMD + 'org.open_power.Logging.Error.TestError1 \
+    xyz.openbmc_project.Logging.Entry.Level.Error 0'
 
-CMD_INFORMATIONAL_ERROR = (
-    ERROR_LOG_CREATE_BASE_CMD
-    + "xyz.openbmc_project.Common.Error.TestError2    "
-    " xyz.openbmc_project.Logging.Entry.Level.Informational 0"
-)
+CMD_INFORMATIONAL_ERROR = ERROR_LOG_CREATE_BASE_CMD + 'xyz.openbmc_project.Common.Error.TestError2 \
+    xyz.openbmc_project.Logging.Entry.Level.Informational 0'
 
-CMD_INVENTORY_PREFIX = (
-    "busctl get-property xyz.openbmc_project.Inventory.Manager    "
-    " /xyz/openbmc_project/inventory/system/chassis/motherboard"
-)
+CMD_INVENTORY_PREFIX = 'busctl get-property xyz.openbmc_project.Inventory.Manager \
+    /xyz/openbmc_project/inventory/system/chassis/motherboard'
 
-CMD_UNRECOVERABLE_ERROR = (
-    ERROR_LOG_CREATE_BASE_CMD
-    + "org.open_power.Logging.Error.TestError1    "
-    " xyz.openbmc_project.Logging.Entry.Level.Error 0"
-)
+CMD_UNRECOVERABLE_ERROR = ERROR_LOG_CREATE_BASE_CMD + 'org.open_power.Logging.Error.TestError1 \
+    xyz.openbmc_project.Logging.Entry.Level.Error 0'
 
-CMD_PREDICTIVE_ERROR = (
-    ERROR_LOG_CREATE_BASE_CMD
-    + "xyz.openbmc_project.Sensor.Threshold.Error.TemperatureWarningLow    "
-    " xyz.openbmc_project.Logging.Entry.Level.Warning 0"
-)
+CMD_PREDICTIVE_ERROR = ERROR_LOG_CREATE_BASE_CMD + \
+    'xyz.openbmc_project.Sensor.Threshold.Error.TemperatureWarningLow \
+    xyz.openbmc_project.Logging.Entry.Level.Warning 0'
 
-CMD_UNRECOVERABLE_HOST_ERROR = (
-    ERROR_LOG_CREATE_BASE_CMD
-    + "xyz.openbmc_project.Host.Error.Event    "
-    " xyz.openbmc_project.Logging.Entry.Level.Error 1 RAWPEL"
-    " /tmp/FILE_NBMC_UNRECOVERABLE"
-)
+CMD_UNRECOVERABLE_HOST_ERROR = ERROR_LOG_CREATE_BASE_CMD + 'xyz.openbmc_project.Host.Error.Event \
+    xyz.openbmc_project.Logging.Entry.Level.Error 1 RAWPEL /tmp/FILE_NBMC_UNRECOVERABLE'
 
-CMD_INFORMATIONAL_HOST_ERROR = (
-    ERROR_LOG_CREATE_BASE_CMD
-    + "xyz.openbmc_project.Host.Error.Event    "
-    " xyz.openbmc_project.Logging.Entry.Level.Error 1 RAWPEL"
-    " /tmp/FILE_HOST_INFORMATIONAL"
-)
+CMD_INFORMATIONAL_HOST_ERROR = ERROR_LOG_CREATE_BASE_CMD + 'xyz.openbmc_project.Host.Error.Event \
+    xyz.openbmc_project.Logging.Entry.Level.Error 1 RAWPEL /tmp/FILE_HOST_INFORMATIONAL'
diff --git a/data/platform_variables.py b/data/platform_variables.py
index 512b8ea..94d8a53 100644
--- a/data/platform_variables.py
+++ b/data/platform_variables.py
@@ -4,12 +4,11 @@
  Define methods to import platform specific files.
 """
 
-import imp
-import importlib
-import string
 import sys
-
 from robot.libraries.BuiltIn import BuiltIn
+import imp
+import string
+import importlib
 
 
 def get_service_restart_policy_services(module_name):
diff --git a/data/pldm_variables.py b/data/pldm_variables.py
index 61b0ea1..c5407d6 100755
--- a/data/pldm_variables.py
+++ b/data/pldm_variables.py
@@ -4,66 +4,38 @@
 Contains PLDM-related constants.
 """
 
-PLDM_SUPPORTED_TYPES = ["base", "platform", "bios", "fru", "oem-ibm"]
+PLDM_SUPPORTED_TYPES = ['base', 'platform', 'bios', 'fru', 'oem-ibm']
 
 # PLDM types.
-PLDM_TYPE_BASE = {"VALUE": "00", "STRING": "base"}
-PLDM_TYPE_PLATFORM = {"VALUE": "02", "STRING": "platform"}
-PLDM_TYPE_BIOS = {"VALUE": "03", "STRING": "bios"}
-PLDM_TYPE_FRU = {"VALUE": "04", "STRING": "fru"}
-PLDM_TYPE_OEM = {"VALUE": "63", "STRING": "oem-ibm"}
-PLDM_SUPPORTED_TYPES = [
-    "0(base)",
-    "2(platform)",
-    "3(bios)",
-    "4(fru)",
-    "63(oem-ibm)",
-]
+PLDM_TYPE_BASE = {'VALUE': '00', 'STRING': 'base'}
+PLDM_TYPE_PLATFORM = {'VALUE': '02', 'STRING': 'platform'}
+PLDM_TYPE_BIOS = {'VALUE': '03', 'STRING': 'bios'}
+PLDM_TYPE_FRU = {'VALUE': '04', 'STRING': 'fru'}
+PLDM_TYPE_OEM = {'VALUE': '63', 'STRING': 'oem-ibm'}
+PLDM_SUPPORTED_TYPES = ['0(base)', '2(platform)', '3(bios)', '4(fru)', '63(oem-ibm)']
 
-VERSION_BASE = {"VALUE": ["f1", "f0", "f0", "00"], "STRING": "1.0.0"}
-VERSION_PLATFORM = {"VALUE": ["f1", "f2", "f0", "00"], "STRING": "1.2.0"}
-VERSION_BIOS = {"VALUE": ["f1", "f1", "f1", "00"], "STRING": "1.0.0"}
-VERSION_FRU = {"VALUE": ["f1", "f0", "f0", "00"], "STRING": "1.0.0"}
-VERSION_OEM = {"VALUE": ["f1", "f0", "f0", "00"], "STRING": "1.0.0"}
+VERSION_BASE = {'VALUE': ['f1', 'f0', 'f0', '00'], 'STRING': '1.0.0'}
+VERSION_PLATFORM = {'VALUE': ['f1', 'f2', 'f0', '00'], 'STRING': '1.2.0'}
+VERSION_BIOS = {'VALUE': ['f1', 'f1', 'f1', '00'], 'STRING': '1.0.0'}
+VERSION_FRU = {'VALUE': ['f1', 'f0', 'f0', '00'], 'STRING': '1.0.0'}
+VERSION_OEM = {'VALUE': ['f1', 'f0', 'f0', '00'], 'STRING': '1.0.0'}
 
 
-PLDM_BASE_CMDS = [
-    "2(GetTID)",
-    "3(GetPLDMVersion)",
-    "4(GetPLDMTypes)",
-    "5(GetPLDMCommands)",
-]
-PLDM_PLATFORM_CMDS = ["57(SetStateEffecterStates)", "81(GetPDR)"]
-PLDM_BIOS_CMDS = [
-    "1(GetBIOSTable)",
-    "7(SetBIOSAttributeCurrentValue)",
-    "8(GetBIOSAttributeCurrentValueByHandle)",
-    "12(GetDateTime)",
-    "13(SetDateTime)",
-]
-PLDM_FRU_CMDS = [
-    "1(GetFRURecordTableMetadata)",
-    "2(GetFRURecordTable)",
-    "4(GetFRURecordByOption)",
-]
-PLDM_OEM_CMDS = [
-    "1(GetFileTable)",
-    "4(ReadFile)",
-    "5(WriteFile)",
-    "6(ReadFileInToMemory)",
-    "7(WriteFileFromMemory)",
-    "8(ReadFileByTypeIntoMemory)",
-    "9(WriteFileByTypeFromMemory)",
-    "10(NewFileAvailable)",
-    "11(ReadFileByType)",
-    "12(WriteFileByType)",
-    "13(FileAck)",
-    "240(GetAlertStatus)",
-]
+PLDM_BASE_CMDS = ['2(GetTID)', '3(GetPLDMVersion)', '4(GetPLDMTypes)', '5(GetPLDMCommands)']
+PLDM_PLATFORM_CMDS = ['57(SetStateEffecterStates)', '81(GetPDR)']
+PLDM_BIOS_CMDS = ['1(GetBIOSTable)', '7(SetBIOSAttributeCurrentValue)',
+                  '8(GetBIOSAttributeCurrentValueByHandle)', '12(GetDateTime)',
+                  '13(SetDateTime)']
+PLDM_FRU_CMDS = ['1(GetFRURecordTableMetadata)', '2(GetFRURecordTable)', '4(GetFRURecordByOption)']
+PLDM_OEM_CMDS = ['1(GetFileTable)', '4(ReadFile)', '5(WriteFile)', '6(ReadFileInToMemory)',
+                 '7(WriteFileFromMemory)', '8(ReadFileByTypeIntoMemory)',
+                 '9(WriteFileByTypeFromMemory)', '10(NewFileAvailable)',
+                 '11(ReadFileByType)', '12(WriteFileByType)', '13(FileAck)',
+                 '240(GetAlertStatus)']
 
 # PLDM command format.
 
-"""
+'''
 e.g. : GetPLDMVersion usage
 
 pldmtool base GetPLDMVersion -t <pldm_type>
@@ -72,49 +44,46 @@
 
 base->0,platform->2,bios->3,fru->4
 
-"""
-CMD_GETPLDMVERSION = "base GetPLDMVersion -t %s"
+'''
+CMD_GETPLDMVERSION = 'base GetPLDMVersion -t %s'
 
-"""
+'''
 e.g. : PLDM raw command usage
 
 pldmtool raw -d 0x80 0x00 0x03 0x00 0x00 0x00 0x00 0x01 0x00
 
 pldm raw -d 0x<header> 0x<pldm_type> 0x<pldm_cmd_type> 0x<payload_data>
-"""
+'''
 
-CMD_PLDMTOOL_RAW = "raw -d 0x80" + "0x%s" + " " + "0x%s"
+CMD_PLDMTOOL_RAW = 'raw -d 0x80' + '0x%s' + ' ' + '0x%s'
 
 
 # PLDM command payload data.
 
-PAYLOAD_GetPLDMVersion = (  # %(TransferOperationFlag, PLDMType)
-    " 0x00 0x00 0x00 0x00 0x%s 0x%s"
-)
+PAYLOAD_GetPLDMVersion = \
+    ' 0x00 0x00 0x00 0x00 0x%s 0x%s'    # %(TransferOperationFlag, PLDMType)
 
 
-"""
+'''
 e.g. : SetDateTime usage
 
 pldmtool bios SetDateTime -d <YYYYMMDDHHMMSS>
 
-"""
-CMD_SETDATETIME = "bios SetDateTime -d %s"
+'''
+CMD_SETDATETIME = 'bios SetDateTime -d %s'
 
 
-CMD_GETPDR = "platform GetPDR -d %s"
+CMD_GETPDR = 'platform GetPDR -d %s'
 
-"""
+'''
 e.g. : SetStateEffecterStates usage
 
 pldmtool platform GetPDR -i <effter_handle> -c <count> -d <effecterID, effecterState>
 
 pldmtool platform SetStateEffecterStates -i 1 -c 1 -d 1 1
-"""
+'''
 
-CMD_SETSTATEEFFECTERSTATES = (
-    "platform SetStateEffecterStates -i %s -c %s -d %s"
-)
+CMD_SETSTATEEFFECTERSTATES = 'platform SetStateEffecterStates -i %s -c %s -d %s'
 
 # GetPDR parsed response message for record handle.
 # Dictionary value array holds the expected output for record handle 1, 2.
@@ -124,137 +93,98 @@
 #      Only record handle 0, 1, 2 are supported as of now.
 
 RESPONSE_DICT_GETPDR_SETSTATEEFFECTER = {
-    "PDRHeaderVersion": [1],
-    "PDRType": ["State Effecter PDR"],
-    "recordChangeNumber": [0],
-    "effecterID": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-    "entityType": [
-        "Virtual Machine Manager",
-        "System chassis (main enclosure)",
-        "System Firmware",
-        "Processor Module",
-        "32801(OEM)",
-        "Management Controller",
-        "24577(OEM)",
-    ],
-    "entityInstanceNumber": [0, 1, 2, 3, 4],
-    "containerID": [0, 1],
-    "effecterSemanticID": [0],
-    "effecterInit": ["noInit"],
-    "effecterDescriptionPDR": [False],
-    "compositeEffecterCount": [1],
-}
+    'PDRHeaderVersion': [1],
+    'PDRType': ['State Effecter PDR'],
+    'recordChangeNumber': [0],
+    'effecterID': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+    'entityType': ['Virtual Machine Manager', 'System chassis (main enclosure)',
+                   'System Firmware', 'Processor Module', '32801(OEM)',
+                   'Management Controller', '24577(OEM)'],
+    'entityInstanceNumber': [0, 1, 2, 3, 4],
+    'containerID': [0, 1],
+    'effecterSemanticID': [0],
+    'effecterInit': ['noInit'],
+    'effecterDescriptionPDR': [False],
+    'compositeEffecterCount': [1]}
 
 RESPONSE_DICT_GETPDR_FRURECORDSETIDENTIFIER = {
-    "PDRHeaderVersion": [1],
-    "PDRType": ["FRU Record Set PDR"],
-    "recordChangeNumber": [0],
-    "dataLength": [10],
-    "entityType": [
-        "System Board",
-        "Chassis front panel board (control panel)",
-        "Management Controller",
-        "OEM",
-        "Power converter",
-        "System (logical)",
-        "System chassis (main enclosure)",
-        "Chassis front panel board (control panel)",
-        "Processor Module",
-        "Memory Module",
-        "Power Supply",
-        "24576(OEM)",
-        "60(OEM)",
-        "Processor",
-        "142(OEM)",
-    ],
-    "containerID": [0, 1, 2, 3],
-}
+    'PDRHeaderVersion': [1],
+    'PDRType': ['FRU Record Set PDR'],
+    'recordChangeNumber': [0],
+    'dataLength': [10],
+    'entityType': ['System Board', 'Chassis front panel board (control panel)',
+                   'Management Controller', 'OEM', 'Power converter',
+                   'System (logical)', 'System chassis (main enclosure)',
+                   'Chassis front panel board (control panel)',
+                   'Processor Module', 'Memory Module', 'Power Supply',
+                   '24576(OEM)', '60(OEM)', 'Processor', '142(OEM)'],
+    'containerID': [0, 1, 2, 3]}
 
 RESPONSE_DICT_GETPDR_PDRENTITYASSOCIATION = {
-    "PDRHeaderVersion": [1],
-    "PDRType": ["Entity Association PDR"],
-    "recordChangeNumber": [0],
-    "containerID": [1, 2, 3],
-    "associationtype": ["Physical"],
-    "containerentityType": [
-        "System Board",
-        "System (logical)",
-        "System chassis (main enclosure)",
-    ],
-}
+    'PDRHeaderVersion': [1],
+    'PDRType': ['Entity Association PDR'],
+    'recordChangeNumber': [0],
+    'containerID': [1, 2, 3],
+    'associationtype': ['Physical'],
+    'containerentityType': ['System Board', 'System (logical)',
+                            'System chassis (main enclosure)']}
 
 RESPONSE_DICT_GETPDR_STATESENSORPDR = {
-    "entityType": [
-        "Communication Channel",
-        "Connector",
-        "Processor Module",
-        "32774(OEM)",
-        "57346(OEM)",
-        "57347(OEM)",
-        "32801(OEM)",
-        "91(OEM)",
-        "5(OEM)",
-        "24577(OEM)",
-    ],
-    "sensorInit": ["noInit"],
-    "sensorAuxiliaryNamesPDR": [False],
-}
+    'entityType': ['Communication Channel', 'Connector', 'Processor Module',
+                   '32774(OEM)', '57346(OEM)', '57347(OEM)', '32801(OEM)',
+                   '91(OEM)', '5(OEM)', '24577(OEM)'],
+    'sensorInit': ['noInit'],
+    'sensorAuxiliaryNamesPDR': [False]}
 
 RESPONSE_DICT_GETPDR_TERMINUSLOCATORPDR = {
-    "PDRHeaderVersion": [1],
-    "PDRType": ["Terminus Locator PDR"],
-    "recordChangeNumber": [0],
-    "validity": ["valid"],
-    "TID": [0, 1, 208],
-    "containerID": [0, 1],
-    "terminusLocatorType": ["MCTP_EID"],
-    "terminusLocatorValueSize": [1],
-}
+    'PDRHeaderVersion': [1],
+    'PDRType': ['Terminus Locator PDR'],
+    'recordChangeNumber': [0],
+    'validity': ['valid'],
+    'TID': [0, 1, 208],
+    'containerID': [0, 1],
+    'terminusLocatorType': ['MCTP_EID'],
+    'terminusLocatorValueSize': [1]}
 
 RESPONSE_DICT_GETPDR_NUMERICEFFECTERPDR = {
-    "PDRHeaderVersion": [1],
-    "PDRType": ["Numeric Effecter PDR"],
-    "recordChangeNumber": [0],
-    "entityInstanceNumber": [0, 1],
-    "containerID": [0],
-    "effecterSemanticID": [0],
-    "effecterInit": [0],
-    "effecterAuxiliaryNames": [False],
-    "baseUnit": [0, 72, 21],
-    "unitModifier": [0],
-    "baseOEMUnitHandle": [0],
-    "auxUnit": [0],
-    "auxUnitModifier": [0],
-    "auxrateUnit": [0],
-    "auxOEMUnitHandle": [0],
-    "resolution": [1, 0],
-    "offset": [0],
-    "accuracy": [0],
-    "plusTolerance": [0],
-    "minusTolerance": [0],
-    "stateTransitionInterval": [0],
-    "TransitionInterval": [0],
-    "minSettable": [0],
-    "rangeFieldSupport": [0],
-    "nominalValue": [0],
-    "normalMax": [0],
-    "normalMin": [0],
-    "ratedMax": [0],
-    "ratedMin": [0],
-}
+    'PDRHeaderVersion': [1],
+    'PDRType': ['Numeric Effecter PDR'],
+    'recordChangeNumber': [0],
+    'entityInstanceNumber': [0, 1],
+    'containerID': [0],
+    'effecterSemanticID': [0],
+    'effecterInit': [0],
+    'effecterAuxiliaryNames': [False],
+    'baseUnit': [0, 72, 21],
+    'unitModifier': [0],
+    'baseOEMUnitHandle': [0],
+    'auxUnit': [0],
+    'auxUnitModifier': [0],
+    'auxrateUnit': [0],
+    'auxOEMUnitHandle': [0],
+    'resolution': [1, 0],
+    'offset': [0],
+    'accuracy': [0],
+    'plusTolerance': [0],
+    'minusTolerance': [0],
+    'stateTransitionInterval': [0],
+    'TransitionInterval': [0],
+    'minSettable': [0],
+    'rangeFieldSupport': [0],
+    'nominalValue': [0],
+    'normalMax': [0],
+    'normalMin': [0],
+    'ratedMax': [0],
+    'ratedMin': [0]}
 
 PLDM_PDR_TYPES = {
-    "PLDM_STATE_EFFECTER_PDR": "State Effecter PDR",
-    "PLDM_PDR_FRU_RECORD_SET": "FRU Record Set PDR",
-    "PLDM_PDR_ENTITY_ASSOCIATION": "Entity Association PDR",
-    "PLDM_STATE_SENSOR_PDR": "State Sensor PDR",
-    "PLDM_NUMERIC_EFFECTER_PDR": "Numeric Effecter PDR",
-    "PLDM_TERMINUS_LOCATOR_PDR": "Terminus Locator PDR",
-    "PLDM_COMPACT_NUMERIC_SENSOR_PDR": "21",
-}
+    'PLDM_STATE_EFFECTER_PDR': 'State Effecter PDR',
+    'PLDM_PDR_FRU_RECORD_SET': 'FRU Record Set PDR',
+    'PLDM_PDR_ENTITY_ASSOCIATION': 'Entity Association PDR',
+    'PLDM_STATE_SENSOR_PDR': 'State Sensor PDR',
+    'PLDM_NUMERIC_EFFECTER_PDR': 'Numeric Effecter PDR',
+    'PLDM_TERMINUS_LOCATOR_PDR': 'Terminus Locator PDR',
+    'PLDM_COMPACT_NUMERIC_SENSOR_PDR': '21'}
 
 RESPONSE_LIST_GETBIOSTABLE_ATTRVALTABLE = [
-    "BIOSString",
-    "BIOSInteger",
-    "BIOSEnumeration",
-]
+    'BIOSString', 'BIOSInteger', 'BIOSEnumeration']
diff --git a/data/variables.py b/data/variables.py
index 55d513f..2c9933e 100755
--- a/data/variables.py
+++ b/data/variables.py
@@ -1,245 +1,235 @@
 import os
-
 from robot.libraries.BuiltIn import BuiltIn
 
-OPENBMC_BASE_URI = "/xyz/openbmc_project/"
-OPENBMC_BASE_DBUS = "xyz.openbmc_project."
+OPENBMC_BASE_URI = '/xyz/openbmc_project/'
+OPENBMC_BASE_DBUS = 'xyz.openbmc_project.'
 
 # Generic Dbus commands.
 OPENBMC_DBUS_GET_PROPERTY = "busctl get-property "
 OPENBMC_DBUS_SET_PROPERTY = "busctl set-property "
 
 # org open power base URI.
-OPENPOWER_BASE_URI = "/org/open_power/"
-OPENPOWER_CONTROL = OPENPOWER_BASE_URI + "control/"
-OPENPOWER_SENSORS = OPENPOWER_BASE_URI + "sensors/"
+OPENPOWER_BASE_URI = '/org/open_power/'
+OPENPOWER_CONTROL = OPENPOWER_BASE_URI + 'control/'
+OPENPOWER_SENSORS = OPENPOWER_BASE_URI + 'sensors/'
 
 # REST URI base endpoint paths.
-CONTROL_URI = OPENBMC_BASE_URI + "control/"
+CONTROL_URI = OPENBMC_BASE_URI + 'control/'
 # Continue to keep to support legacy code.
-SETTINGS_URI = "/org/openbmc/settings/"
-WATCHDOG_URI = OPENBMC_BASE_URI + "watchdog/"
-TIME_MANAGER_URI = OPENBMC_BASE_URI + "time/"
-NETWORK_MANAGER = OPENBMC_BASE_URI + "network/"
-NETWORK_RESOURCE = "xyz.openbmc_project.Network.IP.Protocol.IPv4"
+SETTINGS_URI = '/org/openbmc/settings/'
+WATCHDOG_URI = OPENBMC_BASE_URI + 'watchdog/'
+TIME_MANAGER_URI = OPENBMC_BASE_URI + 'time/'
+NETWORK_MANAGER = OPENBMC_BASE_URI + 'network/'
+NETWORK_RESOURCE = 'xyz.openbmc_project.Network.IP.Protocol.IPv4'
 # SNMP
-SNMP_MANAGER_URI = NETWORK_MANAGER + "snmp/manager/"
+SNMP_MANAGER_URI = NETWORK_MANAGER + 'snmp/manager/'
 # Sensors base variables.
-SENSORS_URI = OPENBMC_BASE_URI + "sensors/"
+SENSORS_URI = OPENBMC_BASE_URI + 'sensors/'
 # Thermal Control base variables
-THERMAL_CONTROL_URI = CONTROL_URI + "thermal/0"
-THERMAL_METRICS = "ThermalSubsystem/ThermalMetrics"
+THERMAL_CONTROL_URI = CONTROL_URI + 'thermal/0'
+THERMAL_METRICS = 'ThermalSubsystem/ThermalMetrics'
 
-COMPONENT_NAME_OF_POWER_SUPPLY = "powersupply"
+COMPONENT_NAME_OF_POWER_SUPPLY = 'powersupply'
 
 # State Manager base variables
-BMC_REBOOT_TRANS = "xyz.openbmc_project.State.BMC.Transition.Reboot"
+BMC_REBOOT_TRANS = 'xyz.openbmc_project.State.BMC.Transition.Reboot'
 
-HOST_POWEROFF_TRANS = "xyz.openbmc_project.State.Host.Transition.Off"
-HOST_POWERON_TRANS = "xyz.openbmc_project.State.Host.Transition.On"
-HOST_REBOOT_TRANS = "xyz.openbmc_project.State.Host.Transition.Reboot"
-HOST_POWEROFF_STATE = "xyz.openbmc_project.State.Host.HostState.Off"
-HOST_POWERON_STATE = "xyz.openbmc_project.State.Host.HostState.Running"
+HOST_POWEROFF_TRANS = 'xyz.openbmc_project.State.Host.Transition.Off'
+HOST_POWERON_TRANS = 'xyz.openbmc_project.State.Host.Transition.On'
+HOST_REBOOT_TRANS = 'xyz.openbmc_project.State.Host.Transition.Reboot'
+HOST_POWEROFF_STATE = 'xyz.openbmc_project.State.Host.HostState.Off'
+HOST_POWERON_STATE = 'xyz.openbmc_project.State.Host.HostState.Running'
 
-CHASSIS_POWEROFF_TRANS = "xyz.openbmc_project.State.Chassis.Transition.Off"
-CHASSIS_POWERON_TRANS = "xyz.openbmc_project.State.Chassis.Transition.On"
-CHASSIS_POWEROFF_STATE = "xyz.openbmc_project.State.Chassis.PowerState.Off"
-CHASSIS_POWERON_STATE = "xyz.openbmc_project.State.Chassis.PowerState.On"
+CHASSIS_POWEROFF_TRANS = 'xyz.openbmc_project.State.Chassis.Transition.Off'
+CHASSIS_POWERON_TRANS = 'xyz.openbmc_project.State.Chassis.Transition.On'
+CHASSIS_POWEROFF_STATE = 'xyz.openbmc_project.State.Chassis.PowerState.Off'
+CHASSIS_POWERON_STATE = 'xyz.openbmc_project.State.Chassis.PowerState.On'
 
 # State Manager URI variables.
-SYSTEM_STATE_URI = OPENBMC_BASE_URI + "state/"
-BMC_STATE_URI = OPENBMC_BASE_URI + "state/bmc0/"
-HOST_STATE_URI = OPENBMC_BASE_URI + "state/host0/"
-CHASSIS_STATE_URI = OPENBMC_BASE_URI + "state/chassis0/"
-HOST_WATCHDOG_URI = OPENBMC_BASE_URI + "watchdog/host0/"
+SYSTEM_STATE_URI = OPENBMC_BASE_URI + 'state/'
+BMC_STATE_URI = OPENBMC_BASE_URI + 'state/bmc0/'
+HOST_STATE_URI = OPENBMC_BASE_URI + 'state/host0/'
+CHASSIS_STATE_URI = OPENBMC_BASE_URI + 'state/chassis0/'
+HOST_WATCHDOG_URI = OPENBMC_BASE_URI + 'watchdog/host0/'
 
 # OS state for x86 architecture
-OS_STATE_URI = OPENBMC_BASE_URI + "state/os/"
+OS_STATE_URI = OPENBMC_BASE_URI + 'state/os/'
 
 # Logging URI variables
-BMC_LOGGING_URI = OPENBMC_BASE_URI + "logging/"
-BMC_LOGGING_ENTRY = BMC_LOGGING_URI + "entry/"
-REDFISH_BMC_LOGGING_ENTRY = (
-    "/redfish/v1/Systems/system/LogServices/EventLog/Entries/"
-)
+BMC_LOGGING_URI = OPENBMC_BASE_URI + 'logging/'
+BMC_LOGGING_ENTRY = BMC_LOGGING_URI + 'entry/'
+REDFISH_BMC_LOGGING_ENTRY = '/redfish/v1/Systems/system/LogServices/EventLog/Entries/'
 
 
 # Software manager version
-SOFTWARE_VERSION_URI = OPENBMC_BASE_URI + "software/"
-ACTIVE = "xyz.openbmc_project.Software.Activation.Activations.Active"
-READY = "xyz.openbmc_project.Software.Activation.Activations.Ready"
-INVALID = "xyz.openbmc_project.Software.Activation.Activations.Invalid"
-ACTIVATING = "xyz.openbmc_project.Software.Activation.Activations.Activating"
-NOTREADY = "xyz.openbmc_project.Software.Activation.Activations.NotReady"
-FAILED = "xyz.openbmc_project.Software.Activation.Activations.Failed"
+SOFTWARE_VERSION_URI = OPENBMC_BASE_URI + 'software/'
+ACTIVE = 'xyz.openbmc_project.Software.Activation.Activations.Active'
+READY = 'xyz.openbmc_project.Software.Activation.Activations.Ready'
+INVALID = 'xyz.openbmc_project.Software.Activation.Activations.Invalid'
+ACTIVATING = 'xyz.openbmc_project.Software.Activation.Activations.Activating'
+NOTREADY = 'xyz.openbmc_project.Software.Activation.Activations.NotReady'
+FAILED = 'xyz.openbmc_project.Software.Activation.Activations.Failed'
 
-SOFTWARE_ACTIVATION = "xyz.openbmc_project.Software.Activation"
-REQUESTED_ACTIVATION = SOFTWARE_ACTIVATION + ".RequestedActivations"
-REQUESTED_ACTIVE = REQUESTED_ACTIVATION + ".Active"
-REQUESTED_NONE = REQUESTED_ACTIVATION + ".None"
+SOFTWARE_ACTIVATION = 'xyz.openbmc_project.Software.Activation'
+REQUESTED_ACTIVATION = SOFTWARE_ACTIVATION + '.RequestedActivations'
+REQUESTED_ACTIVE = REQUESTED_ACTIVATION + '.Active'
+REQUESTED_NONE = REQUESTED_ACTIVATION + '.None'
 
-SOFTWARE_PURPOSE = "xyz.openbmc_project.Software.Version.VersionPurpose"
-VERSION_PURPOSE_HOST = SOFTWARE_PURPOSE + ".Host"
-VERSION_PURPOSE_BMC = SOFTWARE_PURPOSE + ".BMC"
-VERSION_PURPOSE_SYSTEM = SOFTWARE_PURPOSE + ".System"
+SOFTWARE_PURPOSE = 'xyz.openbmc_project.Software.Version.VersionPurpose'
+VERSION_PURPOSE_HOST = SOFTWARE_PURPOSE + '.Host'
+VERSION_PURPOSE_BMC = SOFTWARE_PURPOSE + '.BMC'
+VERSION_PURPOSE_SYSTEM = SOFTWARE_PURPOSE + '.System'
 
 # Image Upload Directory Path
-IMAGE_UPLOAD_DIR_PATH = "/tmp/images/"
+IMAGE_UPLOAD_DIR_PATH = '/tmp/images/'
 
 # Inventory URI variables
-HOST_INVENTORY_URI = OPENBMC_BASE_URI + "inventory/"
-CHASSIS_INVENTORY_URI = HOST_INVENTORY_URI + "system/chassis/"
-MOTHERBOARD_INVENTORY_URI = CHASSIS_INVENTORY_URI + "motherboard/"
+HOST_INVENTORY_URI = OPENBMC_BASE_URI + 'inventory/'
+CHASSIS_INVENTORY_URI = HOST_INVENTORY_URI + 'system/chassis/'
+MOTHERBOARD_INVENTORY_URI = CHASSIS_INVENTORY_URI + 'motherboard/'
 
 # Led URI variable
-LED_GROUPS_URI = OPENBMC_BASE_URI + "led/groups/"
-LED_PHYSICAL_URI = OPENBMC_BASE_URI + "led/physical/"
-LED_LAMP_TEST_ASSERTED_URI = LED_GROUPS_URI + "lamp_test/"
-LED_PHYSICAL_PS0_URI = LED_PHYSICAL_URI + "cffps1_69/"
-LED_PHYSICAL_PS1_URI = LED_PHYSICAL_URI + "cffps1_68/"
-LED_PHYSICAL_FAN0_URI = LED_PHYSICAL_URI + "fan0/"
-LED_PHYSICAL_FAN2_URI = LED_PHYSICAL_URI + "fan2/"
-LED_PHYSICAL_FAN3_URI = LED_PHYSICAL_URI + "fan3/"
+LED_GROUPS_URI = OPENBMC_BASE_URI + 'led/groups/'
+LED_PHYSICAL_URI = OPENBMC_BASE_URI + 'led/physical/'
+LED_LAMP_TEST_ASSERTED_URI = LED_GROUPS_URI + 'lamp_test/'
+LED_PHYSICAL_PS0_URI = LED_PHYSICAL_URI + 'cffps1_69/'
+LED_PHYSICAL_PS1_URI = LED_PHYSICAL_URI + 'cffps1_68/'
+LED_PHYSICAL_FAN0_URI = LED_PHYSICAL_URI + 'fan0/'
+LED_PHYSICAL_FAN2_URI = LED_PHYSICAL_URI + 'fan2/'
+LED_PHYSICAL_FAN3_URI = LED_PHYSICAL_URI + 'fan3/'
 
 # Host control URI variables.
-CONTROL_HOST_URI = OPENBMC_BASE_URI + "control/host0/"
+CONTROL_HOST_URI = OPENBMC_BASE_URI + 'control/host0/'
 
 # Power restore variables.
-POWER_RESTORE_URI = CONTROL_HOST_URI + "power_restore_policy"
-CONTROL_DBUS_BASE = "xyz.openbmc_project.Control."
+POWER_RESTORE_URI = CONTROL_HOST_URI + 'power_restore_policy'
+CONTROL_DBUS_BASE = 'xyz.openbmc_project.Control.'
 
-RESTORE_LAST_STATE = CONTROL_DBUS_BASE + "Power.RestorePolicy.Policy.Restore"
-ALWAYS_POWER_ON = CONTROL_DBUS_BASE + "Power.RestorePolicy.Policy.AlwaysOn"
-ALWAYS_POWER_OFF = CONTROL_DBUS_BASE + "Power.RestorePolicy.Policy.AlwaysOff"
+RESTORE_LAST_STATE = CONTROL_DBUS_BASE + 'Power.RestorePolicy.Policy.Restore'
+ALWAYS_POWER_ON = CONTROL_DBUS_BASE + 'Power.RestorePolicy.Policy.AlwaysOn'
+ALWAYS_POWER_OFF = CONTROL_DBUS_BASE + 'Power.RestorePolicy.Policy.AlwaysOff'
 
 # Dump URI variables.
-REST_DUMP_URI = OPENBMC_BASE_URI + "dump/bmc/"
-DUMP_ENTRY_URI = REST_DUMP_URI + "entry/"
+REST_DUMP_URI = OPENBMC_BASE_URI + 'dump/bmc/'
+DUMP_ENTRY_URI = REST_DUMP_URI + 'entry/'
 DUMP_DOWNLOAD_URI = "/download/dump/"
 # The path on the BMC where dumps are stored.
 DUMP_DIR_PATH = "/var/lib/phosphor-debug-collector/"
 
 # Boot progress variables.
-STATE_DBUS_BASE = "xyz.openbmc_project.State."
-OS_BOOT_START = STATE_DBUS_BASE + "Boot.Progress.ProgressStages.OSStart"
-OS_BOOT_OFF = STATE_DBUS_BASE + "Boot.Progress.ProgressStages.Unspecified"
-OS_BOOT_PCI = STATE_DBUS_BASE + "Boot.Progress.ProgressStages.PCIInit"
-OS_BOOT_SECPCI = (
-    STATE_DBUS_BASE + "Boot.Progress.ProgressStages.SecondaryProcInit"
-)
-OS_BOOT_MEM = STATE_DBUS_BASE + "Boot.Progress.ProgressStages.MemoryInit"
-OS_BOOT_MOTHERBOARD = (
-    STATE_DBUS_BASE + "Boot.Progress.ProgressStages.MotherboardInit"
-)
+STATE_DBUS_BASE = 'xyz.openbmc_project.State.'
+OS_BOOT_START = STATE_DBUS_BASE + 'Boot.Progress.ProgressStages.OSStart'
+OS_BOOT_OFF = STATE_DBUS_BASE + 'Boot.Progress.ProgressStages.Unspecified'
+OS_BOOT_PCI = STATE_DBUS_BASE + 'Boot.Progress.ProgressStages.PCIInit'
+OS_BOOT_SECPCI = STATE_DBUS_BASE + \
+    'Boot.Progress.ProgressStages.SecondaryProcInit'
+OS_BOOT_MEM = STATE_DBUS_BASE + 'Boot.Progress.ProgressStages.MemoryInit'
+OS_BOOT_MOTHERBOARD = STATE_DBUS_BASE + \
+    'Boot.Progress.ProgressStages.MotherboardInit'
 OPENBMC_DBUS_BMC_STATE = STATE_DBUS_BASE + "BMC"
 
 # OperatingSystem status variables.
-OS_BOOT_COMPLETE = (
-    STATE_DBUS_BASE + "OperatingSystem.Status.OSStatus.BootComplete"
-)
-OS_BOOT_CDROM = STATE_DBUS_BASE + "OperatingSystem.Status.OSStatus.CDROMBoot"
-OS_BOOT_ROM = STATE_DBUS_BASE + "OperatingSystem.Status.OSStatus.ROMBoot"
-OS_BOOT_PXE = STATE_DBUS_BASE + "OperatingSystem.Status.OSStatus.PXEBoot"
-OS_BOOT_CBoot = STATE_DBUS_BASE + "OperatingSystem.Status.OSStatus.CBoot"
-OS_BOOT_DiagBoot = STATE_DBUS_BASE + "OperatingSystem.Status.OSStatus.DiagBoot"
+OS_BOOT_COMPLETE = STATE_DBUS_BASE + \
+    'OperatingSystem.Status.OSStatus.BootComplete'
+OS_BOOT_CDROM = STATE_DBUS_BASE + 'OperatingSystem.Status.OSStatus.CDROMBoot'
+OS_BOOT_ROM = STATE_DBUS_BASE + 'OperatingSystem.Status.OSStatus.ROMBoot'
+OS_BOOT_PXE = STATE_DBUS_BASE + 'OperatingSystem.Status.OSStatus.PXEBoot'
+OS_BOOT_CBoot = STATE_DBUS_BASE + 'OperatingSystem.Status.OSStatus.CBoot'
+OS_BOOT_DiagBoot = STATE_DBUS_BASE + 'OperatingSystem.Status.OSStatus.DiagBoot'
 
 # Boot variables.
-BOOT_SOURCE_DEFAULT = "xyz.openbmc_project.Control.Boot.Source.Sources.Default"
-BOOT_SOURCE_NETWORK = "xyz.openbmc_project.Control.Boot.Source.Sources.Network"
-BOOT_SOURCE_DISK = "xyz.openbmc_project.Control.Boot.Source.Sources.Disk"
-BOOT_SOURCE_CDROM = (
-    "xyz.openbmc_project.Control.Boot.Source.Sources.ExternalMedia"
-)
-BOOT_MODE_SAFE = "xyz.openbmc_project.Control.Boot.Mode.Modes.Safe"
-BOOT_MODE_SETUP = "xyz.openbmc_project.Control.Boot.Mode.Modes.Setup"
-BOOT_MODE_REGULAR = "xyz.openbmc_project.Control.Boot.Mode.Modes.Regular"
-BOOT_TYPE_LEGACY = "xyz.openbmc_project.Control.Boot.Type.Types.Legacy"
-BOOT_TYPE_EFI = "xyz.openbmc_project.Control.Boot.Type.Types.EFI"
+BOOT_SOURCE_DEFAULT = 'xyz.openbmc_project.Control.Boot.Source.Sources.Default'
+BOOT_SOURCE_NETWORK = 'xyz.openbmc_project.Control.Boot.Source.Sources.Network'
+BOOT_SOURCE_DISK = 'xyz.openbmc_project.Control.Boot.Source.Sources.Disk'
+BOOT_SOURCE_CDROM = 'xyz.openbmc_project.Control.Boot.Source.Sources.ExternalMedia'
+BOOT_MODE_SAFE = 'xyz.openbmc_project.Control.Boot.Mode.Modes.Safe'
+BOOT_MODE_SETUP = 'xyz.openbmc_project.Control.Boot.Mode.Modes.Setup'
+BOOT_MODE_REGULAR = 'xyz.openbmc_project.Control.Boot.Mode.Modes.Regular'
+BOOT_TYPE_LEGACY = 'xyz.openbmc_project.Control.Boot.Type.Types.Legacy'
+BOOT_TYPE_EFI = 'xyz.openbmc_project.Control.Boot.Type.Types.EFI'
 
 # Time variables.
-TIME_DBUS_BASE = "xyz.openbmc_project.Time."
-BMC_OWNER = TIME_DBUS_BASE + "Owner.Owners.BMC"
-HOST_OWNER = TIME_DBUS_BASE + "Owner.Owners.Host"
-SPLIT_OWNER = TIME_DBUS_BASE + "Owner.Owners.Split"
-BOTH_OWNER = TIME_DBUS_BASE + "Owner.Owners.Both"
-NTP_MODE = TIME_DBUS_BASE + "Synchronization.Method.NTP"
-MANUAL_MODE = TIME_DBUS_BASE + "Synchronization.Method.Manual"
+TIME_DBUS_BASE = 'xyz.openbmc_project.Time.'
+BMC_OWNER = TIME_DBUS_BASE + 'Owner.Owners.BMC'
+HOST_OWNER = TIME_DBUS_BASE + 'Owner.Owners.Host'
+SPLIT_OWNER = TIME_DBUS_BASE + 'Owner.Owners.Split'
+BOTH_OWNER = TIME_DBUS_BASE + 'Owner.Owners.Both'
+NTP_MODE = TIME_DBUS_BASE + 'Synchronization.Method.NTP'
+MANUAL_MODE = TIME_DBUS_BASE + 'Synchronization.Method.Manual'
 
 # User manager variable.
-BMC_USER_URI = OPENBMC_BASE_URI + "user/"
+BMC_USER_URI = OPENBMC_BASE_URI + 'user/'
 
 # LDAP User manager variable.
-BMC_LDAP_URI = BMC_USER_URI + "ldap"
+BMC_LDAP_URI = BMC_USER_URI + 'ldap'
 
 # The path on the BMC where signed keys are stored.
 ACTIVATION_DIR_PATH = "/etc/activationdata/"
 
 # Redfish variables.
-REDFISH_BASE_URI = "/redfish/v1/"
-REDFISH_SESSION = REDFISH_BASE_URI + "SessionService/Sessions"
-REDFISH_SESSION_URI = "SessionService/Sessions/"
-REDFISH_NW_ETH0 = "Managers/bmc/EthernetInterfaces/eth0/"
+REDFISH_BASE_URI = '/redfish/v1/'
+REDFISH_SESSION = REDFISH_BASE_URI + 'SessionService/Sessions'
+REDFISH_SESSION_URI = 'SessionService/Sessions/'
+REDFISH_NW_ETH0 = 'Managers/bmc/EthernetInterfaces/eth0/'
 REDFISH_NW_ETH0_URI = REDFISH_BASE_URI + REDFISH_NW_ETH0
-REDFISH_NW_ETH_IFACE = REDFISH_BASE_URI + "Managers/bmc/EthernetInterfaces/"
-REDFISH_NW_PROTOCOL = "Managers/bmc/NetworkProtocol"
+REDFISH_NW_ETH_IFACE = REDFISH_BASE_URI + 'Managers/bmc/EthernetInterfaces/'
+REDFISH_NW_PROTOCOL = 'Managers/bmc/NetworkProtocol'
 REDFISH_NW_PROTOCOL_URI = REDFISH_BASE_URI + REDFISH_NW_PROTOCOL
-REDFISH_ACCOUNTS_SERVICE = "AccountService/"
+REDFISH_ACCOUNTS_SERVICE = 'AccountService/'
 REDFISH_ACCOUNTS_SERVICE_URI = REDFISH_BASE_URI + REDFISH_ACCOUNTS_SERVICE
-REDFISH_ACCOUNTS = "AccountService/Accounts/"
+REDFISH_ACCOUNTS = 'AccountService/Accounts/'
 REDFISH_ACCOUNTS_URI = REDFISH_BASE_URI + REDFISH_ACCOUNTS
-REDFISH_HTTPS_CERTIFICATE = "Managers/bmc/NetworkProtocol/HTTPS/Certificates"
+REDFISH_HTTPS_CERTIFICATE = 'Managers/bmc/NetworkProtocol/HTTPS/Certificates'
 REDFISH_HTTPS_CERTIFICATE_URI = REDFISH_BASE_URI + REDFISH_HTTPS_CERTIFICATE
-REDFISH_LDAP_CERTIFICATE = "AccountService/LDAP/Certificates"
+REDFISH_LDAP_CERTIFICATE = 'AccountService/LDAP/Certificates'
 REDFISH_LDAP_CERTIFICATE_URI = REDFISH_BASE_URI + REDFISH_LDAP_CERTIFICATE
-REDFISH_CA_CERTIFICATE = "Managers/bmc/Truststore/Certificates"
+REDFISH_CA_CERTIFICATE = 'Managers/bmc/Truststore/Certificates'
 REDFISH_CA_CERTIFICATE_URI = REDFISH_BASE_URI + REDFISH_CA_CERTIFICATE
-REDFISH_CHASSIS_URI = REDFISH_BASE_URI + "Chassis/"
-REDFISH_CHASSIS_THERMAL = "chassis/Thermal/"
+REDFISH_CHASSIS_URI = REDFISH_BASE_URI + 'Chassis/'
+REDFISH_CHASSIS_THERMAL = 'chassis/Thermal/'
 REDFISH_CHASSIS_THERMAL_URI = REDFISH_CHASSIS_URI + REDFISH_CHASSIS_THERMAL
-REDFISH_CHASSIS_POWER = "chassis/Power/"
+REDFISH_CHASSIS_POWER = 'chassis/Power/'
 REDFISH_CHASSIS_POWER_URI = REDFISH_CHASSIS_URI + REDFISH_CHASSIS_POWER
-REDFISH_CHASSIS_SENSORS = "chassis/Sensors"
+REDFISH_CHASSIS_SENSORS = 'chassis/Sensors'
 REDFISH_CHASSIS_SENSORS_URI = REDFISH_CHASSIS_URI + REDFISH_CHASSIS_SENSORS
-REDFISH_BMC_DUMP = "Managers/bmc/LogServices/Dump/Entries"
+REDFISH_BMC_DUMP = 'Managers/bmc/LogServices/Dump/Entries'
 REDFISH_DUMP_URI = REDFISH_BASE_URI + REDFISH_BMC_DUMP
 
 # Boot options and URI variables.
-POWER_ON = "On"
+POWER_ON = 'On'
 POWER_GRACEFUL_OFF = "GracefulShutdown"
 POWER_GRACEFUL_RESTART = "GracefulRestart"
-POWER_FORCE_OFF = "ForceOff"
+POWER_FORCE_OFF = 'ForceOff'
 
-REDFISH_POWER = "Systems/system/Actions/ComputerSystem.Reset"
+REDFISH_POWER = 'Systems/system/Actions/ComputerSystem.Reset'
 REDFISH_POWER_URI = REDFISH_BASE_URI + REDFISH_POWER
 
 # rsyslog variables.
-REMOTE_LOGGING_URI = OPENBMC_BASE_URI + "logging/config/remote/"
+REMOTE_LOGGING_URI = OPENBMC_BASE_URI + 'logging/config/remote/'
 
 # Certificate variables.
-SERVER_CERTIFICATE_URI = OPENBMC_BASE_URI + "certs/server/https"
-CLIENT_CERTIFICATE_URI = OPENBMC_BASE_URI + "certs/client/ldap"
-CA_CERTIFICATE_URI = OPENBMC_BASE_URI + "certs/authority/ldap"
+SERVER_CERTIFICATE_URI = OPENBMC_BASE_URI + 'certs/server/https'
+CLIENT_CERTIFICATE_URI = OPENBMC_BASE_URI + 'certs/client/ldap'
+CA_CERTIFICATE_URI = OPENBMC_BASE_URI + 'certs/authority/ldap'
 
 # EventLog variables.
-SYSTEM_BASE_URI = REDFISH_BASE_URI + "Systems/system/"
-EVENT_LOG_URI = SYSTEM_BASE_URI + "LogServices/EventLog/"
-DUMP_URI = SYSTEM_BASE_URI + "LogServices/Dump/"
+SYSTEM_BASE_URI = REDFISH_BASE_URI + 'Systems/system/'
+EVENT_LOG_URI = SYSTEM_BASE_URI + 'LogServices/EventLog/'
+DUMP_URI = SYSTEM_BASE_URI + 'LogServices/Dump/'
 
-BIOS_ATTR_URI = SYSTEM_BASE_URI + "Bios"
-BIOS_ATTR_SETTINGS_URI = BIOS_ATTR_URI + "/Settings"
+BIOS_ATTR_URI = SYSTEM_BASE_URI + 'Bios'
+BIOS_ATTR_SETTINGS_URI = BIOS_ATTR_URI + '/Settings'
 
-"""
+'''
   QEMU HTTPS variable:
 
   By default lib/resource.robot AUTH URI construct is as
   ${AUTH_URI}   https://${OPENBMC_HOST}${AUTH_SUFFIX}
   ${AUTH_SUFFIX} is populated here by default EMPTY else
   the port from the OS environment
-"""
+'''
 
-AUTH_SUFFIX = ":" + BuiltIn().get_variable_value(
-    "${HTTPS_PORT}", os.getenv("HTTPS_PORT", "443")
-)
+AUTH_SUFFIX = ":" + BuiltIn().get_variable_value("${HTTPS_PORT}", os.getenv('HTTPS_PORT', '443'))
 
 # Here contains a list of valid Properties bases on fru_type after a boot.
 INVENTORY_ITEMS = {
@@ -263,6 +253,7 @@
         "present",
         "version",
     ],
+
     "DIMM": [
         "Asset Tag",
         "Custom Field 1",
diff --git a/data/vpd_variables.py b/data/vpd_variables.py
index 3392b6a..dc310c8 100644
--- a/data/vpd_variables.py
+++ b/data/vpd_variables.py
@@ -25,5 +25,5 @@
     },
     "/system/chassis/motherboard/vdd_vrm1": {
         "type": "xyz.openbmc_project.Inventory.Item.Vrm"
-    },
+    }
 }