v0.5.2 enlarge vim_tenant_id to allow extra fields. Allow extra datacenter configurat...

[osm/RO.git] / openmanod.py

diff --git a/openmanod.py b/openmanod.py
index 4a0a7ec..62b83ac 100755 (executable)
--- a/openmanod.py
+++ b/openmanod.py
@@ -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.4.54-r496"
-version_date="Sep 2016"
-database_version="0.13"      #expected database schema version
+__version__="0.5.2-r510"
+version_date="Oct 2016"
+database_version="0.16"      #expected database schema version
 
 import httpserver
 import time
@@ -45,6 +45,7 @@ import yaml
 import nfvo_db
 from jsonschema import validate as js_v, exceptions as js_e
 from openmano_schemas import config_schema
+from db_base import db_base_Exception
 import nfvo
 import logging
 import logging.handlers as log_handlers
@@ -62,9 +63,6 @@ def load_configuration(configuration_file):
                      'http_console_proxy': True,
                      'http_console_host': None,
                      'log_level': 'DEBUG',
-                     'log_level_db': 'ERROR',
-                     'log_level_vimconn': 'DEBUG',
-                     'log_level_nfvo': 'DEBUG',
                      'log_socket_port': 9022,
                     }
     try:
@@ -176,7 +174,7 @@ if __name__=="__main__":
                 port_admin = a
             elif o == "--log-socket-port":
                 log_socket_port = a
-            elif o == "--log-socket-port":
+            elif o == "--log-socket-host":
                 log_socket_host = a
             elif o == "--log-file":
                 log_file = a
@@ -259,18 +257,20 @@ if __name__=="__main__":
         #nfvo.logger = global_config["logger_nfvo"]
         
         # Initialize DB connection
-        mydb = nfvo_db.nfvo_db(log_level=global_config["log_level_db"]);
-        if mydb.connect(global_config['db_host'], global_config['db_user'], global_config['db_passwd'], global_config['db_name']) == -1:
-            logger.critical("Cannot connect to database %s at %s@%s", global_config['db_name'], global_config['db_user'], global_config['db_host'])
-            exit(-1)
-        r = mydb.get_db_version()
-        if r[0]<0:
-            logger.critical("DATABASE is not a MANO one or it is a '0.0' version. Try to upgrade to version '%s' with './database_utils/migrate_mano_db.sh'", database_version)
+        mydb = nfvo_db.nfvo_db();
+        mydb.connect(global_config['db_host'], global_config['db_user'], global_config['db_passwd'], global_config['db_name'])
+        try:
+            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)
+                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 \
+                            './database_utils/migrate_mano_db.sh'", database_version)
             exit(-1)
-        elif 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)
-            exit(-1)
-        
+
         nfvo.global_config=global_config
         
         httpthread = httpserver.httpserver(mydb, False, global_config['http_host'], global_config['http_port'])
@@ -308,4 +308,7 @@ if __name__=="__main__":
     except LoadConfigurationException as e:
         logger.critical(str(e))
         exit(-1)
+    except db_base_Exception as e:
+        logger.critical(str(e))
+        exit(-1)