Fix merge issues (#392) a6e022c

interuss · Dec 7, 2023 · 508b0e1 · 508b0e1
1 parent 7f96bdf
commit 508b0e1
Show file tree

Hide file tree

Showing 212 changed files with 172,241 additions and 110,743 deletions.
diff --git a/artifacts/uss_qualifier/reports/dss_probing/report.json b/artifacts/uss_qualifier/reports/dss_probing/report.json
diff --git a/artifacts/uss_qualifier/reports/dss_probing/requirements/1.html b/artifacts/uss_qualifier/reports/dss_probing/requirements/1.html
diff --git a/artifacts/uss_qualifier/reports/dss_probing/requirements/2.html b/artifacts/uss_qualifier/reports/dss_probing/requirements/2.html
diff --git a/artifacts/uss_qualifier/reports/dss_probing/requirements/s.html b/artifacts/uss_qualifier/reports/dss_probing/requirements/s.html
diff --git a/artifacts/uss_qualifier/reports/dss_probing/requirements/status.json b/artifacts/uss_qualifier/reports/dss_probing/requirements/status.json
@@ -1,9 +1,9 @@
 {
   "test_run_information": {
-    "test_run_id": "3847bf49972c380b56913ead4304314c950554e73d713e9e4f5dfe96ce99e2d3",
-    "start_time": "2023-12-05 04:29:00 UTC",
-    "end_time": "2023-12-05 04:31:01 UTC",
-    "baseline": "49af11c22c53e7d203ba3649ea0ab2e24fe4624ed48eed8d7bd899646ea9c21a",
+    "test_run_id": "2147be454a40de06e57b6eb72d59cd582429263f96b4b0a5ab83e53a7e234dba",
+    "start_time": "2023-12-07 17:16:53 UTC",
+    "end_time": "2023-12-07 17:18:54 UTC",
+    "baseline": "9865194eaec9c4c49a5b7fe5fc08a601462aa91ed45f896b6153e4a7d384eadd",
     "environment": "383670842b90e623e04660bab8132198849a61457e0d90caf9eebb0df6322efb"
   },
   "participant_verifications": {

diff --git a/artifacts/uss_qualifier/reports/dss_probing/requirements/u.html b/artifacts/uss_qualifier/reports/dss_probing/requirements/u.html
diff --git a/artifacts/uss_qualifier/reports/dss_probing/requirements/uss1.html b/artifacts/uss_qualifier/reports/dss_probing/requirements/uss1.html
diff --git a/artifacts/uss_qualifier/reports/dss_probing/requirements/uss2.html b/artifacts/uss_qualifier/reports/dss_probing/requirements/uss2.html
diff --git a/artifacts/uss_qualifier/reports/dss_probing/sequence/index.html b/artifacts/uss_qualifier/reports/dss_probing/sequence/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <title>TR-3847bf4 sequence view</title>
+  <title>TR-2147be4 sequence view</title>
   <style>
     body {
       margin: 0;
@@ -107,31 +107,31 @@ <h1>Sequence view of uss_qualifier test run</h1>
       </tr>
       <tr>
         <td>Test run identifier</td>
-        <td>TR-3847bf4</td>
+        <td>TR-2147be4</td>
       </tr>
       <tr>
         <td>Start time</td>
-        <td>2023-12-05 04:29:00 UTC</td>
+        <td>2023-12-07 17:16:53 UTC</td>
       </tr>
       <tr>
         <td>End time</td>
-        <td>2023-12-05 04:31:01 UTC</td>
+        <td>2023-12-07 17:18:54 UTC</td>
       </tr>
       <tr>
         <td>Test baseline identifier</td>
-        <td>TB-49af11c</td>
+        <td>TB-9865194</td>
       </tr>
       <tr>
         <td>Environment identifier</td>
         <td>TE-3836708</td>
       </tr>
       <tr>
         <td>Codebase version</td>
-        <td>interuss/monitoring/v0.0.0-817060b</td>
+        <td>interuss/monitoring/v0.0.0-a6e022c</td>
       </tr>
       <tr>
         <td>Commit hash</td>
-        <td>817060bf9a5bb4c317c6623ee2ebb1a00b8ae1cd</td>
+        <td>a6e022cc39e6e6fed443720c0a3d77a6b4b3dd33</td>
       </tr>
     </table>
   </div>

diff --git a/artifacts/uss_qualifier/reports/dss_probing/sequence/s1.html b/artifacts/uss_qualifier/reports/dss_probing/sequence/s1.html
diff --git a/artifacts/uss_qualifier/reports/dss_probing/sequence/s10.html b/artifacts/uss_qualifier/reports/dss_probing/sequence/s10.html
diff --git a/artifacts/uss_qualifier/reports/dss_probing/sequence/s11.html b/artifacts/uss_qualifier/reports/dss_probing/sequence/s11.html
diff --git a/artifacts/uss_qualifier/reports/dss_probing/sequence/s12.html b/artifacts/uss_qualifier/reports/dss_probing/sequence/s12.html
diff --git a/artifacts/uss_qualifier/reports/dss_probing/sequence/s13.html b/artifacts/uss_qualifier/reports/dss_probing/sequence/s13.html
@@ -91,7 +91,7 @@
 </head>
 <body>
 <div>
-    <h2><a href="https://github.com/interuss/monitoring/blob/817060bf9a5bb4c317c6623ee2ebb1a00b8ae1cd/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/a6e022cc39e6e6fed443720c0a3d77a6b4b3dd33/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">
@@ -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/817060bf9a5bb4c317c6623ee2ebb1a00b8ae1cd/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_expiry.md#setup-test-case">Setup</a>
+                    <a href="https://github.com/interuss/monitoring/blob/a6e022cc39e6e6fed443720c0a3d77a6b4b3dd33/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/817060bf9a5bb4c317c6623ee2ebb1a00b8ae1cd/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/test_steps/clean_workspace.md#ensure-clean-workspace-test-step">Ensure clean workspace</a>
+                    <a href="https://github.com/interuss/monitoring/blob/a6e022cc39e6e6fed443720c0a3d77a6b4b3dd33/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/test_steps/clean_workspace.md#ensure-clean-workspace-test-step-fragment">Ensure clean workspace</a>
                 </span></td>
               <td><a href="#e1">1</a></td>
                 <td>&#x1F310;</td>
@@ -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-12-05T04:29:29.014452Z
+        <div class="node_value">    2023-12-07T17:17:21.706505Z
 </div>
       </li>
       <li class="collapseable">
@@ -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.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMTc1NDE0NiwiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy5yZWFkLmlkZW50aWZpY2F0aW9uX3NlcnZpY2VfYXJlYXMiLCJzdWIiOiJ1c3NfcXVhbGlmaWVyIn0.REDACTED
+        <div class="node_value">    Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMTk3MzAxOSwiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy5yZWFkLmlkZW50aWZpY2F0aW9uX3NlcnZpY2VfYXJlYXMiLCJzdWIiOiJ1c3NfcXVhbGlmaWVyIn0.REDACTED
 </div>
       </li>
   </ul>
@@ -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">    Tue, 05 Dec 2023 04:29:29 GMT
+        <div class="node_value">    Thu, 07 Dec 2023 17:17:21 GMT
 </div>
       </li>
       <li class="not_collapseable">
@@ -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.000967
+        <div class="node_value">    0.000966
 </div>
       </li>
       <li class="not_collapseable">
         <div class="node_key">reported</div>:
-        <div class="node_value">    2023-12-05T04:29:29.015826Z
+        <div class="node_value">    2023-12-07T17:17:21.707925Z
 </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:225c7697-b274-4396-b1ff-9416c2f2a722)
+        <div class="node_value">    ISA 00000171-e36d-40be-d38b-eca6ca350000 not found (E:6f2892eb-3e35-48c3-8895-072707ea5951)
 </div>
       </li>
   </ul>
@@ -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/817060bf9a5bb4c317c6623ee2ebb1a00b8ae1cd/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/a6e022cc39e6e6fed443720c0a3d77a6b4b3dd33/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/817060bf9a5bb4c317c6623ee2ebb1a00b8ae1cd/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/a6e022cc39e6e6fed443720c0a3d77a6b4b3dd33/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>
@@ -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-12-05T04:29:29.016891Z
+        <div class="node_value">    2023-12-07T17:17:21.709042Z
 </div>
       </li>
       <li class="collapseable">
@@ -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.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMTc1NDE2OCwiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy53cml0ZS5pZGVudGlmaWNhdGlvbl9zZXJ2aWNlX2FyZWFzIiwic3ViIjoidXNzX3F1YWxpZmllciJ9.REDACTED
+        <div class="node_value">    Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMTk3MzA0MSwiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy53cml0ZS5pZGVudGlmaWNhdGlvbl9zZXJ2aWNlX2FyZWFzIiwic3ViIjoidXNzX3F1YWxpZmllciJ9.REDACTED
 </div>
       </li>
   </ul>
@@ -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-12-05T04:29:29.016192Z
+        <div class="node_value">    2023-12-07T17:17:21.708317Z
 </div>
       </li>
       <li class="not_collapseable">
         <div class="node_key">time_end</div>:
-        <div class="node_value">    2023-12-05T04:29:34.016192Z
+        <div class="node_value">    2023-12-07T17:17:26.708317Z
 </div>
       </li>
   </ul>
@@ -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">    bbd7c065-9c60-446e-86dc-0423bf7d16ed
+        <div class="node_value">    7df8e329-90e2-4e9a-afca-3d2bcebb58de
 </div>
       </li>
   </ul>
@@ -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">    Tue, 05 Dec 2023 04:29:29 GMT
+        <div class="node_value">    Thu, 07 Dec 2023 17:17:21 GMT
 </div>
       </li>
       <li class="not_collapseable">
@@ -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.006197
+        <div class="node_value">    0.006017
 </div>
       </li>
       <li class="not_collapseable">
         <div class="node_key">reported</div>:
-        <div class="node_value">    2023-12-05T04:29:29.023590Z
+        <div class="node_value">    2023-12-07T17:17:21.715563Z
 </div>
       </li>
       <li class="collapseable">
@@ -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-12-05T04:29:29.016192Z
+        <div class="node_value">    2023-12-07T17:17:21.708317Z
 </div>
       </li>
       <li class="not_collapseable">
         <div class="node_key">time_end</div>:
-        <div class="node_value">    2023-12-05T04:29:34.016192Z
+        <div class="node_value">    2023-12-07T17:17:26.708317Z
 </div>
       </li>
       <li class="not_collapseable">
         <div class="node_key">version</div>:
-        <div class="node_value">    1f7el4199s28g
+        <div class="node_value">    1f7ks62br02hg
 </div>
       </li>
       <li class="not_collapseable">
@@ -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-12-05T04:29:34.025974Z
+        <div class="node_value">    2023-12-07T17:17:26.717817Z
 </div>
       </li>
       <li class="collapseable">
@@ -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.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMTc1NDE0NiwiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy5yZWFkLmlkZW50aWZpY2F0aW9uX3NlcnZpY2VfYXJlYXMiLCJzdWIiOiJ1c3NfcXVhbGlmaWVyIn0.REDACTED
+        <div class="node_value">    Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMTk3MzAxOSwiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy5yZWFkLmlkZW50aWZpY2F0aW9uX3NlcnZpY2VfYXJlYXMiLCJzdWIiOiJ1c3NfcXVhbGlmaWVyIn0.REDACTED
 </div>
       </li>
   </ul>
@@ -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">    Tue, 05 Dec 2023 04:29:34 GMT
+        <div class="node_value">    Thu, 07 Dec 2023 17:17:26 GMT
 </div>
       </li>
       <li class="not_collapseable">
@@ -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.002284
+        <div class="node_value">    0.002254
 </div>
       </li>
       <li class="not_collapseable">
         <div class="node_key">reported</div>:
-        <div class="node_value">    2023-12-05T04:29:34.028822Z
+        <div class="node_value">    2023-12-07T17:17:26.720736Z
 </div>
       </li>
       <li class="collapseable">
@@ -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-12-05T04:29:34.029367Z
+        <div class="node_value">    2023-12-07T17:17:26.721290Z
 </div>
       </li>
       <li class="collapseable">
@@ -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.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMTc1NDE0NiwiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy5yZWFkLmlkZW50aWZpY2F0aW9uX3NlcnZpY2VfYXJlYXMiLCJzdWIiOiJ1c3NfcXVhbGlmaWVyIn0.REDACTED
+        <div class="node_value">    Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJkc3MudXNzMi5sb2NhbHV0bSIsImV4cCI6MTcwMTk3MzAxOSwiaXNzIjoiZHVtbXkiLCJzY29wZSI6ImRzcy5yZWFkLmlkZW50aWZpY2F0aW9uX3NlcnZpY2VfYXJlYXMiLCJzdWIiOiJ1c3NfcXVhbGlmaWVyIn0.REDACTED
 </div>
       </li>
   </ul>
@@ -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">    Tue, 05 Dec 2023 04:29:34 GMT
+        <div class="node_value">    Thu, 07 Dec 2023 17:17:26 GMT
 </div>
       </li>
       <li class="not_collapseable">
@@ -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.001113
+        <div class="node_value">    0.001015
 </div>
       </li>
       <li class="not_collapseable">
         <div class="node_key">reported</div>:
-        <div class="node_value">    2023-12-05T04:29:34.030950Z
+        <div class="node_value">    2023-12-07T17:17:26.722689Z
 </div>
       </li>
       <li class="collapseable">
@@ -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-12-05T04:29:29.016192Z
+        <div class="node_value">    2023-12-07T17:17:21.708317Z
 </div>
       </li>
       <li class="not_collapseable">
         <div class="node_key">time_end</div>:
-        <div class="node_value">    2023-12-05T04:29:34.016192Z
+        <div class="node_value">    2023-12-07T17:17:26.708317Z
 </div>
       </li>
       <li class="not_collapseable">
         <div class="node_key">version</div>:
-        <div class="node_value">    1f7el4199s28g
+        <div class="node_value">    1f7ks62br02hg
 </div>
       </li>
       <li class="not_collapseable">