Merge branch 'packaging'

[osm/RO.git] / openmanod

diff --git a/openmanod b/openmanod
index bb32339..a63a1f0 100755 (executable)
--- a/openmanod
+++ b/openmanod
@@ -33,9 +33,9 @@ It loads the configuration file and launches the http_server thread that will li
 '''
 __author__="Alfonso Tierno, Gerardo Garcia, Pablo Montes"
 __date__ ="$26-aug-2014 11:09:29$"
-__version__="0.5.8-r518"
-version_date="Jan 2017"
-database_version="0.19"      #expected database schema version
+__version__="0.5.9-r519"
+version_date="Mar 2017"
+database_version="0.20"      #expected database schema version
 
 import time
 import sys
@@ -48,6 +48,7 @@ import socket
 from osm_ro import httpserver, nfvo, nfvo_db
 from osm_ro.openmano_schemas import config_schema
 from osm_ro.db_base import db_base_Exception
+import osm_ro
 
 global global_config
 global logger
@@ -56,14 +57,16 @@ class LoadConfigurationException(Exception):
     pass
 
 def load_configuration(configuration_file):
-    default_tokens ={'http_port':9090,
-                     'http_host':'localhost',
-                     'http_console_proxy': True,
-                     'http_console_host': None,
-                     'log_level': 'DEBUG',
-                     'log_socket_port': 9022,
-                     'auto_push_VNF_to_VIMs': True
-                    }
+    default_tokens = {'http_port':9090,
+                      'http_host':'localhost',
+                      'http_console_proxy': True,
+                      'http_console_host': None,
+                      'log_level': 'DEBUG',
+                      'log_socket_port': 9022,
+                      'auto_push_VNF_to_VIMs': True,
+                      'db_host': 'localhost',
+                      'db_ovim_host': 'localhost'
+    }
     try:
         #Check config file exists
         with open(configuration_file, 'r') as f:
@@ -150,7 +153,7 @@ if __name__=="__main__":
         opts, args = getopt.getopt(sys.argv[1:], "hvc:V:p:P:", ["config=", "help", "version", "port=", "vnf-repository=", "adminport=", "log-socket-host=", "log-socket-port=", "log-file="])
         port=None
         port_admin = None
-        config_file = 'openmanod.cfg'
+        config_file = 'osm_ro/openmanod.cfg'
         vnf_repository = None
         log_file = None
         log_socket_host = None
@@ -240,7 +243,7 @@ if __name__=="__main__":
         logger.critical("Starting openmano server version: '%s %s' command: '%s'",  
                          __version__, version_date, " ".join(sys.argv))
         
-        for log_module in ("nfvo", "http", "vim", "db", "console"):
+        for log_module in ("nfvo", "http", "vim", "db", "console", "ovim"):
             log_level_module = "log_level_" + log_module
             log_file_module = "log_file_" + log_module
             logger_module = logging.getLogger('openmano.' + log_module)
@@ -264,8 +267,8 @@ if __name__=="__main__":
             r = mydb.get_db_version()
             if r[1] != database_version:
                 logger.critical("DATABASE wrong version '%s'. \
-                                Try to upgrade/downgrade to version '%s' with './database_utils/migrate_mano_db.sh'",
-                                r[1], database_version)
+                                Try to upgrade/downgrade to version '%s' with '%s/database_utils/migrate_mano_db.sh'",
+                                r[1], database_version, osm_ro.__path__[0])
                 exit(-1)
         except db_base_Exception as e:
             logger.critical("DATABASE is not a MANO one or it is a '0.0' version. Try to upgrade to version '%s' with \
@@ -314,6 +317,4 @@ if __name__=="__main__":
     nfvo.stop_service()
     if httpthread:
         httpthread.join(1)
-    for thread in global_config["console_thread"]:
-        thread.terminate = True