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

fix: improve logic of PurgeEntities

parent 60a77f4f

TP/NGSI-LD/DistributedOperations/Provision/Entities/PurgeEntities/D017_01_exc.robot

+6 −7
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Test Teardown Delete Registrations And Stop Context Source Mock Server 




*** Variables ***

${entity_payload_filename}              vehicle-simple-attributes.jsonld

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

${speed_entity_filename}                vehicle-speed-attribute.jsonld

${registration_payload_file_path}       csourceRegistrations/context-source-registration-vehicle-speed-with-redirection-ops.jsonld
@@ -26,7 +26,8 @@ D017_01_exc Purge Entities On Both Context Broker And Context Source 
    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_04    proxy-exclusive    4_3_6_3    5_6_21



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

    ${speed_entity}=    Create Entity    ${speed_entity_filename}    ${entity_id}

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

    Check Response Status Code    201    ${speed_entity.status_code}



    Set Stub Reply    DELETE    /broker1/ngsi-ld/v1/entities?type=Vehicle    204

    ${response}=    Purge Entities    type=Vehicle    context=${ngsild_test_suite_context}
@@ -35,16 +36,14 @@ D017_01_exc Purge Entities On Both Context Broker And Context Source 
    ${stub_count}=    Get Stub Count    DELETE    /broker1/ngsi-ld/v1/entities?type=Vehicle

    Should Be True    ${stub_count} > 0



    ${response}=    Retrieve Entity    ${entity_id}

    Check Response Status Code    404    ${response.status_code}



    Set Stub Reply    GET    /broker1/ngsi-ld/v1/entities?type=Vehicle    200

    ${response}=    Query Entities    entity_types=Vehicle    context=${ngsild_test_suite_context}

    Should Be Empty    ${response.json()}



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

TP/NGSI-LD/DistributedOperations/Provision/Entities/PurgeEntities/D017_01_inc.robot

+3 −3
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ D017_01_inc Purge Entities On Both Context Broker And Context Source 
    ${stub_count}=    Get Stub Count    DELETE    /ngsi-ld/v1/entities?type=Vehicle

    Should Be True    ${stub_count} > 0



    ${response}=    Retrieve Entity    ${entity_id}

    Check Response Status Code    404    ${response.status_code}



    Set Stub Reply    GET    /ngsi-ld/v1/entities?type=Vehicle    200

    ${response}=    Query Entities    entity_types=Vehicle    context=${ngsild_test_suite_context}

    Should Be Empty    ${response.json()}



*** Keywords ***

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

TP/NGSI-LD/DistributedOperations/Provision/Entities/PurgeEntities/D017_01_red.robot

+6 −3
Original line number Diff line number Diff line
@@ -39,9 +39,12 @@ D017_01_red Purge Entities On The Context Source 
    ${stub_count}=    Get Stub Count    DELETE    /broker2/ngsi-ld/v1/entities?type=Vehicle

    Should Be True    ${stub_count} > 0



    ${response}=    Retrieve Entity    ${entity_id}

    Check Response Status Code    404    ${response.status_code}



    Set Stub Reply    GET    /broker1/ngsi-ld/v1/entities?type=Vehicle    200

    ${response}=    Query Entities    entity_types=Vehicle    context=${ngsild_test_suite_context}

    Should Be Empty    ${response.json()}

    Set Stub Reply    GET    /broker2/ngsi-ld/v1/entities?type=Vehicle    200

    ${response}=    Query Entities    entity_types=Vehicle    context=${ngsild_test_suite_context}

    Should Be Empty    ${response.json()}



*** Keywords ***

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