added additional search for hostname in IMS cache

inventory_provider/routes/classifier.py

@@ -136,12 +136,18 @@ def get_ims_equipment_name(equipment_name: str, r: Redis = None) -> str:
     if not r:
         r = common.get_current_redis()
     ims_equipment_name = equipment_name.upper()
-    most_likely = ims_equipment_name.split('.GEANT.')[0]
+    candidates = [
+        ims_equipment_name.split('.GEANT.')[0],
+        ims_equipment_name,
+        ims_equipment_name.split('.OFFICE.')[0]
+    ]
+    return_value = candidates[0]
     loc_key = 'ims:location:{}'
-    if r.exists(loc_key.format(most_likely)) \
-            or not r.exists(loc_key.format(ims_equipment_name)):
-        ims_equipment_name = most_likely
-    return ims_equipment_name
+    for c in candidates:
+        if r.exists(loc_key.format(c)):
+            return_value = c
+            break
+    return return_value
 
 
 def get_ims_interface(interface: str) -> str: