From 558f64f17a68c3200e8775297513f86a9ac9d5bd Mon Sep 17 00:00:00 2001 From: Julien Perrochet Date: Fri, 27 Oct 2023 18:53:00 +0200 Subject: [PATCH] Reference the standard directly where relevant --- .../interuss/f3411/dss_endpoints.md | 4 ---- .../dss/isa_subscription_interactions.py | 5 ++--- .../v19/dss/isa_subscription_interactions.md | 12 +++++------ .../v22a/dss/isa_subscription_interactions.md | 12 +++++------ .../suites/astm/netrid/f3411_19.md | 19 ++--------------- .../astm/netrid/f3411_19/dss_probing.md | 19 ++--------------- .../suites/astm/netrid/f3411_22a.md | 19 ++--------------- .../astm/netrid/f3411_22a/dss_probing.md | 19 ++--------------- .../suites/interuss/dss/all_tests.md | 21 +++---------------- .../suites/uspace/network_identification.md | 19 ++--------------- .../suites/uspace/required_services.md | 19 ++--------------- 11 files changed, 29 insertions(+), 139 deletions(-) diff --git a/monitoring/uss_qualifier/requirements/interuss/f3411/dss_endpoints.md b/monitoring/uss_qualifier/requirements/interuss/f3411/dss_endpoints.md index 7a717b11c2..2d8a926754 100644 --- a/monitoring/uss_qualifier/requirements/interuss/f3411/dss_endpoints.md +++ b/monitoring/uss_qualifier/requirements/interuss/f3411/dss_endpoints.md @@ -2,9 +2,5 @@ While neither ASTM F3411-19 nor F3411-22a explicitly require DSS implementations to implement all endpoints specified in Annex A4 (of each respective standard), InterUSS automated testing expects DSS implementations to implement all DSS endpoints specified in Annex A4. Specifically: -* PutISA: The DSS implementation under test must implement the ability to create and update an Identification Service Area by ID in accordance with the API specified in Annex A4 of the respective standard. * GetISA: The DSS implementation under test must implement the ability to retrieve an Identification Service Area by ID in accordance with the API specified in Annex A4 of the respective standard. -* DeleteISA: The DSS implementation under test must implement the ability to delete an Identification Service Area by ID in accordance with the API specified in Annex A4 of the respective standard. * SearchISAs: The DSS implementation under test must implement the ability to search for Identification Service Areas meeting the specified criteria in accordance with the API specified in Annex A4 of the respective standard. -* PutSubscription: The DSS implementation under test must implement the ability to create a subscription in accordance with the API specified in Annex A4 of the respective standard. -* SearchSubscriptions: The DSS implementation under test must implement the ability to search for subscriptions in accordance with the API specified in Annex A4 of the respective standard. diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_subscription_interactions.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_subscription_interactions.py index b987478627..22ab4cf477 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_subscription_interactions.py +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_subscription_interactions.py @@ -231,9 +231,8 @@ def _check_subscription_behaviors(self): for subscriber_url, notification in deleted_isa.notifications.items(): # For checking the notifications, we ignore the request we made for the subscription that we created. if self._isa.base_url not in subscriber_url: - with self.check("Notified subscriber", [subscriber_url]) as check: - # TODO: Find a better way to identify a subscriber who couldn't be notified: - # as-is the subscriber url causes the test-suite to crash when it writes its report + pid = notification.query.participant_id + with self.check("Notified subscriber", [pid] if pid else []) as check: if not notification.success: check.record_failed( "Could not notify ISA subscriber", diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_subscription_interactions.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_subscription_interactions.md index 7e5e1d2ad6..db583beff8 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_subscription_interactions.md +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_subscription_interactions.md @@ -40,7 +40,7 @@ When a pre-existing ISA needs to be deleted to ensure a clean workspace, any sub #### Successful subscription query check -**[interuss.f3411.dss_endpoints.SearchSubscriptions](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires the implementation of the DSS endpoint to allow callers to retrieve the subscriptions they created. +**[astm.f3411.v19.DSS0030,f](../../../../../requirements/astm/f3411/v19.md)** requires the implementation of the DSS endpoint to allow callers to retrieve the subscriptions they created. #### Successful subscription deletion check @@ -80,11 +80,11 @@ the previously created ISA. If not, the serving DSS is in violation of **[astm.f #### Newly created subscription has a notification_index of 0 check A newly created subscription is expected to have a notification index of 0, otherwise the DSS implementation under -test does not comply with **[interuss.f3411.dss_endpoints.PutSubscription](../../../../../requirements/interuss/f3411/dss_endpoints.md)** +test does not comply with **[astm.f3411.v19.DSS0030,c](../../../../../requirements/astm/f3411/v19.md)** #### Mutate the ISA check -If the ISA cannot be mutated, **[interuss.f3411.dss_endpoints.PutISA](../../../../../requirements/interuss/f3411/dss_endpoints.md)** is likely not implemented correctly. +If the ISA cannot be mutated, **[astm.f3411.v19.DSS0030,a](../../../../../requirements/astm/f3411/v19.md)** is likely not implemented correctly. #### Response to the mutation of the ISA contains subscription ID check @@ -96,7 +96,7 @@ or be in violation of **[astm.f3411.v19.DSS0030,a](../../../../../requirements/a When an ISA is mutated, the DSS must increment the notification index of any subscription to that ISA, and return the up-to-date subscription in the response to the query mutating the ISA. -Failure to do so means that the DSS is not properly implementing **[interuss.f3411.dss_endpoints.PutISA](../../../../../requirements/interuss/f3411/dss_endpoints.md)**. +Failure to do so means that the DSS is not properly implementing **[astm.f3411.v19.DSS0030,a](../../../../../requirements/astm/f3411/v19.md)**. #### Delete the ISA check @@ -112,7 +112,7 @@ or be in violation of **[astm.f3411.v19.DSS0030,b](../../../../../requirements/a When an ISA is deleted, the DSS must increment the notification index of any subscription to that ISA, and return the up-to-date subscription in the response to the query deleting the ISA. -Failure to do so means that the DSS is not properly implementing **[interuss.f3411.dss_endpoints.PutISA](../../../../../requirements/interuss/f3411/dss_endpoints.md)**. +Failure to do so means that the DSS is not properly implementing **[astm.f3411.v19.DSS0030,a](../../../../../requirements/astm/f3411/v19.md)**. #### Successful subscription deletion check @@ -141,7 +141,7 @@ When a pre-existing ISA needs to be deleted to ensure a clean workspace, any sub #### Successful subscription query check -**[interuss.f3411.dss_endpoints.SearchSubscriptions](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires the implementation of the DSS endpoint to allow callers to retrieve the subscriptions they created. +**[astm.f3411.v19.DSS0030,f](../../../../../requirements/astm/f3411/v19.md)** requires the implementation of the DSS endpoint to allow callers to retrieve the subscriptions they created. #### Successful subscription deletion check diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/isa_subscription_interactions.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/isa_subscription_interactions.md index f7f1acf398..f4e9e86e40 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/isa_subscription_interactions.md +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/isa_subscription_interactions.md @@ -40,7 +40,7 @@ When a pre-existing ISA needs to be deleted to ensure a clean workspace, any sub #### Successful subscription query check -**[interuss.f3411.dss_endpoints.SearchSubscriptions](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires the implementation of the DSS endpoint to allow callers to retrieve the subscriptions they created. +**[astm.f3411.v22a.DSS0030,f](../../../../../requirements/astm/f3411/v22a.md)** requires the implementation of the DSS endpoint to allow callers to retrieve the subscriptions they created. #### Successful subscription deletion check @@ -80,11 +80,11 @@ the previously created ISA. If not, the serving DSS is in violation of **[astm.f #### Newly created subscription has a notification_index of 0 check A newly created subscription is expected to have a notification index of 0, otherwise the DSS implementation under -test does not comply with **[interuss.f3411.dss_endpoints.PutSubscription](../../../../../requirements/interuss/f3411/dss_endpoints.md)** +test does not comply with **[astm.f3411.v22a.DSS0030,c](../../../../../requirements/astm/f3411/v22a.md)** #### Mutate the ISA check -If the ISA cannot be mutated, **[interuss.f3411.dss_endpoints.PutISA](../../../../../requirements/interuss/f3411/dss_endpoints.md)** is likely not implemented correctly. +If the ISA cannot be mutated, **[astm.f3411.v22a.DSS0030,a](../../../../../requirements/astm/f3411/v22a.md)** is likely not implemented correctly. #### Response to the mutation of the ISA contains subscription ID check @@ -96,7 +96,7 @@ or be in violation of **[astm.f3411.v22a.DSS0030,a](../../../../../requirements/ When an ISA is mutated, the DSS must increment the notification index of any subscription to that ISA, and return the up-to-date subscription in the response to the query mutating the ISA. -Failure to do so means that the DSS is not properly implementing **[interuss.f3411.dss_endpoints.PutISA](../../../../../requirements/interuss/f3411/dss_endpoints.md)**. +Failure to do so means that the DSS is not properly implementing **[astm.f3411.v22a.DSS0030,a](../../../../../requirements/astm/f3411/v22a.md)**. #### Delete the ISA check @@ -112,7 +112,7 @@ or be in violation of **[astm.f3411.v22a.DSS0030,b](../../../../../requirements/ When an ISA is deleted, the DSS must increment the notification index of any subscription to that ISA, and return the up-to-date subscription in the response to the query deleting the ISA. -Failure to do so means that the DSS is not properly implementing **[interuss.f3411.dss_endpoints.PutISA](../../../../../requirements/interuss/f3411/dss_endpoints.md)**. +Failure to do so means that the DSS is not properly implementing **[astm.f3411.v22a.DSS0030,a](../../../../../requirements/astm/f3411/v22a.md)**. #### Successful subscription deletion check @@ -141,7 +141,7 @@ When a pre-existing ISA needs to be deleted to ensure a clean workspace, any sub #### Successful subscription query check -**[interuss.f3411.dss_endpoints.SearchSubscriptions](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires the implementation of the DSS endpoint to allow callers to retrieve the subscriptions they created. +**[astm.f3411.v22a.DSS0030,f](../../../../../requirements/astm/f3411/v22a.md)** requires the implementation of the DSS endpoint to allow callers to retrieve the subscriptions they created. #### Successful subscription deletion check diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md index 31cb096c92..0b46d1d692 100644 --- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md +++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md @@ -44,7 +44,7 @@ DSS0030,f Implemented - ASTM NetRID DSS: Subscription Validation + ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Validation DSS0050 @@ -359,29 +359,14 @@ ASTM NetRID nominal behavior - interuss
.f3411
.dss_endpoints + interuss
.f3411
.dss_endpoints GetISA Implemented ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations - - PutISA - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - - - PutSubscription - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - SearchISAs Implemented ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: Simple ISA
ASTM NetRID nominal behavior - - SearchSubscriptions - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - 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 f3e22359f3..af009a680c 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 @@ -45,7 +45,7 @@ DSS0030,f Implemented - ASTM NetRID DSS: Subscription Validation + ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Validation DSS0050 @@ -203,29 +203,14 @@ ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations - interuss
.f3411
.dss_endpoints + interuss
.f3411
.dss_endpoints GetISA Implemented ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations - - PutISA - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - - - PutSubscription - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - SearchISAs Implemented ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: Simple ISA - - SearchSubscriptions - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md index fc26b3fc0a..574c121027 100644 --- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md +++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md @@ -49,7 +49,7 @@ DSS0030,f Implemented - ASTM NetRID DSS: Subscription Validation + ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Validation DSS0050 @@ -484,29 +484,14 @@ ASTM NetRID nominal behavior - interuss
.f3411
.dss_endpoints + interuss
.f3411
.dss_endpoints GetISA Implemented ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations - - PutISA - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - - - PutSubscription - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - SearchISAs Implemented ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: Simple ISA
ASTM NetRID nominal behavior - - SearchSubscriptions - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - 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 7ee16524d3..35c5476bfd 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 @@ -50,7 +50,7 @@ DSS0030,f Implemented - ASTM NetRID DSS: Subscription Validation + ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Validation DSS0050 @@ -213,29 +213,14 @@ ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations - interuss
.f3411
.dss_endpoints + interuss
.f3411
.dss_endpoints GetISA Implemented ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations - - PutISA - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - - - PutSubscription - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - SearchISAs Implemented ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: Simple ISA - - SearchSubscriptions - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - diff --git a/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md b/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md index f5f6c0353a..f582f9ab1b 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,f Implemented - ASTM NetRID DSS: Subscription Validation + ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Validation DSS0050 @@ -228,7 +228,7 @@ DSS0030,f Implemented - ASTM NetRID DSS: Subscription Validation + ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Validation DSS0050 @@ -391,29 +391,14 @@ ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations - interuss
.f3411
.dss_endpoints + interuss
.f3411
.dss_endpoints GetISA Implemented ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations - - PutISA - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - - - PutSubscription - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - SearchISAs Implemented ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: Simple ISA - - SearchSubscriptions - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - diff --git a/monitoring/uss_qualifier/suites/uspace/network_identification.md b/monitoring/uss_qualifier/suites/uspace/network_identification.md index b86874b7f3..28230fd3ac 100644 --- a/monitoring/uss_qualifier/suites/uspace/network_identification.md +++ b/monitoring/uss_qualifier/suites/uspace/network_identification.md @@ -44,7 +44,7 @@ DSS0030,f Implemented - ASTM NetRID DSS: Subscription Validation + ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Validation DSS0050 @@ -479,29 +479,14 @@ ASTM NetRID nominal behavior - interuss
.f3411
.dss_endpoints + interuss
.f3411
.dss_endpoints GetISA Implemented ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations - - PutISA - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - - - PutSubscription - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - SearchISAs Implemented ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: Simple ISA
ASTM NetRID nominal behavior - - SearchSubscriptions - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - diff --git a/monitoring/uss_qualifier/suites/uspace/required_services.md b/monitoring/uss_qualifier/suites/uspace/required_services.md index 023652f6fa..33c2a97919 100644 --- a/monitoring/uss_qualifier/suites/uspace/required_services.md +++ b/monitoring/uss_qualifier/suites/uspace/required_services.md @@ -46,7 +46,7 @@ DSS0030,f Implemented - ASTM NetRID DSS: Subscription Validation + ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Validation DSS0050 @@ -603,31 +603,16 @@ ASTM NetRID nominal behavior - interuss
.f3411
.dss_endpoints + interuss
.f3411
.dss_endpoints GetISA Implemented ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations - - PutISA - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - - - PutSubscription - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - SearchISAs Implemented ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: Simple ISA
ASTM NetRID nominal behavior - - SearchSubscriptions - Implemented - ASTM NetRID DSS: ISA Subscription Interactions - versioning ReportSystemVersion