From 57e9470667a6799ec4c1fb42d96e5a33869e764c Mon Sep 17 00:00:00 2001 From: Julien Perrochet Date: Sun, 3 Nov 2024 15:35:01 +0100 Subject: [PATCH] [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 | 7 ++++- .../astm/netrid/f3411_19/dss_probing.md | 7 ++++- .../suites/astm/netrid/f3411_22a.md | 7 ++++- .../astm/netrid/f3411_22a/dss_probing.md | 7 ++++- .../suites/interuss/dss/all_tests.md | 14 +++++++-- .../suites/uspace/network_identification.md | 7 ++++- .../suites/uspace/required_services.md | 7 ++++- 10 files changed, 93 insertions(+), 8 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..87b335497a 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.py +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.py @@ -464,6 +464,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 = self._dss_primary.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], + ) 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 and should have been notified of the ISA modification that happened on the primary 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 a4fbffda05..4efec6734c 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss_interoperability.md +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss_interoperability.md @@ -164,6 +164,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 + +**[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 342ebc4f03..2eff3fe90b 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss_interoperability.md +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss_interoperability.md @@ -163,6 +163,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 + +**[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 a46e1098de..6a9e6f1322 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 @@ -101,6 +101,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 1772b7348e..f0692c1063 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 @@ -105,6 +105,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 11a5e75bfd..abfaf3ee2e 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 @@ -106,6 +106,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 6a31483122..7d2006c61d 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 @@ -110,6 +110,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 1a29774a5d..3ddc9d7ee4 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 @@ -101,6 +101,11 @@ Implemented ASTM F3411-19 NetRID DSS interoperability + + DSS0130,2,e + Implemented + ASTM F3411-19 NetRID DSS interoperability + DSS0130,2,f 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 @@ -297,6 +302,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 c410c77e5d..e5738cc123 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 @@ -102,6 +102,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 0e6ba34b0d..32ca2e49b8 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 @@ -103,6 +103,11 @@ Implemented ASTM F3411-22a NetRID DSS interoperability + + DSS0130,2,e + Implemented + ASTM F3411-22a NetRID DSS interoperability + DSS0130,2,f Implemented