Commit 334dd6d0 authored by Benedetta Arena's avatar Benedetta Arena
Browse files

Resolve "Refactor broker naming and update README documentation"

parent b2a4cc24

IOP_TP/NGSI-LD/Interoperability/Consumption/Entity/QueryEntities/IOP_003_01_01.robot

+46 −49
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Three brokers are set up A, B and C. A has two registrations, one inclusive for the entities created in B and one exclusive for the entity created in C.

...                 The client sends a HTTP GET request to check that quering the offparking type returns the entities in B and C.

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/IOPUtils/InteroperabilityUtils.resource



Test Setup          Setup Initial Context Source Registrations

Test Teardown       Delete Entities and Delete Registrations
@@ -17,9 +13,9 @@ ${second_entity_payload_filename} interoperability/offstreet-parkin 
${third_entity_payload_filename}               interoperability/offstreet-parking2-no-location-and-totalspotsnumber.jsonld

${inclusive_registration_payload_file_path}    csourceRegistrations/interoperability/context-source-registration-inclusive-2.jsonld

${exclusive_registration_payload_file_path}    csourceRegistrations/interoperability/context-source-registration-exclusive-2.jsonld

${b1_url}

${b2_url}

${b3_url}

${broker_A_url}

${broker_B_url}

${broker_C_url}



*** Test Cases ***

IOP_003_01_01 Query Entities Of Type OffstreetParking Via GET
@@ -28,7 +24,7 @@ IOP_003_01_01 Query Entities Of Type OffstreetParking Via GET 
    [Tags]    since_v1.6.1    iop    cnf_01    4_3_3    additive-inclusive    proxy-exclusive    4_3_6    5_7_2    6_4_3_1



    #Agent queries all entities with type OffstreetParking in A and checks for a successful response that contains the attributes of both entities in B and C.

    ${response}=    Query Entities    entity_types=OffstreetParking    broker_url=${b1_url}

    ${response}=    Query Entities    entity_types=OffstreetParking    broker_url=${broker_A_url}

    Check Response Status Code    200    ${response.status_code}

    @{payload}=    Set Variable   ${response.json()}

    Should Contain    ${payload}\[OffstreetParking1]    availableSpotsNumber
@@ -37,12 +33,12 @@ IOP_003_01_01 Query Entities Of Type OffstreetParking Via GET 
    Should Contain    ${payload}\[OffstreetParking2]    location



    #Agent queries all entities with type OffstreetParking in B and C

    ${response}=    Query Entities    entity_types=OffstreetParking    broker_url=${b2_url}

    ${response}=    Query Entities    entity_types=OffstreetParking    broker_url=${broker_B_url}

    @{first_expected_payload}=    Set Variable    ${response.json()}

    ${entity_ids}=    Create List    ${entity_id}    ${second_entity_id}

    Check Response Body Containing Entities URIS set to    ${entity_ids}    ${response.json()}



    ${response}=    Query Entities    entity_types=OffstreetParking    broker_url=${b3_url}

    ${response}=    Query Entities    entity_types=OffstreetParking    broker_url=${broker_C_url}

    @{second_expected_payload}=    Set Variable    ${response.json()}

    Check Response Body Containing Entities URIS set to    ${entity_id}    ${response.json()}
@@ -53,54 +49,55 @@ IOP_003_01_01 Query Entities Of Type OffstreetParking Via GET 


*** Keywords ***

Setup Initial Context Source Registrations



    ${entity_id}=    Generate Random Parking Entity Id

    Set Suite Variable    ${entity_id}

    ${second_entity_id}=    Generate Random Parking Entity Id

    Set Suite Variable    ${second_entity_id}

    ${response}=    Create Entity    ${first_entity_payload_filename}    ${entity_id}    broker_url=${b2_url}



    ${response}=    Create Entity

    ...    ${first_entity_payload_filename}

    ...    ${entity_id}

    ...    broker_url=${broker_B_url}

    Check Response Status Code    201    ${response.status_code}

    ${response}=    Create Entity    ${third_entity_payload_filename}    ${second_entity_id}    broker_url=${b2_url}



    ${response}=    Create Entity

    ...    ${third_entity_payload_filename}

    ...    ${second_entity_id}

    ...    broker_url=${broker_B_url}

    Check Response Status Code    201    ${response.status_code}

    ${response}=    Create Entity    ${second_entity_payload_filename}    ${entity_id}    broker_url=${b3_url}



    ${response}=    Create Entity

    ...    ${second_entity_payload_filename}

    ...    ${entity_id}

    ...    broker_url=${broker_C_url}

    Check Response Status Code    201    ${response.status_code}



    ${registration_id1}=     Generate Random CSR Id

    Set Suite Variable    ${registration_id1}

    ${registration_payload}=    Prepare Context Source Registration From File

    ...    ${registration_id1}

    @{first_set}=    Create List

    ...    ${entity_id}

    ...    ${inclusive_registration_payload_file_path}

    ...    entity_id=${entity_id}

    ...    broker_url=${b2_url}

    ...    mode=inclusive

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

    Check Response Status Code    201    ${response.status_code}

    ...    inclusive

    ...    ${broker_B_url}

    ...    ${broker_A_url}



    ${registration_id2}=     Generate Random CSR Id

    Set Suite Variable    ${registration_id2}

    ${registration_payload}=    Prepare Context Source Registration From File

    ...    ${registration_id2}

    @{second_set}=    Create List

    ...    ${second_entity_id}

    ...    ${inclusive_registration_payload_file_path}

    ...    entity_id=${second_entity_id}

    ...    broker_url=${b2_url}

    ...    mode=inclusive

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

    Check Response Status Code    201    ${response.status_code}

    ...    inclusive

    ...    ${broker_B_url}

    ...    ${broker_A_url}



    ${registration_id3}=     Generate Random CSR Id

    Set Suite Variable    ${registration_id3}

    ${registration_payload}=    Prepare Context Source Registration From File

    ...    ${registration_id3}

    @{third_set}=    Create List

    ...    ${entity_id}

    ...    ${exclusive_registration_payload_file_path}

    ...    entity_id=${entity_id}

    ...    broker_url=${b3_url}

    ...    mode=exclusive

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

    Check Response Status Code    201    ${response.status_code}

    ...    exclusive

    ...    ${broker_C_url}

    ...    ${broker_A_url}



    @{first_configuration}=    Create List    ${first_set}    ${second_set}    ${third_set}

    Compose IOP Configuration    ${first_configuration}



Delete Entities And Delete Registrations

    Delete Context Source Registration    ${registration_id1}    broker_url=${b1_url}

    Delete Context Source Registration    ${registration_id2}    broker_url=${b1_url}

    Delete Context Source Registration    ${registration_id3}    broker_url=${b1_url}

    Delete Entity    ${entity_id}    broker_url=${b2_url}

    Delete Entity    ${second_entity_id}    broker_url=${b2_url}

    Delete Entity    ${entity_id}    broker_url=${b3_url}
 
 No newline at end of file
 
    @{broker_count}=    Create List    ${broker_A_url}    ${broker_B_url}    ${broker_C_url}

    @{entities_to_delete}=    Create List    ${entity_id}    ${second_entity_id}

    Delete Registrations And Entities    ${broker_count}    ${entities_to_delete}
 
 No newline at end of file

IOP_TP/NGSI-LD/Interoperability/Consumption/Entity/QueryEntities/IOP_003_01_02.robot

+45 −49
Original line number Diff line number Diff line
@@ -2,12 +2,7 @@ 
Documentation       Three brokers are set up A, B and C. A has two registrations, one inclusive for the entities created in B and one exclusive for the entity created in C.

...                 The client sends and HTTP POST request to check that the entities can be queried from all brokers.



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/IOPUtils/InteroperabilityUtils.resource



Test Setup          Setup Initial Context Source Registrations

Test Teardown       Delete Entities and Delete Registrations
@@ -18,9 +13,9 @@ ${second_entity_payload_filename} interoperability/offstreet-parkin 
${third_entity_payload_filename}               interoperability/offstreet-parking2-no-location-and-totalspotsnumber.jsonld

${inclusive_registration_payload_file_path}    csourceRegistrations/interoperability/context-source-registration-inclusive-2.jsonld

${exclusive_registration_payload_file_path}    csourceRegistrations/interoperability/context-source-registration-exclusive-2.jsonld

${b1_url}

${b2_url}

${b3_url}

${broker_A_url}

${broker_B_url}

${broker_C_url}



*** Test Cases ***

IOP_003_01_02 Query Entities Of Type OffstreetParking Via POST
@@ -30,7 +25,7 @@ IOP_003_01_02 Query Entities Of Type OffstreetParking Via POST 


    #Agent queries all entities with type OffstreetParking in A and checks for a successful response that contains the attributes of both entities in B and C.

    @{entities}=    Create List    ${entity_id}    ${second_entity_id}

    ${response}=    Query Entities Via POST   entities=${entities}    broker_url=${b1_url}

    ${response}=    Query Entities Via POST   entities=${entities}    broker_url=${broker_A_url}

    Check Response Status Code    200    ${response.status_code}

    @{payload}=    Set Variable   ${response.json()}

    Should Contain    ${payload}\[OffstreetParking1]    availableSpotsNumber
@@ -39,11 +34,11 @@ IOP_003_01_02 Query Entities Of Type OffstreetParking Via POST 
    Should Contain    ${payload}\[OffstreetParking2]    location



    #Agent queries all entities with type OffstreetParking in B and C

    ${response}=    Query Entities Via POST   entities=${entities}    broker_url=${b2_url}

    ${response}=    Query Entities Via POST   entities=${entities}    broker_url=${broker_B_url}

    @{first_expected_payload}=    Set Variable    ${response.json()}

    Check Response Body Containing Entities URIS set to    ${entities}    ${response.json()}



    ${response}=    Query Entities Via POST   entities=${entity_id}    broker_url=${b3_url}

    ${response}=    Query Entities Via POST   entities=${entity_id}    broker_url=${broker_C_url}

    @{second_expected_payload}=    Set Variable    ${response.json()}

    Check Response Body Containing Entities URIS set to    ${entity_id}    ${response.json()}
@@ -54,54 +49,55 @@ IOP_003_01_02 Query Entities Of Type OffstreetParking Via POST 


*** Keywords ***

Setup Initial Context Source Registrations



    ${entity_id}=    Generate Random Parking Entity Id

    Set Suite Variable    ${entity_id}

    ${second_entity_id}=    Generate Random Parking Entity Id

    Set Suite Variable    ${second_entity_id}

    ${response}=    Create Entity    ${first_entity_payload_filename}    ${entity_id}    broker_url=${b2_url}



    ${response}=    Create Entity

    ...    ${first_entity_payload_filename}

    ...    ${entity_id}

    ...    broker_url=${broker_B_url}

    Check Response Status Code    201    ${response.status_code}

    ${response}=    Create Entity    ${third_entity_payload_filename}    ${second_entity_id}    broker_url=${b2_url}



    ${response}=    Create Entity

    ...    ${third_entity_payload_filename}

    ...    ${second_entity_id}

    ...    broker_url=${broker_B_url}

    Check Response Status Code    201    ${response.status_code}

    ${response}=    Create Entity    ${second_entity_payload_filename}    ${entity_id}    broker_url=${b3_url}



    ${response}=    Create Entity

    ...    ${second_entity_payload_filename}

    ...    ${entity_id}

    ...    broker_url=${broker_C_url}

    Check Response Status Code    201    ${response.status_code}



    ${registration_id1}=     Generate Random CSR Id

    Set Suite Variable    ${registration_id1}

    ${registration_payload}=    Prepare Context Source Registration From File

    ...    ${registration_id1}

    @{first_set}=    Create List

    ...    ${entity_id}

    ...    ${inclusive_registration_payload_file_path}

    ...    entity_id=${entity_id}

    ...    broker_url=${b2_url}

    ...    mode=inclusive

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

    Check Response Status Code    201    ${response.status_code}

    ...    inclusive

    ...    ${broker_B_url}

    ...    ${broker_A_url}



    ${registration_id2}=     Generate Random CSR Id

    Set Suite Variable    ${registration_id2}

    ${registration_payload}=    Prepare Context Source Registration From File

    ...    ${registration_id2}

    @{second_set}=    Create List

    ...    ${second_entity_id}

    ...    ${inclusive_registration_payload_file_path}

    ...    entity_id=${second_entity_id}

    ...    broker_url=${b2_url}

    ...    mode=inclusive

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

    Check Response Status Code    201    ${response.status_code}

    ...    inclusive

    ...    ${broker_B_url}

    ...    ${broker_A_url}



    ${registration_id3}=     Generate Random CSR Id

    Set Suite Variable    ${registration_id3}

    ${registration_payload}=    Prepare Context Source Registration From File

    ...    ${registration_id3}

    @{third_set}=    Create List

    ...    ${entity_id}

    ...    ${exclusive_registration_payload_file_path}

    ...    entity_id=${entity_id}

    ...    broker_url=${b3_url}

    ...    mode=exclusive

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

    Check Response Status Code    201    ${response.status_code}

    ...    exclusive

    ...    ${broker_C_url}

    ...    ${broker_A_url}



    @{first_configuration}=    Create List    ${first_set}    ${second_set}    ${third_set}

    Compose IOP Configuration    ${first_configuration}



Delete Entities And Delete Registrations

    Delete Context Source Registration    ${registration_id1}    broker_url=${b1_url}

    Delete Context Source Registration    ${registration_id2}    broker_url=${b1_url}

    Delete Context Source Registration    ${registration_id3}    broker_url=${b1_url}

    Delete Entity    ${entity_id}    broker_url=${b2_url}

    Delete Entity    ${second_entity_id}    broker_url=${b2_url}

    Delete Entity    ${entity_id}    broker_url=${b3_url}
 
 No newline at end of file
 
    @{broker_count}=    Create List    ${broker_A_url}    ${broker_B_url}    ${broker_C_url}

    @{entities_to_delete}=    Create List    ${entity_id}    ${second_entity_id}

    Delete Registrations And Entities    ${broker_count}    ${entities_to_delete}
 
 No newline at end of file

IOP_TP/NGSI-LD/Interoperability/Consumption/Entity/QueryEntities/IOP_003_02_01.robot

+63 −89

File changed.

Preview size limit exceeded, changes collapsed.

IOP_TP/NGSI-LD/Interoperability/Consumption/Entity/QueryEntities/IOP_003_02_02.robot

+48 −73

File changed.

Preview size limit exceeded, changes collapsed.

IOP_TP/NGSI-LD/Interoperability/Consumption/Entity/QueryEntities/IOP_003_03_01.robot

+36 −50
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Four brokers are set up A, B, C and D. A has three registrations, one auxiliary for the entities created in B, one inclusive for the entities created in C and one inclusive for the entity created in D.

...                 Check that the entity returned from A match the attributes from the entity in B, C and D.

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

...                 Check that the entities returned from A match the attributes from the entities in B, C and D.



Resource            ${EXECDIR}/resources/IOPUtils/InteroperabilityUtils.resource



Test Setup          Setup Initial Context Source Registrations

Test Teardown       Delete Entities and Delete Registrations
@@ -18,10 +14,10 @@ ${second_full_offstreet_payload_filename} interoperability/offstreet 
${first_inclusive_registration_payload_file_path}     csourceRegistrations/interoperability/context-source-registration-inclusive-1.jsonld

${second_inclusive_registration_payload_file_path}    csourceRegistrations/interoperability/context-source-registration-inclusive-2.jsonld

${auxiliary_registration_payload_file_path}           csourceRegistrations/interoperability/context-source-registration-auxiliary-1.jsonld

${b1_url}

${b2_url}

${b3_url}

${b4_url}

${broker_A_url}

${broker_B_url}

${broker_C_url}

${broker_D_url}



*** Test Cases ***

IOP_003_03_01 Query Entities Of Type OffstreetParking Via GET
@@ -30,7 +26,7 @@ IOP_003_03_01 Query Entities Of Type OffstreetParking Via GET 
    [Tags]    since_v1.6.1    iop    cnf_03    4_3_3    additive-inclusive    additive-auxiliary    4_3_6    5_7_2    6_4_3_1



    #Client queries all entities with type OffstreetParking in A and checks for a successful response. 

    ${response}=    Query Entities    entity_types=OffstreetParking    broker_url=${b1_url}

    ${response}=    Query Entities    entity_types=OffstreetParking    broker_url=${broker_A_url}

    Check Response Status Code    200    ${response.status_code}



    &{payload}=    Evaluate    {i['id']: i for i in ${response.json()}}
@@ -38,15 +34,15 @@ IOP_003_03_01 Query Entities Of Type OffstreetParking Via GET 
    ${second_parking_payload}=    Get From Dictionary    ${payload}    OffstreetParking:2



    #Client queries all entities with type OffstreetParking in B, C and D.

    ${response}=    Query Entities    entity_types=OffstreetParking    broker_url=${b2_url}

    ${response}=    Query Entities    entity_types=OffstreetParking    broker_url=${broker_B_url}

    ${payload}=    Evaluate    {i['id']: i for i in ${response.json()}}

    ${expected_parking1}=    Get From Dictionary    ${payload}    OffstreetParking:2



    ${response}=    Query Entities    entity_types=OffstreetParking    broker_url=${b3_url}

    ${response}=    Query Entities    entity_types=OffstreetParking    broker_url=${broker_C_url}

    ${payload}=    Evaluate    {i['id']: i for i in ${response.json()}}

    ${expected_parking2}=    Get From Dictionary    ${payload}    OffstreetParking:1



    ${response}=    Query Entities    entity_types=OffstreetParking    broker_url=${b4_url}

    ${response}=    Query Entities    entity_types=OffstreetParking    broker_url=${broker_D_url}

    ${payload}=    Evaluate    {i['id']: i for i in ${response.json()}}

    ${expected_parking3}=    Get From Dictionary    ${payload}    OffstreetParking:2
@@ -59,52 +55,42 @@ IOP_003_03_01 Query Entities Of Type OffstreetParking Via GET 


*** Keywords ***

Setup Initial Context Source Registrations



    ${entity_id}=    Generate Random Parking Entity Id

    Set Suite Variable    ${entity_id}



    ${response}=    Create Entity    ${offstreet_no_location_payload_filename}    ${entity_id}    broker_url=${b2_url}

    ${response}=    Create Entity    ${offstreet_no_location_payload_filename}    ${entity_id}    broker_url=${broker_B_url}

    Check Response Status Code    201    ${response.status_code}

    ${response}=    Create Entity    ${first_full_offstreet_payload_filename}    ${entity_id}    broker_url=${b3_url}

    ${response}=    Create Entity    ${first_full_offstreet_payload_filename}    ${entity_id}    broker_url=${broker_C_url}

    Check Response Status Code    201    ${response.status_code}

    ${response}=    Create Entity    ${second_full_offstreet_payload_filename}    ${entity_id}    broker_url=${b4_url}

    ${response}=    Create Entity    ${second_full_offstreet_payload_filename}    ${entity_id}    broker_url=${broker_D_url}

    Check Response Status Code    201    ${response.status_code}



    ${registration_id1}=    Generate Random CSR Id

    Set Suite Variable    ${registration_id1}

    ${registration_payload}=    Prepare Context Source Registration From File

    ...    ${registration_id1}

    @{first_set}=    Create List

    ...    ${entity_id}

    ...    ${auxiliary_registration_payload_file_path}

    ...    entity_id=${entity_id}

    ...    endpoint=${b2_url}

    ...    mode=auxiliary

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

    Check Response Status Code    201    ${response.status_code}

    ...    auxiliary

    ...    ${broker_B_url}

    ...    ${broker_A_url}



    ${registration_id2}=    Generate Random CSR Id

    Set Suite Variable    ${registration_id2}

    ${registration_payload}=    Prepare Context Source Registration From File

    ...    ${registration_id2}

    @{second_set}=    Create List

    ...    ${entity_id}

    ...    ${first_inclusive_registration_payload_file_path}

    ...    entity_id=${entity_id}

    ...    endpoint=${b3_url}

    ...    mode=inclusive

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

    Check Response Status Code    201    ${response.status_code}

    ...    inclusive

    ...    ${broker_C_url}

    ...    ${broker_A_url}



    ${registration_id3}=    Generate Random CSR Id

    Set Suite Variable    ${registration_id3}

    ${registration_payload}=    Prepare Context Source Registration From File

    ...    ${registration_id3}

    @{third_set}=    Create List

    ...    ${entity_id}

    ...    ${second_inclusive_registration_payload_file_path}

    ...    entity_id=${entity_id}

    ...    endpoint=${b4_url}

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

    Check Response Status Code    201    ${response.status_code}

    ...    inclusive

    ...    ${broker_D_url}

    ...    ${broker_A_url}



    @{third_configuration}=    Create List    ${first_set}    ${second_set}    ${third_set}

    Compose IOP Configuration    ${third_configuration}



Delete Entities And Delete Registrations

    Delete Context Source Registration    ${registration_id1}    broker_url=${b1_url}

    Delete Context Source Registration    ${registration_id2}    broker_url=${b1_url}

    Delete Context Source Registration    ${registration_id3}    broker_url=${b1_url}

    Delete Entity    ${entity_id}    broker_url=${b2_url}

    Delete Entity    ${entity_id}    broker_url=${b3_url}

    Delete Entity    ${entity_id}    broker_url=${b4_url}
 
 No newline at end of file
 
    @{broker_count}=    Create List    ${broker_A_url}    ${broker_B_url}    ${broker_C_url}    ${broker_D_url}

    @{entities_to_delete}=    Create List    ${entity_id}

    Delete Registrations And Entities    ${broker_count}    ${entities_to_delete}
 
 No newline at end of file