diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.py
index aef642eda..2adcd2b3b 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.py
@@ -24,6 +24,7 @@
from monitoring.uss_qualifier.scenarios.scenario import GenericTestScenario
from monitoring.uss_qualifier.suites.suite import ExecutionContext
+# TODO pass a test resource specifying the test area instead
VERTICES: List[s2sphere.LatLng] = [
s2sphere.LatLng.from_degrees(lng=130.6205, lat=-23.6558),
s2sphere.LatLng.from_degrees(lng=130.6301, lat=-23.6898),
@@ -60,6 +61,12 @@ class TestEntity(object):
class DSSInteroperability(GenericTestScenario):
+ """
+ TODO additional improvements/extensions:
+ - cell ID synchronization checks can be improved further by search outside of the
+ subscription's footprint on the secondary DSS and confirming it is not returned
+ """
+
_dss_primary: DSSWrapper
_dss_others: List[DSSWrapper]
_allow_private_addresses: bool = False
@@ -400,6 +407,29 @@ def get_fail_params(
other_sub.subscription.time_end,
)
)
+ with self.check(
+ "Subscription[n] search returned with proper response",
+ [dss.participant_id],
+ ) as check:
+ searched_subs = dss.search_subs(check, VERTICES)
+ if not searched_subs.success:
+ check.record_failed(
+ summary="Subscription search on secondary DSS failed",
+ details=f"Subscription search request on secondary DSS failed with HTTP code {searched_subs.status_code}: {searched_subs.errors}",
+ query_timestamps=[searched_subs.query.request.timestamp],
+ )
+
+ with self.check(
+ "Subscription[P] cell ID is properly synchronized with all DSS",
+ self._dss_primary.participant_id,
+ ) as check:
+ if primary_sub.subscription.id not in searched_subs.subscriptions:
+ check.record_failed(
+ summary=f"Subscription {primary_sub.subscription.id} not returned by search on secondary DSS",
+ details=f"Subscription {primary_sub.subscription.id} was written to the primary DSS in a specific area and searched for in the same area on the secondary DSS, but was not found. "
+ f"This may indicate that the primary DSS failed to properly synchronize the Cell ID to the DAR.",
+ query_timestamps=[searched_subs.query.request.timestamp],
+ )
def step4(self):
"""Can query all Subscriptions in area from all DSSs."""
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss_interoperability.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss_interoperability.md
index a4fbffda0..4eed64a91 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss_interoperability.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss_interoperability.md
@@ -134,6 +134,16 @@ Qualitatively proves: Can retrieve specific Subscription emplaced in primary DSS
**[astm.f3411.v19.DSS0130,2,f](../../../../requirements/astm/f3411/v19.md)**
+#### 🛑 Subscription[*n*] search returned with proper response check
+
+**[astm.f3411.v19.DSS0030,e](../../../../requirements/astm/f3411/v19.md)**
+
+**[astm.f3411.v19.DSS0130,A2-6-1,6](../../../../requirements/astm/f3411/v19.md)**
+
+#### 🛑 Subscription[*P*] cell ID is properly synchronized with all DSS check
+
+**[astm.f3411.v19.DSS0130,1](../../../../requirements/astm/f3411/v19.md)**
+
### S4 test step
Action: USS2@DSS*n*: GET Subscriptions using ISA[*P*]’s area
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss_interoperability.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss_interoperability.md
index 342ebc4f0..a03df5538 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss_interoperability.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss_interoperability.md
@@ -133,6 +133,16 @@ Qualitatively proves: Can retrieve specific Subscription emplaced in primary DSS
**[astm.f3411.v22a.DSS0130,2,f](../../../../requirements/astm/f3411/v22a.md)**
+#### 🛑 Subscription[*n*] search returned with proper response check
+
+**[astm.f3411.v22a.DSS0030,e](../../../../requirements/astm/f3411/v22a.md)**
+
+**[astm.f3411.v22a.DSS0130,A2-6-1,6](../../../../requirements/astm/f3411/v22a.md)**
+
+#### 🛑 Subscription[*P*] cell ID is properly synchronized with all DSS check
+
+**[astm.f3411.v22a.DSS0130,1](../../../../requirements/astm/f3411/v22a.md)**
+
### S4 test step
Action: USS2@DSS*n*: GET Subscriptions using ISA[*P*]’s area
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md
index a32a77e1a..57e3292c6 100644
--- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md
+++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md
@@ -21,7 +21,7 @@
Checked in |
- astm .f3411 .v19 |
+ astm .f3411 .v19 |
DSS0010 |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -49,7 +49,7 @@
DSS0030,e |
Implemented |
- ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
+ ASTM F3411-19 NetRID DSS interoperability ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
DSS0030,f |
@@ -81,6 +81,11 @@
Implemented |
ASTM NetRID DSS: Direct CRDB access |
+
+ DSS0130,1 |
+ Implemented |
+ ASTM F3411-19 NetRID DSS interoperability |
+
DSS0130,2,a |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.md
index 1772b7348..270339fa0 100644
--- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.md
+++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.md
@@ -25,7 +25,7 @@
Checked in |
- astm .f3411 .v19 |
+ astm .f3411 .v19 |
DSS0010 |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -53,7 +53,7 @@
DSS0030,e |
Implemented |
- ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
+ ASTM F3411-19 NetRID DSS interoperability ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
DSS0030,f |
@@ -85,6 +85,11 @@
Implemented |
ASTM NetRID DSS: Direct CRDB access |
+
+ DSS0130,1 |
+ Implemented |
+ ASTM F3411-19 NetRID DSS interoperability |
+
DSS0130,2,a |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md
index 793bff05d..888e5d045 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 .v22a |
+ astm .f3411 .v22a |
DSS0010 |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -54,7 +54,7 @@
DSS0030,e |
Implemented |
- ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
+ ASTM F3411-22a NetRID DSS interoperability ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
DSS0030,f |
@@ -86,6 +86,11 @@
Implemented |
ASTM NetRID DSS: Direct CRDB access |
+
+ DSS0130,1 |
+ Implemented |
+ ASTM F3411-22a NetRID DSS interoperability |
+
DSS0130,2,a |
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 6a3148312..58852e7ad 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
@@ -25,7 +25,7 @@
Checked in |
- astm .f3411 .v22a |
+ astm .f3411 .v22a |
DSS0010 |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -58,7 +58,7 @@
DSS0030,e |
Implemented |
- ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
+ ASTM F3411-22a NetRID DSS interoperability ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
DSS0030,f |
@@ -90,6 +90,11 @@
Implemented |
ASTM NetRID DSS: Direct CRDB access |
+
+ DSS0130,1 |
+ Implemented |
+ ASTM F3411-22a NetRID DSS interoperability |
+
DSS0130,2,a |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md b/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md
index 1a29774a5..e7cd7252a 100644
--- a/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md
+++ b/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md
@@ -21,7 +21,7 @@
Checked in |
- astm .f3411 .v19 |
+ astm .f3411 .v19 |
DSS0010 |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -49,7 +49,7 @@
DSS0030,e |
Implemented |
- ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
+ ASTM F3411-19 NetRID DSS interoperability ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
DSS0030,f |
@@ -81,6 +81,11 @@
Implemented |
ASTM NetRID DSS: Direct CRDB access |
+
+ DSS0130,1 |
+ Implemented |
+ ASTM F3411-19 NetRID DSS interoperability |
+
DSS0130,2,a |
Implemented |
@@ -212,7 +217,7 @@
ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
- astm .f3411 .v22a |
+ astm .f3411 .v22a |
DSS0010 |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -245,7 +250,7 @@
DSS0030,e |
Implemented |
- ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
+ ASTM F3411-22a NetRID DSS interoperability ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
DSS0030,f |
@@ -277,6 +282,11 @@
Implemented |
ASTM NetRID DSS: Direct CRDB access |
+
+ DSS0130,1 |
+ Implemented |
+ ASTM F3411-22a NetRID DSS interoperability |
+
DSS0130,2,a |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/uspace/network_identification.md b/monitoring/uss_qualifier/suites/uspace/network_identification.md
index 790fd6fcc..38c67b0b4 100644
--- a/monitoring/uss_qualifier/suites/uspace/network_identification.md
+++ b/monitoring/uss_qualifier/suites/uspace/network_identification.md
@@ -17,7 +17,7 @@
Checked in |
- astm .f3411 .v22a |
+ astm .f3411 .v22a |
DSS0010 |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -50,7 +50,7 @@
DSS0030,e |
Implemented |
- ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
+ ASTM F3411-22a NetRID DSS interoperability ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
DSS0030,f |
@@ -82,6 +82,11 @@
Implemented |
ASTM NetRID DSS: Direct CRDB access |
+
+ DSS0130,1 |
+ Implemented |
+ ASTM F3411-22a NetRID DSS interoperability |
+
DSS0130,2,a |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/uspace/required_services.md b/monitoring/uss_qualifier/suites/uspace/required_services.md
index 4365971fc..5dfcf2535 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 .v22a |
+ astm .f3411 .v22a |
DSS0010 |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -51,7 +51,7 @@
DSS0030,e |
Implemented |
- ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
+ ASTM F3411-22a NetRID DSS interoperability ASTM NetRID DSS: Concurrent Requests ASTM NetRID DSS: ISA Expiry ASTM NetRID DSS: ISA Subscription Interactions ASTM NetRID DSS: Simple ISA ASTM NetRID DSS: Submitted ISA Validations ASTM NetRID DSS: Subscription Simple ASTM NetRID DSS: Subscription Validation ASTM NetRID DSS: Token Validation |
DSS0030,f |
@@ -83,6 +83,11 @@
Implemented |
ASTM NetRID DSS: Direct CRDB access |
+
+ DSS0130,1 |
+ Implemented |
+ ASTM F3411-22a NetRID DSS interoperability |
+
DSS0130,2,a |
Implemented |