Add ContainedByChassisUri and ContainsChassisUris to inventory catalog

Signed-off-by: Derek Chan <[email protected]>

Author: dchanman

redfish_utilities/inventory.py

@@ -207,7 +207,9 @@ def catalog_resource( context, resource, inventory, chassis_id ):
         "AssetTag": resource.get( "AssetTag", None ),
         "Label": resource.get( location_prop, {} ).get( "PartLocation", {} ).get( "ServiceLabel", None ),
         "State": resource.get( "Status", {} ).get( "State", None ),
-        "Description": None
+        "Description": None,
+        "ContainedByChassisUri": None,
+        "ContainsChassisUris": []
     }
 
     # If no label was found, build a default name
@@ -284,6 +286,31 @@ def catalog_resource( context, resource, inventory, chassis_id ):
                     description_str = description_str + " Storage Controller"
         catalog["Description"] = description_str.strip()
 
+    # Determine the chassis containment links:
+    # Chassis resources have explicit ContainedBy and Contains Links
+    if resource_type == "Chassis":
+        if "Links" in resource:
+            if "ContainedBy" in resource["Links"] and "@odata.id" in resource["Links"]["ContainedBy"]:
+                catalog["ContainedByChassisUri"] = resource["Links"]["ContainedBy"]["@odata.id"]
+            if "Contains" in resource["Links"]:
+                for contains_link in [contained["@odata.id"] for contained in resource["Links"]["Contains"] if "@odata.id" in contained]:
+                    catalog["ContainsChassisUris"].append(contains_link)
+
+    # Processor, Memory, and Drive resources have Chassis Links
+    elif resource_type == "Processor" or resource_type == "Memory" or resource_type == "Drive":
+        if "Links" in resource and "Chassis" in resource["Links"] and "@odata.id" in resource["Links"]["Chassis"]:
+            catalog["ContainedByChassisUri"] = resource["Links"]["Chassis"]["@odata.id"]
+
+    # These remaining types do not have explicit links yet
+    elif resource_type == "PCIeDevice":
+        pass
+    elif resource_type == "StorageController":
+        pass
+    elif resource_type == "NetworkAdapter":
+        pass
+    elif resource_type == "Switch":
+        pass
+
     # Find the inventory instance to update based on the chassis identifier
     inventory_instance = None
     for chassis_inventory in inventory: