Skip to content

Commit eca0936

Browse files
ShastickShastick
authored
[uss_qualifier] netrid-0470/v22a - cover 'distance' and split height and height type (#875)
1 parent 9848684 commit eca0936

File tree

5 files changed

+56
-9
lines changed

5 files changed

+56
-9
lines changed

‎monitoring/uss_qualifier/scenarios/astm/netrid/common_dictionary_evaluator.py‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ def _evaluate_height(
458458
if self._rid_version == RIDVersion.f3411_22a:
459459
if height_obs is not None:
460460
with self._test_scenario.check(
461-
"Height Type consistency with Common Dictionary", participants
461+
"Height consistency with Common Dictionary", participants
462462
) as check:
463463
if (
464464
height_obs.reference
@@ -475,19 +475,43 @@ def _evaluate_height(
475475
with self._test_scenario.check(
476476
"Height is consistent with injected one", participants
477477
) as check:
478-
if (
479-
height_obs.reference != height_inj.reference
480-
or abs(height_obs.distance - height_inj.distance) > 1.0
478+
if not math.isclose(
479+
height_obs.distance, height_inj.distance, abs_tol=1.0
481480
):
482481
check.record_failed(
483482
"Observed Height is inconsistent with injected one",
484483
details=f"Observed height: {height_obs} - injected: {height_inj}",
485484
severity=Severity.Medium,
486485
)
486+
487+
with self._test_scenario.check(
488+
"Height Type consistency with Common Dictionary", participants
489+
) as check:
490+
if (
491+
height_obs.reference
492+
!= observation_api.RIDHeightReference.TakeoffLocation
493+
and height_obs.reference
494+
!= observation_api.RIDHeightReference.GroundLevel
495+
):
496+
check.record_failed(
497+
f"Invalid height type: {height_obs.reference}",
498+
details=f"The height type reference shall be either {observation_api.RIDHeightReference.TakeoffLocation} or {observation_api.RIDHeightReference.GroundLevel}",
499+
severity=Severity.Medium,
500+
)
501+
502+
with self._test_scenario.check(
503+
"Height Type is consistent with injected one", participants
504+
) as check:
505+
if height_obs.reference != height_inj.reference:
506+
check.record_failed(
507+
"Observed Height type is inconsistent with injected one",
508+
details=f"Observed height: {height_obs} - injected: {height_inj}",
509+
severity=Severity.Medium,
510+
)
487511
else:
488512
self._test_scenario.record_note(
489513
key="skip_reason",
490-
message=f"Unsupported version {self._rid_version}: skipping Height evaluation",
514+
message=f"Unsupported version {self._rid_version}: skipping Height and Height Type evaluation",
491515
)
492516

493517
def _evaluate_operator_location(

‎monitoring/uss_qualifier/scenarios/astm/netrid/v22a/common_dictionary_evaluator_dp_flight.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,19 @@ TODO: If the resolution is greater than 7 number digits, this check will fail.
2727

2828
If the Position reported for an observation does not correspond to the injected one, the DP is not providing timely and accurate data and is thus in breach of **[astm.f3411.v22a.NET0450](../../../../requirements/astm/f3411/v22a.md)**
2929

30+
## Height consistency with Common Dictionary check
31+
32+
**[astm.f3411.v22a.NET0470](../../../../requirements/astm/f3411/v22a.md)** requires that Net-RID Display Provider shall provide access to required and optional fields to Remote ID Display Applications according to the Common Dictionary. This check validates that the Height (**[astm.f3411.v22a.NET0470,Table1,14](../../../../requirements/astm/f3411/v22a.md)**), if present, is valid.
33+
34+
## Height is consistent with injected one check
35+
36+
If the Height reported for an observation does not correspond to the injected one, the DP is not providing timely and accurate data and is thus in breach of **[astm.f3411.v22a.NET0450](../../../../requirements/astm/f3411/v22a.md)**
37+
3038
## Height Type consistency with Common Dictionary check
3139

3240
**[astm.f3411.v22a.NET0470](../../../../requirements/astm/f3411/v22a.md)** requires that Net-RID Display Provider shall provide access to required and optional fields to Remote ID Display Applications according to the Common Dictionary. This check validates that the Height Type (**[astm.f3411.v22a.NET0470,Table1,15](../../../../requirements/astm/f3411/v22a.md)**), if present, is valid. If the observed Height Type indicates a value different than Takeoff Location or Ground Level, this check will fail.
3341

34-
## Height is consistent with injected one check
42+
## Height Type is consistent with injected one check
3543

3644
If the Height Type reported for an observation does not correspond to the injected one, the DP is not providing timely and accurate data and is thus in breach of **[astm.f3411.v22a.NET0450](../../../../requirements/astm/f3411/v22a.md)**
3745

‎monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<th><a href="../../README.md#checked-in">Checked in</a></th>
2222
</tr>
2323
<tr>
24-
<td rowspan="100" style="vertical-align:top;"><a href="../../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
24+
<td rowspan="101" style="vertical-align:top;"><a href="../../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
2525
<td><a href="../../../requirements/astm/f3411/v22a.md">DSS0010</a></td>
2626
<td>Implemented</td>
2727
<td><a href="../../../scenarios/astm/netrid/v22a/dss/token_validation.md">ASTM NetRID DSS: Token Validation</a></td>
@@ -426,6 +426,11 @@
426426
<td>TODO</td>
427427
<td><a href="../../../scenarios/astm/netrid/v22a/nominal_behavior.md">ASTM NetRID nominal behavior</a></td>
428428
</tr>
429+
<tr>
430+
<td><a href="../../../requirements/astm/f3411/v22a.md">NET0470,Table1,14</a></td>
431+
<td>Implemented</td>
432+
<td><a href="../../../scenarios/astm/netrid/v22a/nominal_behavior.md">ASTM NetRID nominal behavior</a></td>
433+
</tr>
429434
<tr>
430435
<td><a href="../../../requirements/astm/f3411/v22a.md">NET0470,Table1,15</a></td>
431436
<td>Implemented</td>

‎monitoring/uss_qualifier/suites/uspace/network_identification.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<th><a href="../README.md#checked-in">Checked in</a></th>
1818
</tr>
1919
<tr>
20-
<td rowspan="100" style="vertical-align:top;"><a href="../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
20+
<td rowspan="101" style="vertical-align:top;"><a href="../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
2121
<td><a href="../../requirements/astm/f3411/v22a.md">DSS0010</a></td>
2222
<td>Implemented</td>
2323
<td><a href="../../scenarios/astm/netrid/v22a/dss/token_validation.md">ASTM NetRID DSS: Token Validation</a></td>
@@ -422,6 +422,11 @@
422422
<td>TODO</td>
423423
<td><a href="../../scenarios/astm/netrid/v22a/nominal_behavior.md">ASTM NetRID nominal behavior</a></td>
424424
</tr>
425+
<tr>
426+
<td><a href="../../requirements/astm/f3411/v22a.md">NET0470,Table1,14</a></td>
427+
<td>Implemented</td>
428+
<td><a href="../../scenarios/astm/netrid/v22a/nominal_behavior.md">ASTM NetRID nominal behavior</a></td>
429+
</tr>
425430
<tr>
426431
<td><a href="../../requirements/astm/f3411/v22a.md">NET0470,Table1,15</a></td>
427432
<td>Implemented</td>

‎monitoring/uss_qualifier/suites/uspace/required_services.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<th><a href="../README.md#checked-in">Checked in</a></th>
1919
</tr>
2020
<tr>
21-
<td rowspan="100" style="vertical-align:top;"><a href="../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
21+
<td rowspan="101" style="vertical-align:top;"><a href="../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
2222
<td><a href="../../requirements/astm/f3411/v22a.md">DSS0010</a></td>
2323
<td>Implemented</td>
2424
<td><a href="../../scenarios/astm/netrid/v22a/dss/token_validation.md">ASTM NetRID DSS: Token Validation</a></td>
@@ -423,6 +423,11 @@
423423
<td>TODO</td>
424424
<td><a href="../../scenarios/astm/netrid/v22a/nominal_behavior.md">ASTM NetRID nominal behavior</a></td>
425425
</tr>
426+
<tr>
427+
<td><a href="../../requirements/astm/f3411/v22a.md">NET0470,Table1,14</a></td>
428+
<td>Implemented</td>
429+
<td><a href="../../scenarios/astm/netrid/v22a/nominal_behavior.md">ASTM NetRID nominal behavior</a></td>
430+
</tr>
426431
<tr>
427432
<td><a href="../../requirements/astm/f3411/v22a.md">NET0470,Table1,15</a></td>
428433
<td>Implemented</td>

0 commit comments

Comments
 (0)