From 147568dfbe0bbe2043678e86c772a01f224f46e1 Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Mon, 8 Feb 2021 10:11:47 +0100 Subject: [PATCH] fix: add keyword to load subscriptions with reachable endpoint --- .../NotificationBehaviour/037_01.robot | 2 +- .../NotificationBehaviour/037_02.robot | 2 +- .../NotificationBehaviour/037_03.robot | 2 +- .../NotificationBehaviour/037_04.robot | 2 +- .../NotificationBehaviour/037_05.robot | 2 +- .../NotificationBehaviour/037_07.robot | 2 +- .../NotificationBehaviour/037_08.robot | 2 +- .../NotificationBehaviour/037_09.robot | 2 +- .../NotificationBehaviour/037_10.robot | 2 +- .../NotificationBehaviour/037_11.robot | 2 +- .../NotificationBehaviour/037_12.robot | 2 +- .../NotificationBehaviour/037_13.robot | 2 +- .../NotificationBehaviour/037_14.robot | 2 +- .../NotificationBehaviour/037_15.robot | 2 +- .../NotificationBehaviour/037_16.robot | 2 +- resources/AssertionUtils.resource | 4 +++- resources/JsonUtils.resource | 10 ++++++++++ resources/NotificationUtils.resource | 2 +- 18 files changed, 29 insertions(+), 17 deletions(-) diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_01.robot index 80b336d4..09b5e1f6 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_01.robot @@ -20,7 +20,7 @@ Receive cSourceNotification Periodically And Initially On Subscription [Tags] mandatory ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} - ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + ${subscription_payload}= Load Subscription Sample With Reachable Endpoint ${subscription_payload_file_path} ${subscription_id} Set Suite Variable ${subscription_id} Create Context Source Registration Subscription ${subscription_payload} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_02.robot index 4846a9f5..04e6f2ac 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_02.robot @@ -21,7 +21,7 @@ Receive cSourceNotification Initially On Subscription And Whenever There Is A Ch [Tags] mandatory ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} - ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + ${subscription_payload}= Load Subscription Sample With Reachable Endpoint ${subscription_payload_file_path} ${subscription_id} Set Suite Variable ${subscription_id} Create Context Source Registration Subscription ${subscription_payload} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_03.robot index 7ad2693f..8531a45f 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_03.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_03.robot @@ -35,7 +35,7 @@ Setup Initial Context Source Registration Subscriptions Start Local Server ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} - ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + ${subscription_payload}= Load Subscription Sample With Reachable Endpoint ${subscription_payload_file_path} ${subscription_id} Create Context Source Registration Subscription ${subscription_payload} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_04.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_04.robot index aac6a6c3..c61dd058 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_04.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_04.robot @@ -33,7 +33,7 @@ Setup Initial Context Source Registration Subscriptions Start Local Server ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} - ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + ${subscription_payload}= Load Subscription Sample With Reachable Endpoint ${subscription_payload_file_path} ${subscription_id} Create Context Source Registration Subscription ${subscription_payload} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_05.robot index f562b613..61af8f1d 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_05.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_05.robot @@ -37,7 +37,7 @@ Setup Initial Context Source Registration Subscriptions Start Local Server ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} - ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + ${subscription_payload}= Load Subscription Sample With Reachable Endpoint ${subscription_payload_file_path} ${subscription_id} Create Context Source Registration Subscription ${subscription_payload} Set Suite Variable ${subscription_id} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_07.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_07.robot index 09c91737..6b244861 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_07.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_07.robot @@ -41,7 +41,7 @@ Setup Initial Context Source Registration Subscriptions Start Local Server ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} - ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + ${subscription_payload}= Load Subscription Sample With Reachable Endpoint ${subscription_payload_file_path} ${subscription_id} Create Context Source Registration Subscription ${subscription_payload} Set Suite Variable ${subscription_id} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_08.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_08.robot index 800f0a9f..16b9cb92 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_08.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_08.robot @@ -33,7 +33,7 @@ Setup Initial Context Source Registrations And Subscriptions ${context_source_registration_id}= Generate Random Entity Id ${context_source_registration_id_prefix} ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} ${context_source_registration_payload}= Load Test Sample ${context_source_registration_payload_file_path} ${context_source_registration_id} - ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + ${subscription_payload}= Load Subscription Sample With Reachable Endpoint ${subscription_payload_file_path} ${subscription_id} Create Context Source Registration ${context_source_registration_payload} Create Context Source Registration Subscription ${subscription_payload} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_09.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_09.robot index bd0794af..834ab1ae 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_09.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_09.robot @@ -33,7 +33,7 @@ Setup Initial Context Source Registrations And Subscriptions ${context_source_registration_id}= Generate Random Entity Id ${context_source_registration_id_prefix} ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} ${context_source_registration_payload}= Load Test Sample ${context_source_registration_payload_file_path} ${context_source_registration_id} - ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + ${subscription_payload}= Load Subscription Sample With Reachable Endpoint ${subscription_payload_file_path} ${subscription_id} Create Context Source Registration ${context_source_registration_payload} Create Context Source Registration Subscription ${subscription_payload} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_10.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_10.robot index 37f11385..6d2d3a1b 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_10.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_10.robot @@ -33,7 +33,7 @@ Setup Initial Context Source Registration Subscriptions Start Local Server ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} - ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + ${subscription_payload}= Load Subscription Sample With Reachable Endpoint ${subscription_payload_file_path} ${subscription_id} Create Context Source Registration Subscription ${subscription_payload} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_11.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_11.robot index 81487f69..64dca133 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_11.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_11.robot @@ -25,7 +25,7 @@ Receive cSourceNotification For Matching Context Source Registrations On Managem [Tags] mandatory ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} - ${subscription_payload}= Load Test Sample ${filepath} ${subscription_id} + ${subscription_payload}= Load Subscription Sample With Reachable Endpoint ${filepath} ${subscription_id} Create Context Source Registration Subscription ${subscription_payload} Set Suite Variable ${subscription_id} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_12.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_12.robot index 5c63941f..995a53c9 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_12.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_12.robot @@ -33,7 +33,7 @@ Setup Initial Context Source Registration Subscriptions Start Local Server ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} - ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + ${subscription_payload}= Load Subscription Sample With Reachable Endpoint ${subscription_payload_file_path} ${subscription_id} Create Context Source Registration Subscription ${subscription_payload} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_13.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_13.robot index 3da7df0c..3317b4f6 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_13.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_13.robot @@ -33,7 +33,7 @@ Setup Initial Context Source Registration Subscriptions Start Local Server ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} - ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + ${subscription_payload}= Load Subscription Sample With Reachable Endpoint ${subscription_payload_file_path} ${subscription_id} Create Context Source Registration Subscription ${subscription_payload} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_14.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_14.robot index e269b57d..bb978005 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_14.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_14.robot @@ -33,7 +33,7 @@ Setup Initial Context Source Registration Subscriptions Start Local Server ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} - ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + ${subscription_payload}= Load Subscription Sample With Reachable Endpoint ${subscription_payload_file_path} ${subscription_id} Create Context Source Registration Subscription ${subscription_payload} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_15.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_15.robot index 9527579f..ae8bc477 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_15.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_15.robot @@ -33,7 +33,7 @@ Setup Initial Context Source Registration Subscriptions Start Local Server ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} - ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + ${subscription_payload}= Load Subscription Sample With Reachable Endpoint ${subscription_payload_file_path} ${subscription_id} Create Context Source Registration Subscription ${subscription_payload} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_16.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_16.robot index 8c5b3f15..cc397045 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_16.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_16.robot @@ -39,7 +39,7 @@ Setup Initial Context Source Registrations And Subscriptions ${first_context_source_registration_id}= Generate Random Entity Id ${context_source_registration_id_prefix} ${second_context_source_registration_id}= Generate Random Entity Id ${context_source_registration_id_prefix} - ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + ${subscription_payload}= Load Subscription Sample With Reachable Endpoint ${subscription_payload_file_path} ${subscription_id} ${first_context_source_registration_payload}= Load Test Sample ${first_context_source_registration_payload_file_path} ${first_context_source_registration_id} ${second_context_source_registration_payload}= Load Test Sample ${second_context_source_registration_payload_file_path} ${second_context_source_registration_id} diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource index c4a8c7a9..8665b91a 100755 --- a/resources/AssertionUtils.resource +++ b/resources/AssertionUtils.resource @@ -4,6 +4,7 @@ Library ${EXECDIR}/libraries/assertionUtils.py *** Variable *** ${instance_id_regex_expr}= root\\[.*\\]\\['instanceId'\\] ${notification_timestamps_regex_expr}= root\\['last.*'\\] +${notification_endpoint_uri_regex_expr}= root\\['endpoint'\\]\\['uri'\\] ${context_regex_expr}= root\\['@context'\\] ${status_regex_expr}= root\\['status'\\] @@ -210,7 +211,8 @@ Check NotificationParams [Arguments] ${filename} ${expected_additional_members} ${expected_notification}= Load Json From File ${EXECDIR}/data/${filename} - ${comparaison_result}= Compare Dictionaries Ignoring Keys ${response['body']['notification']} ${expected_notification} ${notification_timestamps_regex_expr} + ${ignored_keys}= Create List ${notification_timestamps_regex_expr} ${notification_endpoint_uri_regex_expr} + ${comparaison_result}= Compare Dictionaries Ignoring Keys ${response['body']['notification']} ${expected_notification} ${ignored_keys} Should Be True ${comparaison_result} msg=NotificationParams Comparaison Failed FOR ${expected_additional_member} IN @{expected_additional_members} diff --git a/resources/JsonUtils.resource b/resources/JsonUtils.resource index 78c7d74d..c0827f79 100644 --- a/resources/JsonUtils.resource +++ b/resources/JsonUtils.resource @@ -5,6 +5,8 @@ Library JSONLibrary *** Variable *** ${date_format}= %Y-%m-%dT%H:%M:%SZ +${notification_server_url}= http://${notification_server_host}:${notification_server_port}/notify + *** Keywords *** Load Entity [Arguments] ${entity_file_name} ${entity_id} @@ -24,6 +26,14 @@ Load Test Sample [return] ${test_sample} +Load Subscription Sample With Reachable Endpoint + [Arguments] ${subscription_file_path} ${subscription_id}=${EMPTY} ${notification_endpoint_uri}=${notification_server_url} + + ${subscription_payload}= Load Test Sample ${subscription_file_path} ${subscription_id} + ${subscription}= Update Value To Json ${subscription_payload} $..notification['endpoint']['uri'] ${notification_endpoint_uri} + + [return] ${subscription} + Remove Entity Type [Arguments] ${entity} diff --git a/resources/NotificationUtils.resource b/resources/NotificationUtils.resource index e9749abb..fffcde35 100644 --- a/resources/NotificationUtils.resource +++ b/resources/NotificationUtils.resource @@ -13,7 +13,7 @@ ${date_format}= %Y-%m-%dT%H:%M:%SZ *** Keywords *** Start Local Server #Initialize HTTP Client And Server - Start Server ${notification_server_host} ${notification_server_port} + Start Server 0.0.0.0 8085 Wait for notification [Arguments] ${timeout}=${5} -- GitLab