X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=openmanod.py;h=ee9b86217571bf559c4cb5b78fd9067efb9c0f19;hb=c5651795c9b7fc6782fa666a27351c2aae52c08f;hp=761e912381f197dc6399c9f3fd35f9540ee32524;hpb=1ae5134493bbe3d013ea61dbc3b53edc4c11b8a6;p=osm%2FRO.git

diff --git a/openmanod.py b/openmanod.py
index 761e9123..ee9b8621 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.5.5-r514"
-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
@@ -64,6 +64,7 @@ def load_configuration(configuration_file):
                      'http_console_host': None,
                      'log_level': 'DEBUG',
                      'log_socket_port': 9022,
+                     'auto_push_VNF_to_VIMs': True
                     }
     try:
         #Check config file exists
@@ -144,7 +145,8 @@ 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="])
@@ -273,6 +275,7 @@ if __name__=="__main__":
             exit(-1)
 
         nfvo.global_config=global_config
+        nfvo.start_service(mydb)
         
         httpthread = httpserver.httpserver(mydb, False, global_config['http_host'], global_config['http_port'])
         
@@ -291,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))
@@ -312,4 +313,7 @@ if __name__=="__main__":
     except db_base_Exception as e:
         logger.critical(str(e))
         exit(-1)
+    nfvo.stop_service()
+    if httpthread:
+        httpthread.join(1)