From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Tue, 4 Feb 2020 15:47:18 +0000 (+0000)
Subject: move version package to __init__
X-Git-Tag: v7.1.0rc1~29
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F58%2F8558%2F1;p=osm%2FNBI.git

move version package to __init__

Change-Id: Ie0b02033af9bb7420977b9fb968662a5482a0d99
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

diff --git a/osm_nbi/__init__.py b/osm_nbi/__init__.py
index 46f927f..1644d0b 100644
--- a/osm_nbi/__init__.py
+++ b/osm_nbi/__init__.py
@@ -12,6 +12,12 @@
 # under the License.
 ##
 
-version = '7.0.0.post5'
-version_date = '2019-01-14'
+version = '7.0.0.post11'
+version_date = '2019-02-04'
 
+# Obtain installed package version. Ignore if error, e.g. pkg_resources not installed
+try:
+    from pkg_resources import get_distribution
+    version = get_distribution("osm_nbi").version
+except Exception:
+    pass
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 osm_common.msgbase import MsgException
 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 @@ database_version = '1.2'
 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 @@ class Server(object):
                             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 @@ def _start_service():
     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():