[uss_qualifier] Update flight intent names (interuss#388)

* Update flight intent names * Fix hash
openskies-sh · Dec 7, 2023 · f5b0ab0 · f5b0ab0
1 parent 1b5e2c2
commit f5b0ab0
Show file tree

Hide file tree

Showing 8 changed files with 241 additions and 261 deletions.
diff --git a/monitoring/uss_qualifier/configurations/dev/library/resources.yaml b/monitoring/uss_qualifier/configurations/dev/library/resources.yaml
@@ -134,7 +134,7 @@ che_conflicting_flights:
     file:
       path: file://./test_data/che/flight_intents/conflicting_flights.yaml
       # Note that this hash_sha512 field can be safely deleted if the content changes
-      hash_sha512: ac109b89c95381ba4685d6db5f7064dac64875a8875e58989aad19d91d2e7b10e568d5091749b5ea2b0892191a84486971d999b63ac8c73fd4249131111a6c58
+      hash_sha512: c35e3536d63b7dd521042cefa094dd1ecd2d3feaf31997ce6a2902361b85c42dec636bec62df853157e46e08d3fc811c00fedfd6dfe4b8bbd0506149cfeb4a17
 
 che_invalid_flight_intents:
   $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json

diff --git a/.../conflict_equal_priority_not_permitted/conflict_equal_priority_not_permitted.md b/.../conflict_equal_priority_not_permitted/conflict_equal_priority_not_permitted.md
@@ -31,48 +31,48 @@ Otherwise, the FlightIntentsResource must provide the following flight intents:
     <th>Must not conflict with</th>
   </tr>
   <tr>
-    <td><code>flight_1_planned_vol_A</code></td>
+    <td><code>flight1_planned</code></td>
     <td rowspan="2">Flight 1</td>
     <td rowspan="8">Any (but all the same)</td>
     <td>Accepted</td>
     <td rowspan="2">Flight 2</td>
     <td rowspan="2">N/A</td>
   </tr>
   <tr>
-    <td><code>flight_1_activated_vol_A</code></td>
+    <td><code>flight1_activated</code></td>
     <td>Activated</td>
   </tr>
   <tr>
-    <td><code>flight_1_activated_vol_A_extended</code></td>
+    <td><code>flight1m_activated</code></td>
     <td>Flight 1m</td>
     <td>Activated</td>
     <td>Flight 2</td>
     <td>N/A</td>
   </tr>
   <tr>
-    <td><code>flight_1_planned_vol_B</code></td>
+    <td><code>flight1c_planned</code></td>
     <td rowspan="2">Flight 1c</td>
     <td>Planned</td>
     <td rowspan="2">N/A</td>
     <td rowspan="2">Flight 2</td>
   </tr>
   <tr>
-    <td><code>flight_1_activated_vol_B</code></td>
+    <td><code>flight1c_activated</code></td>
     <td>Activated</td>
   </tr>
   <tr>
-    <td><code>flight_2_equal_prio_planned_vol_B</code></td>
+    <td><code>equal_prio_flight2_planned</code></td>
     <td rowspan="3">Flight 2</td>
     <td>Planned</td>
     <td rowspan="3">Flight 1, Flight 1m</td>
     <td rowspan="3">Flight 1c</td>
   </tr>
   <tr>
-    <td><code>flight_2_equal_prio_activated_vol_B</code></td>
+    <td><code>equal_prio_flight2_activated</code></td>
     <td>Activated</td>
   </tr>
   <tr>
-    <td><code>flight_2_equal_prio_nonconforming_vol_A</code></td>
+    <td><code>equal_prio_flight2_nonconforming</code></td>
     <td>Nonconforming</td>
   </tr>
 </table>

diff --git a/...l_planning/conflict_equal_priority_not_permitted/conflict_equal_priority_not_permitted.py b/...l_planning/conflict_equal_priority_not_permitted/conflict_equal_priority_not_permitted.py
diff --git a/.../astm/utm/nominal_planning/conflict_higher_priority/conflict_higher_priority.md b/.../astm/utm/nominal_planning/conflict_higher_priority/conflict_higher_priority.md
@@ -26,49 +26,49 @@ FlightIntentsResource that provides the following flight intents:
     <th>Must not conflict with</th>
   </tr>
   <tr>
-    <td><code>flight_1_planned_vol_A</code></td>
+    <td><code>flight1_planned</code></td>
     <td rowspan="2">Flight 1</td>
     <td rowspan="5">Any</td>
     <td>Accepted</td>
     <td rowspan="2">Flight 2</td>
     <td rowspan="2">Flight 2m</td>
   </tr>
   <tr>
-    <td><code>flight_1_activated_vol_A</code></td>
+    <td><code>flight1_activated</code></td>
     <td>Activated</td>
   </tr>
   <tr>
-    <td><code>flight_1_planned_vol_A_extended</code></td>
+    <td><code>flight1m_planned</code></td>
     <td rowspan="2">Flight 1m</td>
     <td>Accepted</td>
     <td rowspan="2">Flight 2</td>
     <td rowspan="2">N/A</td>
   </tr>
   <tr>
-    <td><code>flight_1_activated_vol_A_extended</code></td>
+    <td><code>flight1m_activated</code></td>
     <td>Activated</td>
   </tr>
   <tr>
-    <td><code>flight_1_activated_vol_B</code></td>
+    <td><code>flight1c_activated</code></td>
     <td>Flight 1c</td>
     <td>Activated</td>
     <td>Flight 2</td>
     <td>N/A</td>
   </tr>
   <tr>
-    <td><code>flight_2_planned_vol_A</code></td>
+    <td><code>flight2_planned</code></td>
     <td rowspan="2">Flight 2</td>
     <td rowspan="3">Higher than Flight 1*</td>
     <td>Accepted</td>
     <td rowspan="2">Flight 1</td>
     <td rowspan="2">N/A</td>
   </tr>
   <tr>
-    <td><code>flight_2_activated_vol_A</code></td>
+    <td><code>flight2_activated</code></td>
     <td>Activated</td>
   </tr>
   <tr>
-    <td><code>flight_2_activated_vol_B</code></td>
+    <td><code>flight2m_activated</code></td>
     <td>Flight 2m</td>
     <td>Activated</td>
     <td>Flight 1c</td>