Inventory: Add "containing" Association for Item

This Association indicates that an Item (usually a Chassis or Board
object) physically contains other objects.

Also remove the duplicate definition from Cpu and CpuCore since it's now
covered by Item.

Signed-off-by: Benjamin Fair <benjaminfair@google.com>
Change-Id: I6df06b1dddfd9408ff39e8917d269a2cba22668d
diff --git a/yaml/xyz/openbmc_project/Inventory/Item.interface.yaml b/yaml/xyz/openbmc_project/Inventory/Item.interface.yaml
index 73172cf..0326595 100644
--- a/yaml/xyz/openbmc_project/Inventory/Item.interface.yaml
+++ b/yaml/xyz/openbmc_project/Inventory/Item.interface.yaml
@@ -17,6 +17,22 @@
           Whether or not the item is present.
 
 associations:
+    - name: containing
+      description: >
+          Any inventory Items (usually Boards or Chassis) can optionally
+          implement the 'containing' association to provide one or more links
+          to Items which it physically contains.
+      reverse_name: contained_by
+      required_endpoint_interfaces:
+          - xyz.openbmc_project.Inventory.Item
+    - name: contained_by
+      description: >
+          Any inventory Items can optionally implement the 'contained_by'
+          association to provide a link to exactly one Item (usually a Board or
+          Chassis) which physically contains it.
+      reverse_name: containing
+      required_endpoint_interfaces:
+          - xyz.openbmc_project.Inventory.Item
     - name: sensors
       description: >
           Sensors may implement an 'inventory' to 'sensors' association with
@@ -24,4 +40,4 @@
       reverse_names:
           - inventory
       required_endpoint_interfaces:
-          - xyz.openbmc_project.Sensor.Value
\ No newline at end of file
+          - xyz.openbmc_project.Sensor.Value