'''
__author__="Alfonso Tierno, Gerardo Garcia, Pablo Montes"
__date__ ="$26-aug-2014 11:09:29$"
-__version__="0.5.7-r517"
-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 httpserver
import time
'http_console_host': None,
'log_level': 'DEBUG',
'log_socket_port': 9022,
+ 'auto_push_VNF_to_VIMs': True
}
try:
#Check config file exists
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="])
exit(-1)
nfvo.global_config=global_config
+ nfvo.start_service(mydb)
httpthread = httpserver.httpserver(mydb, False, global_config['http_host'], global_config['http_port'])
#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))
except db_base_Exception as e:
logger.critical(str(e))
exit(-1)
+ nfvo.stop_service()
+ if httpthread:
+ httpthread.join(1)