From b57bf9683c502fe520b7374a7a490f2c6d996099 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Thu, 17 Oct 2019 17:29:59 +0200
Subject: [PATCH] don't return 404 for unknown peer addresses
---
inventory_provider/routes/classifier.py | 10 +++++-----
test/test_classifier_routes.py | 4 +++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/inventory_provider/routes/classifier.py b/inventory_provider/routes/classifier.py
index c29d2d8e..ea9e4ca6 100644
--- a/inventory_provider/routes/classifier.py
+++ b/inventory_provider/routes/classifier.py
@@ -272,11 +272,11 @@ def peer_info(address):
if interfaces:
result['interfaces'] = interfaces
- if not result:
- return Response(
- response='no peering info found for %s' % address,
- status=404,
- mimetype="text/html")
+ # if not result:
+ # return Response(
+ # response='no peering info found for %s' % address,
+ # status=404,
+ # mimetype="text/html")
result = json.dumps(result)
# cache this data for the next call
diff --git a/test/test_classifier_routes.py b/test/test_classifier_routes.py
index b713132b..1aa3cece 100644
--- a/test/test_classifier_routes.py
+++ b/test/test_classifier_routes.py
@@ -299,7 +299,9 @@ def test_peer_not_found(client):
rv = client.get(
'/classifier/peer-info/1.2.3.4',
headers=DEFAULT_REQUEST_HEADERS)
- assert rv.status_code == 404
+ assert rv.status_code == 200
+ response_data = json.loads(rv.data.decode('utf-8'))
+ assert response_data == {}
@pytest.mark.parametrize('equipment,entity_name,card_id,port_number', [
--
GitLab