diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.md index 89402ce69a..ffc799cae2 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.md @@ -68,6 +68,34 @@ If the DSS omits any of the implicit subscriptions belonging to an OIR previousl any of the DSSes at which an earlier OIR was created, or the DSS at which the current OIR has been created, are in violation of **[astm.f3548.v21.DSS0210,A2-7-2,4b](../../../../requirements/astm/f3548/v21.md)**. +### Modify an OIR at every DSS in sequence test step + +This test step will modify the previously created operational intent reference and assorted subscription at every DSS, in sequence, each time verifying that the DSS +requires notifications for any previously established subscription that intersects with the modified OIR. + +Note that this step is run once for each involved DSS (that is, once for the primary DSS and once for every secondary DSS) + +#### [Modify OIR](./fragments/oir/crud/update_query.md) + +Check that the OIR modification query succeeds + +#### 🛑 DSS response contains the expected background subscription check + +The response from a DSS to a valid OIR modification request is expected to contain any relevant subscription for the OIR's extents. +This includes the subscription created earlier, as it is designed to intersect with the OIRs being modified. + +If the DSS omits the intersecting subscription, it fails to implement **[astm.f3548.v21.DSS0210,A2-7-2,4c](../../../../requirements/astm/f3548/v21.md)**. + +#### 🛑 DSS returns the implicit subscriptions from intersecting OIRs check + +The response from a DSS to a valid OIR modification request is expected to contain any relevant subscription for the OIR's extents. +This includes any implicit subscription previously created on the DSS as part of a previously created OIR. + +If the DSS omits any of the implicit subscriptions belonging to an OIR previously created over time range A on another DSS (which are designed to all intersect), +any of the DSSes at which an earlier OIR was created, or the DSS at which the current OIR has been modified, +are in violation of **[astm.f3548.v21.DSS0210,A2-7-2,4c](../../../../requirements/astm/f3548/v21.md)**. + + ## Subscription creation returns relevant OIRs test case This test case checks that, when a newly created subscription intersects with an existing OIR and that the subscription is intended for operational intent references, diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.py index c5c62260fb..709fea0512 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.py @@ -164,6 +164,7 @@ def _implicit_subs_check( _notif_ids: set[str], _query_timestamp: datetime, ): + # TODO: the participants of this check should be only the subscription owner and the DSS that returned the subscription with self.check( "DSS returns the implicit subscriptions from intersecting OIRs", _participants, @@ -226,6 +227,56 @@ def _implicit_subs_check( self._current_oirs[oir_id] = oir self.end_test_step() + self.begin_test_step("Modify an OIR at every DSS in sequence") + for i, dss in enumerate([self._dss] + self._secondary_instances): + oir_id = self._oir_ids[i] + oir = self._planning_area.get_new_operational_intent_ref_params( + key=[current_oir.ovn for current_oir in self._current_oirs.values()], + state=OperationalIntentState.Accepted, + uss_base_url="https://example.interuss.org/oir_base_url_bis", # dummy modification of the OIR + time_start=datetime.utcnow(), + time_end=self._time_send + timedelta(minutes=10), + subscription_id=self._current_oirs[oir_id].subscription_id, + ) + + with self.check( + "Mutate operational intent reference query succeeds", + [dss.participant_id], + ) as check: + try: + oir, subs, q = dss.put_op_intent( + extents=oir.extents, + key=oir.key, + state=oir.state, + base_url=oir.uss_base_url, + oi_id=oir_id, + ovn=self._current_oirs[oir_id].ovn, + subscription_id=oir.subscription_id, + ) + self.record_query(q) + except QueryError as qe: + self.record_queries(qe.queries) + check.record_failed( + summary="Failed to mutate operational intent reference", + details=f"Failed to mutate operational intent reference: {qe}", + query_timestamps=qe.query_timestamps, + ) + + notification_ids = to_sub_ids(subs) + + _expected_subs_check( + dss.participant_id, notification_ids, q.request.timestamp + ) + _implicit_subs_check( + [self._dss.participant_id] + + [sec_dss.participant_id for sec_dss in self._secondary_instances], + notification_ids, + q.request.timestamp, + ) + + self._current_oirs[oir_id] = oir + self.end_test_step() + def _steps_create_subs_at_each_dss(self): """Creates a subscription at each DSS instance""" diff --git a/monitoring/uss_qualifier/suites/astm/utm/dss_probing.md b/monitoring/uss_qualifier/suites/astm/utm/dss_probing.md index 8b51ab64e0..5b0a847279 100644 --- a/monitoring/uss_qualifier/suites/astm/utm/dss_probing.md +++ b/monitoring/uss_qualifier/suites/astm/utm/dss_probing.md @@ -27,7 +27,7 @@ Checked in - astm
.f3548
.v21
+ astm
.f3548
.v21
DSS0005,1 Implemented ASTM F3548-21 UTM DSS Operational Intent Reference Access Control
ASTM SCD DSS: Interfaces authentication
ASTM SCD DSS: Operational Intent Reference Key Validation
ASTM SCD DSS: Operational Intent Reference Synchronization
ASTM SCD DSS: Subscription Simple
ASTM SCD DSS: Subscription Synchronization
ASTM SCD DSS: Subscription Validation
ASTM SCD DSS: Subscription and entity deletion interaction
ASTM SCD DSS: Subscription and entity interaction @@ -157,6 +157,11 @@ Implemented ASTM SCD DSS: Subscription and entity interaction + + DSS0210,A2-7-2,4c + Implemented + ASTM SCD DSS: Subscription and entity interaction + DSS0210,A2-7-2,5a Implemented diff --git a/monitoring/uss_qualifier/suites/astm/utm/f3548_21.md b/monitoring/uss_qualifier/suites/astm/utm/f3548_21.md index e447efbcb3..f6ac43a509 100644 --- a/monitoring/uss_qualifier/suites/astm/utm/f3548_21.md +++ b/monitoring/uss_qualifier/suites/astm/utm/f3548_21.md @@ -35,7 +35,7 @@ Checked in - astm
.f3548
.v21
+ astm
.f3548
.v21
DSS0005,1 Implemented ASTM F3548 flight planners preparation
ASTM F3548-21 UTM DSS Operational Intent Reference Access Control
ASTM SCD DSS: Interfaces authentication
ASTM SCD DSS: Operational Intent Reference Key Validation
ASTM SCD DSS: Operational Intent Reference Synchronization
ASTM SCD DSS: Subscription Simple
ASTM SCD DSS: Subscription Synchronization
ASTM SCD DSS: Subscription Validation
ASTM SCD DSS: Subscription and entity deletion interaction
ASTM SCD DSS: Subscription and entity interaction
Nominal planning: not permitted conflict with equal priority
Off-Nominal planning: down USS
Off-Nominal planning: down USS with equal priority conflicts not permitted @@ -170,6 +170,11 @@ Implemented ASTM SCD DSS: Subscription and entity interaction + + DSS0210,A2-7-2,4c + Implemented + ASTM SCD DSS: Subscription and entity interaction + DSS0210,A2-7-2,5a Implemented diff --git a/monitoring/uss_qualifier/suites/faa/uft/message_signing.md b/monitoring/uss_qualifier/suites/faa/uft/message_signing.md index d2085cf952..89feb92231 100644 --- a/monitoring/uss_qualifier/suites/faa/uft/message_signing.md +++ b/monitoring/uss_qualifier/suites/faa/uft/message_signing.md @@ -18,7 +18,7 @@ Checked in - astm
.f3548
.v21
+ astm
.f3548
.v21
DSS0005,1 Implemented ASTM F3548 flight planners preparation
ASTM F3548-21 UTM DSS Operational Intent Reference Access Control
ASTM SCD DSS: Interfaces authentication
ASTM SCD DSS: Operational Intent Reference Key Validation
ASTM SCD DSS: Operational Intent Reference Synchronization
ASTM SCD DSS: Subscription Simple
ASTM SCD DSS: Subscription Synchronization
ASTM SCD DSS: Subscription Validation
ASTM SCD DSS: Subscription and entity deletion interaction
ASTM SCD DSS: Subscription and entity interaction
Nominal planning: not permitted conflict with equal priority
Off-Nominal planning: down USS
Off-Nominal planning: down USS with equal priority conflicts not permitted @@ -153,6 +153,11 @@ Implemented ASTM SCD DSS: Subscription and entity interaction + + DSS0210,A2-7-2,4c + Implemented + ASTM SCD DSS: Subscription and entity interaction + DSS0210,A2-7-2,5a Implemented diff --git a/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md b/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md index 178ee41639..3f87043968 100644 --- a/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md +++ b/monitoring/uss_qualifier/suites/interuss/dss/all_tests.md @@ -408,7 +408,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
.f3548
.v21
+ astm
.f3548
.v21
DSS0005,1 Implemented ASTM F3548-21 UTM DSS Operational Intent Reference Access Control
ASTM SCD DSS: Interfaces authentication
ASTM SCD DSS: Operational Intent Reference Key Validation
ASTM SCD DSS: Operational Intent Reference Synchronization
ASTM SCD DSS: Subscription Simple
ASTM SCD DSS: Subscription Synchronization
ASTM SCD DSS: Subscription Validation
ASTM SCD DSS: Subscription and entity deletion interaction
ASTM SCD DSS: Subscription and entity interaction @@ -538,6 +538,11 @@ Implemented ASTM SCD DSS: Subscription and entity interaction + + DSS0210,A2-7-2,4c + Implemented + ASTM SCD DSS: Subscription and entity interaction + DSS0210,A2-7-2,5a Implemented diff --git a/monitoring/uss_qualifier/suites/uspace/flight_auth.md b/monitoring/uss_qualifier/suites/uspace/flight_auth.md index 6f8229a102..539cea93f6 100644 --- a/monitoring/uss_qualifier/suites/uspace/flight_auth.md +++ b/monitoring/uss_qualifier/suites/uspace/flight_auth.md @@ -19,7 +19,7 @@ Checked in - astm
.f3548
.v21
+ astm
.f3548
.v21
DSS0005,1 Implemented ASTM F3548 flight planners preparation
ASTM F3548-21 UTM DSS Operational Intent Reference Access Control
ASTM SCD DSS: Interfaces authentication
ASTM SCD DSS: Operational Intent Reference Key Validation
ASTM SCD DSS: Operational Intent Reference Synchronization
ASTM SCD DSS: Subscription Simple
ASTM SCD DSS: Subscription Synchronization
ASTM SCD DSS: Subscription Validation
ASTM SCD DSS: Subscription and entity deletion interaction
ASTM SCD DSS: Subscription and entity interaction
Nominal planning: not permitted conflict with equal priority
Off-Nominal planning: down USS
Off-Nominal planning: down USS with equal priority conflicts not permitted @@ -154,6 +154,11 @@ Implemented ASTM SCD DSS: Subscription and entity interaction + + DSS0210,A2-7-2,4c + Implemented + ASTM SCD DSS: Subscription and entity interaction + DSS0210,A2-7-2,5a Implemented diff --git a/monitoring/uss_qualifier/suites/uspace/required_services.md b/monitoring/uss_qualifier/suites/uspace/required_services.md index e2854ec5cf..f5a8dce453 100644 --- a/monitoring/uss_qualifier/suites/uspace/required_services.md +++ b/monitoring/uss_qualifier/suites/uspace/required_services.md @@ -454,7 +454,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
.f3548
.v21
+ astm
.f3548
.v21
DSS0005,1 Implemented ASTM F3548 flight planners preparation
ASTM F3548-21 UTM DSS Operational Intent Reference Access Control
ASTM SCD DSS: Interfaces authentication
ASTM SCD DSS: Operational Intent Reference Key Validation
ASTM SCD DSS: Operational Intent Reference Synchronization
ASTM SCD DSS: Subscription Simple
ASTM SCD DSS: Subscription Synchronization
ASTM SCD DSS: Subscription Validation
ASTM SCD DSS: Subscription and entity deletion interaction
ASTM SCD DSS: Subscription and entity interaction
Nominal planning: not permitted conflict with equal priority
Off-Nominal planning: down USS
Off-Nominal planning: down USS with equal priority conflicts not permitted @@ -589,6 +589,11 @@ Implemented ASTM SCD DSS: Subscription and entity interaction + + DSS0210,A2-7-2,4c + Implemented + ASTM SCD DSS: Subscription and entity interaction + DSS0210,A2-7-2,5a Implemented