Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Report: Add data
[csit.git]
/
resources
/
tools
/
presentation
/
generator_tables.py
diff --git
a/resources/tools/presentation/generator_tables.py
b/resources/tools/presentation/generator_tables.py
index
d6b234e
..
0d52ce1
100644
(file)
--- a/
resources/tools/presentation/generator_tables.py
+++ b/
resources/tools/presentation/generator_tables.py
@@
-47,7
+47,6
@@
def generate_tables(spec, data):
"""
generator = {
"""
generator = {
- u"table_details": table_details,
u"table_merged_details": table_merged_details,
u"table_perf_comparison": table_perf_comparison,
u"table_perf_comparison_nic": table_perf_comparison_nic,
u"table_merged_details": table_merged_details,
u"table_perf_comparison": table_perf_comparison,
u"table_perf_comparison_nic": table_perf_comparison_nic,
@@
-97,7
+96,14
@@
def table_oper_data_html(table, input_data):
if data.empty:
return
data = input_data.merge_data(data)
if data.empty:
return
data = input_data.merge_data(data)
- data.sort_index(inplace=True)
+
+ sort_tests = table.get(u"sort", None)
+ if sort_tests and sort_tests in (u"ascending", u"descending"):
+ args = dict(
+ inplace=True,
+ ascending=True if sort_tests == u"ascending" else False
+ )
+ data.sort_index(**args)
suites = input_data.filter_data(
table,
suites = input_data.filter_data(
table,
@@
-285,12
+291,15
@@
def table_merged_details(table, input_data):
)
data = input_data.filter_data(table, continue_on_error=True)
data = input_data.merge_data(data)
)
data = input_data.filter_data(table, continue_on_error=True)
data = input_data.merge_data(data)
- data.sort_index(inplace=True)
- logging.info(
- f" Creating the data set for the {table.get(u'type', u'')} "
- f"{table.get(u'title', u'')}."
- )
+ sort_tests = table.get(u"sort", None)
+ if sort_tests and sort_tests in (u"ascending", u"descending"):
+ args = dict(
+ inplace=True,
+ ascending=True if sort_tests == u"ascending" else False
+ )
+ data.sort_index(**args)
+
suites = input_data.filter_data(
table, continue_on_error=True, data_set=u"suites")
suites = input_data.merge_data(suites)
suites = input_data.filter_data(
table, continue_on_error=True, data_set=u"suites")
suites = input_data.merge_data(suites)
@@
-1527,7
+1536,7
@@
def _generate_url(testbed, test_name):
elif u"dnv" in testbed or u"tsh" in testbed:
driver = u"ixgbe"
else:
elif u"dnv" in testbed or u"tsh" in testbed:
driver = u"ixgbe"
else:
- driver = u"
i40e
"
+ driver = u"
dpdk
"
if u"acl" in test_name or \
u"macip" in test_name or \
if u"acl" in test_name or \
u"macip" in test_name or \