projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes in vimconn_vmware.py : Patch to get DHCP leased addresses for Isolated networ...
[osm/RO.git]
/
openmanod.py
diff --git
a/openmanod.py
b/openmanod.py
index
d00f618
..
5ec3650
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$"
'''
__author__="Alfonso Tierno, Gerardo Garcia, Pablo Montes"
__date__ ="$26-aug-2014 11:09:29$"
-__version__="0.5.
4-r512
"
+__version__="0.5.
8-r518
"
version_date="Jan 2017"
version_date="Jan 2017"
-database_version="0.1
8
" #expected database schema version
+database_version="0.1
9
" #expected database schema version
import httpserver
import time
import httpserver
import time
@@
-64,6
+64,7
@@
def load_configuration(configuration_file):
'http_console_host': None,
'log_level': 'DEBUG',
'log_socket_port': 9022,
'http_console_host': None,
'log_level': 'DEBUG',
'log_socket_port': 9022,
+ 'auto_push_VNF_to_VIMs': True
}
try:
#Check config file exists
}
try:
#Check config file exists
@@
-240,7
+241,7
@@
if __name__=="__main__":
logger.critical("Starting openmano server version: '%s %s' command: '%s'",
__version__, version_date, " ".join(sys.argv))
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"
):
log_level_module = "log_level_" + log_module
log_file_module = "log_file_" + log_module
logger_module = logging.getLogger('openmano.' + log_module)
log_level_module = "log_level_" + log_module
log_file_module = "log_file_" + log_module
logger_module = logging.getLogger('openmano.' + log_module)