X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Flcm.py;h=3b8da7d982cf1d9ce615235b501899b36bfddec2;hb=8069ce54d91918c53ec3bf9f8fd4eee8b6aacb93;hp=57e8173bcfa1aec74613b52d28a30fa41d4acef3;hpb=51d065c2b514f5fccd0d4caa822a68d614bc55fc;p=osm%2FLCM.git

diff --git a/osm_lcm/lcm.py b/osm_lcm/lcm.py
index 57e8173..3b8da7d 100644
--- a/osm_lcm/lcm.py
+++ b/osm_lcm/lcm.py
@@ -23,14 +23,12 @@ import logging
 import logging.handlers
 import getopt
 import sys
-import ROclient
-import ns
-import vim_sdn
-import netslice
+
+from osm_lcm import ROclient, ns, vim_sdn, netslice
 from time import time, sleep
-from lcm_utils import versiontuple, LcmException, TaskRegistry, LcmExceptionExit
+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, ROclient
 from osm_common import dbmemory, dbmongo, fslocal, msglocal, msgkafka
 from osm_common import version as common_version
 from osm_common.dbbase import DbException
@@ -42,12 +40,12 @@ from n2vc import version as n2vc_version
 
 
 __author__ = "Alfonso Tierno"
-min_RO_version = [0, 6, 3]
+min_RO_version = "0.6.3"
 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 = '0.1.41'
+# lcm_version_date = '2019-06-19'
 health_check_file = path.expanduser("~") + "/time_last_ping"   # TODO find better location for this file
 
 
@@ -186,7 +184,7 @@ class Lcm:
         try:
             RO = ROclient.ROClient(self.loop, **self.ro_config)
             RO_version = await RO.get_version()
-            if RO_version < min_RO_version:
+            if versiontuple(RO_version) < versiontuple(min_RO_version):
                 raise LcmException("Not compatible osm/RO version '{}.{}.{}'. Needed '{}.{}.{}' or higher".format(
                     *RO_version, *min_RO_version
                 ))