mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-15 17:31:31 +02:00
Code Issues Projects Releases Wiki Activity

Fix for log handling in bmv2.py

Browse Source 
Change-Id: Idf96ace58c4b1cb67c52e2c122ad644b945f4f99
This commit is contained in:
Carmelo Cascone 2017-06-27 16:06:33 -04:00
parent f773b65f6d
commit 9e6621ffb0
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/dev/mininet/bmv2.py
View File

@ -23,7 +23,7 @@ class ONOSBmv2Switch(Switch):
instanceCount = 0 instanceCount = 0
def __init__(self, name, debugger=False, loglevel="warn", elogger=False, persistent=False, def __init__(self, name, debugger=False, loglevel="warn", elogger=False, persistent=False,
logflush=False, thriftPort=None, grpcPort=None, netcfg=True, **kwargs): thriftPort=None, grpcPort=None, netcfg=True, **kwargs):
Switch.__init__(self, name, **kwargs) Switch.__init__(self, name, **kwargs)
self.thriftPort = ONOSBmv2Switch.pickUnusedPort() if not thriftPort else thriftPort self.thriftPort = ONOSBmv2Switch.pickUnusedPort() if not thriftPort else thriftPort
self.grpcPort = ONOSBmv2Switch.pickUnusedPort() if not grpcPort else grpcPort self.grpcPort = ONOSBmv2Switch.pickUnusedPort() if not grpcPort else grpcPort
@ -37,7 +37,6 @@ class ONOSBmv2Switch(Switch):
self.logfile = '/tmp/bmv2-%d.log' % self.deviceId self.logfile = '/tmp/bmv2-%d.log' % self.deviceId
self.elogger = elogger self.elogger = elogger
self.persistent = persistent self.persistent = persistent
self.logflush = logflush
self.netcfg = netcfg self.netcfg = netcfg
self.netcfgfile = '/tmp/bmv2-%d-netcfg.json' % self.deviceId self.netcfgfile = '/tmp/bmv2-%d-netcfg.json' % self.deviceId
if persistent: if persistent:
@ -118,9 +117,7 @@ class ONOSBmv2Switch(Switch):
args.append('--nanolog %s' % nanomsg) args.append('--nanolog %s' % nanomsg)
if self.debugger: if self.debugger:
args.append('--debugger') args.append('--debugger')
args.append('--log-file %s -L%s' % (self.logfile, self.loglevel)) args.append('-L%s' % self.loglevel)
if self.logflush:
args.append('--log-flush')
args.append(INIT_BMV2_JSON) args.append(INIT_BMV2_JSON)
@ -136,9 +133,9 @@ class ONOSBmv2Switch(Switch):
cmdStr = "(while [ -e {} ]; " \ cmdStr = "(while [ -e {} ]; " \
"do {} ; " \ "do {} ; " \
"sleep 1; " \ "sleep 1; " \
"done;) &".format(self.exectoken, bmv2cmd) "done;) > {} 2>&1 &".format(self.exectoken, bmv2cmd, self.logfile)
else: else:
cmdStr = "{} &".format(bmv2cmd) cmdStr = "{} > {} 2>&1 &".format(bmv2cmd, self.logfile)
# Starts the switch. # Starts the switch.
out = self.cmd(cmdStr) out = self.cmd(cmdStr)
@ -157,8 +154,7 @@ class ONOSBmv2Switch(Switch):
def stop(self, deleteIntfs=True): def stop(self, deleteIntfs=True):
"""Terminate switch.""" """Terminate switch."""
self.cmd("rm -f /tmp/bmv2-%d-*" % self.deviceId) self.cmd("rm -f /tmp/bmv2-%d-*" % self.deviceId)
# wildcard end as BMv2 might create log files with .txt extension self.cmd("rm -f /tmp/bmv2-%d.log" % self.deviceId)
self.cmd("rm -f /tmp/bmv2-%d.log*" % self.deviceId)
self.cmd('kill %' + BMV2_TARGET) self.cmd('kill %' + BMV2_TARGET)
Switch.stop(self, deleteIntfs) Switch.stop(self, deleteIntfs)