proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-04 12:00:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: lutil - fix test counting, add returnJson flag

Browse Source 
Signed-off-by: Lou Berger <lberger@labn.net>
This commit is contained in:
Lou Berger 2018-02-21 08:42:56 -05:00 committed by Donald Sharp
parent 623afc9d83
commit cc3cf6a883
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/topotests/lib/lutil.py
View File

@ -21,6 +21,7 @@ import re
import sys import sys
import time import time
import datetime import datetime
import json
from topolog import logger from topolog import logger
from mininet.net import Mininet from mininet.net import Mininet
@ -171,21 +172,29 @@ Total %-4d %-4d %d\n\
self.log('unable to read: ' + tstFile) self.log('unable to read: ' + tstFile)
sys.exit(1) sys.exit(1)
def command(self, target, command, regexp, op, result): def command(self, target, command, regexp, op, result, returnJson):
global net global net
if op != 'wait': if op != 'wait':
self.l_line += 1 self.l_line += 1
if op == 'pass' or op == 'fail':
self.l_total += 1 self.l_total += 1
self.log('%s:%s COMMAND:%s:%s:%s:%s:%s:' % \ self.log('%s:%s COMMAND:%s:%s:%s:%s:%s:' % \
(self.l_filename, self.l_line, target, command, regexp, op, result)) (self.l_filename, self.l_line, target, command, regexp, op, result))
if self.net == '': if self.net == '':
return False return False
#self.log("Running %s %s" % (target, command)) #self.log("Running %s %s" % (target, command))
js = None
out = self.net[target].cmd(command).rstrip() out = self.net[target].cmd(command).rstrip()
if len(out) == 0: if len(out) == 0:
report = "<no output>" report = "<no output>"
else: else:
report = out report = out
if returnJson == True:
try:
js = json.loads(out)
except:
js = None
self.log('WARNING: JSON load failed -- confirm command output is in JSON format.')
self.log('COMMAND OUTPUT:%s:' % report) self.log('COMMAND OUTPUT:%s:' % report)
out = " ".join(out.splitlines()) out = " ".join(out.splitlines())
search = re.search(regexp, out) search = re.search(regexp, out)
@ -205,9 +214,11 @@ Total %-4d %-4d %d\n\
success = False success = False
if op == 'pass' or op == 'fail': if op == 'pass' or op == 'fail':
self.result(target, success, result) self.result(target, success, result)
if js != None:
return js
return ret return ret
def wait(self, target, command, regexp, op, result, wait): def wait(self, target, command, regexp, op, result, wait, returnJson):
self.log('%s:%s WAIT:%s:%s:%s:%s:%s:%s:' % \ self.log('%s:%s WAIT:%s:%s:%s:%s:%s:%s:' % \
(self.l_filename, self.l_line, target, command, regexp, op, result,wait)) (self.l_filename, self.l_line, target, command, regexp, op, result,wait))
llevel = LUtil.l_level llevel = LUtil.l_level
@ -216,7 +227,7 @@ Total %-4d %-4d %d\n\
startt = time.time() startt = time.time()
delta = time.time() - startt delta = time.time() - startt
while delta < wait and found is False: while delta < wait and found is False:
found = self.command(target, command, regexp, op, result) found = self.command(target, command, regexp, op, result, returnJson)
n+=1 n+=1
LUtil.l_level = 0 LUtil.l_level = 0
delta = time.time() - startt delta = time.time() - startt
@ -224,7 +235,7 @@ Total %-4d %-4d %d\n\
time.sleep (0.5) time.sleep (0.5)
LUtil.l_level = llevel LUtil.l_level = llevel
self.log('Done after %d loops, time=%s, Found=%s' % (n, delta, found)) self.log('Done after %d loops, time=%s, Found=%s' % (n, delta, found))
found = self.command(target, command, regexp, 'pass', '%s +%4.2f secs' % (result, delta)) found = self.command(target, command, regexp, 'pass', '%s +%4.2f secs' % (result, delta), returnJson)
return found return found
#initialized by luStart #initialized by luStart
@ -245,11 +256,11 @@ def luStart(baseScriptDir='.', baseLogDir='.', net='',
LUtil.fsum_name = baseLogDir + '/' + fsum LUtil.fsum_name = baseLogDir + '/' + fsum
LUtil.l_level = level LUtil.l_level = level
def luCommand(target, command, regexp='.', op='none', result='', time=10): def luCommand(target, command, regexp='.', op='none', result='', time=10, returnJson=False):
if op != 'wait': if op != 'wait':
return LUtil.command(target, command, regexp, op, result) return LUtil.command(target, command, regexp, op, result, returnJson)
else: else:
return LUtil.wait(target, command, regexp, op, result, time) return LUtil.wait(target, command, regexp, op, result, time, returnJson)
def luLast(): def luLast():
if LUtil.l_last != None: if LUtil.l_last != None: