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

Resolve "Add TCs for Batch Entity Delete in the Distributed Case"

parent d2bc40dd

TP/NGSI-LD/DistributedOperations/Provision/BatchEntities/DeleteBatchEntities/D015_01_inc.robot

0 → 100644
+65 −0
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Check that one can delete a batch of entities on both Context Broker and Context Source thanks to an inclusive registration



Resource            ${EXECDIR}/resources/ApiUtils/Common.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationProvision.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextSourceDiscovery.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextSourceRegistration.resource

Resource            ${EXECDIR}/resources/AssertionUtils.resource

Resource            ${EXECDIR}/resources/JsonUtils.resource

Resource            ${EXECDIR}/resources/MockServerUtils.resource



Test Setup          Setup Entity Id And Registration And Start Context Source Mock Server

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



*** Variables ***

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

${entity_pattern}                       urn:ngsi-ld:Vehicle:*

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



*** Test Cases ***

D015_01_inc Delete Batch Of Entities On Both Context Broker And Context Source

    [Documentation]    Check that if one requests the Context Broker to delete a batch of entities that match an inclusive registration, this is deleted on the Context Source too

    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_06    additive-inclusive    4_3_6_2    5_6_10



    Set Stub Reply    POST    /ngsi-ld/v1/entityOperations/delete    204

    ${response}=    Batch Delete Entities    entities_ids_to_be_deleted=@{entities_ids_to_be_deleted}

    Check Response Status Code    204    ${response.status_code}

    Check Response Body Is Empty    ${response}



    ${expected_entities_ids}=    Catenate    SEPARATOR=,    @{entities_ids_to_be_deleted}

    ${response}=    Query Entities

    ...    entity_ids=${expected_entities_ids}

    ...    entity_types=Vehicle

    ...    context=${ngsild_test_suite_context}

    Check SUT Not Containing Resources    ${response.json()}



*** Keywords ***

Setup Entity Id And Registration And Start Context Source Mock Server

    ${first_entity_id}=    Generate Random Vehicle Entity Id

    Set Suite Variable    ${first_entity_id}

    ${second_entity_id}=    Generate Random Vehicle Entity Id

    Set Suite Variable    ${second_entity_id}



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

    Check Response Status Code    201    ${response.status_code}

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

    Check Response Status Code    201    ${response.status_code}

    @{entities_ids_to_be_deleted}=    Create List    ${first_entity_id}    ${second_entity_id}

    Set Suite Variable    ${entities_ids_to_be_deleted}



    ${registration_id}=    Generate Random CSR Id

    Set Suite Variable    ${registration_id}

    ${registration_payload}=    Prepare Context Source Registration From File

    ...    ${registration_id}

    ...    ${registration_payload_file_path}

    ...    entity_pattern=${entity_pattern}

    ${response}=    Create Context Source Registration With Return    ${registration_payload}

    Check Response Status Code    201    ${response.status_code}



    Start Context Source Mock Server



Delete Created Entity And Registration And Stop Context Source Mock Server

    Delete Context Source Registration    ${registration_id}

    Stop Context Source Mock Server

TP/NGSI-LD/DistributedOperations/Provision/BatchEntities/DeleteBatchOfEntities/D015_01_exc.robot

0 → 100644
+67 −0
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Check that one can delete a batch of entities on both Context Broker and Context Source thanks to an exclusive registration



Resource            ${EXECDIR}/resources/ApiUtils/Common.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationProvision.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextSourceRegistration.resource

Resource            ${EXECDIR}/resources/AssertionUtils.resource

Resource            ${EXECDIR}/resources/MockServerUtils.resource



Test Setup          Create Entities And Registration And Start Context Source Mock Server

Test Teardown       Delete Registration And Stop Context Source Mock Server

*** Variables ***

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

${entity_pattern}                       urn:ngsi-ld:Vehicle:*

${registration_payload_file_path}       csourceRegistrations/context-source-registration-vehicle-speed-with-batch-ops.jsonld



*** Test Cases ***

D015_01_exc Delete Batch Of Entities On Both Context Broker And Context Source

    [Documentation]    Check that if one requests the Context Broker to delete a batch of entities that match an exclusive registration, this is deleted on the Context Source too

    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_06    additive-exclusive    4_3_6_3    5_6_10



    Set Stub Reply    POST    /broker1/ngsi-ld/v1/entityOperations/delete    204

    ${response}=    Batch Delete Entities    entities_ids_to_be_deleted=@{entities_ids_to_be_deleted}

    Check Response Status Code    204    ${response.status_code}

    Check Response Body Is Empty    ${response}



    ${stub_count}=    Get Stub Count    POST    /broker1/ngsi-ld/v1/entityOperations/delete

    Should Be Equal    ${stub_count}    1



    ${expected_entities_ids}=    Catenate    SEPARATOR=,    @{entities_ids_to_be_deleted}

    ${response}=    Query Entities

    ...    entity_ids=${expected_entities_ids}

    ...    entity_types=Vehicle

    ...    context=${ngsild_test_suite_context}

    Check SUT Not Containing Resources    ${response.json()}



*** Keywords ***

Create Entities And Registration And Start Context Source Mock Server

    ${first_entity_id}=    Generate Random Vehicle Entity Id

    Set Suite Variable    ${first_entity_id}

    ${second_entity_id}=    Generate Random Vehicle Entity Id

    Set Suite Variable    ${second_entity_id}



    ${response}=    Create Entity    ${entity_payload_filename}    ${first_entity_id}    local=true

    Check Response Status Code    201    ${response.status_code}

    ${response}=    Create Entity    ${entity_payload_filename}    ${second_entity_id}    local=true

    Check Response Status Code    201    ${response.status_code}

    @{entities_ids_to_be_deleted}=    Create List    ${first_entity_id}    ${second_entity_id}

    Set Suite Variable    ${entities_ids_to_be_deleted}



    ${registration_id}=    Generate Random CSR Id

    Set Suite Variable    ${registration_id}

    ${registration_payload}=    Prepare Context Source Registration From File

    ...    ${registration_id}

    ...    ${registration_payload_file_path}

    ...    entity_id_pattern=${entity_pattern}

    ...    mode=exclusive

    ...    endpoint=/broker1

    ${response}=    Create Context Source Registration With Return    ${registration_payload}

    Check Response Status Code    201    ${response.status_code}



    Start Context Source Mock Server



Delete Registration And Stop Context Source Mock Server

    Delete Context Source Registration    ${registration_id}

    Stop Context Source Mock Server

TP/NGSI-LD/DistributedOperations/Provision/BatchEntities/DeleteBatchOfEntities/D015_01_inc.robot

0 → 100644
+66 −0
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Check that one can delete a batch of entities on both Context Broker and Context Source thanks to an inclusive registration



Resource            ${EXECDIR}/resources/ApiUtils/Common.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationProvision.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextSourceRegistration.resource

Resource            ${EXECDIR}/resources/AssertionUtils.resource

Resource            ${EXECDIR}/resources/MockServerUtils.resource



Test Setup          Create Entities And Registration And Start Context Source Mock Server

Test Teardown       Delete Registration And Stop Context Source Mock Server



*** Variables ***

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

${entity_pattern}                       urn:ngsi-ld:Vehicle:*

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



*** Test Cases ***

D015_01_inc Delete Batch Of Entities On Both Context Broker And Context Source

    [Documentation]    Check that if one requests the Context Broker to delete a batch of entities that match an inclusive registration, this is deleted on the Context Source too

    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_06    additive-inclusive    4_3_6_2    5_6_10



    Set Stub Reply    POST    /ngsi-ld/v1/entityOperations/delete    204

    ${response}=    Batch Delete Entities    entities_ids_to_be_deleted=@{entities_ids_to_be_deleted}

    Check Response Status Code    204    ${response.status_code}

    Check Response Body Is Empty    ${response}



    ${stub_count}=    Get Stub Count    POST    /ngsi-ld/v1/entityOperations/delete

    Should Be Equal    ${stub_count}    1



    ${expected_entities_ids}=    Catenate    SEPARATOR=,    @{entities_ids_to_be_deleted}

    ${response}=    Query Entities

    ...    entity_ids=${expected_entities_ids}

    ...    entity_types=Vehicle

    ...    context=${ngsild_test_suite_context}

    Check SUT Not Containing Resources    ${response.json()}



*** Keywords ***

Create Entities And Registration And Start Context Source Mock Server

    ${first_entity_id}=    Generate Random Vehicle Entity Id

    Set Suite Variable    ${first_entity_id}

    ${second_entity_id}=    Generate Random Vehicle Entity Id

    Set Suite Variable    ${second_entity_id}



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

    Check Response Status Code    201    ${response.status_code}

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

    Check Response Status Code    201    ${response.status_code}

    @{entities_ids_to_be_deleted}=    Create List    ${first_entity_id}    ${second_entity_id}

    Set Suite Variable    ${entities_ids_to_be_deleted}



    ${registration_id}=    Generate Random CSR Id

    Set Suite Variable    ${registration_id}

    ${registration_payload}=    Prepare Context Source Registration From File

    ...    ${registration_id}

    ...    ${registration_payload_file_path}

    ...    entity_id_pattern=${entity_pattern}

    ${response}=    Create Context Source Registration With Return    ${registration_payload}

    Check Response Status Code    201    ${response.status_code}



    Start Context Source Mock Server



Delete Registration And Stop Context Source Mock Server

    Delete Context Source Registration    ${registration_id}

    Stop Context Source Mock Server

TP/NGSI-LD/DistributedOperations/Provision/BatchEntities/DeleteBatchOfEntities/D015_01_red.robot

0 → 100644
+72 −0
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Check that one can delete a batch of entities on the Context Source thanks to a redirect registration



Resource            ${EXECDIR}/resources/ApiUtils/Common.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationProvision.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextSourceRegistration.resource

Resource            ${EXECDIR}/resources/AssertionUtils.resource

Resource            ${EXECDIR}/resources/MockServerUtils.resource



Test Setup          Create Entities And Registration And Start Context Source Mock Server

Test Teardown       Delete Registration And Stop Context Source Mock Server



*** Variables ***

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

${entity_pattern}                       urn:ngsi-ld:Vehicle:*

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



*** Test Cases ***

D015_01_red Delete Batch Of Entities On Context Source

    [Documentation]    Check that if one requests the Context Broker to delete a batch of entities that match a redirect registration, they are deleted on the Context Source

    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_06    additive-redirect    4_3_6_3    5_6_10



    Set Stub Reply    POST    /broker1/ngsi-ld/v1/entityOperations/delete    204

    Set Stub Reply    POST    /broker2/ngsi-ld/v1/entityOperations/delete    204

    ${response}=    Batch Delete Entities    entities_ids_to_be_deleted=@{entities_ids_to_be_deleted}

    Check Response Status Code    204    ${response.status_code}

    Check Response Body Is Empty    ${response}



    ${stub_count}=    Get Stub Count    POST    /broker1/ngsi-ld/v1/entityOperations/delete

    Should Be Equal    ${stub_count}    1

    ${stub_count}=    Get Stub Count    POST    /broker2/ngsi-ld/v1/entityOperations/delete

    Should Be Equal    ${stub_count}    1



*** Keywords ***

Create Entities And Registration And Start Context Source Mock Server

    ${first_entity_id}=    Generate Random Vehicle Entity Id

    Set Suite Variable    ${first_entity_id}

    ${second_entity_id}=    Generate Random Vehicle Entity Id

    Set Suite Variable    ${second_entity_id}



    @{entities_ids_to_be_deleted}=    Create List    ${first_entity_id}    ${second_entity_id}

    Set Suite Variable    ${entities_ids_to_be_deleted}



    ${registration_id}=    Generate Random CSR Id

    Set Suite Variable    ${registration_id}

    ${registration_payload}=    Prepare Context Source Registration From File

    ...    ${registration_id}

    ...    ${registration_payload_file_path}

    ...    entity_id_pattern=${entity_pattern}

    ...    mode=redirect

    ...    endpoint=/broker1

    ${response}=    Create Context Source Registration With Return    ${registration_payload}

    Check Response Status Code    201    ${response.status_code}



    ${registration_id2}=    Generate Random CSR Id

    Set Suite Variable    ${registration_id2}

    ${registration_payload}=    Prepare Context Source Registration From File

    ...    ${registration_id2}

    ...    ${registration_payload_file_path}

    ...    entity_id_pattern=${entity_pattern}

    ...    mode=redirect

    ...    endpoint=/broker2

    ${response}=    Create Context Source Registration With Return    ${registration_payload}

    Check Response Status Code    201    ${response.status_code}



    Start Context Source Mock Server



Delete Registration And Stop Context Source Mock Server

    Delete Context Source Registration    ${registration_id}

    Delete Context Source Registration    ${registration_id2}

    Stop Context Source Mock Server

doc/analysis/initial_setup.py

+16 −2
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ class InitialSetup: 
            'Setup Entity Id And Registration And Start Context Source Mock Server': InitialSetup.init_eid_and_csr_and_ms(),

            'Setup Registration And Start Context Source Mock Server': InitialSetup.init_csr_and_ms(),

            'Create Entity And Registration On The Context Broker And Start Context Source Mock Server': InitialSetup.init_local_entity_and_csr_and_ms(),

            'Create Initial Cached @context from entity': InitialSetup.init_cached_context()

            'Create Initial Cached @context from entity': InitialSetup.init_cached_context(),

            'Create Entities And Registration And Start Context Source Mock Server': InitialSetup.init_entities_and_csr_and_ms(),

        }



        self.folder_test_suites = dirname(dirname(dirname(__file__)))
@@ -354,6 +355,19 @@ class InitialSetup: 
}'''

        return data



    @staticmethod

    def init_entities_and_csr_and_ms() -> str:

        data = '''with {

        the SUT being in the "initial state" and

        the SUT containing initial Entities ${first_entity_id} and ${second_entity_id} on the Context Broker

            with payload set to ${entity_payload_filename}

        and the SUT containing a Context Source Registration 

            with id equal to ${registration_id}

            and payload set to ${registration_payload_file_path}

        and the SUT containing a Context Source Mock Server

    }'''

        return data



    def get_property_values(self, root_folder: str, property_name: str) -> [str, str]:

        robot_files_without_setup = list()

        robot_files_with_setup = list()