Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[uss_qualifier] Add information to sequence view index page #255

Merged
merged 1 commit into from
Oct 16, 2023
Merged

[uss_qualifier] Add information to sequence view index page #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions monitoring/uss_qualifier/reports/sequence_view.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from monitoring.uss_qualifier.configurations.configuration import (
ParticipantID,
SequenceViewConfiguration,
TestConfiguration,
)
from monitoring.uss_qualifier.reports import jinja_env
from monitoring.uss_qualifier.reports.report import (
Expand All @@ -20,6 +21,9 @@
PassedCheck,
FailedCheck,
)
from monitoring.uss_qualifier.reports.tested_requirements import (
compute_test_run_information,
)
from monitoring.uss_qualifier.scenarios.definitions import TestScenarioTypeName


Expand Down Expand Up @@ -482,6 +486,8 @@ def generate_sequence_view(
with open(overview_file, "w") as f:
f.write(
template.render(
report=report,
test_run=compute_test_run_information(report),
overview_rows=overview_rows,
max_suite_cols=max_suite_cols,
all_participants=all_participants,
Expand Down
93 changes: 91 additions & 2 deletions monitoring/uss_qualifier/reports/templates/sequence_view/overview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<html>
<!DOCTYPE html>
{% from "explorer.html" import explorer_header, explorer_content, explorer_footer %}
<html lang="en">
<head>
<title>TR-{{ test_run.test_run_id[0:7] }} sequence view</title>
<style>
body {
margin: 0;
Expand Down Expand Up @@ -58,9 +61,91 @@
background-color: rgb(192, 192, 192);
}
</style>
{{ explorer_header() }}
</head>
<body>
{% set collapsible = namespace(queries=[]) %}

<h1>Sequence view of uss_qualifier test run</h1>

<div id="test_run_section" class="collapseable">
<div class="node_key" onclick="showHide(document.getElementById('test_run_section'))"><h2>Test run</h2></div>
<div class="node_value">
<table>
<tr>
<th>Test characteristic</th>
<th>Value</th>
</tr>
<tr>
<td>Test run identifier</td>
<td>TR-{{ test_run.test_run_id[0:7] }}</td>
</tr>
{% if test_run.start_time %}
<tr>
<td>Start time</td>
<td>{{ test_run.start_time }}</td>
</tr>
{% endif %}
{% if test_run.end_time %}
<tr>
<td>End time</td>
<td>{{ test_run.end_time }}</td>
</tr>
{% endif %}
<tr>
<td>Test baseline identifier</td>
<td>TB-{{ test_run.baseline[0:7] }}</td>
</tr>
<tr>
<td>Environment identifier</td>
<td>TE-{{ test_run.environment[0:7] }}</td>
</tr>
<tr>
<td>Codebase version</td>
<td>{{ report.codebase_version }}</td>
</tr>
<tr>
<td>Commit hash</td>
<td>{{ report.commit_hash }}</td>
</tr>
</table>
</div>
</div>

<div id="configuration_section" class="collapseable">
<div class="node_key" onclick="showHide(document.getElementById('configuration_section'))"><h2>Configuration</h2></div>
<div class="node_value">
{% for is_baseline in (True, False) %}
<h3>{{ "Baseline" if is_baseline else "Environment" }}</h3>
<ul>
{% set current = namespace(address="v1.test_run.resources.resource_declarations") %}
{% for resource_id, resource_dec in report.configuration.resources.resource_declarations.items() %}
{% set current.address = current.address + "." + resource_id %}
{% if (current.address in report.configuration.non_baseline_inputs) != is_baseline %}
<li id="resource_{{ resource_id }}"><code>{{ resource_id }}</code> ({{ resource_dec.resource_type }})
<ul>
{% if resource_dec.dependencies %}
{% for local_name, source_name in resource_dec.dependencies.items() %}
<li><code>{{ local_name }}</code>: From <a href="#resource_{{ source_name }}"><code>{{ source_name }}</code> resource</a></li>
{% endfor %}
{% endif %}
<li>Specification:
{% set spec_id = "specification_" + resource_id %}
{{ explorer_content(spec_id, resource_dec.specification) }}
{% set collapsible.queries = collapsible.queries + [spec_id] %}
</li>
</ul>
</li>
{% endif %}
{% set current.address = ".".join(current.address.split(".")[0:-1]) %}
{% endfor %}
</ul>
{% endfor %}
</div>
</div>

<div>
<h2>Scenarios executed</h2>
<table>
<tr>
{% if max_suite_cols > 0 %}
Expand All @@ -78,7 +163,7 @@
{% if suite_cell.node != None %}
<td rowspan="{{ suite_cell.node.rows }}" colspan="{{ suite_cell.colspan }}">{{ suite_cell.node.name }}</td>
{% else %}
<td rowspan="{{ suite_cell.rowspan }}" colspan="{{ suite_cell.colspan }}"></td>
<td rowspan="{{ suite_cell.rowspan }}" colspan="{{ suite_cell.colspan }}">&rarr;</td>
{% endif %}
{% endif %}
{% endfor %}
Expand All @@ -100,5 +185,9 @@
{% endfor %}
</table>
</div>
{{ explorer_footer(collapsible.queries) }}
<script>
showHide(document.getElementById('configuration_section'));
</script>
</body>
</html>
4 changes: 2 additions & 2 deletions monitoring/uss_qualifier/reports/tested_requirements.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,12 @@ def generate_tested_requirements(
participant_id=participant_id,
other_participants=other_participants,
breakdown=participant_breakdown,
test_run=_compute_test_run_information(report),
test_run=compute_test_run_information(report),
)
)


def _compute_test_run_information(report: TestRunReport) -> TestRunInformation:
def compute_test_run_information(report: TestRunReport) -> TestRunInformation:
def print_datetime(t: Optional[StringBasedDateTime]) -> Optional[str]:
if t is None:
return None
Expand Down
Loading