From 0d2481169bd077560c5fbbcbcfc94215b9dce106 Mon Sep 17 00:00:00 2001 From: ScorpioBroker <55130839+ScorpioBroker@users.noreply.github.com> Date: Mon, 14 Apr 2025 15:12:22 +0200 Subject: [PATCH 1/3] allowing broker generated keys in subs --- .../Subscription/CreateSubscription/028_01.robot | 3 ++- .../Subscription/RetrieveSubscription/030_03.robot | 2 ++ .../Subscription/UpdateSubscription/029_05.robot | 2 ++ .../Subscription/UpdateSubscription/029_06.robot | 2 +- doc/analysis/checks.py | 4 ++-- resources/AssertionUtils.resource | 7 +++++-- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot index 8c618ad72..ef67897cb 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot @@ -29,7 +29,8 @@ ${subscription_expectation_file_path}= subscriptions/expectations/subscript ... id=${subscription_id} ... accept=${CONTENT_TYPE_LD_JSON} ... context=${ngsild_test_suite_context} - Check Created Resource Set To ${expected_subscription} ${response1.json()} + ${ignore_keys}= Create List "jsonldContext" "timesFailed" "timesSent" "notificationTrigger" + Check Created Resource Set To ${expected_subscription} ${response1.json()} ${ignore_keys} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot index 69baa4d00..351d61b07 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot @@ -23,10 +23,12 @@ ${expectation_file_path}= subscriptions/expectations/subscriptions ... id=${subscription_id} ... context=${ngsild_test_suite_context} Check Response Status Code 200 ${response.status_code} + ${ignore_keys}= Create List "jsonldContext" "timesFailed" "timesSent" "notificationTrigger" Check Response Body Containing Subscription element ... ${expectation_file_path} ... ${subscription_id} ... ${response.json()} + ... ${ignore_keys} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot index f5100d6a8..a7d8f1d40 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot @@ -30,10 +30,12 @@ ${expected_expanded_subscription_payload_file_path}= subscriptions/expectatio ${response1}= Retrieve Subscription ... id=${subscription_id} ... context=${ngsild_test_suite_context} + ${ignore_keys}= Create List "jsonldContext" "timesFailed" "timesSent" "notificationTrigger" Check Response Body Containing Subscription element ... ${expected_subscription_payload_file_path} ... ${subscription_id} ... ${response1.json()} + ... ${ignore_keys} 029_05_02 Update Subscription With Term to Uri Expansion without Context [Documentation] Check that one can update a subcription: Term to URI expansion of Attribute names shall be observed diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot index 45b847e29..09c738450 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot @@ -31,7 +31,7 @@ ${subscription_update_fragment_file_path}= subscriptions/fragments/subscrip ... id=${subscription_id} ... accept=${CONTENT_TYPE_LD_JSON} ... context=${ngsild_test_suite_context} - ${ignored_attributes}= Create List ${status_regex_expr} notificationTrigger + ${ignored_attributes}= Create List ${status_regex_expr} notificationTrigger "jsonldContext" "timesFailed" "timesSent" "notificationTrigger" Check Updated Resource Set To ... updated_resource=${subscription} ... response_body=${response1.json()} diff --git a/doc/analysis/checks.py b/doc/analysis/checks.py index 61c260e35..9eb23fab5 100644 --- a/doc/analysis/checks.py +++ b/doc/analysis/checks.py @@ -310,8 +310,8 @@ class Checks: 'position': [0, 1] }, 'Check Response Body Containing Subscription element': { - 'params': ['filename', 'subscription_id', 'response_body'], - 'position': [0, 1, 2] + 'params': ['filename', 'subscription_id', 'response_body', 'additional_ignored_keys'], + 'position': [0, 1, 2, 3] }, 'Wait for notification': { 'params': ['timeout'], diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource index 1cb78c3fc..bde600c79 100755 --- a/resources/AssertionUtils.resource +++ b/resources/AssertionUtils.resource @@ -232,10 +232,13 @@ Check Response Body Containing List Containing EntityTemporal elements Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} Check Response Body Containing Subscription element - [Arguments] ${expectation_filename} ${subscription_id} ${response_body} + [Arguments] ${expectation_filename} ${subscription_id} ${response_body} ${additional_ignored_keys}=None ${subscription_payload}= Load JSON From File ${EXECDIR}/data/${expectation_filename} ${subscription}= Update Value To JSON ${subscription_payload} $..id ${subscription_id} ${ignored_keys}= Create List ${context_regex_expr} + IF ${additional_ignored_keys} != None + Extend List ${ignored_keys} ${additional_ignored_keys} + END ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${subscription} ... ${response_body} @@ -253,7 +256,7 @@ Check Response Body Containing List Containing Subscription elements ... ${subscription_id} ${index}= Evaluate ${index} + 1 END - ${ignored_keys}= Create List ${context_regex_expr} + ${ignored_keys}= Create List ${context_regex_expr} "jsonldContext" "timesFailed" "timesSent" "notificationTrigger" ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${subscription_payload} ... ${response_body} -- GitLab From 662bf1ea09c53a26272a294c67bfe65bb9959abe Mon Sep 17 00:00:00 2001 From: ScorpioBroker <55130839+ScorpioBroker@users.noreply.github.com> Date: Mon, 14 Apr 2025 16:27:04 +0200 Subject: [PATCH 2/3] fixing indentation --- .../Subscription/UpdateSubscription/029_05.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot index a7d8f1d40..2923a37e9 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot @@ -35,7 +35,7 @@ ${expected_expanded_subscription_payload_file_path}= subscriptions/expectatio ... ${expected_subscription_payload_file_path} ... ${subscription_id} ... ${response1.json()} - ... ${ignore_keys} + ... ${ignore_keys} 029_05_02 Update Subscription With Term to Uri Expansion without Context [Documentation] Check that one can update a subcription: Term to URI expansion of Attribute names shall be observed -- GitLab From 32c27421997d15b5cdb4ae2644a2631356ed560c Mon Sep 17 00:00:00 2001 From: Benjamin Hebgen Date: Thu, 10 Jul 2025 08:05:30 +0000 Subject: [PATCH 3/3] Edit 029_06.robot --- .../Subscription/UpdateSubscription/029_06.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot index 09c738450..99aa8ecee 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot @@ -31,7 +31,7 @@ ${subscription_update_fragment_file_path}= subscriptions/fragments/subscrip ... id=${subscription_id} ... accept=${CONTENT_TYPE_LD_JSON} ... context=${ngsild_test_suite_context} - ${ignored_attributes}= Create List ${status_regex_expr} notificationTrigger "jsonldContext" "timesFailed" "timesSent" "notificationTrigger" + ${ignored_attributes}= Create List ${status_regex_expr} "jsonldContext" "timesFailed" "timesSent" "notificationTrigger" Check Updated Resource Set To ... updated_resource=${subscription} ... response_body=${response1.json()} -- GitLab