Skip to content

Commit

Permalink
[uss_qualifier] MockUssClient and test steps with FlightPlannerClient (
Browse files Browse the repository at this point in the history
…#347)

* Added V1FlightPlannerClient to MockUssClient; added test steps to plan flight using FlightPlannerClient

* Removing unwanted port mapping

* Removing unwanted import

* Update monitoring/uss_qualifier/resources/interuss/mock_uss/client.py

Co-authored-by: Benjamin Pelletier <[email protected]>

* Fixing per PR review comments

* Remove an unwanted import

* Adding missing code

* Removing code causing failure

* Fix bug

* Fix format

* Fix bug

* Update monitoring/uss_qualifier/scenarios/flight_planning/test_steps.py

Co-authored-by: Benjamin Pelletier <[email protected]>

* Fixing PR review comments

* Removing if condition not required

* Fix per PR review

* Nit fix per review

---------

Co-authored-by: Benjamin Pelletier <[email protected]> 58fdbcb
  • Loading branch information
github-actions[bot] committed Nov 20, 2023
1 parent 0d8dbb3 commit be36498
Show file tree
Hide file tree
Showing 182 changed files with 76,170 additions and 40,704 deletions.
2 changes: 1 addition & 1 deletion artifacts/uss_qualifier/reports/dss_probing/report.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"test_run_information": {
"test_run_id": "50af90781f2790a49f04388632e1f281b757c95ab07de3d7fa23f81fc558a878",
"start_time": "2023-11-18 17:35:55 UTC",
"end_time": "2023-11-18 17:37:02 UTC",
"baseline": "5fc4c0a231aed29288a0f8791677daa385c7704e170308ab2ba1eb5eb2bd984f",
"test_run_id": "9797aaeb0560dee780ac3e8e6aff1e45e8317f7781f5d6ef24d250f68fba996d",
"start_time": "2023-11-20 19:49:56 UTC",
"end_time": "2023-11-20 19:51:03 UTC",
"baseline": "512ad1fabc681dec07734fa3b463ad57a8e00a3c56a6f36928852d8e780086e5",
"environment": "383670842b90e623e04660bab8132198849a61457e0d90caf9eebb0df6322efb"
},
"participant_verifications": {
Expand Down
1,762 changes: 881 additions & 881 deletions artifacts/uss_qualifier/reports/dss_probing/requirements/uss1.html

Large diffs are not rendered by default.

1,762 changes: 881 additions & 881 deletions artifacts/uss_qualifier/reports/dss_probing/requirements/uss2.html

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions artifacts/uss_qualifier/reports/dss_probing/sequence/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>TR-50af907 sequence view</title>
<title>TR-9797aae sequence view</title>
<style>
body {
margin: 0;
Expand Down Expand Up @@ -107,31 +107,31 @@ <h1>Sequence view of uss_qualifier test run</h1>
</tr>
<tr>
<td>Test run identifier</td>
<td>TR-50af907</td>
<td>TR-9797aae</td>
</tr>
<tr>
<td>Start time</td>
<td>2023-11-18 17:35:55 UTC</td>
<td>2023-11-20 19:49:56 UTC</td>
</tr>
<tr>
<td>End time</td>
<td>2023-11-18 17:37:02 UTC</td>
<td>2023-11-20 19:51:03 UTC</td>
</tr>
<tr>
<td>Test baseline identifier</td>
<td>TB-5fc4c0a</td>
<td>TB-512ad1f</td>
</tr>
<tr>
<td>Environment identifier</td>
<td>TE-3836708</td>
</tr>
<tr>
<td>Codebase version</td>
<td>interuss/monitoring/v0.0.0-190def8</td>
<td>interuss/monitoring/v0.0.0-58fdbcb</td>
</tr>
<tr>
<td>Commit hash</td>
<td>190def8ac7497ab0ebc45c6f6dcb2b6b4cf61083</td>
<td>58fdbcb3d0747679f8da64344861bff5501ba53f</td>
</tr>
</table>
</div>
Expand Down
330 changes: 165 additions & 165 deletions artifacts/uss_qualifier/reports/dss_probing/sequence/s1.html

Large diffs are not rendered by default.

314 changes: 157 additions & 157 deletions artifacts/uss_qualifier/reports/dss_probing/sequence/s10.html

Large diffs are not rendered by default.

140 changes: 70 additions & 70 deletions artifacts/uss_qualifier/reports/dss_probing/sequence/s11.html

Large diffs are not rendered by default.

70 changes: 35 additions & 35 deletions artifacts/uss_qualifier/reports/dss_probing/sequence/s12.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
</head>
<body>
<div>
<h2><a href="https://github.com/interuss/monitoring/blob/190def8ac7497ab0ebc45c6f6dcb2b6b4cf61083/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_expiry.md">ASTM NetRID DSS: ISA Expiry</a></h2>
<h2><a href="https://github.com/interuss/monitoring/blob/58fdbcb3d0747679f8da64344861bff5501ba53f/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_expiry.md">ASTM NetRID DSS: ISA Expiry</a></h2>
<h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
<table>
<tr class="header_row">
Expand All @@ -105,10 +105,10 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>

<tr id="e1">
<td rowspan="2"><span class="sticky_cell_value">
<a href="https://github.com/interuss/monitoring/blob/190def8ac7497ab0ebc45c6f6dcb2b6b4cf61083/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_expiry.md#setup-test-case">Setup</a>
<a href="https://github.com/interuss/monitoring/blob/58fdbcb3d0747679f8da64344861bff5501ba53f/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_expiry.md#setup-test-case">Setup</a>
</span></td>
<td rowspan="2"><span class="sticky_cell_value">
<a href="https://github.com/interuss/monitoring/blob/190def8ac7497ab0ebc45c6f6dcb2b6b4cf61083/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_expiry.md#ensure-clean-workspace-test-step">Ensure clean workspace</a>
<a href="https://github.com/interuss/monitoring/blob/58fdbcb3d0747679f8da64344861bff5501ba53f/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_expiry.md#ensure-clean-workspace-test-step">Ensure clean workspace</a>
</span></td>
<td><a href="#e1">1</a></td>
<td>&#x1F310;</td>
Expand All @@ -131,7 +131,7 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">initiated_at</div>:
<div class="node_value"> 2023-11-18T17:36:12.411883Z
<div class="node_value"> 2023-11-20T19:50:13.494434Z
</div>
</li>
<li class="collapseable">
Expand Down Expand Up @@ -159,7 +159,7 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">Authorization</div>:
<div class="node_value"> Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMDMzMjU2MSwiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy5yZWFkLmlkZW50aWZpY2F0aW9uX3NlcnZpY2VfYXJlYXMiLCJzdWIiOiJ1c3NfcXVhbGlmaWVyIn0.REDACTED
<div class="node_value"> Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMDUxMzQwMiwiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy5yZWFkLmlkZW50aWZpY2F0aW9uX3NlcnZpY2VfYXJlYXMiLCJzdWIiOiJ1c3NfcXVhbGlmaWVyIn0.REDACTED
</div>
</li>
</ul>
Expand Down Expand Up @@ -198,7 +198,7 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">Date</div>:
<div class="node_value"> Sat, 18 Nov 2023 17:36:12 GMT
<div class="node_value"> Mon, 20 Nov 2023 19:50:13 GMT
</div>
</li>
<li class="not_collapseable">
Expand All @@ -212,20 +212,20 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">elapsed_s</div>:
<div class="node_value"> 0.001419
<div class="node_value"> 0.001459
</div>
</li>
<li class="not_collapseable">
<div class="node_key">reported</div>:
<div class="node_value"> 2023-11-18T17:36:12.413967Z
<div class="node_value"> 2023-11-20T19:50:13.496671Z
</div>
</li>
<li class="collapseable">
<div class="node_key">json</div>:
<div class="node_value"> <ul>
<li class="not_collapseable">
<div class="node_key">message</div>:
<div class="node_value"> ISA 00000171-e36d-40be-d38b-eca6ca350000 not found (E:37eb9bec-6680-4869-97dd-97c2efef1a55)
<div class="node_value"> ISA 00000171-e36d-40be-d38b-eca6ca350000 not found (E:2718bb87-73c9-4081-8fa3-23800d8b5a41)
</div>
</li>
</ul>
Expand Down Expand Up @@ -263,10 +263,10 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</tr>
<tr id="e3">
<td rowspan="6"><span class="sticky_cell_value">
<a href="https://github.com/interuss/monitoring/blob/190def8ac7497ab0ebc45c6f6dcb2b6b4cf61083/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_expiry.md#isa-expiry-test-case">ISA Expiry</a>
<a href="https://github.com/interuss/monitoring/blob/58fdbcb3d0747679f8da64344861bff5501ba53f/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_expiry.md#isa-expiry-test-case">ISA Expiry</a>
</span></td>
<td rowspan="6"><span class="sticky_cell_value">
<a href="https://github.com/interuss/monitoring/blob/190def8ac7497ab0ebc45c6f6dcb2b6b4cf61083/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_expiry.md#isa-expiry-test-step">ISA Expiry</a>
<a href="https://github.com/interuss/monitoring/blob/58fdbcb3d0747679f8da64344861bff5501ba53f/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_expiry.md#isa-expiry-test-step">ISA Expiry</a>
</span></td>
<td><a href="#e3">3</a></td>
<td>&#x1F310;</td>
Expand All @@ -289,7 +289,7 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">initiated_at</div>:
<div class="node_value"> 2023-11-18T17:36:12.415168Z
<div class="node_value"> 2023-11-20T19:50:13.497973Z
</div>
</li>
<li class="collapseable">
Expand Down Expand Up @@ -327,7 +327,7 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">Authorization</div>:
<div class="node_value"> Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMDMzMjU3MiwiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy53cml0ZS5pZGVudGlmaWNhdGlvbl9zZXJ2aWNlX2FyZWFzIiwic3ViIjoidXNzX3F1YWxpZmllciJ9.REDACTED
<div class="node_value"> Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMDUxMzQxMywiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy53cml0ZS5pZGVudGlmaWNhdGlvbl9zZXJ2aWNlX2FyZWFzIiwic3ViIjoidXNzX3F1YWxpZmllciJ9.REDACTED
</div>
</li>
</ul>
Expand Down Expand Up @@ -441,12 +441,12 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">time_start</div>:
<div class="node_value"> 2023-11-18T17:36:12.414446Z
<div class="node_value"> 2023-11-20T19:50:13.497259Z
</div>
</li>
<li class="not_collapseable">
<div class="node_key">time_end</div>:
<div class="node_value"> 2023-11-18T17:36:17.414446Z
<div class="node_value"> 2023-11-20T19:50:18.497259Z
</div>
</li>
</ul>
Expand All @@ -460,7 +460,7 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">request_id</div>:
<div class="node_value"> 7a13747f-7c35-47f0-a54f-53b441957d63
<div class="node_value"> 4101e3f8-03f3-4eaf-9d88-f8e62f87f518
</div>
</li>
</ul>
Expand Down Expand Up @@ -494,7 +494,7 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">Date</div>:
<div class="node_value"> Sat, 18 Nov 2023 17:36:12 GMT
<div class="node_value"> Mon, 20 Nov 2023 19:50:13 GMT
</div>
</li>
<li class="not_collapseable">
Expand All @@ -508,12 +508,12 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">elapsed_s</div>:
<div class="node_value"> 0.005858
<div class="node_value"> 0.004966
</div>
</li>
<li class="not_collapseable">
<div class="node_key">reported</div>:
<div class="node_value"> 2023-11-18T17:36:12.421769Z
<div class="node_value"> 2023-11-20T19:50:13.503579Z
</div>
</li>
<li class="collapseable">
Expand Down Expand Up @@ -541,17 +541,17 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">time_start</div>:
<div class="node_value"> 2023-11-18T17:36:12.414446Z
<div class="node_value"> 2023-11-20T19:50:13.497259Z
</div>
</li>
<li class="not_collapseable">
<div class="node_key">time_end</div>:
<div class="node_value"> 2023-11-18T17:36:17.414446Z
<div class="node_value"> 2023-11-20T19:50:18.497259Z
</div>
</li>
<li class="not_collapseable">
<div class="node_key">version</div>:
<div class="node_value"> 1f6686492slvg
<div class="node_value"> 1f6bcl9laq0b0
</div>
</li>
<li class="not_collapseable">
Expand Down Expand Up @@ -618,7 +618,7 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">initiated_at</div>:
<div class="node_value"> 2023-11-18T17:36:17.424457Z
<div class="node_value"> 2023-11-20T19:50:18.510195Z
</div>
</li>
<li class="collapseable">
Expand Down Expand Up @@ -646,7 +646,7 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">Authorization</div>:
<div class="node_value"> Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMDMzMjU2MSwiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy5yZWFkLmlkZW50aWZpY2F0aW9uX3NlcnZpY2VfYXJlYXMiLCJzdWIiOiJ1c3NfcXVhbGlmaWVyIn0.REDACTED
<div class="node_value"> Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMDUxMzQwMiwiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy5yZWFkLmlkZW50aWZpY2F0aW9uX3NlcnZpY2VfYXJlYXMiLCJzdWIiOiJ1c3NfcXVhbGlmaWVyIn0.REDACTED
</div>
</li>
</ul>
Expand Down Expand Up @@ -685,7 +685,7 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">Date</div>:
<div class="node_value"> Sat, 18 Nov 2023 17:36:17 GMT
<div class="node_value"> Mon, 20 Nov 2023 19:50:18 GMT
</div>
</li>
<li class="not_collapseable">
Expand All @@ -699,12 +699,12 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">elapsed_s</div>:
<div class="node_value"> 0.002286
<div class="node_value"> 0.002051
</div>
</li>
<li class="not_collapseable">
<div class="node_key">reported</div>:
<div class="node_value"> 2023-11-18T17:36:17.427631Z
<div class="node_value"> 2023-11-20T19:50:18.513017Z
</div>
</li>
<li class="collapseable">
Expand Down Expand Up @@ -772,7 +772,7 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">initiated_at</div>:
<div class="node_value"> 2023-11-18T17:36:17.428262Z
<div class="node_value"> 2023-11-20T19:50:18.513607Z
</div>
</li>
<li class="collapseable">
Expand Down Expand Up @@ -800,7 +800,7 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">Authorization</div>:
<div class="node_value"> Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMDMzMjU2MSwiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy5yZWFkLmlkZW50aWZpY2F0aW9uX3NlcnZpY2VfYXJlYXMiLCJzdWIiOiJ1c3NfcXVhbGlmaWVyIn0.REDACTED
<div class="node_value"> Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMDUxMzQwMiwiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy5yZWFkLmlkZW50aWZpY2F0aW9uX3NlcnZpY2VfYXJlYXMiLCJzdWIiOiJ1c3NfcXVhbGlmaWVyIn0.REDACTED
</div>
</li>
</ul>
Expand Down Expand Up @@ -839,7 +839,7 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">Date</div>:
<div class="node_value"> Sat, 18 Nov 2023 17:36:17 GMT
<div class="node_value"> Mon, 20 Nov 2023 19:50:18 GMT
</div>
</li>
<li class="not_collapseable">
Expand All @@ -853,12 +853,12 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">elapsed_s</div>:
<div class="node_value"> 0.001393
<div class="node_value"> 0.001231
</div>
</li>
<li class="not_collapseable">
<div class="node_key">reported</div>:
<div class="node_value"> 2023-11-18T17:36:17.430222Z
<div class="node_value"> 2023-11-20T19:50:18.515382Z
</div>
</li>
<li class="collapseable">
Expand All @@ -879,17 +879,17 @@ <h3>scenarios.astm.netrid.v19.dss.ISAExpiry</h3>
</li>
<li class="not_collapseable">
<div class="node_key">time_start</div>:
<div class="node_value"> 2023-11-18T17:36:12.414446Z
<div class="node_value"> 2023-11-20T19:50:13.497259Z
</div>
</li>
<li class="not_collapseable">
<div class="node_key">time_end</div>:
<div class="node_value"> 2023-11-18T17:36:17.414446Z
<div class="node_value"> 2023-11-20T19:50:18.497259Z
</div>
</li>
<li class="not_collapseable">
<div class="node_key">version</div>:
<div class="node_value"> 1f6686492slvg
<div class="node_value"> 1f6bcl9laq0b0
</div>
</li>
<li class="not_collapseable">
Expand Down
Loading

0 comments on commit be36498

Please sign in to comment.