From 197390ed923ad3901480fd61fbaf39de99739095 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Thu, 3 Jan 2019 21:02:07 +0100
Subject: [PATCH] put correct module version in /version response
---
inventory_provider/routes/data.py | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/inventory_provider/routes/data.py b/inventory_provider/routes/data.py
index 680bb907..97c1488c 100644
--- a/inventory_provider/routes/data.py
+++ b/inventory_provider/routes/data.py
@@ -1,5 +1,6 @@
import functools
import json
+import pkg_resources
from flask import Blueprint, request, Response, current_app
from lxml import etree
@@ -9,10 +10,7 @@ from inventory_provider import juniper
routes = Blueprint("inventory-data-query-routes", __name__)
-VERSION = {
- "api": "0.1",
- "module": "0.1"
-}
+API_VERSION = '0.1'
def require_accepts_json(f):
@@ -37,8 +35,17 @@ def require_accepts_json(f):
@routes.route("/version", methods=['GET', 'POST'])
@require_accepts_json
def version():
+ VERSION = {
+ "api": "0.1",
+ "module": "0.1"
+ }
+
return Response(
- json.dumps(VERSION),
+ json.dumps({
+ 'api': API_VERSION,
+ 'module':
+ pkg_resources.get_distribution('inventory_provider').version
+ }),
mimetype="application/json"
)
--
GitLab