scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-10-31 02:38:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nicer table at the top of the report, including support for multiple devices

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
Matthew Stidham
2021-07-08 17:38:21 -07:00
parent 588c66f7c4
commit 1d639b22fa
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
py-dashboard/GhostRequest.py
View File

@@ -292,6 +292,7 @@ class GhostRequest:
images = list() images = list()
times = list() times = list()
test_pass_fail = list() test_pass_fail = list()
devices = dict()
for target_folder in target_folders: for target_folder in target_folders:
try: try:
@@ -304,6 +305,7 @@ class GhostRequest:
dut_sw = csvreader.get_column(df, 'dut-sw-version')[0] dut_sw = csvreader.get_column(df, 'dut-sw-version')[0]
dut_model = csvreader.get_column(df, 'dut-model-num')[0] dut_model = csvreader.get_column(df, 'dut-model-num')[0]
dut_serial = csvreader.get_column(df, 'dut-serial-num')[0] dut_serial = csvreader.get_column(df, 'dut-serial-num')[0]
devices[csv_testbed] = [dut_hw, dut_sw, dut_model, dut_serial]
times_append = csvreader.get_column(df, 'Date') times_append = csvreader.get_column(df, 'Date')
for target_time in times_append: for target_time in times_append:
times.append(float(target_time) / 1000) times.append(float(target_time) / 1000)
@@ -422,9 +424,23 @@ class GhostRequest:
influxdb.post_to_influx(short_description, numeric_score, tags, date) influxdb.post_to_influx(short_description, numeric_score, tags, date)
text = 'Testbed: %s<br />' % testbeds[0] text = 'Testbed: %s<br />' % testbeds[0]
dut_table = '<table><tr><td>DUT_HW</td><td>DUT_SW</td><td>DUT model</td><td>DUT Serial</td><td>Tests passed</td><td>Tests failed</td></tr>' \ dut_table = '<table style="border:1px solid #ddd"><tr>' \
'<tr><td style="white-space:nowrap">%s</td><td style="white-space:nowrap">%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr></table>' % ( '<td>Device</td>' \
dut_hw, dut_sw, dut_model, dut_serial, test_pass_fail_results['PASS'], '<td>DUT_HW</td>' \
'<td>DUT_SW</td>' \
'<td>DUT model</td>' \
'<td>DUT Serial</td>' \
'<td>Tests passed</td>' \
'<td>Tests failed</td></tr>'
for device, data in devices.items():
dut_table = dut_table + '<tr><td style="white-space:nowrap; border:1px solid #ddd">%s</td>' \
'<td style="white-space:nowrap; border:1px solid #ddd">%s</td>' \
'<td style="white-space:nowrap; border:1px solid #ddd">%s</td>' \
'<td style="white-space:nowrap; border:1px solid #ddd">%s</td>' \
'<td style="white-space:nowrap; border:1px solid #ddd">%s</td>' \
'<td style="white-space:nowrap; border:1px solid #ddd">%s</td>' \
'<td style="white-space:nowrap; border:1px solid #ddd">%s</td></tr></table>' % (
device, data[0], data[1], data[2], data[3], test_pass_fail_results['PASS'],
test_pass_fail_results['FAIL']) test_pass_fail_results['FAIL'])
text = text + dut_table text = text + dut_table