From 93e0db8edb649d7c8a6411f23eb4f8dc2ea4a18e Mon Sep 17 00:00:00 2001 From: Ratan Gupta Date: Thu, 16 Feb 2017 16:34:26 +0530 Subject: Inventory: Map chassis fru data Make the association for chassis. Update mrw revision due to co-req with script changes. Change-Id: I42ef9edbf9714d302d7afe2a0851f5ca6f2fe579 Signed-off-by: Ratan Gupta Signed-off-by: Patrick Williams --- .../ipmi/hostboot-inventory-config/config.yaml | 187 ++++++++++++--------- 1 file changed, 103 insertions(+), 84 deletions(-) (limited to 'meta-openbmc-machines/meta-openpower') diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml index a03e27586..2c7f8ee7e 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml @@ -1,89 +1,108 @@ PROC: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruSection: Board - IPMIFruProperty: "Mfg Date" - Manufacturer: - IPMIFruSection: Board - IPMIFruProperty: "Manufacturer" - PartNumber: - IPMIFruSection: Board - IPMIFruProperty: "Part Number" - SerialNumber: - IPMIFruSection: Board - IPMIFruProperty: "Serial Number" - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruSection: Board - IPMIFruProperty: "Name" - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruSection: Board - # Custom Field 2 is EC. - IPMIFruProperty: "Custom Field 2" - # Delimiter value in ascii as YAML parser - # was not allowing certain characters like ":" as value - IPMIFruValueDelimiter: "58" - + Interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruSection: Board + IPMIFruProperty: "Mfg Date" + Manufacturer: + IPMIFruSection: Board + IPMIFruProperty: "Manufacturer" + PartNumber: + IPMIFruSection: Board + IPMIFruProperty: "Part Number" + SerialNumber: + IPMIFruSection: Board + IPMIFruProperty: "Serial Number" + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruSection: Board + IPMIFruProperty: "Name" + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruSection: Board + # Custom Field 2 is EC. + IPMIFruProperty: "Custom Field 2" + # Delimiter value in ascii as YAML parser + # was not allowing certain characters like ":" as value + IPMIFruValueDelimiter: "58" SYS: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruSection: Board - IPMIFruProperty: "Mfg Date" - Manufacturer: - IPMIFruSection: Board - IPMIFruProperty: "Manufacturer" - PartNumber: - IPMIFruSection: Board - IPMIFruProperty: "Part Number" - SerialNumber: - IPMIFruSection: Board - IPMIFruProperty: "Serial Number" - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruSection: Board - IPMIFruProperty: "Name" + Interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + PartNumber: + IPMIFruSection: Chassis + IPMIFruProperty: "Part Number" + SerialNumber: + IPMIFruSection: Chassis + IPMIFruProperty: "Serial Number" + Model: + IPMIFruSection: Chassis + IPMIFruProperty: "Type" + +NODE: + Interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruSection: Board + IPMIFruProperty: "Mfg Date" + Manufacturer: + IPMIFruSection: Board + IPMIFruProperty: "Manufacturer" + PartNumber: + IPMIFruSection: Board + IPMIFruProperty: "Part Number" + SerialNumber: + IPMIFruSection: Board + IPMIFruProperty: "Serial Number" + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruSection: Board + IPMIFruProperty: "Name" + AssociatedTypes: + - SYS + DIMM: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruSection: Product - IPMIFruProperty: "Mfg Date" - Manufacturer: - IPMIFruSection: Product - IPMIFruProperty: "Manufacturer" - PartNumber: - IPMIFruSection: Product - IPMIFruProperty: "Part Number" - SerialNumber: - IPMIFruSection: Product - IPMIFruProperty: "Serial Number" - Model: - IPMIFruSection: Product - IPMIFruProperty: "Model Number" - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruSection: Product - IPMIFruProperty: "Name" - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruSection: Product - IPMIFruProperty: "Version" + Interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruSection: Product + IPMIFruProperty: "Mfg Date" + Manufacturer: + IPMIFruSection: Product + IPMIFruProperty: "Manufacturer" + PartNumber: + IPMIFruSection: Product + IPMIFruProperty: "Part Number" + SerialNumber: + IPMIFruSection: Product + IPMIFruProperty: "Serial Number" + Model: + IPMIFruSection: Product + IPMIFruProperty: "Model Number" + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruSection: Product + IPMIFruProperty: "Name" + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruSection: Product + IPMIFruProperty: "Version" MEMBUFF: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruSection: Board - IPMIFruProperty: "Mfg Date" - Manufacturer: - IPMIFruSection: Board - IPMIFruProperty: "Manufacturer" - PartNumber: - IPMIFruSection: Board - IPMIFruProperty: "Part Number" - SerialNumber: - IPMIFruSection: Board - IPMIFruProperty: "Serial Number" - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruSection: Board - IPMIFruProperty: "Name" + Interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruSection: Board + IPMIFruProperty: "Mfg Date" + Manufacturer: + IPMIFruSection: Board + IPMIFruProperty: "Manufacturer" + PartNumber: + IPMIFruSection: Board + IPMIFruProperty: "Part Number" + SerialNumber: + IPMIFruSection: Board + IPMIFruProperty: "Serial Number" + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruSection: Board + IPMIFruProperty: "Name" -- cgit v1.2.1