aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-02-01 13:49:01 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-01 13:49:01 +0000
commitda1a92b67e0538ebb9a0512097bebe1a37cff990 (patch)
treebc26a83256e83bfd8ee4fdb7a4b33634aeb90c36
parenteef859dc4803c4a11d58d34c33492d1caa9432f4 (diff)
parent817f19d6c668176d9e62ab4a3523585fcdd92b01 (diff)
Merge "Add testcases results to DB"
-rw-r--r--testcases/Controllers/ONOS/Teston/CI/onosfunctest.py35
1 files changed, 29 insertions, 6 deletions
diff --git a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py b/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
index 2d22baec9..0c68fd799 100644
--- a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
+++ b/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
@@ -98,11 +98,11 @@ def GetResult():
# 'status': Result}
cmd = "grep -rnh 'Execution Time' " + LOGPATH
Resultbuffer = os.popen(cmd).read()
- time1 = Resultbuffer[114:128]
- time2 = Resultbuffer[28:42]
+ time1 = Resultbuffer[114:128]
+ time2 = Resultbuffer[28:42]
cmd = "grep -rnh 'Success Percentage' " + LOGPATH + "/FUNCvirNetNB_*"
Resultbuffer = os.popen(cmd).read()
- if Resultbuffer.find('100%') >= 0:
+ if Resultbuffer.find('100%') >= 0:
result1='Success'
else:
result1='Failed'
@@ -112,10 +112,33 @@ def GetResult():
result2='Success'
else:
result2='Failed'
- payload={'FUNCvirNet':{'duration': time1,
- 'result': result1},
+ status1 = []
+ status2 = []
+ cmd = "grep -rnh 'h3' " + LOGPATH + "/FUNCvirNetNB_*"
+ Resultbuffer = os.popen(cmd).read()
+ pattern = re.compile("<h3>([^-]+) - ([^-]+) - (\S*)</h3>")
+ #res = pattern.search(Resultbuffer).groups()
+ res = pattern.findall(Resultbuffer)
+ i = 0
+ for index in range(len(res)):
+ status1.append({'Case name:':res[i][0] + res[i][1],'Case result':res[i][2]})
+ i=i+1
+ cmd = "grep -rnh 'h3' " + LOGPATH + "/FUNCvirNetNBL3*"
+ Resultbuffer = os.popen(cmd).read()
+ pattern = re.compile("<h3>([^-]+) - ([^-]+) - (\S*)</h3>")
+ #res = pattern.search(Resultbuffer).groups()
+ res = pattern.findall(Resultbuffer)
+ i = 0
+ for index in range(len(res)):
+ status2.append({'Case name:':res[i][0] + res[i][1],'Case result':res[i][2]})
+ i=i+1
+ payload={'timestart': str(starttime),
+ 'FUNCvirNet':{'duration': time1,
+ 'result': result1,
+ 'status': status1},
'FUNCvirNetL3':{'duration': time2,
- 'result': result2}}
+ 'result': result2,
+ 'status': status2}}
return payload
def SetOnosIp():