Commit 530d49ff authored by Benedetta Arena's avatar Benedetta Arena
Browse files

fix: update endpoint references and improve noOverwrite checks for AppendEntityAttributes

parent 3d7d40be
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
*** Settings ***
Documentation       Check that when appending entity attributes to an entity with an exclusive registration, the attributes managed locally are updated on the Context Broker, while attributes managed with the exclusive registration are updated in the Context Source.

Resource            ${EXECDIR}/resources/ApiUtils/Common.resource
Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationProvision.resource
Resource            ${EXECDIR}/resources/ApiUtils/ContextSourceRegistration.resource
Resource            ${EXECDIR}/resources/ApiUtils/ContextSourceDiscovery.resource
Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationProvision.resource
Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource
Resource            ${EXECDIR}/resources/AssertionUtils.resource
Resource            ${EXECDIR}/resources/JsonUtils.resource
Resource            ${EXECDIR}/resources/MockServerUtils.resource
@@ -30,18 +31,17 @@ D003_01_exc Append Entity Attribute
    Check Response Status Code    204    ${response.status_code}

    ${stub_count}=    Get Stub Count    POST    /broker1/ngsi-ld/v1/entities/${entity_id}/attrs/
    Should Be Equal As Integers    ${stub_count}    1
    Should Be Equal    ${stub_count}    1

    ${response}=    Retrieve Entity    ${entity_id}    context=${ngsild_test_suite_context}    local=true
    ${body}=    Get From Dictionary    ${response.json()}    speed
    Should Not Contain    ${body}    speed
    Should Not Contain    ${response.json()}    speed

*** Keywords ***
Create Entity And Registration On The Context Broker And Start Context Source Mock Server
    ${entity_id}=    Generate Random Vehicle Entity Id
    Set Suite Variable    ${entity_id}

    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    local=true
    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}
    Check Response Status Code    201    ${response.status_code}

    ${registration_id}=    Generate Random CSR Id
@@ -51,7 +51,7 @@ Create Entity And Registration On The Context Broker And Start Context Source Mo
    ...    ${registration_payload_file_path}
    ...    entity_id=${entity_id}
    ...    mode=exclusive
    ...    endpoint=/broker1
    ...    endpoint=${context_source_url}/broker1
    ${response}=    Create Context Source Registration With Return    ${registration_payload}
    Check Response Status Code    201    ${response.status_code}
    Start Context Source Mock Server
+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ Setup Registration And Start Context Source Mock Server
    ...    ${registration_payload_file_path}
    ...    entity_id=${entity_id}
    ...    mode=redirect
    ...    endpoint=/broker1
    ...    endpoint=${context_source_url}/broker1
    ${response}=    Create Context Source Registration With Return    ${registration_payload}
    Check Response Status Code    201    ${response.status_code}

@@ -62,7 +62,7 @@ Setup Registration And Start Context Source Mock Server
    ...    ${registration_payload_file_path}
    ...    entity_id=${entity_id}
    ...    mode=redirect
    ...    endpoint=/broker2
    ...    endpoint=${context_source_url}/broker2
    ${response}=    Create Context Source Registration With Return    ${registration_payload}
    Check Response Status Code    201    ${response.status_code}
    
+4 −4
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ D003_02_exc Append Entity Attribute
    ...    ${fragment_filename}
    ...    ${CONTENT_TYPE_JSON}
    ...    noOverwrite
    Wait for redirected request
    Check Response Status Code    207   ${response.status_code}
    Should Contain    ${response.request.url}    options=noOverwrite

    ${stub}=    Get Request Url Params    options
    Should Contain    ${stub}    noOverwrite
    ${stub_count}=    Get Stub Count    POST    /broker1/ngsi-ld/v1/entities/${entity_id}/attrs/
    Should Be Equal    ${stub_count}    1

*** Keywords ***
Create Entity And Registration On The Context Broker And Start Context Source Mock Server
@@ -51,7 +51,7 @@ Create Entity And Registration On The Context Broker And Start Context Source Mo
    ...    ${registration_payload_file_path}
    ...    entity_id=${entity_id}
    ...    mode=exclusive
    ...    endpoint=/broker1
    ...    endpoint=${context_source_url}/broker1
    ${response}=    Create Context Source Registration With Return    ${registration_payload}
    Check Response Status Code    201    ${response.status_code}

+2 −4
Original line number Diff line number Diff line
@@ -32,11 +32,9 @@ D003_02_inc Append Entity Attribute
    ...    ${fragment_filename}
    ...    ${CONTENT_TYPE_JSON}
    ...    noOverwrite
    Wait For Request
    Check Response Status Code    207    ${response.status_code}
    
    ${stub}=    Get Request Url Params    options
    Should Contain    ${stub}    noOverwrite
    Should Contain    ${response.request.url}    options=noOverwrite

    ${response}=    Retrieve Entity    ${entity_id}
    ${new_body}=    Get From Dictionary    ${response.json()}    isParked
+8 −5
Original line number Diff line number Diff line
@@ -31,11 +31,14 @@ D003_02_red Append Entity Attribute
    ...    ${fragment_filename}
    ...    ${CONTENT_TYPE_JSON}
    ...    noOverwrite
    Wait for redirected request
    Check Response Status Code    207   ${response.status_code}

    ${stub}=    Get Request Url Params    options
    Should Contain    ${stub}    noOverwrite
    Should Contain    ${response.request.url}    options=noOverwrite

    ${stub_count}=    Get Stub Count    POST    /broker1/ngsi-ld/v1/entities/${entity_id}/attrs/
    Should Be Equal    ${stub_count}    1
    ${stub_count}=    Get Stub Count    POST    /broker2/ngsi-ld/v1/entities/${entity_id}/attrs/
    Should Be Equal    ${stub_count}    1

*** Keywords ***
Setup Registration And Start Context Source Mock Server
@@ -49,7 +52,7 @@ Setup Registration And Start Context Source Mock Server
    ...    ${registration_payload_file_path}
    ...    entity_id=${entity_id}
    ...    mode=redirect
    ...    endpoint=/broker1
    ...    endpoint=${context_source_url}/broker1
    ${response}=    Create Context Source Registration With Return    ${registration_payload}
    Check Response Status Code    201    ${response.status_code}

@@ -60,7 +63,7 @@ Setup Registration And Start Context Source Mock Server
    ...    ${registration_payload_file_path}
    ...    entity_id=${entity_id}
    ...    mode=redirect
    ...    endpoint=/broker2
    ...    endpoint=${context_source_url}/broker2
    ${response}=    Create Context Source Registration With Return    ${registration_payload}
    Check Response Status Code    201    ${response.status_code}