X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=openvimd.py;h=b9d9d826af1e2fd5290e320f65bf2a32260d93e7;hb=2db743baaa4e14e758fbdfdb7a2db0f8d0e91853;hp=17a958fa9d6d473a75e53f358f145fc42ef2d5fc;hpb=18f5de3f9de56ad4b608daf1e9107e65dc22a851;p=osm%2Fopenvim.git diff --git a/openvimd.py b/openvimd.py index 17a958f..b9d9d82 100755 --- a/openvimd.py +++ b/openvimd.py @@ -28,11 +28,9 @@ and launches the rest of threads: http clients, openflow controller and host controllers ''' -__author__="Alfonso Tierno" -__date__ ="$10-jul-2014 12:07:15$" -__version__="0.5.4-r521" -version_date="Jan 2017" -database_version="0.11" #expected database schema version +__author__ = "Alfonso Tierno" +__date__ = "$10-jul-2014 12:07:15$" + import httpserver import auxiliary_functions as af @@ -150,7 +148,7 @@ if __name__=="__main__": for o, a in opts: if o in ("-v", "--version"): - print "openvimd version", __version__, version_date + print "openvimd version", ovim.ovim.get_version(), ovim.ovim.get_version_date() print "(c) Copyright Telefonica" sys.exit(0) elif o in ("-h", "--help"): @@ -219,9 +217,7 @@ if __name__=="__main__": print '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' print "!! Warning, openvimd in TEST mode '%s'" % config_dic['mode'] print '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' - config_dic['version'] = __version__ - - config_dic["database_version"] = database_version + config_dic['version'] = ovim.ovim.get_version() config_dic["logger_name"] = "openvim" engine = ovim.ovim(config_dic)