From 9be4808e4f73943ef31a82e498017b43bb9a70e8 Mon Sep 17 00:00:00 2001 From: Julien Perrochet Date: Thu, 14 Nov 2024 17:19:38 +0100 Subject: [PATCH] [uss_qualifier] rid: dss0130 - Cell ID synchronization (#837) --- .../netrid/common/dss_interoperability.py | 30 +++++++++++++++++++ .../astm/netrid/v19/dss_interoperability.md | 10 +++++++ .../astm/netrid/v22a/dss_interoperability.md | 10 +++++++ .../suites/astm/netrid/f3411_19.md | 9 ++++-- .../astm/netrid/f3411_19/dss_probing.md | 9 ++++-- .../suites/astm/netrid/f3411_22a.md | 9 ++++-- .../astm/netrid/f3411_22a/dss_probing.md | 9 ++++-- .../suites/interuss/dss/all_tests.md | 18 ++++++++--- .../suites/uspace/network_identification.md | 9 ++++-- .../suites/uspace/required_services.md | 9 ++++-- 10 files changed, 106 insertions(+), 16 deletions(-) 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 aef642edad..2adcd2b3b5 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 a4fbffda05..4eed64a91c 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 342ebc4f03..a03df5538e 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 a32a77e1aa..57e3292c61 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 1772b7348e..270339fa0c 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 793bff05dc..888e5d045f 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 6a31483122..58852e7ad9 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 1a29774a5d..e7cd7252a0 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 790fd6fccc..38c67b0b46 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 4365971fcc..5dfcf25353 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