From 926dc92ef84cf8a4d6e3ad3c306b76771be231d1 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Fri, 1 Feb 2019 16:09:54 +0100
Subject: [PATCH] moved /data/version to /version
---
inventory_provider/__init__.py | 3 +++
inventory_provider/routes/data.py | 14 --------------
inventory_provider/routes/default.py | 19 +++++++++++++++++++
test/test_general_routes.py | 2 +-
4 files changed, 23 insertions(+), 15 deletions(-)
create mode 100644 inventory_provider/routes/default.py
diff --git a/inventory_provider/__init__.py b/inventory_provider/__init__.py
index 5de6a311..485cf81c 100644
--- a/inventory_provider/__init__.py
+++ b/inventory_provider/__init__.py
@@ -17,6 +17,9 @@ def create_app():
app = Flask(__name__)
app.secret_key = "super secret session key"
+ from inventory_provider.routes import default
+ app.register_blueprint(default.routes, url_prefix='/')
+
from inventory_provider.routes import data
app.register_blueprint(data.routes, url_prefix='/data')
diff --git a/inventory_provider/routes/data.py b/inventory_provider/routes/data.py
index 85fb5f01..7d39d005 100644
--- a/inventory_provider/routes/data.py
+++ b/inventory_provider/routes/data.py
@@ -10,20 +10,6 @@ from inventory_provider.routes import common
routes = Blueprint("inventory-data-query-routes", __name__)
-API_VERSION = '0.1'
-
-
-@routes.route("/version", methods=['GET', 'POST'])
-@common.require_accepts_json
-def version():
- return Response(
- json.dumps({
- 'api': API_VERSION,
- 'module':
- pkg_resources.get_distribution('inventory_provider').version
- }),
- mimetype="application/json"
- )
@routes.route("/routers", methods=['GET', 'POST'])
diff --git a/inventory_provider/routes/default.py b/inventory_provider/routes/default.py
new file mode 100644
index 00000000..38bf3ea3
--- /dev/null
+++ b/inventory_provider/routes/default.py
@@ -0,0 +1,19 @@
+import json
+import pkg_resources
+
+from flask import Blueprint, jsonify
+from inventory_provider.routes import common
+
+routes = Blueprint("inventory-data-default-routes", __name__)
+
+API_VERSION = '0.1'
+
+
+@routes.route("/version", methods=['GET', 'POST'])
+@common.require_accepts_json
+def version():
+ return jsonify({
+ 'api': API_VERSION,
+ 'module':
+ pkg_resources.get_distribution('inventory_provider').version
+ })
diff --git a/test/test_general_routes.py b/test/test_general_routes.py
index 7f51fcca..f7c4dda4 100644
--- a/test/test_general_routes.py
+++ b/test/test_general_routes.py
@@ -26,7 +26,7 @@ def test_version_request(client):
}
rv = client.post(
- "data/version",
+ "version",
headers=DEFAULT_REQUEST_HEADERS)
assert rv.status_code == 200
jsonschema.validate(
--
GitLab