-# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2023 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:
generate_options, get_list_group_items
from ..utils.url_processing import url_decode
from ..data.data import Data
-from .graphs import graph_iterative, get_short_version, select_iterative_data
+from .graphs import graph_iterative, select_iterative_data
# Control panel partameters and their default values.
self._data = pd.DataFrame()
for rls in releases:
data_mrr = Data(self._data_spec_file, True).\
- read_iterative_mrr(release=rls.replace("csit", "rls"))
+ read_iterative_mrr(release=rls)
data_mrr["release"] = rls
data_ndrpdr = Data(self._data_spec_file, True).\
- read_iterative_ndrpdr(release=rls.replace("csit", "rls"))
+ read_iterative_ndrpdr(release=rls)
data_ndrpdr["release"] = rls
self._data = pd.concat(
[self._data, data_mrr, data_ndrpdr],
ttype = row["test_type"]
lst_job = row["job"].split("-")
dut = lst_job[1]
- d_ver = get_short_version(row["dut_version"], dut)
+ d_ver = row["dut_version"]
tbed = "-".join(lst_job[-2:])
lst_test_id = row["test_id"].split(".")
if dut == "dpdk":
return dbc.Col(
id="col-plotting-area",
children=[
- dcc.Loading(
+ dbc.Spinner(
children=[
dbc.Row(
id="plotting-area",
dbc.Row(
class_name="g-0 p-1",
children=[
- dbc.Label(
- children=show_tooltip(
- self._tooltips,
- "help-framesize",
- "Frame Size"
- )
- ),
- dbc.Col(
- children=[
- dbc.Checklist(
- id={"type": "ctrl-cl", "index": "frmsize-all"},
- options=C.CL_ALL_DISABLED,
- inline=True,
- switch=False,
- input_class_name="border-info bg-info"
+ dbc.InputGroup(
+ [
+ dbc.InputGroupText(
+ children=show_tooltip(
+ self._tooltips,
+ "help-framesize",
+ "Frame Size"
+ )
+ ),
+ dbc.Col(
+ children=[
+ dbc.Checklist(
+ id={
+ "type": "ctrl-cl",
+ "index": "frmsize-all"
+ },
+ options=C.CL_ALL_DISABLED,
+ inline=True,
+ class_name="ms-2"
+ )
+ ],
+ width=2
+ ),
+ dbc.Col(
+ children=[
+ dbc.Checklist(
+ id={
+ "type": "ctrl-cl",
+ "index": "frmsize"
+ },
+ inline=True
+ )
+ ]
)
],
- width=3
- ),
- dbc.Col(
- children=[
- dbc.Checklist(
- id={"type": "ctrl-cl", "index": "frmsize"},
- inline=True,
- switch=False,
- input_class_name="border-info bg-info"
- )
- ]
+ style={"align-items": "center"},
+ size="sm"
)
]
),
dbc.Row(
class_name="g-0 p-1",
children=[
- dbc.Label(
- children=show_tooltip(
- self._tooltips,
- "help-cores",
- "Number of Cores"
- )
- ),
- dbc.Col(
- children=[
- dbc.Checklist(
- id={"type": "ctrl-cl", "index": "core-all"},
- options=C.CL_ALL_DISABLED,
- inline=False,
- switch=False,
- input_class_name="border-info bg-info"
+ dbc.InputGroup(
+ [
+ dbc.InputGroupText(
+ children=show_tooltip(
+ self._tooltips,
+ "help-cores",
+ "Number of Cores"
+ )
+ ),
+ dbc.Col(
+ children=[
+ dbc.Checklist(
+ id={
+ "type": "ctrl-cl",
+ "index": "core-all"
+ },
+ options=C.CL_ALL_DISABLED,
+ inline=True,
+ class_name="ms-2"
+ )
+ ],
+ width=2
+ ),
+ dbc.Col(
+ children=[
+ dbc.Checklist(
+ id={
+ "type": "ctrl-cl",
+ "index": "core"
+ },
+ inline=True
+ )
+ ]
)
],
- width=3
- ),
- dbc.Col(
- children=[
- dbc.Checklist(
- id={"type": "ctrl-cl", "index": "core"},
- inline=True,
- switch=False,
- input_class_name="border-info bg-info"
- )
- ]
+ style={"align-items": "center"},
+ size="sm"
)
]
),
dbc.Row(
class_name="g-0 p-1",
children=[
- dbc.Label(
- children=show_tooltip(
- self._tooltips,
- "help-ttype",
- "Test Type"
- )
- ),
- dbc.Col(
- children=[
- dbc.Checklist(
- id={"type": "ctrl-cl", "index": "tsttype-all"},
- options=C.CL_ALL_DISABLED,
- inline=True,
- switch=False,
- input_class_name="border-info bg-info"
+ dbc.InputGroup(
+ [
+ dbc.InputGroupText(
+ children=show_tooltip(
+ self._tooltips,
+ "help-ttype",
+ "Test Type"
+ )
+ ),
+ dbc.Col(
+ children=[
+ dbc.Checklist(
+ id={
+ "type": "ctrl-cl",
+ "index": "tsttype-all"
+ },
+ options=C.CL_ALL_DISABLED,
+ inline=True,
+ class_name="ms-2"
+ )
+ ],
+ width=2
+ ),
+ dbc.Col(
+ children=[
+ dbc.Checklist(
+ id={
+ "type": "ctrl-cl",
+ "index": "tsttype"
+ },
+ inline=True
+ )
+ ]
)
],
- width=3
- ),
- dbc.Col(
- children=[
- dbc.Checklist(
- id={"type": "ctrl-cl", "index": "tsttype"},
- inline=True,
- switch=False,
- input_class_name="border-info bg-info"
- )
- ]
+ style={"align-items": "center"},
+ size="sm"
)
]
),
dbc.Row(
class_name="g-0 p-1",
children=[
- dbc.Label(
- children=show_tooltip(
- self._tooltips,
- "help-normalize",
- "Normalize"
- )
- ),
- dbc.Col(
- children=[
- dbc.Checklist(
- id="normalize",
- options=[{
- "value": "normalize",
- "label": (
- "Normalize results to CPU "
- "frequency 2GHz"
- )
- }],
- value=[],
- inline=True,
- switch=False,
- input_class_name="border-info bg-info"
+ dbc.InputGroup(
+ [
+ dbc.InputGroupText(
+ children=show_tooltip(
+ self._tooltips,
+ "help-normalize",
+ "Normalization"
+ )
),
- ]
+ dbc.Col(
+ children=[
+ dbc.Checklist(
+ id="normalize",
+ options=[{
+ "value": "normalize",
+ "label": (
+ "Normalize to CPU frequency "
+ "2GHz"
+ )
+ }],
+ value=[],
+ inline=True,
+ class_name="ms-2"
+ )
+ ]
+ )
+ ],
+ style={"align-items": "center"},
+ size="sm"
)
]
),
[
dbc.Button(
id="plot-btn-url",
- children="URL",
+ children="Show URL",
class_name="me-1",
color="info",
style={
f"cl-{param}-val": val_sel,
f"cl-{param}-all-val": val_all,
})
- if all((ctrl_panel.get("cl-core-val"),
+ if all((ctrl_panel.get("cl-core-val"),
ctrl_panel.get("cl-frmsize-val"),
ctrl_panel.get("cl-tsttype-val"), )):
ctrl_panel.set({"btn-add-dis": False})