scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-03 04:07:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a try, except condition around the test_tag variable to support older lanforge versions

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
Matthew Stidham
2021-07-28 16:43:24 -07:00
parent 5d55973fad
commit bd10818fc1
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
py-dashboard/GhostRequest.py
View File

@@ -313,7 +313,10 @@ class GhostRequest:
df = csvreader.read_csv(file=target_file, sep='\t') df = csvreader.read_csv(file=target_file, sep='\t')
test_rig = csvreader.get_column(df, 'test-rig')[0] test_rig = csvreader.get_column(df, 'test-rig')[0]
test_id = csvreader.get_column(df, 'test-id')[0] test_id = csvreader.get_column(df, 'test-id')[0]
test_tag[test_id] = (csvreader.get_column(df, 'test-tag')[0]) try:
test_tag[test_id] = (csvreader.get_column(df, 'test-tag')[0])
except:
notesttag = True
pass_fail = Counter(csvreader.get_column(df, 'pass/fail')) pass_fail = Counter(csvreader.get_column(df, 'pass/fail'))
test_pass_fail.append(pass_fail) test_pass_fail.append(pass_fail)
dut_hw = csvreader.get_column(df, 'dut-hw-version')[0] dut_hw = csvreader.get_column(df, 'dut-hw-version')[0]
@@ -330,8 +333,14 @@ class GhostRequest:
subtest_pass_fail_list['PASS'] = subtest_pass_total subtest_pass_fail_list['PASS'] = subtest_pass_total
subtest_pass_fail_list['FAIL'] = subtest_fail_total subtest_pass_fail_list['FAIL'] = subtest_fail_total
subtest_pass_fail.append(subtest_pass_fail_list) subtest_pass_fail.append(subtest_pass_fail_list)
duts = [dut_serial, dut_hw, dut_sw, dut_model, test_rig, test_tag] if notesttag:
duts = [dut_serial, dut_hw, dut_sw, dut_model, test_rig, test_tag]
else:
duts = [dut_serial, dut_hw, dut_sw, dut_model, test_rig]
times_append = csvreader.get_column(df, 'Date') times_append = csvreader.get_column(df, 'Date')
if len(times_append) == 0:
print(LookupError("%s/kpi.csv has no time points" % target_folder))
break
for target_time in times_append: for target_time in times_append:
times.append(float(target_time) / 1000) times.append(float(target_time) / 1000)
if pass_fail['PASS'] + pass_fail['FAIL'] > 0: if pass_fail['PASS'] + pass_fail['FAIL'] > 0:
@@ -415,6 +424,8 @@ class GhostRequest:
failuredict = dict() failuredict = dict()
failuredict[target_folder] = ['Failure'] failuredict[target_folder] = ['Failure']
webpagesandpdfs.append(failuredict) webpagesandpdfs.append(failuredict)
if len(times) == 0:
return ArithmeticError("There are no datapoints in any folders passed into Ghost")
test_pass_fail_results = sum((Counter(test) for test in test_pass_fail), Counter()) test_pass_fail_results = sum((Counter(test) for test in test_pass_fail), Counter())

1
py-scripts/influx2.py
View File

@@ -21,7 +21,6 @@ import json
import influxdb_client import influxdb_client
from influxdb_client.client.write_api import SYNCHRONOUS from influxdb_client.client.write_api import SYNCHRONOUS
import datetime import datetime
#from LANforge.lfcli_base import LFCliBase
import time import time
class RecordInflux: class RecordInflux: