From 6a17e18a1db86bae3f42b93387513323327e0e54 Mon Sep 17 00:00:00 2001 From: Erik Reid <erik.reid@geant.org> Date: Sun, 7 Apr 2019 17:29:08 +0200 Subject: [PATCH] commented some unused code --- inventory_provider/routes/data.py | 63 ++++++++++++++++--------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/inventory_provider/routes/data.py b/inventory_provider/routes/data.py index 2f893435..3bbe8d02 100644 --- a/inventory_provider/routes/data.py +++ b/inventory_provider/routes/data.py @@ -88,33 +88,36 @@ def bgp_configs(hostname): return jsonify(routes) -@routes.route("/interfaces/status/<hostname>/<path:interface>", - methods=['GET', 'POST']) -@common.require_accepts_json -def interface_statuses(hostname, interface): - r = common.get_redis() - status = r.get( - 'alarmsdb:interface_status:%s:%s' - % (hostname, interface)) - if not status: - return Response( - response="no available info for {} {}".format(hostname, interface), - status=404, - mimetype="text/html") - return jsonify({"status": status.decode('utf-8')}) - - -@routes.route("/services/<hostname>/<path:interface>", - methods=['GET', 'POST']) -@common.require_accepts_json -def services_for_interface(hostname, interface): - r = common.get_redis() - services = r.get( - 'opsdb:interface_services:%s:%s' - % (hostname, interface)) - if not services: - return Response( - response="no available info for {} {}".format(hostname, interface), - status=404, - mimetype="text/html") - return jsonify(json.loads(services.decode('utf-8'))) +# TODO: remove all alarmsdb i/o, and then remove the following +# @routes.route("/interfaces/status/<hostname>/<path:interface>", +# methods=['GET', 'POST']) +# @common.require_accepts_json +# def interface_statuses(hostname, interface): +# r = common.get_redis() +# status = r.get( +# 'alarmsdb:interface_status:%s:%s' +# % (hostname, interface)) +# if not status: +# return Response( +# response="no available info for {} {}".format( +# hostname, interface), +# status=404, +# mimetype="text/html") +# return jsonify({"status": status.decode('utf-8')}) +# +# +# @routes.route("/services/<hostname>/<path:interface>", +# methods=['GET', 'POST']) +# @common.require_accepts_json +# def services_for_interface(hostname, interface): +# r = common.get_redis() +# services = r.get( +# 'opsdb:interface_services:%s:%s' +# % (hostname, interface)) +# if not services: +# return Response( +# response="no available info for {} {}".format( +# hostname, interface), +# status=404, +# mimetype="text/html") +# return jsonify(json.loads(services.decode('utf-8'))) -- GitLab