Adding a None return when there is no resource id found on resource m…

…ap and when there is no manager uuid for a specific ip
HewlettPackard · Sep 24, 2018 · c0487e6 · c0487e6
1 parent e7b1843
commit c0487e6
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/oneview_redfish_toolkit/api/blade_chassis.py b/oneview_redfish_toolkit/api/blade_chassis.py
@@ -59,9 +59,11 @@ def __init__(self, server_hardware, manager_uuid):
             )
 
         self.redfish["Links"]["ManagedBy"] = list()
-        self.redfish["Links"]["ManagedBy"].append(collections.OrderedDict())
-        self.redfish["Links"]["ManagedBy"][0]["@odata.id"] = \
-            "/redfish/v1/Managers/" + manager_uuid
+        if manager_uuid:
+            self.redfish["Links"]["ManagedBy"].append(
+                collections.OrderedDict())
+            self.redfish["Links"]["ManagedBy"][0]["@odata.id"] = \
+                "/redfish/v1/Managers/" + manager_uuid
 
         if server_hardware["locationUri"] is not None:
             self.redfish["Links"]["ContainedBy"] = collections.OrderedDict()

diff --git a/oneview_redfish_toolkit/api/computer_system.py b/oneview_redfish_toolkit/api/computer_system.py
@@ -107,9 +107,11 @@ def __init__(self, server_hardware, server_hardware_types,
         self.redfish["Links"]["Chassis"][0]["@odata.id"] = \
             "/redfish/v1/Chassis/" + server_hardware['uuid']
         self.redfish["Links"]["ManagedBy"] = list()
-        self.redfish["Links"]["ManagedBy"].append(collections.OrderedDict())
-        self.redfish["Links"]["ManagedBy"][0]["@odata.id"] = \
-            "/redfish/v1/Managers/" + manager_uuid
+        if manager_uuid:
+            self.redfish["Links"]["ManagedBy"].append(
+                collections.OrderedDict())
+            self.redfish["Links"]["ManagedBy"][0]["@odata.id"] = \
+                "/redfish/v1/Managers/" + manager_uuid
         self.redfish["Links"]["ResourceBlocks"] = list()
         self._fill_resource_block_members(drives,
                                           server_hardware,

diff --git a/oneview_redfish_toolkit/api/enclosure_chassis.py b/oneview_redfish_toolkit/api/enclosure_chassis.py
@@ -53,9 +53,11 @@ def __init__(self, enclosure, environmental_configuration, manager_uuid):
         self._set_links_to_computer_system(
             enclosure["deviceBays"])
         self.redfish["Links"]["ManagedBy"] = list()
-        self.redfish["Links"]["ManagedBy"].append(collections.OrderedDict())
-        self.redfish["Links"]["ManagedBy"][0]["@odata.id"] = \
-            "/redfish/v1/Managers/" + manager_uuid
+        if manager_uuid:
+            self.redfish["Links"]["ManagedBy"].append(
+                collections.OrderedDict())
+            self.redfish["Links"]["ManagedBy"][0]["@odata.id"] = \
+                "/redfish/v1/Managers/" + manager_uuid
         self.redfish["Links"]["ContainedBy"] = collections.OrderedDict()
         self.redfish["Links"]["ContainedBy"]["@odata.id"] = \
             "/redfish/v1/Chassis/" + environmental_configuration["rackId"]

diff --git a/oneview_redfish_toolkit/api/resource_block_computer_system.py b/oneview_redfish_toolkit/api/resource_block_computer_system.py
@@ -95,7 +95,8 @@ def _fill_links(self, manager_uuid):
         self.redfish["Links"]["Chassis"].append(chassi)
 
         self.redfish["Links"]["ManagedBy"] = list()
-        manager = dict()
-        manager["@odata.id"] = "/redfish/v1/Managers/" \
-                               + manager_uuid
-        self.redfish["Links"]["ManagedBy"].append(manager)
+        if manager_uuid:
+            manager = dict()
+            manager["@odata.id"] = "/redfish/v1/Managers/" \
+                                   + manager_uuid
+            self.redfish["Links"]["ManagedBy"].append(manager)
diff --git a/oneview_redfish_toolkit/services/manager_service.py b/oneview_redfish_toolkit/services/manager_service.py
@@ -20,13 +20,10 @@
 
 def get_manager_uuid(resource_id):
     map_resources = multiple_oneview.get_map_resources()
-    ov_ip = map_resources[resource_id]
-
-    if not ov_ip:
-        return None
+    ov_ip = map_resources.get(resource_id)
 
     map_appliances = multiple_oneview.get_map_appliances()
-    manager_uuid = map_appliances[ov_ip]
+    manager_uuid = map_appliances.get(ov_ip)
 
     return manager_uuid