From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Tue, 10 Dec 2019 11:06:54 +0000 (+0000)
Subject: Get version from installed package if available instead of code
X-Git-Tag: v7.0.0
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=ce1115a47564d9f3b62dc382f9f17ba129537cc6;p=osm%2FLCM.git

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 2bcc9a82..7100a226 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 de829bd5..67e0534f 100644
--- a/osm_lcm/lcm.py
+++ b/osm_lcm/lcm.py
@@ -36,7 +36,7 @@ from osm_lcm import ROclient
 
 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_RO_version = "6.0.2"
 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 @@ class Lcm:
         :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 @@ class Lcm:
         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 @@ class Lcm:
         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 @@ if __name__ == '__main__':
             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 25347241..de1c6a0c 100644
--- a/osm_lcm/ns.py
+++ b/osm_lcm/ns.py
@@ -1090,7 +1090,7 @@ class NsLcm(LcmBase):
                     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)