move version package to __init__
Change-Id: Ie0b02033af9bb7420977b9fb968662a5482a0d99
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
diff --git a/osm_nbi/nbi.py b/osm_nbi/nbi.py
index f5d2293..06b39f3 100644
--- a/osm_nbi/nbi.py
+++ b/osm_nbi/nbi.py
@@ -35,7 +35,7 @@
from http import HTTPStatus
from codecs import getreader
from os import environ, path
-from osm_nbi import version as _nbi_version, version_date as nbi_version_date
+from osm_nbi import version as nbi_version, version_date as nbi_version_date
__author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
@@ -46,8 +46,6 @@
auth_database_version = '1.0'
nbi_server = None # instance of Server class
subscription_thread = None # instance of SubscriptionThread class
-nbi_version = _nbi_version # by default this is fixed in the code
-
"""
North Bound Interface (O: OSM specific; 5,X: SOL005 not implemented yet; O5: SOL005 implemented)
@@ -1183,18 +1181,6 @@
cherrypy.request.login += ";{}={}".format(logging_id, outdata[logging_id][:36])
-def _get_version():
- """
- Try to get version from package using pkg_resources (available with setuptools)
- """
- global nbi_version
- try:
- from pkg_resources import get_distribution
- nbi_version = get_distribution("osm_nbi").version
- except Exception:
- pass
-
-
def _start_service():
"""
Callback function called when cherrypy.engine starts
@@ -1293,14 +1279,9 @@
subscription_thread.start()
# Do not capture except SubscriptionException
- # load and print version. Ignore possible errors, e.g. file not found
- try:
- _get_version()
- backend = engine_config["authentication"]["backend"]
- cherrypy.log.error("Starting OSM NBI Version '{}' with '{}' authentication backend"
- .format(nbi_version + " " + nbi_version_date, backend))
- except Exception:
- pass
+ backend = engine_config["authentication"]["backend"]
+ cherrypy.log.error("Starting OSM NBI Version '{} {}' with '{}' authentication backend"
+ .format(nbi_version, nbi_version_date, backend))
def _stop_service():