diff --git a/inventory_provider/routes/infinera_classifier.py b/inventory_provider/routes/infinera_classifier.py index 1bb5b5a43111ce2daaa3f3d12ecc5afc851e19bd..e522811f9b6a751a6d081e795dcb1831b1ae419a 100644 --- a/inventory_provider/routes/infinera_classifier.py +++ b/inventory_provider/routes/infinera_classifier.py @@ -9,14 +9,14 @@ routes = Blueprint("inventory-data-inf-classifier-support-routes", __name__) @routes.errorhandler(500) -def handle_request_error(error): +def handle_500_error(error): return Response( response=str(error), status=500) @routes.errorhandler(422) -def handle_request_error(error): +def handle_422_error(error): return Response( response=str(error), status=422) @@ -28,7 +28,8 @@ def handle_request_error(error): def get_trap_metadata(source_equipment, interface): r = common.get_redis() - cache_key = 'classifier:infinera:cache:%s:%s' % (source_equipment, interface) + cache_key = 'classifier:infinera:cache:%s:%s' % (source_equipment, + interface) result = r.get(cache_key) if result: @@ -44,16 +45,13 @@ def get_trap_metadata(source_equipment, interface): for s in result['services']: gl = r.get('opsdb:geant_lambdas:%s' % s['name']) if gl: - geant_lambdas.append(json.loads(gl.decode('utf=8'))) + t_gl = json.loads(gl.decode('utf=8')) + t_gl['status'] = t_gl['status'].lower() + geant_lambdas.append(t_gl) if geant_lambdas: result['geant-lambdas'] = geant_lambdas - ifc_info = r.get( - 'netconf-interfaces:%s:%s' % (source_equipment, interface)) - if ifc_info: - result['interface'] = json.loads(ifc_info.decode('utf-8')) - if not result: return Response( response="no available info for {} {}".format(