From b27211f0dce1bb793d3da081ba251c4b20e9139c Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Fri, 19 Jul 2019 12:16:36 +0200
Subject: [PATCH] removed some obsolete code
---
inventory_provider/routes/jobs.py | 9 -------
inventory_provider/routes/testing.py | 35 ----------------------------
2 files changed, 44 deletions(-)
diff --git a/inventory_provider/routes/jobs.py b/inventory_provider/routes/jobs.py
index 2014b398..b4b5acea 100644
--- a/inventory_provider/routes/jobs.py
+++ b/inventory_provider/routes/jobs.py
@@ -18,13 +18,6 @@ def update():
return jsonify(job_ids)
-# TODO: remove this when alarmsdb is
-# @routes.route("update-interface-statuses", methods=['GET', 'POST'])
-# def update_interface_statuses():
-# worker.update_interface_statuses.delay()
-# return Response("OK")
-
-
@routes.route("reload-router-config/<equipment_name>", methods=['GET', 'POST'])
@common.require_accepts_json
def reload_router_config(equipment_name):
@@ -36,5 +29,3 @@ def reload_router_config(equipment_name):
@common.require_accepts_json
def check_task_status(task_id):
return jsonify(worker.check_task_status(task_id))
-
-
diff --git a/inventory_provider/routes/testing.py b/inventory_provider/routes/testing.py
index 1d39603e..6b7871be 100644
--- a/inventory_provider/routes/testing.py
+++ b/inventory_provider/routes/testing.py
@@ -164,38 +164,3 @@ def latch_db():
worker_common.latch_db(config)
r = worker_common.get_current_redis(config)
return jsonify(worker_common.get_latch(r))
-
-
-# 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