diff --git a/meta-witherspoon/recipes-phosphor/logging/ibm-logging/policyTable.json b/meta-witherspoon/recipes-phosphor/logging/ibm-logging/policyTable.json
index 7d7f537..3b66195 100644
--- a/meta-witherspoon/recipes-phosphor/logging/ibm-logging/policyTable.json
+++ b/meta-witherspoon/recipes-phosphor/logging/ibm-logging/policyTable.json
@@ -42,6 +42,48 @@
             "UserAction": null,
             "VMMigrationFlag": true
         },
+        "org.open_power.Host.Access.Error.ReadCFAM": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "org.open_power.Host.Access.Error.ReadCFAM",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0044F",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "Failure to write to host CFAM interface",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Host.Access.Error.WriteCFAM": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "org.open_power.Host.Access.Error.WriteCFAM",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0043F",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "Failure to read from host CFAM interface",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "org.open_power.Host.Boot.Error.Checkstop": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Canister/Appliance",
@@ -153,7 +195,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0090M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -174,7 +216,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -195,7 +237,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -216,7 +258,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,10",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -237,7 +279,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,11",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -258,7 +300,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,12",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -279,7 +321,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,13",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -300,7 +342,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,14",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -321,7 +363,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,15",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -342,7 +384,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,16",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -363,7 +405,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,17",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -384,7 +426,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,18",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -405,7 +447,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,19",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -426,7 +468,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,2",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -447,7 +489,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,20",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -468,7 +510,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,21",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -489,7 +531,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,22",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -510,7 +552,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,23",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -531,7 +573,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,3",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -552,7 +594,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,4",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -573,7 +615,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,5",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -594,7 +636,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,6",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -615,7 +657,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,7",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -636,7 +678,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,8",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -657,7 +699,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,9",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -678,7 +720,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0090M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -699,7 +741,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -720,7 +762,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -741,7 +783,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,10",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -762,7 +804,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,11",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -783,7 +825,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,12",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -804,7 +846,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,13",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -825,7 +867,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,14",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -846,7 +888,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,15",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -867,7 +909,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,16",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -888,7 +930,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,17",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -909,7 +951,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,18",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -930,7 +972,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,19",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -951,7 +993,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,2",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -972,7 +1014,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,20",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -993,7 +1035,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,21",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1014,7 +1056,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,22",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1035,7 +1077,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,23",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1056,7 +1098,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,3",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1077,7 +1119,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,4",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1098,7 +1140,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,5",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1119,7 +1161,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,6",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1140,7 +1182,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,7",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1161,7 +1203,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,8",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1182,7 +1224,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,9",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1203,7 +1245,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1224,7 +1266,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1245,7 +1287,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 10,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1266,7 +1308,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 11,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1287,7 +1329,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 12,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1308,7 +1350,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 13,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1329,7 +1371,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 14,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1350,7 +1392,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 15,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1371,7 +1413,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1392,7 +1434,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1413,7 +1455,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1434,7 +1476,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1455,7 +1497,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 6,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1476,7 +1518,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 7,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1497,7 +1539,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 8,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -1518,7 +1560,7 @@
             "BMCMessageID": "org.open_power.Host.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 9,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2106,7 +2148,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0090M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2127,7 +2169,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2148,7 +2190,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2169,7 +2211,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,10",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2190,7 +2232,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,11",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2211,7 +2253,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,12",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2232,7 +2274,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,13",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2253,7 +2295,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,14",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2274,7 +2316,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,15",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2295,7 +2337,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,16",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2316,7 +2358,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,17",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2337,7 +2379,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,18",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2358,7 +2400,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,19",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2379,7 +2421,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,2",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2400,7 +2442,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,20",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2421,7 +2463,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,21",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2442,7 +2484,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,22",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2463,7 +2505,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,23",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2484,7 +2526,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,3",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2505,7 +2547,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,4",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2526,7 +2568,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,5",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2547,7 +2589,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,6",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2568,7 +2610,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,7",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2589,7 +2631,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,8",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2610,7 +2652,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,9",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2631,7 +2673,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0090M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2652,7 +2694,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2673,7 +2715,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2694,7 +2736,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,10",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2715,7 +2757,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,11",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2736,7 +2778,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,12",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2757,7 +2799,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,13",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2778,7 +2820,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,14",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2799,7 +2841,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,15",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2820,7 +2862,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,16",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2841,7 +2883,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,17",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2862,7 +2904,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,18",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2883,7 +2925,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,19",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2904,7 +2946,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,2",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2925,7 +2967,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,20",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2946,7 +2988,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,21",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2967,7 +3009,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,22",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -2988,7 +3030,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,23",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3009,7 +3051,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,3",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3030,7 +3072,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,4",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3051,7 +3093,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,5",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3072,7 +3114,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,6",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3093,7 +3135,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,7",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3114,7 +3156,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,8",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3135,7 +3177,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,9",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3156,7 +3198,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3177,7 +3219,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3198,7 +3240,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 10,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3219,7 +3261,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 11,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3240,7 +3282,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 12,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3261,7 +3303,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 13,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3282,7 +3324,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 14,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3303,7 +3345,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 15,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3324,7 +3366,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3345,7 +3387,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3366,7 +3408,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3387,7 +3429,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3408,7 +3450,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 6,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3429,7 +3471,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 7,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3450,7 +3492,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 8,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3471,7 +3513,7 @@
             "BMCMessageID": "org.open_power.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 9,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -3486,12 +3528,117 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "org.open_power.Proc.FSI.Error.MasterDetectionFailure||I2C": {
+        "org.open_power.OCC.Device.Error.ConfigFailure": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "org.open_power.OCC.Device.Error.ConfigFailure",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPCR0048M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "Failure to configure OCC",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.OCC.Device.Error.OpenFailure": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "org.open_power.OCC.Device.Error.OpenFailure",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPCR0045M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "Failed to open OCC connection",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.OCC.Device.Error.ReadFailure": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "org.open_power.OCC.Device.Error.ReadFailure",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPCR0046M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "Failed to read from OCC",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.OCC.Device.Error.WriteFailure": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "org.open_power.OCC.Device.Error.WriteFailure",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPCR0047M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "Failed to write to OCC",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.OCC.Metrics.Error.Event": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "org.open_power.OCC.Metrics.Error.Event",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPCR0049M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "Error working with OCC metric data",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Proc.FSI.Error.MasterDetectionFailure||FSI": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Processing",
             "BMCMessageID": "org.open_power.Proc.FSI.Error.MasterDetectionFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0024G",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPU0093M",
             "ComponentInstance": null,
             "DateAdded": null,
             "DateReviewed": null,
@@ -3499,11 +3646,32 @@
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Failed to read from I2C device",
-            "ReferencedInventory": "I2C",
+            "Message": "Unable to detect master processor on FSI bus",
+            "ReferencedInventory": "FSI",
             "RelatedEventIDs": {},
             "Serviceable": true,
-            "Severity": "Warning",
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Proc.FSI.Error.SlaveDetectionFailure": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Processing",
+            "BMCMessageID": "org.open_power.Proc.FSI.Error.SlaveDetectionFailure",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPU0094M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Unable to detect slave processor on FSI bus",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
             "UserAction": null,
             "VMMigrationFlag": null
         },
@@ -3513,7 +3681,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -3534,7 +3702,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -3555,7 +3723,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -3576,7 +3744,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -3597,7 +3765,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -3618,7 +3786,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -3633,13 +3801,139 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card0": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Cooling",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCA0066M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Environmental",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "GPU 0 suffered an over-temperature fault",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card0",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": "Cooling",
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card1": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Cooling",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCA0066M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Environmental",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "GPU 1 suffered an over-temperature fault",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card1",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": "Cooling",
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card2": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Cooling",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCA0066M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Environmental",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "GPU 2 suffered an over-temperature fault",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card2",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": "Cooling",
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card3": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Cooling",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCA0066M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Environmental",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "GPU 3 suffered an over-temperature fault",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card3",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": "Cooling",
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card4": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Cooling",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCA0066M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Environmental",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "GPU 4 suffered an over-temperature fault",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card4",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": "Cooling",
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card5": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Cooling",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCA0066M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Environmental",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "GPU 5 suffered an over-temperature fault",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card5",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": "Cooling",
+            "VMMigrationFlag": null
+        },
         "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Power",
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -3660,7 +3954,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -3681,7 +3975,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -3702,7 +3996,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -3723,7 +4017,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -3744,7 +4038,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -3759,6 +4053,132 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card0": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPPW0038M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Environmental",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "GPU 0 suffered a power fault",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card0",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": "Power",
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card1": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPPW0038M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Environmental",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "GPU 1 suffered a power fault",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card1",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": "Power",
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card2": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPPW0038M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Environmental",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "GPU 2 suffered a power fault",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card2",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": "Power",
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card3": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPPW0038M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Environmental",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "GPU 3 suffered a power fault",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card3",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": "Power",
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card4": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPPW0038M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Environmental",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "GPU 4 suffered a power fault",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card4",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": "Power",
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card5": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPPW0038M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Environmental",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "GPU 5 suffered a power fault",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card5",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": "Power",
+            "VMMigrationFlag": null
+        },
         "org.open_power.Witherspoon.Fault.Error.PowerOnFailure": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Power",
@@ -4248,7 +4668,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyFanFault",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPCA0064M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -4269,7 +4689,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyFanFault",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPCA0064M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -4284,6 +4704,48 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "org.open_power.Witherspoon.Fault.Error.PowerSupplyFanFault||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Cooling",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyFanFault",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPCA0064M",
+            "ComponentInstance": 0,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 0 fan has failed",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.PowerSupplyFanFault||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Cooling",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyFanFault",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPCA0064M",
+            "ComponentInstance": 1,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 1 fan has failed",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Power",
@@ -4311,7 +4773,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0033M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -4332,7 +4794,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0033M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -4347,13 +4809,55 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPPW0033M",
+            "ComponentInstance": 0,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 0 input fault detected",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPPW0033M",
+            "ComponentInstance": 1,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 1 input fault detected",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvercurrent||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Power",
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvercurrent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0035M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -4374,7 +4878,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvercurrent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0035M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -4389,13 +4893,55 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvercurrent||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvercurrent",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0035M",
+            "ComponentInstance": 0,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 0 output current is too high",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvercurrent||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvercurrent",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0035M",
+            "ComponentInstance": 1,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 1 output current is too high",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvervoltage||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Power",
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvervoltage",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0036M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -4416,7 +4962,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvervoltage",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0036M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -4431,13 +4977,55 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvervoltage||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvervoltage",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0036M",
+            "ComponentInstance": 0,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 0 output voltage is too high",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvervoltage||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvervoltage",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0036M",
+            "ComponentInstance": 1,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 1 output voltage is too high",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "org.open_power.Witherspoon.Fault.Error.PowerSupplyShouldBeOn||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Power",
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyShouldBeOn",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0034M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -4458,7 +5046,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyShouldBeOn",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0034M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -4473,13 +5061,55 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "org.open_power.Witherspoon.Fault.Error.PowerSupplyShouldBeOn||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyShouldBeOn",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0034M",
+            "ComponentInstance": 0,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 0 has failed to power on when it needed to",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.PowerSupplyShouldBeOn||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyShouldBeOn",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0034M",
+            "ComponentInstance": 1,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 1 has failed to power on",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "org.open_power.Witherspoon.Fault.Error.PowerSupplyTemperatureFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Cooling",
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyTemperatureFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0065M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -4500,7 +5130,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyTemperatureFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0065M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -4515,13 +5145,55 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "org.open_power.Witherspoon.Fault.Error.PowerSupplyTemperatureFault||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Cooling",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyTemperatureFault",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCA0065M",
+            "ComponentInstance": 0,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Environmental",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 0 is too hot",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.PowerSupplyTemperatureFault||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Cooling",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyTemperatureFault",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCA0065M",
+            "ComponentInstance": 1,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Environmental",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 1 is too hot",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "org.open_power.Witherspoon.Fault.Error.PowerSupplyUnderVoltageFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Power",
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyUnderVoltageFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0009M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -4542,7 +5214,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyUnderVoltageFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0009M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -4557,6 +5229,48 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "org.open_power.Witherspoon.Fault.Error.PowerSupplyUnderVoltageFault||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyUnderVoltageFault",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPPW0009M",
+            "ComponentInstance": 0,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 0 input voltage out of range",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.PowerSupplyUnderVoltageFault||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyUnderVoltageFault",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPPW0009M",
+            "ComponentInstance": 1,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 1 input voltage out of range",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "org.open_power.Witherspoon.Fault.Error.Shutdown": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Power",
@@ -4584,7 +5298,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.Shutdown",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0037M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -4605,7 +5319,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.Shutdown",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0037M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -4620,13 +5334,55 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "org.open_power.Witherspoon.Fault.Error.Shutdown||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.Shutdown",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0037M",
+            "ComponentInstance": 0,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 0 has initiated a power off due to a failure",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.Shutdown||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.Shutdown",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0037M",
+            "ComponentInstance": 1,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 1 has initiated a power off due to a failure",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "org.open_power.Witherspoon.Fault.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Cooling",
             "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -4647,7 +5403,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -4668,7 +5424,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -4689,7 +5445,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -4710,7 +5466,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -4731,7 +5487,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -4752,7 +5508,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -4773,7 +5529,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -4794,7 +5550,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -4815,7 +5571,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -4836,7 +5592,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -4857,7 +5613,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -4872,6 +5628,195 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "xyz.openbmc_project.Common.Callout.Error.Device||FSI": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Common.Callout.Error.Device",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0042F",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "An error occurred on the FSI interface",
+            "ReferencedInventory": "FSI",
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Common.Callout.Error.Device||I2C": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Common.Callout.Error.Device",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0041F",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "An error occurred on the I2C interface",
+            "ReferencedInventory": "I2C",
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Common.Callout.Error.GPIO||GPIO": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Common.Callout.Error.GPIO",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0039F",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "An error occurred on the GPIO interface",
+            "ReferencedInventory": "GPIO",
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Common.Callout.Error.IIC||I2C": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Common.Callout.Error.IIC",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0041F",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "An error occurred on the I2C interface",
+            "ReferencedInventory": "I2C",
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Common.Callout.Error.IPMISensor||IPMI": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Common.Callout.Error.IPMISensor",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0040F",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "An error occurred working with an IPMI sensor",
+            "ReferencedInventory": "IPMI",
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Common.Device.Error.ReadFailure||FSI": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0033G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "Failed to read from FSI Device",
+            "ReferencedInventory": "FSI",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Common.Device.Error.ReadFailure||I2C": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0024G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Failed to read from I2C Device",
+            "ReferencedInventory": "I2C",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Common.Device.Error.WriteFailure||FSI": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.WriteFailure",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0035G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "Failed to write to FSI Device",
+            "ReferencedInventory": "FSI",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Common.Device.Error.WriteFailure||I2C": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.WriteFailure",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0034G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "Failed to write to I2C Device",
+            "ReferencedInventory": "I2C",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "xyz.openbmc_project.Common.Error.InsufficientPermission": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
@@ -4956,13 +5901,76 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "xyz.openbmc_project.Common.File.Error.Open": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Common.File.Error.Open",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0036F",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "Unable to open a file in BMC filesystem.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Common.File.Error.Seek": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Common.File.Error.Seek",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0037F",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "Unable to seek a file in BMC filesystem.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Common.File.Error.Write": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Common.File.Error.Write",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0038F",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "Unable to write a file in BMC filesystem.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "xyz.openbmc_project.Control.Device.Error.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan0_0": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Cooling",
             "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -4983,7 +5991,7 @@
             "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -5004,7 +6012,7 @@
             "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -5025,7 +6033,7 @@
             "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -5046,7 +6054,7 @@
             "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -5067,7 +6075,7 @@
             "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -5088,7 +6096,7 @@
             "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -5109,7 +6117,7 @@
             "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -5130,7 +6138,7 @@
             "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -5151,7 +6159,7 @@
             "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -5172,7 +6180,7 @@
             "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -5193,7 +6201,7 @@
             "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -5214,7 +6222,7 @@
             "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -5235,7 +6243,7 @@
             "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -5256,7 +6264,7 @@
             "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -5277,7 +6285,7 @@
             "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -5292,6 +6300,27 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "xyz.openbmc_project.Control.Host.Error.CommandNotSupported": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Control.Host.Error.CommandNotSupported",
+            "CallHomeCandidate": null,
+            "CommonEventID": "FQPSPCR0039F",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "An invalid host system control command was provided.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "xyz.openbmc_project.Dump.Create.Error.Disabled": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Data Management",
@@ -5403,7 +6432,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0090M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5424,7 +6453,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5445,7 +6474,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5466,7 +6495,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,10",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5487,7 +6516,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,11",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5508,7 +6537,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,12",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5529,7 +6558,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,13",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5550,7 +6579,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,14",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5571,7 +6600,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,15",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5592,7 +6621,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,16",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5613,7 +6642,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,17",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5634,7 +6663,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,18",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5655,7 +6684,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,19",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5676,7 +6705,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,2",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5697,7 +6726,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,20",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5718,7 +6747,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,21",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5739,7 +6768,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,22",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5760,7 +6789,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,23",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5781,7 +6810,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,3",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5802,7 +6831,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,4",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5823,7 +6852,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,5",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5844,7 +6873,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,6",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5865,7 +6894,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,7",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5886,7 +6915,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,8",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5907,7 +6936,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,9",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5928,7 +6957,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0090M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5949,7 +6978,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5970,7 +6999,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -5991,7 +7020,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,10",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6012,7 +7041,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,11",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6033,7 +7062,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,12",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6054,7 +7083,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,13",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6075,7 +7104,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,14",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6096,7 +7125,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,15",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6117,7 +7146,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,16",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6138,7 +7167,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,17",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6159,7 +7188,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,18",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6180,7 +7209,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,19",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6201,7 +7230,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,2",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6222,7 +7251,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,20",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6243,7 +7272,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,21",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6264,7 +7293,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,22",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6285,7 +7314,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,23",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6306,7 +7335,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,3",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6327,7 +7356,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,4",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6348,7 +7377,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,5",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6369,7 +7398,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,6",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6390,7 +7419,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,7",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6411,7 +7440,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,8",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6432,7 +7461,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,9",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6453,7 +7482,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6474,7 +7503,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6495,7 +7524,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 10,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6516,7 +7545,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 11,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6537,7 +7566,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 12,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6558,7 +7587,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 13,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6579,7 +7608,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 14,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6600,7 +7629,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 15,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6621,7 +7650,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6642,7 +7671,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6663,7 +7692,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6684,7 +7713,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6705,7 +7734,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 6,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6726,7 +7755,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 7,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6747,7 +7776,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 8,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6768,7 +7797,7 @@
             "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": null,
+            "ComponentInstance": 9,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -6810,7 +7839,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0088M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -6831,7 +7860,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -6852,7 +7881,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -6873,7 +7902,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,10",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -6894,7 +7923,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,11",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -6915,7 +7944,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,12",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -6936,7 +7965,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,13",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -6957,7 +7986,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,14",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -6978,7 +8007,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,15",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -6999,7 +8028,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,16",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7020,7 +8049,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,17",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7041,7 +8070,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,18",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7062,7 +8091,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,19",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7083,7 +8112,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,2",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7104,7 +8133,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,20",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7125,7 +8154,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,21",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7146,7 +8175,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,22",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7167,7 +8196,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,23",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7188,7 +8217,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,3",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7209,7 +8238,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,4",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7230,7 +8259,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,5",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7251,7 +8280,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,6",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7272,7 +8301,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,7",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7293,7 +8322,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,8",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7314,7 +8343,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,9",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7335,7 +8364,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0088M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7356,7 +8385,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7377,7 +8406,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7398,7 +8427,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,10",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7419,7 +8448,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,11",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7440,7 +8469,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,12",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7461,7 +8490,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,13",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7482,7 +8511,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,14",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7503,7 +8532,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,15",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7524,7 +8553,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,16",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7545,7 +8574,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,17",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7566,7 +8595,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,18",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7587,7 +8616,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,19",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7608,7 +8637,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,2",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7629,7 +8658,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,20",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7650,7 +8679,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,21",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7671,7 +8700,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,22",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7692,7 +8721,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,23",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7713,7 +8742,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,3",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7734,7 +8763,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,4",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7755,7 +8784,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,5",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7776,7 +8805,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,6",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7797,7 +8826,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,7",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7818,7 +8847,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,8",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7839,7 +8868,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,9",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7860,7 +8889,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7881,7 +8910,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7902,7 +8931,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 10,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7923,7 +8952,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 11,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7944,7 +8973,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 12,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7965,7 +8994,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 13,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -7986,7 +9015,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 14,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8007,7 +9036,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 15,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8028,7 +9057,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8049,7 +9078,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8070,7 +9099,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8091,7 +9120,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8112,7 +9141,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 6,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8133,7 +9162,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 7,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8154,7 +9183,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 8,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8175,7 +9204,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 9,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8196,7 +9225,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPCA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8217,7 +9246,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPCA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8238,7 +9267,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPCA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8259,7 +9288,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPCA0056M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8280,7 +9309,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0022M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8301,7 +9330,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0022M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8343,7 +9372,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0085M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8364,7 +9393,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8385,7 +9414,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8406,7 +9435,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,10",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8427,7 +9456,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,11",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8448,7 +9477,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,12",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8469,7 +9498,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,13",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8490,7 +9519,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,14",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8511,7 +9540,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,15",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8532,7 +9561,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,16",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8553,7 +9582,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,17",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8574,7 +9603,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,18",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8595,7 +9624,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,19",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8616,7 +9645,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,2",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8637,7 +9666,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,20",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8658,7 +9687,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,21",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8679,7 +9708,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,22",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8700,7 +9729,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,23",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8721,7 +9750,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,3",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8742,7 +9771,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,4",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8763,7 +9792,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,5",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8784,7 +9813,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,6",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8805,7 +9834,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,7",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8826,7 +9855,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,8",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8847,7 +9876,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,9",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8868,7 +9897,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0085M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8889,7 +9918,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8910,7 +9939,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8931,7 +9960,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,10",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8952,7 +9981,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,11",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8973,7 +10002,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,12",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -8994,7 +10023,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,13",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9015,7 +10044,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,14",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9036,7 +10065,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,15",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9057,7 +10086,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,16",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9078,7 +10107,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,17",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9099,7 +10128,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,18",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9120,7 +10149,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,19",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9141,7 +10170,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,2",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9162,7 +10191,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,20",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9183,7 +10212,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,21",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9204,7 +10233,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,22",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9225,7 +10254,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,23",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9246,7 +10275,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,3",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9267,7 +10296,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,4",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9288,7 +10317,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,5",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9309,7 +10338,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,6",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9330,7 +10359,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,7",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9351,7 +10380,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,8",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9372,7 +10401,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,9",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9393,7 +10422,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9414,7 +10443,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9435,7 +10464,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 10,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9456,7 +10485,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 11,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9477,7 +10506,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 12,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9498,7 +10527,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 13,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9519,7 +10548,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 14,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9540,7 +10569,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 15,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9561,7 +10590,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9582,7 +10611,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9603,7 +10632,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9624,7 +10653,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9645,7 +10674,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 6,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9666,7 +10695,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 7,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9687,7 +10716,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 8,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9708,7 +10737,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": null,
+            "ComponentInstance": 9,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9729,7 +10758,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0071M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9750,7 +10779,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0071M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9771,7 +10800,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0071M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9792,7 +10821,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0071M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9807,55 +10836,13 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0015M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0015M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
         "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Power",
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0015M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9876,7 +10863,7 @@
             "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0015M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Uncorrectable Hardware Failure",
@@ -9891,6 +10878,48 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0015M",
+            "ComponentInstance": 0,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Uncorrectable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 0 has not been detected",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0015M",
+            "ComponentInstance": 1,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Uncorrectable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Power supply 1 has not been detected",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "xyz.openbmc_project.Led.Fru.Monitor.Error.InventoryPathError": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
@@ -9912,13 +10941,55 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "xyz.openbmc_project.Led.Mapper.Error.MethodError": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Led.Mapper.Error.MethodError",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0050F",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "Internal method error with LED Mapper.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Led.Mapper.Error.ObjectNotFoundError": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Led.Mapper.Error.ObjectNotFoundError",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0051F",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "Internal error. LED Mapper object not found.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Cooling",
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -9939,7 +11010,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -9960,7 +11031,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -9981,7 +11052,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -10002,7 +11073,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -10023,7 +11094,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -10527,7 +11598,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyFanFault",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPCA0064M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -10548,7 +11619,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyInputFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0033M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -10569,7 +11640,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyInputFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0033M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -10590,7 +11661,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyOutputOvercurrent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0035M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -10611,7 +11682,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyOutputOvercurrent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0035M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -10632,7 +11703,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyOutputOvervoltage",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0036M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -10653,7 +11724,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyOutputOvervoltage",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0036M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -10674,7 +11745,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyShouldBeOn",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0034M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -10695,7 +11766,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyShouldBeOn",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0034M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -10716,7 +11787,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyTemperatureFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0065M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -10737,7 +11808,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyTemperatureFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0065M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -10758,7 +11829,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyUnderVoltageFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0009M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -10779,7 +11850,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyUnderVoltageFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0009M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -10800,7 +11871,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.Shutdown",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0037M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -10821,7 +11892,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.Shutdown",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0037M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -10842,7 +11913,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -10863,7 +11934,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -10884,7 +11955,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -10905,7 +11976,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -10926,7 +11997,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -10947,7 +12018,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUOverTemp",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -10968,7 +12039,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -10989,7 +12060,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -11010,7 +12081,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -11031,7 +12102,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -11052,7 +12123,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -11073,7 +12144,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -11094,7 +12165,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyFanFault",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPCA0064M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -11115,7 +12186,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyFanFault",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPCA0064M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -11136,7 +12207,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyInputFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0033M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -11157,7 +12228,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyInputFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0033M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -11178,7 +12249,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyOutputOvercurrent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0035M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -11199,7 +12270,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyOutputOvercurrent",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0035M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -11220,7 +12291,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyOutputOvervoltage",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0036M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -11241,7 +12312,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyOutputOvervoltage",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0036M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -11262,7 +12333,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyShouldBeOn",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0034M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -11283,7 +12354,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyShouldBeOn",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0034M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -11304,7 +12375,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyTemperatureFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0065M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -11325,7 +12396,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyTemperatureFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0065M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -11346,7 +12417,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyUnderVoltageFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0009M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -11367,7 +12438,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyUnderVoltageFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0009M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -11388,7 +12459,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Shutdown",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0037M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -11409,7 +12480,7 @@
             "BMCMessageID": "xyz.openbmc_project.Power.Fault.Shutdown",
             "CallHomeCandidate": true,
             "CommonEventID": "FQPSPPW0037M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Unrecoverable Hardware Failure",
@@ -11430,7 +12501,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11451,7 +12522,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11472,7 +12543,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11493,7 +12564,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11514,14 +12585,14 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "2,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Unable to read fan 1 rotor 0 speed",
+            "Message": "Unable to read fan 2 rotor 0 speed",
             "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan2_0",
             "RelatedEventIDs": {},
             "Serviceable": true,
@@ -11535,14 +12606,14 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "2,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Unable to read fan 1 rotor 1 speed",
+            "Message": "Unable to read fan 2 rotor 1 speed",
             "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan2_1",
             "RelatedEventIDs": {},
             "Serviceable": true,
@@ -11556,14 +12627,14 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "3,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Unable to read fan 1 rotor 0 speed",
+            "Message": "Unable to read fan 3 rotor 0 speed",
             "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan3_0",
             "RelatedEventIDs": {},
             "Serviceable": true,
@@ -11577,14 +12648,14 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "3,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Unable to read fan 1 rotor 1 speed",
+            "Message": "Unable to read fan 3 rotor 1 speed",
             "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan3_1",
             "RelatedEventIDs": {},
             "Serviceable": true,
@@ -11619,7 +12690,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11640,7 +12711,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 10,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11661,7 +12732,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 11,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11682,7 +12753,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 12,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11703,7 +12774,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 13,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11724,7 +12795,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 14,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11745,7 +12816,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 15,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11766,7 +12837,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11787,7 +12858,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11808,7 +12879,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11829,7 +12900,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11850,7 +12921,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11871,7 +12942,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 6,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11892,7 +12963,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 7,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11913,7 +12984,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 8,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11934,7 +13005,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 9,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11955,7 +13026,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11976,7 +13047,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -11997,7 +13068,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12018,7 +13089,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12039,7 +13110,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12060,7 +13131,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12081,7 +13152,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12102,7 +13173,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12123,7 +13194,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12144,7 +13215,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12165,7 +13236,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12186,7 +13257,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12207,7 +13278,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12228,7 +13299,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,10",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12249,7 +13320,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,11",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12270,7 +13341,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,12",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12291,7 +13362,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,13",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12312,7 +13383,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,14",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12333,7 +13404,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,15",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12354,7 +13425,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,16",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12375,7 +13446,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,17",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12396,7 +13467,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,18",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12417,7 +13488,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,19",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12438,7 +13509,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12459,7 +13530,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,20",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12480,7 +13551,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,21",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12501,7 +13572,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,22",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12522,7 +13593,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,23",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12543,7 +13614,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,2",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12564,7 +13635,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,3",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12585,7 +13656,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,4",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12606,7 +13677,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,5",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12627,7 +13698,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,6",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12648,7 +13719,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,7",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12669,7 +13740,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,8",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12690,7 +13761,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,9",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12711,7 +13782,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12732,7 +13803,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12753,7 +13824,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12774,7 +13845,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12795,7 +13866,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12816,7 +13887,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,10",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12837,7 +13908,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,11",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12858,7 +13929,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,12",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12879,7 +13950,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,13",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12900,7 +13971,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,14",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12921,7 +13992,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,15",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12942,7 +14013,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,16",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12963,7 +14034,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,17",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -12984,7 +14055,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,18",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13005,7 +14076,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,19",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13026,7 +14097,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13047,7 +14118,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,20",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13068,7 +14139,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,21",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13089,7 +14160,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,22",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13110,7 +14181,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,23",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13131,7 +14202,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,2",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13152,7 +14223,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,3",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13173,7 +14244,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,4",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13194,7 +14265,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,5",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13215,7 +14286,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,6",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13236,7 +14307,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,7",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13257,7 +14328,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,8",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13278,7 +14349,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,9",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13299,7 +14370,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13320,7 +14391,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13341,7 +14412,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13362,7 +14433,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13446,7 +14517,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13467,7 +14538,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13488,7 +14559,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13509,7 +14580,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13530,14 +14601,14 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "2,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Unable to read fan 1 rotor 0 speed",
+            "Message": "Unable to read fan 2 rotor 0 speed",
             "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan2_0",
             "RelatedEventIDs": {},
             "Serviceable": true,
@@ -13551,14 +14622,14 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "2,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Unable to read fan 1 rotor 1 speed",
+            "Message": "Unable to read fan 2 rotor 1 speed",
             "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan2_1",
             "RelatedEventIDs": {},
             "Serviceable": true,
@@ -13572,14 +14643,14 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "3,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Unable to read fan 1 rotor 0 speed",
+            "Message": "Unable to read fan 3 rotor 0 speed",
             "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan3_0",
             "RelatedEventIDs": {},
             "Serviceable": true,
@@ -13593,14 +14664,14 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": null,
+            "ComponentInstance": "3,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Unable to read fan 1 rotor 1 speed",
+            "Message": "Unable to read fan 3 rotor 1 speed",
             "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan3_1",
             "RelatedEventIDs": {},
             "Serviceable": true,
@@ -13614,7 +14685,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0024M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13635,7 +14706,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0024M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13656,7 +14727,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0024M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13677,7 +14748,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0025M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13698,7 +14769,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0026M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13719,7 +14790,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0027M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13740,7 +14811,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0024M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13761,7 +14832,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0024M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13782,7 +14853,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0024M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13803,7 +14874,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0025M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13845,7 +14916,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0027M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13866,7 +14937,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0028M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13887,7 +14958,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0028M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13908,7 +14979,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0029M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13929,7 +15000,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0029M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -13992,7 +15063,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14013,7 +15084,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 10,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14034,7 +15105,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 11,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14055,7 +15126,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 12,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14076,7 +15147,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 13,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14097,7 +15168,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 14,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14118,7 +15189,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 15,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14139,7 +15210,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14160,7 +15231,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14181,7 +15252,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14202,7 +15273,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14223,7 +15294,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14244,7 +15315,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 6,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14265,7 +15336,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 7,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14286,7 +15357,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 8,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14307,7 +15378,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": null,
+            "ComponentInstance": 9,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14328,7 +15399,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14349,7 +15420,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14370,7 +15441,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14391,7 +15462,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14412,7 +15483,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14433,7 +15504,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14454,7 +15525,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14475,7 +15546,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14496,7 +15567,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14517,7 +15588,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14538,7 +15609,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14559,7 +15630,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14580,7 +15651,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14601,7 +15672,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,10",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14622,7 +15693,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,11",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14643,7 +15714,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,12",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14664,7 +15735,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,13",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14685,7 +15756,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,14",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14706,7 +15777,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,15",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14727,7 +15798,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,16",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14748,7 +15819,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,17",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14769,7 +15840,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,18",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14790,7 +15861,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,19",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14811,7 +15882,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14832,7 +15903,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,20",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14853,7 +15924,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,21",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14874,7 +15945,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,22",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14895,7 +15966,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,23",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14916,7 +15987,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,2",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14937,7 +16008,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,3",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14958,7 +16029,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,4",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -14979,7 +16050,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,5",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15000,7 +16071,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,6",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15021,7 +16092,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,7",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15042,7 +16113,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,8",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15063,7 +16134,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "0,9",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15084,7 +16155,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15105,7 +16176,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15126,7 +16197,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15147,7 +16218,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15168,7 +16239,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,0",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15189,7 +16260,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,10",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15210,7 +16281,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,11",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15231,7 +16302,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,12",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15252,7 +16323,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,13",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15273,7 +16344,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,14",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15294,7 +16365,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,15",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15315,7 +16386,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,16",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15336,7 +16407,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,17",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15357,7 +16428,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,18",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15378,7 +16449,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,19",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15399,7 +16470,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,1",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15420,7 +16491,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,20",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15441,7 +16512,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,21",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15462,7 +16533,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,22",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15483,7 +16554,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,23",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15504,7 +16575,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,2",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15525,7 +16596,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,3",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15546,7 +16617,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,4",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15567,7 +16638,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,5",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15588,7 +16659,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,6",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15609,7 +16680,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,7",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15630,7 +16701,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,8",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15651,7 +16722,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": null,
+            "ComponentInstance": "1,9",
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15672,7 +16743,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15693,7 +16764,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15714,7 +16785,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15735,7 +16806,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15756,7 +16827,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0031M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15777,7 +16848,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0032M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15798,7 +16869,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0031M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15819,7 +16890,7 @@
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0032M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Communication Failure/Timeout",
@@ -15847,7 +16918,7 @@
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Three or more CPU cores have gone overtemperature, initiating  a thermal shutdown.",
+            "Message": "Three or more CPU cores have gone over temperature, initiating  a thermal shutdown.",
             "ReferencedInventory": "temperature",
             "RelatedEventIDs": {},
             "Serviceable": true,
@@ -15918,6 +16989,27 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "xyz.openbmc_project.State.Host.Error.SoftOffTimeout": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Host Operating System",
+            "BMCMessageID": "xyz.openbmc_project.State.Host.Error.SoftOffTimeout",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPOS0000G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": null,
+            "Message": "The soft power off of the host has timed out",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "xyz.openbmc_project.State.Host.SoftOffTimeout": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Host Operating System",
@@ -16027,7 +17119,7 @@
             "AffectedLEDs": null,
             "AffectedSubsystem": "Canister/Appliance",
             "BMCMessageID": "xyz.opnbmc_project.State.Host.Error.SoftOffTimeout",
-            "CallHomeCandidate": null,
+            "CallHomeCandidate": false,
             "CommonEventID": "FQPSPAA0010M",
             "ComponentInstance": null,
             "DateAdded": null,
@@ -16047,7 +17139,7 @@
     },
     "fileInfo": {
         "Entity": "IBM OpenBMC",
-        "Version": 1.3,
+        "Version": "1.7.1",
         "language": "English"
     }
-}
+}
\ No newline at end of file