sensor: Modify config for sensor to add additional fields

Added entity ID, entity instance and sensor naming pattern to the
generated sensor yaml.

Resolves openbmc/openbmc#2612

Change-Id: Ie4dc9548833cb30126e873a7597b2be9b1ea7f79
Signed-off-by: Tom Joseph <tomjoseph@in.ibm.com>

4 files changed, 223 insertions, 0 deletions

diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw/openpower-config.yaml b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw/openpower-config.yaml
index 0f887d591..ab3ab832d 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw/openpower-config.yaml
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw/openpower-config.yaml
@@ -1,6 +1,7 @@
 occ_active_sensor:
   serviceInterface: org.freedesktop.DBus.Properties
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     org.open_power.OCC.Status:
       OccActive:
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/occ_sensors.hardcoded.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/occ_sensors.hardcoded.yaml
index de3c84026..5f66494e6 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/occ_sensors.hardcoded.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/occ_sensors.hardcoded.yaml
@@ -1,9 +1,12 @@
 0x08:
+  entityID: 0xD2
+  entityInstance: 1
   sensorType: 0x09
   path: /org/open_power/control/occ0
   sensorReadingType: 0x09
   serviceInterface: org.freedesktop.DBus.Properties
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     org.open_power.OCC.Status:
       OccActive:
@@ -16,11 +19,14 @@
             deassert: false
             type: bool
 0x09:
+  entityID: 0xD2
+  entityInstance: 2
   sensorType: 0x09
   path: /org/open_power/control/occ1
   sensorReadingType: 0x09
   serviceInterface: org.freedesktop.DBus.Properties
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     org.open_power.OCC.Status:
       OccActive:
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml
index 63c417308..9d8f136e3 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml
@@ -2,6 +2,7 @@ boot_count_sensor:
   path: /xyz/openbmc_project/state/host0
   serviceInterface: org.freedesktop.DBus.Properties
   readingType: readingAssertion
+  sensorNamePattern: nameProperty
   interfaces:
     xyz.openbmc_project.Control.Boot.RebootAttempts:
       AttemptsLeft:
@@ -13,6 +14,7 @@ os_boot_sensor:
   path: /xyz/openbmc_project/state/host0
   serviceInterface: org.freedesktop.DBus.Properties
   readingType: assertion
+  sensorNamePattern: nameProperty
   interfaces:
     xyz.openbmc_project.State.OperatingSystem.Status:
       OperatingSystemState:
@@ -40,6 +42,7 @@ fw_boot_sensor:
   path: /xyz/openbmc_project/state/host0
   serviceInterface: org.freedesktop.DBus.Properties
   readingType: eventdata2
+  sensorNamePattern: nameProperty
   interfaces:
     xyz.openbmc_project.State.Boot.Progress:
       BootProgress:
@@ -66,6 +69,7 @@ fw_boot_sensor:
 dimm_func_sensor:
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -90,6 +94,7 @@ dimm_func_sensor:
 cpu_func_sensor:
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -114,6 +119,7 @@ cpu_func_sensor:
 cpucore_func_sensor:
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -140,6 +146,7 @@ tpm_required_sensor:
   path: /xyz/openbmc_project/control/host0/TPMEnable
   serviceInterface: org.freedesktop.DBus.Properties
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.Control.TPM.Policy:
       TPMEnable:
@@ -154,6 +161,7 @@ tpm_required_sensor:
 gpu_func_sensor:
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -179,6 +187,7 @@ host_auto_reboot_control_sensor:
   path: /xyz/openbmc_project/control/host0/auto_reboot
   serviceInterface: org.freedesktop.DBus.Properties
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.Control.Boot.RebootPolicy:
       AutoReboot:
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory/config.yaml b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory/config.yaml
index f5c0e5601..d44c6e47a 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory/config.yaml
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory/config.yaml
@@ -1,9 +1,12 @@
 0x03:
+  entityID: 0x22
+  entityInstance: 1
   sensorType: 0x0F
   path: /xyz/openbmc_project/state/host0
   sensorReadingType: 0x6F
   serviceInterface: org.freedesktop.DBus.Properties
   readingType: eventdata2
+  sensorNamePattern: nameProperty
   interfaces:
     xyz.openbmc_project.State.Boot.Progress:
       BootProgress:
@@ -27,11 +30,14 @@
             type: string
             set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MotherboardInit
 0x05:
+  entityID: 0x23
+  entityInstance: 1
   sensorType: 0x1F
   path: /xyz/openbmc_project/state/host0
   sensorReadingType: 0x6F
   serviceInterface: org.freedesktop.DBus.Properties
   readingType: assertion
+  sensorNamePattern: nameProperty
   interfaces:
     xyz.openbmc_project.State.OperatingSystem.Status:
       OperatingSystemState:
@@ -55,11 +61,14 @@
             assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.ROMBoot
             type: string
 0x07:
+  entityID: 0x22
+  entityInstance: 2
   sensorType: 0xC3
   path: /xyz/openbmc_project/state/host0
   sensorReadingType: 0x6F
   serviceInterface: org.freedesktop.DBus.Properties
   readingType: assertion
+  sensorNamePattern: nameProperty
   interfaces:
     xyz.openbmc_project.Control.Boot.RebootAttempts:
       AttemptsLeft:
@@ -67,11 +76,14 @@
           0xFF:
             type: uint32_t
 0x12:
+  entityID: 0xD0
+  entityInstance: 1
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core0
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -94,11 +106,14 @@
             type: bool
             skipOn: deassert
 0x15:
+  entityID: 0xD0
+  entityInstance: 2
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core1
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -121,11 +136,14 @@
             type: bool
             skipOn: deassert
 0x18:
+  entityID: 0xD0
+  entityInstance: 3
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core2
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -148,11 +166,14 @@
             type: bool
             skipOn: deassert
 0x1b:
+  entityID: 0xD0
+  entityInstance: 4
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core3
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -175,11 +196,14 @@
             type: bool
             skipOn: deassert
 0x1e:
+  entityID: 0xD0
+  entityInstance: 5
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core4
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -202,11 +226,14 @@
             type: bool
             skipOn: deassert
 0x21:
+  entityID: 0xD0
+  entityInstance: 6
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core5
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -229,11 +256,14 @@
             type: bool
             skipOn: deassert
 0x24:
+  entityID: 0xD0
+  entityInstance: 7
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core6
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -256,11 +286,14 @@
             type: bool
             skipOn: deassert
 0x27:
+  entityID: 0xD0
+  entityInstance: 8
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core7
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -283,11 +316,14 @@
             type: bool
             skipOn: deassert
 0x2a:
+  entityID: 0xD0
+  entityInstance: 9
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core8
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -310,11 +346,14 @@
             type: bool
             skipOn: deassert
 0x2d:
+  entityID: 0xD0
+  entityInstance: 10
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core9
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -337,11 +376,14 @@
             type: bool
             skipOn: deassert
 0x30:
+  entityID: 0xD0
+  entityInstance: 11
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core10
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -364,11 +406,14 @@
             type: bool
             skipOn: deassert
 0x33:
+  entityID: 0xD0
+  entityInstance: 12
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core11
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -391,11 +436,14 @@
             type: bool
             skipOn: deassert
 0x36:
+  entityID: 0xD0
+  entityInstance: 13
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core12
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -418,11 +466,14 @@
             type: bool
             skipOn: deassert
 0x39:
+  entityID: 0xD0
+  entityInstance: 14
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core13
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -445,11 +496,14 @@
             type: bool
             skipOn: deassert
 0x3c:
+  entityID: 0xD0
+  entityInstance: 15
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core14
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -472,11 +526,14 @@
             type: bool
             skipOn: deassert
 0x3f:
+  entityID: 0xD0
+  entityInstance: 16
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core15
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -499,11 +556,14 @@
             type: bool
             skipOn: deassert
 0x42:
+  entityID: 0xD0
+  entityInstance: 17
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core16
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -526,11 +586,14 @@
             type: bool
             skipOn: deassert
 0x45:
+  entityID: 0xD0
+  entityInstance: 18
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core17
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -553,11 +616,14 @@
             type: bool
             skipOn: deassert
 0x48:
+  entityID: 0xD0
+  entityInstance: 19
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core18
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -580,11 +646,14 @@
             type: bool
             skipOn: deassert
 0x4b:
+  entityID: 0xD0
+  entityInstance: 20
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core19
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -607,11 +676,14 @@
             type: bool
             skipOn: deassert
 0x4e:
+  entityID: 0xD0
+  entityInstance: 21
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core20
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -634,11 +706,14 @@
             type: bool
             skipOn: deassert
 0x51:
+  entityID: 0xD0
+  entityInstance: 22
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core21
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -661,11 +736,14 @@
             type: bool
             skipOn: deassert
 0x54:
+  entityID: 0xD0
+  entityInstance: 23
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core22
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -688,11 +766,14 @@
             type: bool
             skipOn: deassert
 0x57:
+  entityID: 0xD0
+  entityInstance: 24
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0/core23
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -715,11 +796,14 @@
             type: bool
             skipOn: deassert
 0x5a:
+  entityID: 0x03
+  entityInstance: 1
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu0
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -741,11 +825,14 @@
             deassert: false
             type: bool
 0x5c:
+  entityID: 0xD0
+  entityInstance: 25
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core0
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -768,11 +855,14 @@
             type: bool
             skipOn: deassert
 0x5f:
+  entityID: 0xD0
+  entityInstance: 26
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core1
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -795,11 +885,14 @@
             type: bool
             skipOn: deassert
 0x62:
+  entityID: 0xD0
+  entityInstance: 27
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core2
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -822,11 +915,14 @@
             type: bool
             skipOn: deassert
 0x65:
+  entityID: 0xD0
+  entityInstance: 28
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core3
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -849,11 +945,14 @@
             type: bool
             skipOn: deassert
 0x68:
+  entityID: 0xD0
+  entityInstance: 29
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core4
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -876,11 +975,14 @@
             type: bool
             skipOn: deassert
 0x6b:
+  entityID: 0xD0
+  entityInstance: 30
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core5
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -903,11 +1005,14 @@
             type: bool
             skipOn: deassert
 0x6e:
+  entityID: 0xD0
+  entityInstance: 31
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core6
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -930,11 +1035,14 @@
             type: bool
             skipOn: deassert
 0x71:
+  entityID: 0xD0
+  entityInstance: 32
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core7
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -957,11 +1065,14 @@
             type: bool
             skipOn: deassert
 0x74:
+  entityID: 0xD0
+  entityInstance: 33
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core8
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -984,11 +1095,14 @@
             type: bool
             skipOn: deassert
 0x77:
+  entityID: 0xD0
+  entityInstance: 34
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core9
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1011,11 +1125,14 @@
             type: bool
             skipOn: deassert
 0x7a:
+  entityID: 0xD0
+  entityInstance: 35
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core10
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1038,11 +1155,14 @@
             type: bool
             skipOn: deassert
 0x7d:
+  entityID: 0xD0
+  entityInstance: 36
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core11
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1065,11 +1185,14 @@
             type: bool
             skipOn: deassert
 0x80:
+  entityID: 0xD0
+  entityInstance: 37
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core12
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1092,11 +1215,14 @@
             type: bool
             skipOn: deassert
 0x83:
+  entityID: 0xD0
+  entityInstance: 38
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core13
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1119,11 +1245,14 @@
             type: bool
             skipOn: deassert
 0x86:
+  entityID: 0xD0
+  entityInstance: 39
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core14
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1146,11 +1275,14 @@
             type: bool
             skipOn: deassert
 0x89:
+  entityID: 0xD0
+  entityInstance: 40
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core15
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1173,11 +1305,14 @@
             type: bool
             skipOn: deassert
 0x8c:
+  entityID: 0xD0
+  entityInstance: 41
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core16
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1200,11 +1335,14 @@
             type: bool
             skipOn: deassert
 0x8f:
+  entityID: 0xD0
+  entityInstance: 42
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core17
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1227,11 +1365,14 @@
             type: bool
             skipOn: deassert
 0x92:
+  entityID: 0xD0
+  entityInstance: 43
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core18
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1254,11 +1395,14 @@
             type: bool
             skipOn: deassert
 0x95:
+  entityID: 0xD0
+  entityInstance: 44
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core19
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1281,11 +1425,14 @@
             type: bool
             skipOn: deassert
 0x98:
+  entityID: 0xD0
+  entityInstance: 45
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core20
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1308,11 +1455,14 @@
             type: bool
             skipOn: deassert
 0x9b:
+  entityID: 0xD0
+  entityInstance: 46
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core21
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1335,11 +1485,14 @@
             type: bool
             skipOn: deassert
 0x9e:
+  entityID: 0xD0
+  entityInstance: 47
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core22
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1362,11 +1515,14 @@
             type: bool
             skipOn: deassert
 0xa1:
+  entityID: 0xD0
+  entityInstance: 48
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1/core23
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameParentLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1389,11 +1545,14 @@
             type: bool
             skipOn: deassert
 0xa4:
+  entityID: 0x03
+  entityInstance: 2
   sensorType: 0x07
   path: /system/chassis/motherboard/cpu1
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1415,11 +1574,14 @@
             deassert: false
             type: bool
 0xa6:
+  entityID: 0x20
+  entityInstance: 1
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm0
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1441,11 +1603,14 @@
             deassert: false
             type: bool
 0xa8:
+  entityID: 0x20
+  entityInstance: 2
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm1
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1467,11 +1632,14 @@
             deassert: false
             type: bool
 0xaa:
+  entityID: 0x20
+  entityInstance: 3
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm2
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1493,11 +1661,14 @@
             deassert: false
             type: bool
 0xac:
+  entityID: 0x20
+  entityInstance: 4
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm3
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1519,11 +1690,14 @@
             deassert: false
             type: bool
 0xae:
+  entityID: 0x20
+  entityInstance: 5
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm4
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1545,11 +1719,14 @@
             deassert: false
             type: bool
 0xb0:
+  entityID: 0x20
+  entityInstance: 6
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm5
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1571,11 +1748,14 @@
             deassert: false
             type: bool
 0xb2:
+  entityID: 0x20
+  entityInstance: 7
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm6
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1597,11 +1777,14 @@
             deassert: false
             type: bool
 0xb4:
+  entityID: 0x20
+  entityInstance: 8
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm7
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1623,11 +1806,14 @@
             deassert: false
             type: bool
 0xb6:
+  entityID: 0x20
+  entityInstance: 9
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm8
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1649,11 +1835,14 @@
             deassert: false
             type: bool
 0xb8:
+  entityID: 0x20
+  entityInstance: 10
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm9
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1675,11 +1864,14 @@
             deassert: false
             type: bool
 0xba:
+  entityID: 0x20
+  entityInstance: 11
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm10
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1701,11 +1893,14 @@
             deassert: false
             type: bool
 0xbc:
+  entityID: 0x20
+  entityInstance: 12
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm11
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1727,11 +1922,14 @@
             deassert: false
             type: bool
 0xbe:
+  entityID: 0x20
+  entityInstance: 13
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm12
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1753,11 +1951,14 @@
             deassert: false
             type: bool
 0xc0:
+  entityID: 0x20
+  entityInstance: 14
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm13
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1779,11 +1980,14 @@
             deassert: false
             type: bool
 0xc2:
+  entityID: 0x20
+  entityInstance: 15
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm14
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional:
@@ -1805,11 +2009,14 @@
             deassert: false
             type: bool
 0xc4:
+  entityID: 0x20
+  entityInstance: 16
   sensorType: 0x0C
   path: /system/chassis/motherboard/dimm15
   sensorReadingType: 0x6F
   serviceInterface: xyz.openbmc_project.Inventory.Manager
   readingType: assertion
+  sensorNamePattern: nameLeaf
   interfaces:
     xyz.openbmc_project.State.Decorator.OperationalStatus:
       Functional: