diff --git a/monitoring/mock_uss/f3548v21/flight_planning.py b/monitoring/mock_uss/f3548v21/flight_planning.py
index 87207c2d77..cf30b227db 100644
--- a/monitoring/mock_uss/f3548v21/flight_planning.py
+++ b/monitoring/mock_uss/f3548v21/flight_planning.py
@@ -357,6 +357,11 @@ def get_down_uss_op_intent(
conflict, that way we can just retrieve the conflicting area instead of having to compute again the intersection
between the flight to be planned and the conflicting operational intent.
"""
+
+ # at that point the value of the OVN as it is returned by the DSS may be `Available from USS`, so we explicitly
+ # remove it so that it is excluded from the key
+ op_intent_ref.ovn = None
+
# USS is declared as down and does not answer for details : minimum - 1
if op_intent_ref.state == f3548_v21.OperationalIntentState.Accepted:
return f3548_v21.OperationalIntent(
@@ -437,7 +442,11 @@ def check_op_intent(
new_flight.op_intent, existing_flight, op_intents, locality, log
)
- key = [f3548_v21.EntityOVN(op.reference.ovn) for op in op_intents]
+ key = [
+ f3548_v21.EntityOVN(op.reference.ovn)
+ for op in op_intents
+ if op.reference.ovn is not None
+ ]
else:
# Flight is not nominal and therefore doesn't need to check intersections
key = []
diff --git a/monitoring/uss_qualifier/Makefile b/monitoring/uss_qualifier/Makefile
index ce5d577958..9361617fe3 100644
--- a/monitoring/uss_qualifier/Makefile
+++ b/monitoring/uss_qualifier/Makefile
@@ -2,10 +2,14 @@
lint: validate-docs
.PHONY: validate-docs
-validate-docs:
+validate-docs: check-no-cross-reference
./scripts/validate_test_definitions.sh
./scripts/format_test_suite_docs.sh --lint
+.PHONY: check-no-cross-reference
+check-no-cross-reference:
+ ./scripts/check-netrid-cross-references.sh
+
.PHONY: format
format: format-documentation
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/subscription_simple.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/subscription_simple.md
index f24b6c4a96..c1a2be87af 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/subscription_simple.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/subscription_simple.md
@@ -34,7 +34,7 @@ If the DSS fails to let us search in the area for which test subscriptions will
#### Subscription can be queried by ID check
-If the DSS cannot be queried for the existing test ID, the DSS is likely not implementing **[astm.f3411.v19.DSS0030,e](../../../../../requirements/astm/f3411/v19.md)** correctly.
+If the DSS cannot be queried for the existing test ID, the DSS is likely not implementing **[astm.f3411.v22a.DSS0030,e](../../../../../requirements/astm/f3411/v22a.md)** correctly.
#### Subscription can be deleted check
@@ -390,7 +390,7 @@ The cleanup phase of this test scenario removes the subscription with the known
#### Subscription can be queried by ID check
-If the DSS cannot be queried for the existing test ID, the DSS is likely not implementing **[astm.f3411.v19.DSS0030,e](../../../../../requirements/astm/f3411/v19.md)** correctly.
+If the DSS cannot be queried for the existing test ID, the DSS is likely not implementing **[astm.f3411.v22a.DSS0030,e](../../../../../requirements/astm/f3411/v22a.md)** correctly.
#### Subscription can be deleted check
diff --git a/monitoring/uss_qualifier/scripts/check-netrid-cross-references.sh b/monitoring/uss_qualifier/scripts/check-netrid-cross-references.sh
new file mode 100755
index 0000000000..84c585c7c3
--- /dev/null
+++ b/monitoring/uss_qualifier/scripts/check-netrid-cross-references.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Check for 'v19' references in netrid v22a scenario documents
+filesv22a=$(find ./scenarios/astm/netrid/v22a -name '*.md' -exec grep -l 'v19' {} +)
+if [ -n "$filesv22a" ]; then
+ echo "Error: Found netrid v22a scenario document containing a 'v19' reference:"
+ echo "$filesv22a"
+ error_found=true
+fi
+
+# Check for 'v22a' references in netrid v19 scenario documents
+filesv19=$(find ./scenarios/astm/netrid/v19 -name '*.md' -exec grep -l 'v22a' {} +)
+if [ -n "$filesv19" ]; then
+ echo "Error: Found netrid v19 scenario document containing a 'v22a' reference:"
+ echo "$filesv19"
+ error_found=true
+fi
+
+# Error if we found any file
+if [ "$error_found" = true ]; then
+ exit 1
+fi
+# Otherwise all is good
+exit 0
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md
index c0b817a23b..e62aca6669 100644
--- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md
+++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md
@@ -21,7 +21,7 @@
| Checked in |
- astm
.f3411
.v19 |
+ astm
.f3411
.v19 |
DSS0030,a |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -31,11 +31,6 @@
Implemented |
ASTM NetRID DSS: Token Validation |
-
- | DSS0030,e |
- Implemented |
- ASTM NetRID DSS: Subscription Simple |
-
| NET0730 |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.md
index c0aec9c588..3a67d430fd 100644
--- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.md
+++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.md
@@ -24,7 +24,7 @@
Checked in |
- astm
.f3411
.v19 |
+ astm
.f3411
.v19 |
DSS0030,a |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -34,11 +34,6 @@
Implemented |
ASTM NetRID DSS: Token Validation |
-
- | DSS0030,e |
- Implemented |
- ASTM NetRID DSS: Subscription Simple |
-
| NET0730 |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md b/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md
index 33913722d5..3d5ca942be 100644
--- a/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md
+++ b/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md
@@ -42,7 +42,7 @@
| DSS0030,e |
Implemented |
- ASTM NetRID DSS: Subscription Simple |
+ ASTM NetRID DSS: Subscription Simple |
| DSS0030,f |
diff --git a/monitoring/uss_qualifier/suites/uspace/network_identification.md b/monitoring/uss_qualifier/suites/uspace/network_identification.md
index 97233ee0ec..f6862800f1 100644
--- a/monitoring/uss_qualifier/suites/uspace/network_identification.md
+++ b/monitoring/uss_qualifier/suites/uspace/network_identification.md
@@ -16,7 +16,7 @@
Checked in |
- astm
.f3411
.v19 |
+ astm
.f3411
.v19 |
DSS0030,a |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -26,11 +26,6 @@
Implemented |
ASTM NetRID DSS: Token Validation |
-
- | DSS0030,e |
- Implemented |
- ASTM NetRID DSS: Subscription Simple |
-
| NET0730 |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/uspace/required_services.md b/monitoring/uss_qualifier/suites/uspace/required_services.md
index bae5e85120..a46e8fe057 100644
--- a/monitoring/uss_qualifier/suites/uspace/required_services.md
+++ b/monitoring/uss_qualifier/suites/uspace/required_services.md
@@ -18,7 +18,7 @@
Checked in |
- astm
.f3411
.v19 |
+ astm
.f3411
.v19 |
DSS0030,a |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -28,11 +28,6 @@
Implemented |
ASTM NetRID DSS: Token Validation |
-
- | DSS0030,e |
- Implemented |
- ASTM NetRID DSS: Subscription Simple |
-
| NET0730 |
Implemented |