Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
C-Dash: Add hoststack
[csit.git]
/
csit.infra.dash
/
app
/
cdash
/
report
/
graphs.py
diff --git
a/csit.infra.dash/app/cdash/report/graphs.py
b/csit.infra.dash/app/cdash/report/graphs.py
index
4d585f4
..
411a599
100644
(file)
--- a/
csit.infra.dash/app/cdash/report/graphs.py
+++ b/
csit.infra.dash/app/cdash/report/graphs.py
@@
-1,4
+1,4
@@
-# Copyright (c) 202
2
Cisco and/or its affiliates.
+# Copyright (c) 202
3
Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@
-11,10
+11,9
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-"""
+"""
Implementation of graphs for iterative data.
"""
"""
-import re
import plotly.graph_objects as go
import pandas as pd
import plotly.graph_objects as go
import pandas as pd
@@
-47,26
+46,20
@@
def select_iterative_data(data: pd.DataFrame, itm:dict) -> pd.DataFrame:
else:
return None
else:
return None
- core = str() if itm["dut"] == "trex" else f"{itm['core']}"
- ttype = "ndrpdr" if itm["testtype"] in ("ndr", "pdr") else itm["testtype"]
- dut_v100 = "none" if itm["dut"] == "trex" else itm["dut"]
- dut_v101 = itm["dut"]
-
+ if itm["testtype"] in ("ndr", "pdr"):
+ test_type = "ndrpdr"
+ elif itm["testtype"] == "mrr":
+ test_type = "mrr"
+ elif itm["area"] == "hoststack":
+ test_type = "hoststack"
df = data.loc[(
(data["release"] == itm["rls"]) &
df = data.loc[(
(data["release"] == itm["rls"]) &
- (
- (
- (data["version"] == "1.0.0") &
- (data["dut_type"].str.lower() == dut_v100)
- ) |
- (
- (data["version"] == "1.0.1") &
- (data["dut_type"].str.lower() == dut_v101)
- )
- ) &
- (data["test_type"] == ttype) &
+ (data["test_type"] == test_type) &
(data["passed"] == True)
)]
(data["passed"] == True)
)]
+
+ core = str() if itm["dut"] == "trex" else f"{itm['core']}"
+ ttype = "ndrpdr" if itm["testtype"] in ("ndr", "pdr") else itm["testtype"]
regex_test = \
f"^.*[.|-]{nic}.*{itm['framesize']}-{core}-{drv}{itm['test']}-{ttype}$"
df = df[
regex_test = \
f"^.*[.|-]{nic}.*{itm['framesize']}-{core}-{drv}{itm['test']}-{ttype}$"
df = df[