From 48b8a4c13dce8dcf20061dd9cf63e184a2e92bfc Mon Sep 17 00:00:00 2001 From: Julien Perrochet Date: Sun, 3 Nov 2024 15:35:01 +0100 Subject: [PATCH 1/2] [uss_qualifier] rid: dss0130 - check information relative to intersecting entities is properly synchronized --- .../netrid/common/dss_interoperability.py | 29 +++++++++++++++++++ .../astm/netrid/v19/dss_interoperability.md | 8 +++++ .../astm/netrid/v22a/dss_interoperability.md | 8 +++++ .../suites/astm/netrid/f3411_19.md | 5 ++++ .../astm/netrid/f3411_19/dss_probing.md | 7 ++++- .../suites/astm/netrid/f3411_22a.md | 5 ++++ .../astm/netrid/f3411_22a/dss_probing.md | 7 ++++- .../suites/interuss/dss/all_tests.md | 14 +++++++-- .../suites/uspace/network_identification.md | 5 ++++ .../suites/uspace/required_services.md | 5 ++++ 10 files changed, 89 insertions(+), 4 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 2adcd2b3b5..069699d79d 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.py +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.py @@ -494,6 +494,35 @@ def step5(self): details=f"Subscription {sub_1_0.uuid} was created on the primary DSS and should have been notified of the ISA modification that happened on the primary DSS, but was not.", ) + for sec_dss in self._dss_others: + with self.check( + "Can modify ISA on secondary DSS", + [sec_dss.participant_id], + ) as check: + mutated_isa_sec = sec_dss.put_isa( + check, + isa_id=isa_1.uuid, + isa_version=isa_1.version, + do_not_notify="https://testdummy.interuss.org", + **_default_params(datetime.timedelta(seconds=SHORT_WAIT_SEC)), + ) + isa_1.version = mutated_isa_sec.dss_query.isa.version + + subs_to_notify_sec = [] + for subscriber in mutated_isa_sec.subscribers: + for s in subscriber.raw.subscriptions: + subs_to_notify_sec.append(s.subscription_id) + + with self.check( + "ISA modification on secondary DSS triggers subscription notification requests", + [self._dss_primary.participant_id, sec_dss.participant_id], + ) as check: + if sub_1_0.uuid not in subs_to_notify_sec: + check.record_failed( + summary=f"Subscription {sub_1_0.uuid} was not notified of ISA modification", + details=f"Subscription {sub_1_0.uuid} was created on the primary DSS (participant_id={self._dss_primary.participant_id}) and should have been notified of the ISA modification (ID={isa_1.uuid}, version={isa_1.version}) that happened on the secondary DSS (participant_id={sec_dss}), but was not.", + ) + def step6(self): """Can delete all Subscription in primary DSS""" 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 4eed64a91c..a857965668 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss_interoperability.md +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss_interoperability.md @@ -174,6 +174,14 @@ Qualitatively proves: ISA[*P*] modified with proper response, all Subscription[i **[astm.f3411.v19.DSS0130,A2-6-1,3c](../../../../requirements/astm/f3411/v19.md)** +#### 🛑 Can modify ISA on secondary DSS check + +**[astm.f3411.v19.DSS0130,A2-6-1,1b](../../../../requirements/astm/f3411/v19.md)** + +#### ⚠️ ISA modification on secondary DSS triggers subscription notification requests check + +A failure of this check indicates that the DSS fails to implement either one or both of **[astm.f3411.v19.DSS0130,A2-6-1,3c](../../../../requirements/astm/f3411/v19.md)** and **[astm.f3411.v19.DSS0130,2,e](../../../../requirements/astm/f3411/v19.md)**. + ### S6 test step Action: USS2@DSS*P*: DELETE Subscription[*n*] 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 a03df5538e..b630def151 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss_interoperability.md +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss_interoperability.md @@ -173,6 +173,14 @@ Qualitatively proves: ISA[*P*] modified with proper response, all Subscription[i **[astm.f3411.v22a.DSS0130,A2-6-1,3c](../../../../requirements/astm/f3411/v22a.md)** +#### 🛑 Can modify ISA on secondary DSS check + +**[astm.f3411.v22a.DSS0130,A2-6-1,1b](../../../../requirements/astm/f3411/v22a.md)** + +#### ⚠️ ISA modification on secondary DSS triggers subscription notification requests check + +A failure of this check indicates that the DSS fails to implement either one or both of **[astm.f3411.v22a.DSS0130,A2-6-1,3c](../../../../requirements/astm/f3411/v22a.md)** and **[astm.f3411.v22a.DSS0130,2,e](../../../../requirements/astm/f3411/v22a.md)**. + ### S6 test step Action: USS2@DSS*P*: DELETE Subscription[*n*] diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md index 23b63987b6..b1ef5e0206 100644 --- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md +++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md @@ -106,6 +106,11 @@ Implemented ASTM F3411-19 NetRID DSS interoperability + + DSS0130,2,e + Implemented + ASTM F3411-19 NetRID DSS interoperability + DSS0130,2,f 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 270339fa0c..d3b2aec8f3 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 @@ -110,6 +110,11 @@ Implemented ASTM F3411-19 NetRID DSS interoperability + + DSS0130,2,e + Implemented + ASTM F3411-19 NetRID DSS interoperability + DSS0130,2,f Implemented diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md index e803f28ab1..f456d50c17 100644 --- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md +++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md @@ -111,6 +111,11 @@ Implemented ASTM F3411-22a NetRID DSS interoperability + + DSS0130,2,e + Implemented + ASTM F3411-22a NetRID DSS interoperability + DSS0130,2,f 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 58852e7ad9..f7061b0495 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 @@ -115,6 +115,11 @@ Implemented ASTM F3411-22a NetRID DSS interoperability + + DSS0130,2,e + Implemented + ASTM F3411-22a NetRID DSS interoperability + DSS0130,2,f Implemented diff --git a/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md b/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md index e7cd7252a0..3002507348 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 @@ -106,6 +106,11 @@ Implemented ASTM F3411-19 NetRID DSS interoperability + + DSS0130,2,e + Implemented + ASTM F3411-19 NetRID DSS interoperability + DSS0130,2,f Implemented @@ -217,7 +222,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 @@ -307,6 +312,11 @@ Implemented ASTM F3411-22a NetRID DSS interoperability + + DSS0130,2,e + Implemented + ASTM F3411-22a NetRID DSS interoperability + DSS0130,2,f Implemented diff --git a/monitoring/uss_qualifier/suites/uspace/network_identification.md b/monitoring/uss_qualifier/suites/uspace/network_identification.md index 84373e6627..ec2d0f0179 100644 --- a/monitoring/uss_qualifier/suites/uspace/network_identification.md +++ b/monitoring/uss_qualifier/suites/uspace/network_identification.md @@ -107,6 +107,11 @@ Implemented ASTM F3411-22a NetRID DSS interoperability + + DSS0130,2,e + Implemented + ASTM F3411-22a NetRID DSS interoperability + DSS0130,2,f Implemented diff --git a/monitoring/uss_qualifier/suites/uspace/required_services.md b/monitoring/uss_qualifier/suites/uspace/required_services.md index 20054687de..4645e5b20e 100644 --- a/monitoring/uss_qualifier/suites/uspace/required_services.md +++ b/monitoring/uss_qualifier/suites/uspace/required_services.md @@ -108,6 +108,11 @@ Implemented ASTM F3411-22a NetRID DSS interoperability + + DSS0130,2,e + Implemented + ASTM F3411-22a NetRID DSS interoperability + DSS0130,2,f Implemented From cb41723a54ea8daae14aa68c11168be83faeb0a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Misbach?= Date: Tue, 3 Dec 2024 15:20:45 +0100 Subject: [PATCH 2/2] regen suites .md files --- monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md | 2 +- monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md | 2 +- .../uss_qualifier/suites/uspace/network_identification.md | 2 +- monitoring/uss_qualifier/suites/uspace/required_services.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md index b1ef5e0206..d8e43f13e9 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 diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md index f456d50c17..93a5776ce0 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 diff --git a/monitoring/uss_qualifier/suites/uspace/network_identification.md b/monitoring/uss_qualifier/suites/uspace/network_identification.md index ec2d0f0179..f6ed7c9169 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 diff --git a/monitoring/uss_qualifier/suites/uspace/required_services.md b/monitoring/uss_qualifier/suites/uspace/required_services.md index 4645e5b20e..17438df8c0 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