X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=openmanod.py;h=03901c3fb6c814b08a6af346be21dac3d1f89131;hb=06e6c396413630640cafae3488442a0869f1642d;hp=422e3edfd502f2176cce797dab80dde897bbfbde;hpb=be41e22d64055e9ee71e3f4d6d7ca99225a679fb;p=osm%2FRO.git diff --git a/openmanod.py b/openmanod.py index 422e3edf..03901c3f 100755 --- 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.48-r490" -version_date="Aug 2016" -database_version="0.13" #expected database schema version +__version__="0.5.8-r518" +version_date="Jan 2017" +database_version="0.19" #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,10 +63,8 @@ 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, + 'auto_push_VNF_to_VIMs': True } try: #Check config file exists @@ -125,9 +124,9 @@ def usage(): print( " -p|--port [port_number]: changes port number and overrides the port number in the configuration file (default: 9090)") print( " -P|--adminport [port_number]: changes admin port number and overrides the port number in the configuration file (default: 9095)") #print( " -V|--vnf-repository: changes the path of the vnf-repository and overrides the path in the configuration file") - print( " --log-socket-host: send logs to this host") - print( " --log-socket-port: send logs using this port (default: 9022)") - print( " --log-file: send logs to this file") + print( " --log-socket-host HOST: send logs to this host") + print( " --log-socket-port PORT: send logs using this port (default: 9022)") + print( " --log-file FILE: send logs to this file") return if __name__=="__main__": @@ -146,10 +145,11 @@ if __name__=="__main__": logger.setLevel(logging.DEBUG) socket_handler = None file_handler = None - # Read parameters and configuration file + # Read parameters and configuration file + httpthread = None try: #load parameters and configuration - 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="]) + 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' @@ -176,7 +176,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 @@ -239,22 +239,43 @@ if __name__=="__main__": raise LoadConfigurationException("Cannot open logging file '{}': {}. Check folder exist and permissions".format(global_config["log_file"], str(e)) ) #logging.basicConfig(level = getattr(logging, global_config.get('log_level',"debug"))) logger.setLevel(getattr(logging, global_config['log_level'])) - logger.critical("Starting openmano server command: '%s'", sys.argv[0]) + 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"): + log_level_module = "log_level_" + log_module + log_file_module = "log_file_" + log_module + logger_module = logging.getLogger('openmano.' + log_module) + if log_level_module in global_config: + logger_module.setLevel(global_config[log_level_module]) + if log_file_module in global_config: + try: + file_handler= logging.handlers.RotatingFileHandler(global_config[log_file_module], maxBytes=100e6, backupCount=9, delay=0) + file_handler.setFormatter(log_formatter_simple) + logger_module.addHandler(file_handler) + except IOError as e: + raise LoadConfigurationException("Cannot open logging file '{}': {}. Check folder exist and permissions".format(global_config[log_file_module], str(e)) ) + global_config["logger_"+log_module] = logger_module + #httpserver.logger = global_config["logger_http"] + #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) - 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) + 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) - + nfvo.global_config=global_config + nfvo.start_service(mydb) httpthread = httpserver.httpserver(mydb, False, global_config['http_host'], global_config['http_port']) @@ -273,12 +294,10 @@ if __name__=="__main__": #TODO: Interactive console must be implemented here instead of join or sleep #httpthread.join() - #if 'http_admin_port' in global_config: + #if 'http_admin_port' in global_config: # httpthreadadmin.join() while True: time.sleep(86400) - for thread in global_config["console_thread"]: - thread.terminate = True except KeyboardInterrupt as e: logger.info(str(e)) @@ -291,4 +310,12 @@ 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) + nfvo.stop_service() + if httpthread: + httpthread.join(1) + for thread in global_config["console_thread"]: + thread.terminate = True