clear associations

delete motherboard

4 files changed, 24 insertions, 1427 deletions

diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-motherboard.bb b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-motherboard.bb
deleted file mode 100644
index 18817f5b13..0000000000
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-motherboard.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Add Dimm interface for inventory manager"
-PR = "r1"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-inherit allarch
-inherit phosphor-inventory-manager
-
-PROVIDES += "virtual/phosphor-inventory-manager-motherboard"
-S = "${WORKDIR}"
-
-SRC_URI = "file://motherboard.yaml"
-
-do_install() {
-        install -D motherboard.yaml ${D}${base_datadir}/events.d/motherboard.yaml
-}
-
-FILES:${PN} += "${base_datadir}/events.d/motherboard.yaml"
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-motherboard/motherboard.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-motherboard/motherboard.yaml
deleted file mode 100644
index 57d6085144..0000000000
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-motherboard/motherboard.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-events:
-    - name: Add Chassis interface
-      description: >
-          Add the chassis interface on the chassis inventory path
-      type: startup
-      actions:
-          - name: createObjects
-            objs:
-              /system/chassis/motherboard:
-                xyz.openbmc_project.Inventory.Item.Board.Motherboard:
-                    
-          - name: createObjects
-            objs:   
-              /system/chassis/motherboard:      
-                xyz.openbmc_project.Inventory.Decorator.Asset:        
-                  Manufacturer:
-                    value: "Manufacturer"
-                    type: string       
-                  PartNumber:
-                    value: "PartNumber"
-                    type: string      
-                  SerialNumber:
-                    value: "SerialNumber"
-                    type: string       
-                  BuildDate:
-                    value: "BuildDate"
-                    type: string      
-                  Model:
-                    value: "Model"
-                    type: string       
-                  SubModel:
-                    value: "SubModel"
-                    type: string     
-                  SparePartNumber:
-                    value: "SparePartNumber"
-                    type: string 
-                    
-          - name: createObjects
-            objs:     
-              /system/chassis/motherboard: 
-                xyz.openbmc_project.Inventory.Decorator.AssetTag:
-                  AssetTag:
-                    value: "AssetTag"
-                    type: string                
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
index c6d20245a3..00efe4bea9 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
@@ -47,53 +47,6 @@
         ]
     },
     {
-        "path": "system/chassis/motherboard/powersupply1",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/power/ps1_input_power",
-                    "/xyz/openbmc_project/sensors/power/ps1_output_power",
-                    "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage",
-                    "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage",
-                    "/xyz/openbmc_project/sensors/current/ps1_input_current",
-                    "/xyz/openbmc_project/sensors/current/ps1_output_current",
-                    "/xyz/openbmc_project/sensors/temperature/psu_inlet",
-                    "/xyz/openbmc_project/sensors/voltage/P12V",
-                    "/xyz/openbmc_project/sensors/voltage/P3V3"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "leds"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/physical/front_psu"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "fru",
-                    "fType": "fault_led_group"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/groups/powersupply1_fault"
-                ]
-            }
-        ]
-    },
-    {
         "path": "system/chassis/motherboard/fan",
         "endpoints":
         [
@@ -126,20 +79,18 @@
                 },
                 "paths":
                 [
-                    "/xyz/openbmc_project/sensors/temperature/inlet",
-                    "/xyz/openbmc_project/sensors/temperature/bmc_zone",
-                    "/xyz/openbmc_project/sensors/voltage/PVDD_CPU0",
-                    "/xyz/openbmc_project/sensors/voltage/PVCS_CPU0",
-                    "/xyz/openbmc_project/sensors/voltage/PVDDQ_CPU0_CH01",
-                    "/xyz/openbmc_project/sensors/voltage/PVDDQ_CPU0_CH67",
-                    "/xyz/openbmc_project/sensors/voltage/PVDN_CPU0",
-                    "/xyz/openbmc_project/sensors/voltage/PVIO_CPU0",
-                    "/xyz/openbmc_project/sensors/voltage/PVDD_CPU1",
-                    "/xyz/openbmc_project/sensors/voltage/PVCS_CPU1",
-                    "/xyz/openbmc_project/sensors/voltage/PVDDQ_CPU1_CH01",
-                    "/xyz/openbmc_project/sensors/voltage/PVDDQ_CPU1_CH67",
-                    "/xyz/openbmc_project/sensors/voltage/PVDN_CPU1",
-                    "/xyz/openbmc_project/sensors/voltage/PVIO_CPU1"
+                    "/xyz/openbmc_project/sensors/voltage/P105_PCH_AUX",
+                    "/xyz/openbmc_project/sensors/voltage/P1V8_PCH",
+                    "/xyz/openbmc_project/sensors/voltage/P3V3",
+                    "/xyz/openbmc_project/sensors/voltage/P5V_STBY_PSU",
+                    "/xyz/openbmc_project/sensors/voltage/Baseboard_12Volt",
+                    "/xyz/openbmc_project/sensors/voltage/PVCCIN_CPU1",
+                    "/xyz/openbmc_project/sensors/voltage/PVCCIN_CPU2",
+                    "/xyz/openbmc_project/sensors/voltage/PVCCIO_CPU1",
+                    "/xyz/openbmc_project/sensors/voltage/PVCCIO_CPU2",
+                    "/xyz/openbmc_project/sensors/voltage/PVDQ_ABC_CPU1",
+                    "/xyz/openbmc_project/sensors/voltage/PVDQ_ABC_CPU2",
+                    "/xyz/openbmc_project/sensors/voltage/PVDQ_DEF_CPU1"
                 ]
             },
             {
@@ -257,380 +208,6 @@
         ]
     },
     {
-        "path": "system/chassis/motherboard/cpu0/core2",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core2_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core3",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core3_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core4",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core4_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core5",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core5_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core6",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core6_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core7",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core7_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core8",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core8_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core9",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core9_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core10",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core10_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core11",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core11_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core12",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core12_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core13",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core13_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core14",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core14_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core15",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core15_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core16",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core16_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core17",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core17_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core18",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core18_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core19",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core19_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core20",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core20_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core21",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core21_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core22",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core22_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu0/core23",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p0_core23_temp"
-                ]
-            }
-        ]
-    },
-    {
         "path": "system/chassis/motherboard/cpu1/core0",
         "endpoints":
         [
@@ -665,380 +242,6 @@
         ]
     },
     {
-        "path": "system/chassis/motherboard/cpu1/core2",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core2_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core3",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core3_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core4",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core4_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core5",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core5_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core6",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core6_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core7",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core7_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core8",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core8_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core9",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core9_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core10",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core10_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core11",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core11_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core12",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core12_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core13",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core13_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core14",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core14_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core15",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core15_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core16",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core16_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core17",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core17_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core18",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core18_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core19",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core19_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core20",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core20_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core21",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core21_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core22",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core22_temp"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/cpu1/core23",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/p1_core23_temp"
-                ]
-            }
-        ]
-    },
-    {
         "path": "system/chassis/motherboard/dimm0",
         "endpoints":
         [
@@ -1195,474 +398,6 @@
         ]
     },
     {
-        "path": "system/chassis/motherboard/dimm4",
-        "endpoints":
-        [
-			{
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/dimm4_temp"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "leds"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/physical/front-memory"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "fru",
-                    "fType": "fault_led_group"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/groups/dimm4_fault"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/dimm5",
-        "endpoints":
-        [
-			{
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/dimm5_temp"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "leds"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/physical/front-memory"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "fru",
-                    "fType": "fault_led_group"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/groups/dimm5_fault"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/dimm6",
-        "endpoints":
-        [
-			{
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/dimm6_temp"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "leds"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/physical/front-memory"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "fru",
-                    "fType": "fault_led_group"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/groups/dimm6_fault"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/dimm7",
-        "endpoints":
-        [
-			{
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/dimm7_temp"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "leds"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/physical/front-memory"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "fru",
-                    "fType": "fault_led_group"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/groups/dimm7_fault"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/dimm8",
-        "endpoints":
-        [
-			{
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/dimm8_temp"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "leds"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/physical/front-memory"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "fru",
-                    "fType": "fault_led_group"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/groups/dimm8_fault"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/dimm9",
-        "endpoints":
-        [
-			{
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/dimm9_temp"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "leds"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/physical/front-memory"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "fru",
-                    "fType": "fault_led_group"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/groups/dimm9_fault"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/dimm10",
-        "endpoints":
-        [
-			{
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/dimm10_temp"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "leds"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/physical/front-memory"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "fru",
-                    "fType": "fault_led_group"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/groups/dimm10_fault"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/dimm11",
-        "endpoints":
-        [
-			{
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/dimm11_temp"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "leds"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/physical/front-memory"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "fru",
-                    "fType": "fault_led_group"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/groups/dimm11_fault"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/dimm12",
-        "endpoints":
-        [
-			{
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/dimm12_temp"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "leds"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/physical/front-memory"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "fru",
-                    "fType": "fault_led_group"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/groups/dimm12_fault"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/dimm13",
-        "endpoints":
-        [
-			{
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/dimm13_temp"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "leds"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/physical/front-memory"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "fru",
-                    "fType": "fault_led_group"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/groups/dimm13_fault"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/dimm14",
-        "endpoints":
-        [
-			{
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/dimm14_temp"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "leds"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/physical/front-memory"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "fru",
-                    "fType": "fault_led_group"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/groups/dimm14_fault"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/dimm15",
-        "endpoints":
-        [
-			{
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/temperature/dimm15_temp"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "leds"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/physical/front-memory"
-                ]
-            },
-            {
-                "types":
-                {
-                    "rType": "fru",
-                    "fType": "fault_led_group"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/led/groups/dimm15_fault"
-                ]
-            }
-        ]
-    },
-    {
         "path": "system/chassis",
         "endpoints":
         [
@@ -1682,102 +417,26 @@
 
                     "/xyz/openbmc_project/sensors/temperature/p0_core0_temp",
                     "/xyz/openbmc_project/sensors/temperature/p0_core1_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core2_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core3_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core4_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core5_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core6_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core7_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core8_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core9_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core10_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core11_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core12_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core13_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core14_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core15_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core16_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core17_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core18_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core19_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core20_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core21_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core22_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p0_core23_temp",
                     "/xyz/openbmc_project/sensors/temperature/p1_core0_temp",
                     "/xyz/openbmc_project/sensors/temperature/p1_core1_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core2_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core3_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core4_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core5_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core6_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core7_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core8_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core9_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core10_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core11_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core12_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core13_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core14_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core15_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core16_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core17_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core18_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core19_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core20_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core21_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core22_temp",
-                    "/xyz/openbmc_project/sensors/temperature/p1_core23_temp",
 
                     "/xyz/openbmc_project/sensors/temperature/dimm0_temp",
                     "/xyz/openbmc_project/sensors/temperature/dimm1_temp",
                     "/xyz/openbmc_project/sensors/temperature/dimm2_temp",
                     "/xyz/openbmc_project/sensors/temperature/dimm3_temp",
-                    "/xyz/openbmc_project/sensors/temperature/dimm4_temp",
-                    "/xyz/openbmc_project/sensors/temperature/dimm5_temp",
-                    "/xyz/openbmc_project/sensors/temperature/dimm6_temp",
-                    "/xyz/openbmc_project/sensors/temperature/dimm7_temp",
-                    "/xyz/openbmc_project/sensors/temperature/dimm8_temp",
-                    "/xyz/openbmc_project/sensors/temperature/dimm9_temp",
-                    "/xyz/openbmc_project/sensors/temperature/dimm10_temp",
-                    "/xyz/openbmc_project/sensors/temperature/dimm11_temp",
-                    "/xyz/openbmc_project/sensors/temperature/dimm12_temp",
-                    "/xyz/openbmc_project/sensors/temperature/dimm13_temp",
-                    "/xyz/openbmc_project/sensors/temperature/dimm14_temp",
-                    "/xyz/openbmc_project/sensors/temperature/dimm15_temp",
 
-                    "/xyz/openbmc_project/sensors/temperature/inlet",
-                    "/xyz/openbmc_project/sensors/temperature/outlet",
-                    "/xyz/openbmc_project/sensors/temperature/ocp_zone",
-                    "/xyz/openbmc_project/sensors/temperature/bmc_zone",
-                    "/xyz/openbmc_project/sensors/voltage/P12V",
+                    "/xyz/openbmc_project/sensors/voltage/P105_PCH_AUX",
+                    "/xyz/openbmc_project/sensors/voltage/P1V8_PCH",
                     "/xyz/openbmc_project/sensors/voltage/P3V3",
-                    "/xyz/openbmc_project/sensors/voltage/P5V",
-                    "/xyz/openbmc_project/sensors/voltage/PVCS_CPU0",
-                    "/xyz/openbmc_project/sensors/voltage/PVCS_CPU1",
-                    "/xyz/openbmc_project/sensors/voltage/PVDDQ_CPU0_CH01",
-                    "/xyz/openbmc_project/sensors/voltage/PVDDQ_CPU0_CH067",
-                    "/xyz/openbmc_project/sensors/voltage/PVDDQ_CPU1_CH01",
-                    "/xyz/openbmc_project/sensors/voltage/PVDDQ_CPU1_CH067",
-                    "/xyz/openbmc_project/sensors/voltage/PVDD_CPU0",
-                    "/xyz/openbmc_project/sensors/voltage/PVDD_CPU1",
-                    "/xyz/openbmc_project/sensors/voltage/PVDN_CPU0",
-                    "/xyz/openbmc_project/sensors/voltage/PVDN_CPU1",
-                    "/xyz/openbmc_project/sensors/voltage/PVIO_CPU0",
-                    "/xyz/openbmc_project/sensors/voltage/PVIO_CPU1",
-                    "/xyz/openbmc_project/sensors/power/ps0_input_power",
-                    "/xyz/openbmc_project/sensors/power/ps0_output_power",
-                    "/xyz/openbmc_project/sensors/power/ps1_input_power",
-                    "/xyz/openbmc_project/sensors/power/ps1_output_power",
-                    "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage",
-                    "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage",
-                    "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage",
-                    "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage",
-                    "/xyz/openbmc_project/sensors/current/ps0_input_current",
-                    "/xyz/openbmc_project/sensors/current/ps0_output_current",
-                    "/xyz/openbmc_project/sensors/current/ps1_input_current",
-                    "/xyz/openbmc_project/sensors/current/ps1_output_current",
-                    "/xyz/openbmc_project/sensors/temperature/psu_inlet"
+                    "/xyz/openbmc_project/sensors/voltage/P5V_STBY_PSU",
+                    "/xyz/openbmc_project/sensors/voltage/Baseboard_12Volt",
+                    "/xyz/openbmc_project/sensors/voltage/PVCCIN_CPU1",
+                    "/xyz/openbmc_project/sensors/voltage/PVCCIN_CPU2",
+                    "/xyz/openbmc_project/sensors/voltage/PVCCIO_CPU1",
+                    "/xyz/openbmc_project/sensors/voltage/PVCCIO_CPU2",
+                    "/xyz/openbmc_project/sensors/voltage/PVDQ_ABC_CPU1",
+                    "/xyz/openbmc_project/sensors/voltage/PVDQ_ABC_CPU2",
+                    "/xyz/openbmc_project/sensors/voltage/PVDQ_DEF_CPU1"
                 ]
             }
         ]
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
index 8bfe4bce64..63933e512c 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
@@ -3,7 +3,7 @@ PACKAGECONFIG:append = " associations"
 SRC_URI += " file://associations.json"
 
 DEPENDS += " phosphor-inventory-manager-chassis"
-DEPENDS += " phosphor-inventory-manager-motherboard"
+#DEPENDS += " phosphor-inventory-manager-motherboard"
 DEPENDS += " phosphor-inventory-manager-cpu"
 DEPENDS += " phosphor-inventory-manager-dimm"