From 1b181d707138305e8c133d201bab17ac991e1cb2 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Fri, 31 Jan 2020 11:20:56 +0100
Subject: [PATCH] pep8
---
inventory_provider/db/opsdb.py | 5 ++++-
inventory_provider/routes/lg.py | 1 -
test/test_lg_routes.py | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/inventory_provider/db/opsdb.py b/inventory_provider/db/opsdb.py
index 3074c856..91cffad1 100644
--- a/inventory_provider/db/opsdb.py
+++ b/inventory_provider/db/opsdb.py
@@ -337,7 +337,10 @@ WHERE
print(row)
return {
'equipment name': row['router_name'],
- 'type': 'INTERNAL' if row['pop_name'] in INTERNAL_POP_NAMES else 'CORE',
+ 'type':
+ 'INTERNAL'
+ if row['pop_name'] in INTERNAL_POP_NAMES
+ else 'CORE',
'pop': {
'name': row['pop_name'],
'city': row['pop_city'],
diff --git a/inventory_provider/routes/lg.py b/inventory_provider/routes/lg.py
index 90539e81..37dc49be 100644
--- a/inventory_provider/routes/lg.py
+++ b/inventory_provider/routes/lg.py
@@ -1,5 +1,4 @@
import json
-import re
from flask import Blueprint, jsonify, Response
diff --git a/test/test_lg_routes.py b/test/test_lg_routes.py
index d83586ae..e45e3b59 100644
--- a/test/test_lg_routes.py
+++ b/test/test_lg_routes.py
@@ -66,6 +66,7 @@ def test_public_routers(client):
# no internal routers should be present
assert all(r['type'] == 'CORE' for r in response_data)
+
def test_internal_routers(client):
rv = client.get(
'/lg/routers/all',
@@ -82,7 +83,6 @@ def test_internal_routers(client):
assert any(r['type'] == 'CORE' for r in response_data)
-
@pytest.mark.parametrize('bad_endpoint', [
# bad access param keyword
@@ -99,7 +99,7 @@ def test_internal_routers(client):
'/lg/',
'/lg/something'
])
-def test_internal_routers(client, bad_endpoint):
+def test_bad_endpoints(client, bad_endpoint):
rv = client.get(
bad_endpoint,
headers=DEFAULT_REQUEST_HEADERS)
--
GitLab