Get version from installed package if available instead of code
Change-Id: Id3e95e4e9e4fd4c95b5e63dd3abd26e05cfbd692
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
diff --git a/osm_lcm/__init__.py b/osm_lcm/__init__.py
index 2bcc9a8..7100a22 100644
--- a/osm_lcm/__init__.py
+++ b/osm_lcm/__init__.py
@@ -13,5 +13,5 @@
##
# version moved to lcm.py. uncomment if LCM is installed as library and installed
-version = '6.0.3.post20'
-version_date = '2019-11-28'
+version = '7.0.0.post1'
+version_date = '2019-12-10'
diff --git a/osm_lcm/lcm.py b/osm_lcm/lcm.py
index de829bd..67e0534 100644
--- a/osm_lcm/lcm.py
+++ b/osm_lcm/lcm.py
@@ -36,7 +36,7 @@
from time import time, sleep
from osm_lcm.lcm_utils import versiontuple, LcmException, TaskRegistry, LcmExceptionExit
-from osm_lcm import version as lcm_version, version_date as lcm_version_date
+from osm_lcm import version as _lcm_version, version_date as lcm_version_date
from osm_common import dbmemory, dbmongo, fslocal, fsmongo, msglocal, msgkafka
from osm_common import version as common_version
@@ -56,9 +56,7 @@
min_n2vc_version = "0.0.2"
min_common_version = "0.1.19"
-# uncomment if LCM is installed as library and installed, and get them from __init__.py
-# lcm_version = '0.1.41'
-# lcm_version_date = '2019-06-19'
+lcm_version = _lcm_version
health_check_file = path.expanduser("~") + "/time_last_ping" # TODO find better location for this file
@@ -73,7 +71,7 @@
:param config: two level dictionary with configuration. Top level should contain 'database', 'storage',
:return: None
"""
-
+ global lcm_version
self.db = None
self.msg = None
self.msg_admin = None
@@ -226,6 +224,7 @@
self.logger.debug("Starting/Ending test task: {}".format(param))
async def kafka_ping(self):
+ global lcm_version
self.logger.debug("Task kafka_ping Enter")
consecutive_errors = 0
first_start = True
@@ -576,6 +575,18 @@
return ''.join(random_choice("0123456789abcdef") for _ in range(12))
+def _get_version():
+ """
+ Try to get version from package using pkg_resources (available with setuptools)
+ """
+ global lcm_version
+ try:
+ from pkg_resources import get_distribution
+ lcm_version = get_distribution("osm_lcm").version
+ except Exception:
+ pass
+
+
def usage():
print("""Usage: {} [options]
-c|--config [configuration_file]: loads the configuration file (default: ./lcm.cfg)
@@ -644,6 +655,8 @@
else:
print("No configuration file 'lcm.cfg' found neither at local folder nor at /etc/osm/", file=sys.stderr)
exit(1)
+ # get version from package and upate global lcm_version
+ _get_version()
lcm = Lcm(config_file)
lcm.start()
except (LcmException, getopt.GetoptError) as e:
diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py
index 2534724..de1c6a0 100644
--- a/osm_lcm/ns.py
+++ b/osm_lcm/ns.py
@@ -1090,7 +1090,7 @@
step = "Install configuration Software, getting public ssh key"
pub_key = await self.n2vc.get_ee_ssh_public__key(ee_id=ee_id, db_dict=db_dict)
- step = "Insert public key into VM"
+ step = "Insert public key into VM user={} ssh_key={}".format(user, pub_key)
else:
step = "Waiting to VM being up and getting IP address"
self.logger.debug(logging_text + step)