afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

daemon: Initial support for exporting a scenario using the new NRL

Browse source 
Network Modeling Framework (NMF) XML representation.
This commit is contained in:
tgoff0 2015-05-22 00:53:01 +00:00
parent 04e98a8004
commit 08c9fd8bf5
4 changed files with 994 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
daemon/sbin/core-daemon
View file

@ -1152,7 +1152,7 @@ class CoreRequestHandler(SocketServer.BaseRequestHandler):
return self.session.sendobjs()
elif eventtype == coreapi.CORE_EVENT_FILE_SAVE:
filename = msg.tlvdata[coreapi.CORE_TLV_EVENT_NAME]
savesessionxml(self.session, filename)
savesessionxml(self.session, filename, self.session.cfg['xmlfilever'])
elif eventtype == coreapi.CORE_EVENT_SCHEDULED:
etime = msg.gettlv(coreapi.CORE_TLV_EVENT_TIME)
node = msg.gettlv(coreapi.CORE_TLV_EVENT_NODE)
@ -1639,6 +1639,7 @@ def getMergedConfig(filename):
'listenaddr' : 'localhost',
'pidfile' : '%s/run/core-daemon.pid' % CORE_STATE_DIR,
'logfile' : '%s/log/core-daemon.log' % CORE_STATE_DIR,
'xmlfilever' : '1.0',
'numthreads' : '1',
'verbose' : 'False',
'daemonize' : 'False',