X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=openmanod.py;h=55c7e8c78ec8442ec60b9f44595538542b6ae1dc;hb=639520f575673d48cfb8599bfb737aa559d1e7d5;hp=d00f61823a7451bafd5e17b66e4fd0be84c6c86b;hpb=2a1fc4e770c0688ac1fcb41e1c62bf36a2719d28;p=osm%2FRO.git

diff --git a/openmanod.py b/openmanod.py
index d00f6182..55c7e8c7 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.4-r512"
-version_date="Jan 2017"
-database_version="0.18"      #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
@@ -58,13 +58,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,
-                    }
+    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:
@@ -144,7 +147,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="])
@@ -240,7 +244,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"):
+        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)
@@ -273,6 +277,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 +296,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 +315,7 @@ if __name__=="__main__":
     except db_base_Exception as e:
         logger.critical(str(e))
         exit(-1)
+    nfvo.stop_service()
+    if httpthread:
+        httpthread.join(1)