summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
bee3bad)
Change-Id: I0c9336ff02f90094af580b2fb2e1b8cd55fd67fb
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
-version = '6.0.3.post22'
-version_date = '2018-11-05'
+version = '7.0.0.post1'
+version_date = '2018-12-10'
<a href="/osm/admin/v1/vim_accounts">VIMs </a>
<a href="/osm/admin/v1/wim_accounts">WIMs </a>
<a href="/osm/admin/v1/sdns">SDNs </a>
<a href="/osm/admin/v1/vim_accounts">VIMs </a>
<a href="/osm/admin/v1/wim_accounts">WIMs </a>
<a href="/osm/admin/v1/sdns">SDNs </a>
- <a href="/osm/admin/v1/k8sclusters">K8s_cluseters </a>
+ <a href="/osm/admin/v1/k8sclusters">K8s_clusters </a>
<a href="/osm/admin/v1/k8srepos">K8s_repos </a>
<a href="/osm/admin/v1/tokens?METHOD=DELETE">logout </a>
</div>
<a href="/osm/admin/v1/k8srepos">K8s_repos </a>
<a href="/osm/admin/v1/tokens?METHOD=DELETE">logout </a>
</div>
from http import HTTPStatus
from codecs import getreader
from os import environ, path
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>"
__author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
auth_database_version = '1.0'
nbi_server = None # instance of Server class
subscription_thread = None # instance of SubscriptionThread class
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
cherrypy.request.login += ";{}={}".format(logging_id, outdata[logging_id][:36])
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
def _start_service():
"""
Callback function called when cherrypy.engine starts
# load and print version. Ignore possible errors, e.g. file not found
try:
# load and print version. Ignore possible errors, e.g. file not found
try:
backend = engine_config["authentication"]["backend"]
backend = engine_config["authentication"]["backend"]
cherrypy.log.error("Starting OSM NBI Version '{}' with '{}' authentication backend"
.format(nbi_version + " " + nbi_version_date, backend))
except Exception:
cherrypy.log.error("Starting OSM NBI Version '{}' with '{}' authentication backend"
.format(nbi_version + " " + nbi_version_date, backend))
except Exception: