Commit 6510fb0c authored by kzangeli's avatar kzangeli
Browse files

Merge branch 'fix/047-csub-notification-behaviour' into integration/all-fixes

parents ed2b803f 9d5d5957

TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_02.robot

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Test Teardown Delete Created Context Source Registration And Context Sourc 




*** Variables ***

${context_source_registration_payload_file_path}=       csourceRegistrations/context-source-registration.jsonld

${context_source_registration_payload_file_path}=       csourceRegistrations/context-source-registration-building-and-bus-entities.jsonld

${subscription_payload_file_path}=                      csourceSubscriptions/subscription.jsonld

${update_fragment_file_path}=                           csourceRegistrations/fragments/context-source-registration-update.json

TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_03.robot

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ Setup Initial Context Source Registration Subscription 
    ${create_response}=    Create Context Source Registration Subscription    ${subscription_payload}

    Check Response Status Code    201    ${create_response.status_code}

    Set Suite Variable    ${subscription_id}

    # TS 104-175 clause 12.4.7: the initial csource notification is sent

    # unconditionally on subscription — with no matching CSR yet it carries

    # an empty data array. Consume it so later waits see the right one.

    Wait for notification



Delete Created Context Source Registration And Subscription

    Stop Local Server

TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_04.robot

+5 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Test Teardown Delete Created Context Source Registration And Subscription 




*** Variables ***

${context_source_registration_payload_file_path}=       csourceRegistrations/context-source-registration.jsonld

${context_source_registration_payload_file_path}=       csourceRegistrations/context-source-registration-building-and-bus-entities.jsonld

${subscription_payload_file_path}=                      csourceSubscriptions/subscription.jsonld
@@ -44,6 +44,10 @@ Setup Initial Context Source Registration Subscription 
    ${create_response}=    Create Context Source Registration Subscription    ${subscription_payload}

    Check Response Status Code    201    ${create_response.status_code}

    Set Suite Variable    ${subscription_id}

    # TS 104-175 clause 12.4.7: the initial csource notification is sent

    # unconditionally on subscription — with no matching CSR yet it carries

    # an empty data array. Consume it so later waits see the right one.

    Wait for notification



Delete Created Context Source Registration And Subscription

    Stop Local Server

TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_05.robot

+6 −1
Original line number Diff line number Diff line
@@ -27,8 +27,13 @@ ${notification_expectation_file_path}= notifications/expectatio 
    ...    ${context_source_registration_payload_file_path}

    ...    ${context_source_registration_id}

    Set Suite Variable    ${context_source_registration_id}

    ${create_response}=    Create Context Source Registration    ${context_source_registration_payload}

    # TS 104-175 clause 12.4.7: the initial csource notification (sent

    # unconditionally on subscription) is the successful delivery whose

    # bookkeeping this test verifies. The CSR created above does not match

    # the subscription's entities, so no further notification may arrive.

    Wait for notification

    ${create_response}=    Create Context Source Registration    ${context_source_registration_payload}

    Wait for no notification

    ${response}=    Retrieve Context Source Registration Subscription

    ...    subscription_id=${subscription_id}

    @{expected_notification_additional_members}=    Create List    lastNotification    lastSuccess

TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_07.robot

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ Setup Initial Context Source Registration Subscription 
    ...    ${subscription_id}

    ${create_response}=    Create Context Source Registration Subscription    ${subscription_payload}

    Check Response Status Code    201    ${create_response.status_code}

    # TS 104-175 clause 12.4.7: the subscription is created active, so the

    # unconditional initial csource notification arrives before the pause —

    # consume it so "Wait for no notification" only sees post-pause traffic.

    Wait for notification

    Set Suite Variable    ${subscription_id}



Delete Created Context Source Registration And Subscription