From 29fd022fec8cedbaf2102d3ce21b0b7ab0784092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Misbach?= Date: Thu, 31 Oct 2024 17:15:06 +0100 Subject: [PATCH] [uss_qualifier/scenarios/utm/data_exchange_validation] Fix expect_mock_uss_receives_op_intent_notification --- .../data_exchange_validation/get_op_data_validation.py | 1 + .../test_steps/expected_interactions_test_steps.py | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/data_exchange_validation/get_op_data_validation.py b/monitoring/uss_qualifier/scenarios/astm/utm/data_exchange_validation/get_op_data_validation.py index c88f5890f..739d5d238 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/data_exchange_validation/get_op_data_validation.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/data_exchange_validation/get_op_data_validation.py @@ -215,6 +215,7 @@ def _plan_successfully_test_case(self, times: Dict[TimeDuringTest, Time]): self, self.mock_uss, flight_1_planning_time, + flight_1_oi_ref.id, self.tested_uss_client.participant_id, plan_res.queries[0].request.timestamp, ) diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/data_exchange_validation/test_steps/expected_interactions_test_steps.py b/monitoring/uss_qualifier/scenarios/astm/utm/data_exchange_validation/test_steps/expected_interactions_test_steps.py index c95e53791..9d00b7db6 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/data_exchange_validation/test_steps/expected_interactions_test_steps.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/data_exchange_validation/test_steps/expected_interactions_test_steps.py @@ -30,6 +30,7 @@ def expect_mock_uss_receives_op_intent_notification( scenario: TestScenarioType, mock_uss: MockUSSClient, st: StringBasedDateTime, + op_intent_id: EntityID, participant_id: str, plan_request_time: datetime, ): @@ -37,6 +38,7 @@ def expect_mock_uss_receives_op_intent_notification( Args: st: the earliest time a notification may have been sent + op_intent_id: the operational intent ID subject of the notification participant_id: id of the participant responsible to send the notification plan_request_time: timestamp of the flight plan query that would lead to sending notification """ @@ -48,13 +50,15 @@ def expect_mock_uss_receives_op_intent_notification( st, operation_filter(OperationID.NotifyOperationalIntentDetailsChanged), direction_filter(QueryDirection.Incoming), + notif_op_intent_id_filter(op_intent_id), + status_code_filter(204), ) with scenario.check("Expect Notification sent", [participant_id]) as check: if not found: check.record_failed( - summary=f"Notification not sent", - details=f"Notification to USS with pre-existing relevant operational intent not sent even though DSS instructed the planning USS to notify due to subscription.", + summary=f"Notification not sent for {op_intent_id}", + details=f"Notification from {participant_id} to USS for {op_intent_id} with pre-existing relevant operational intent not sent even though DSS instructed the planning USS to notify due to subscription.", query_timestamps=[plan_request_time, query.request.timestamp], )