Commit e9a7182f authored by Benedetta Arena's avatar Benedetta Arena
Browse files

fix: improve logic of DeleteEntity

parent 83d675ab

TP/NGSI-LD/DistributedOperations/Provision/Entities/DeleteEntity/D002_01_exc.robot

+9 −11
Original line number Diff line number Diff line
@@ -8,17 +8,13 @@ Resource ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption. 
Resource            ${EXECDIR}/resources/AssertionUtils.resource

Resource            ${EXECDIR}/resources/JsonUtils.resource

Resource            ${EXECDIR}/resources/MockServerUtils.resource

Resource            ${EXECDIR}/resources/AssertionUtils.resource



Test Setup          Create Entity And Registration On The Context Broker And Start Context Source Mock Server

Test Teardown       Delete Created Entity And Registration And Stop Context Source Mock Server





*** Variables ***

${entity_id_prefix}                     urn:ngsi-ld:Vehicle:

${entity_payload_filename}              vehicle-simple-attributes.jsonld

${entity_speed_filename}                vehicle-speed-attribute.json

${registration_id_prefix}               urn:ngsi-ld:Registration:

${entity_payload_filename}              vehicle-simple-different-attributes.jsonld

${registration_payload_file_path}       csourceRegistrations/context-source-registration-vehicle-speed-with-redirection-ops.jsonld
@@ -26,7 +22,14 @@ ${registration_payload_file_path} csourceRegistrations/context-source-regi 
D002_01_exc Delete Entity With Exclusive Registration

    [Documentation]    Check that the entity is deleted correctly in the Context Broker and in the Context Source.

    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_04    proxy-exclusive    4_3_6_3    5_6_6

    ${speed_entity}=    Load Entity    ${entity_speed_filename}    ${entity_id}



    Set Stub Reply    POST    /broker1/ngsi-ld/v1/entities/    201

    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}

    Check Response Status Code    201    ${response.status_code}



    ${response}=    Retrieve Entity    ${entity_id}    context=${ngsild_test_suite_context}    local=true

    Check Response Status Code    200    ${response.status_code}

    Should Not Contain    ${response.json()}    speed



    Set Stub Reply    DELETE    /broker1/ngsi-ld/v1/entities/${entity_id}    204

    ${response}=    Delete Entity    ${entity_id}
@@ -34,15 +37,11 @@ D002_01_exc Delete Entity With Exclusive Registration 
    ${stub_count}=    Get Stub Count    DELETE    /broker1/ngsi-ld/v1/entities/${entity_id}

    Should Be True    ${stub_count} > 0





*** 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

    Check Response Status Code    201    ${response.status_code}



    ${registration_id}=    Generate Random CSR Id

    Set Suite Variable    ${registration_id}

    ${registration_payload}=    Prepare Context Source Registration From File
@@ -58,5 +57,4 @@ Create Entity And Registration On The Context Broker And Start Context Source Mo 


Delete Created Entity And Registration And Stop Context Source Mock Server

    Delete Context Source Registration    ${registration_id}

    Delete Entity    ${entity_id}

    Stop Context Source Mock Server

TP/NGSI-LD/DistributedOperations/Provision/Entities/DeleteEntity/D002_01_inc.robot

+0 −1
Original line number Diff line number Diff line
@@ -52,5 +52,4 @@ Create Entity And Registration On The Context Broker And Start Context Source Mo 


Delete Created Entity And Registration And Stop Context Source Mock Server

    Delete Context Source Registration    ${registration_id}

    Delete Entity    ${entity_id}

    Stop Context Source Mock Server

TP/NGSI-LD/DistributedOperations/Provision/Entities/DeleteEntity/D002_01_red.robot

+2 −4
Original line number Diff line number Diff line
@@ -14,9 +14,7 @@ Test Teardown Delete Registrations And Stop Context Source Mock Server 




*** Variables ***

${entity_id_prefix}                     urn:ngsi-ld:Vehicle:

${entity_payload_filename}              vehicle-simple-attributes.jsonld

${registration_id_prefix}               urn:ngsi-ld:Registration:

${registration_payload_file_path}       csourceRegistrations/context-source-registration-vehicle-redirection-ops.jsonld

TP/NGSI-LD/DistributedOperations/Provision/Entities/DeleteEntity/D002_02_exc.robot

+4 −8
Original line number Diff line number Diff line
@@ -8,17 +8,14 @@ Resource ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption. 
Resource            ${EXECDIR}/resources/AssertionUtils.resource

Resource            ${EXECDIR}/resources/JsonUtils.resource

Resource            ${EXECDIR}/resources/MockServerUtils.resource

Resource            ${EXECDIR}/resources/AssertionUtils.resource



Test Setup          Create Entity And Registration On The Context Broker And Start Context Source Mock Server

Test Teardown       Delete Created Entity And Registration And Stop Context Source Mock Server





*** Variables ***

${entity_id_prefix}                     urn:ngsi-ld:Vehicle:

${entity_payload_filename}              vehicle-simple-attributes.jsonld

${registration_id_prefix}               urn:ngsi-ld:Registration:

${registration_payload_file_path}       csourceRegistrations/context-source-registration-vehicle-redirection-ops.jsonld

${registration_payload_file_path}       csourceRegistrations/context-source-registration-vehicle-speed-without-redirection-ops.jsonld





*** Test Cases ***
@@ -26,20 +23,19 @@ D002_02_exc Delete Entity Without Redirection Operations 
    [Documentation]    Check that the deletion is not forwarded to the Context Source due to a lack of redirection operations in the registration.

    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_04    proxy-exclusive    4_3_6_3    5_6_6



    Set Stub Reply    DELETE    /broker1/ngsi-ld/v1/entities/${entity_id}    207

    Set Stub Reply    DELETE    /broker1/ngsi-ld/v1/entities/${entity_id}    409

    ${response}=    Delete Entity    ${entity_id}

    Check Response Status Code    207    ${response.status_code}

    Check Response Status Code    204    ${response.status_code}



    ${stub_count}=    Get Stub Count    DELETE    /broker1/ngsi-ld/v1/entities/${entity_id}

    Should Be True    ${stub_count} == 0





*** 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