Commit 93baa13f authored by Benedetta Arena's avatar Benedetta Arena
Browse files

refactor: centralize setup and teardown logic for first retrieve configurations

parent a472337f

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

+6 −6
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ Setup Initial Context Source Registrations 
    ${second_entity_id}=    Generate Random Parking Entity Id

    Set Suite Variable    ${second_entity_id}



    ${response}=    Initialize Three Broker IOP Scenario

    ${response}=    Initialize Three Broker IOP Scenario For Query

    ...    ${entity_id}

    ...    ${second_entity_id}

    ...    ${entity_id}
@@ -59,10 +59,10 @@ Setup Initial Context Source Registrations 
    ...    ${broker_C_url}



Delete Entities And Delete Registrations

    ${response}=    Delete Three Broker IOP Scenario

    ...    ${entity_id}

    ...    ${second_entity_id}

    ...    ${entity_id}

    ${response}=    Delete Three Broker IOP Scenario For Query

    ...    ${broker_A_url}

    ...    ${broker_B_url}

    ...    ${broker_C_url}

    ...    ${entity_id}

    ...    ${second_entity_id}

    ...    ${entity_id}
 
 No newline at end of file

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

+7 −7
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. 



Resource            ${EXECDIR}/resources/InteroperabilityUtils.resource

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



Test Setup          Setup Initial Context Source Registrations

Test Teardown       Delete Entities and Delete Registrations
@@ -50,7 +50,7 @@ Setup Initial Context Source Registrations 
    ${second_entity_id}=    Generate Random Parking Entity Id

    Set Suite Variable    ${second_entity_id}



    ${response}=    Initialize Three Broker IOP Scenario

    ${response}=    Initialize Three Broker IOP Scenario For Query

    ...    ${entity_id}

    ...    ${second_entity_id}

    ...    ${entity_id}
@@ -59,10 +59,10 @@ Setup Initial Context Source Registrations 
    ...    ${broker_C_url}



Delete Entities And Delete Registrations

    ${response}=    Delete Three Broker IOP Scenario

    ...    ${entity_id}

    ...    ${second_entity_id}

    ...    ${entity_id}

    ${response}=    Delete Three Broker IOP Scenario For Query

    ...    ${broker_A_url}

    ...    ${broker_B_url}

    ...    ${broker_C_url}

    ...    ${entity_id}

    ...    ${second_entity_id}

    ...    ${entity_id}
 
 No newline at end of file

IOP_TP/NGSI-LD/Interoperability/Consumption/Entity/RetrieveEntity/IOP_CNF_01_01.robot

+15 −43
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.



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



*** Variables ***

${first_entity_payload_filename}               interoperability/offstreet-parking1-full.jsonld

${second_entity_payload_filename}              interoperability/offstreet-parking2-full.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

${broker_A_url}

${broker_B_url}

${broker_C_url}
@@ -46,41 +37,22 @@ Setup Initial Context Source Registrations 


    ${entity_id1}=    Generate Random Parking Entity Id

    Set Suite Variable    ${entity_id1}

    ${response}=    Create Entity    ${first_entity_payload_filename}    ${entity_id1}    broker_url=${broker_B_url}

    Check Response Status Code    201    ${response.status_code}

    

    ${entity_id2}=    Generate Random Parking Entity Id

    Set Suite Variable    ${entity_id2}

    ${response}=    Create Entity    ${second_entity_payload_filename}    ${entity_id2}    broker_url=${broker_B_url}

    Check Response Status Code    201    ${response.status_code}

    ${response}=    Create Entity    ${second_entity_payload_filename}    ${entity_id2}    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}

    ...    ${inclusive_registration_payload_file_path}

    ...    entity_id=${entity_id1}

    ...    broker_url=${broker_B_url}

    ...    mode=inclusive

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

    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}

    ...    ${exclusive_registration_payload_file_path}

    ...    entity_id=${entity_id2}

    ...    broker_url=${broker_C_url}

    ...    mode=exclusive

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

    Check Response Status Code    201    ${response.status_code}

    ${response}=    Initialize Three Broker IOP Scenario For First Retrieve

    ...    ${entity_id1}

    ...    ${entity_id2}

    ...    ${entity_id2}

    ...    ${broker_A_url}

    ...    ${broker_B_url}

    ...    ${broker_C_url}



Delete Entities And Delete Registrations

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

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

    Delete Entity    ${entity_id1}    broker_url=${broker_B_url}

    Delete Entity    ${entity_id2}    broker_url=${broker_B_url}

    Delete Entity    ${entity_id2}    broker_url=${broker_C_url}
 
 No newline at end of file
 
    ${response}=    Delete Three Broker IOP Scenario For Retrieve

    ...    first_broker_url=${broker_A_url}

    ...    second_broker_url=${broker_B_url}

    ...    third_broker_url=${broker_C_url}

    ...    first_entity_id=${entity_id1}

    ...    second_entity_id=${entity_id2}

    ...    third_entity_id=${entity_id2}
 
 No newline at end of file

IOP_TP/NGSI-LD/Interoperability/Consumption/Entity/RetrieveEntity/IOP_CNF_01_02.robot

+15 −39
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 the entity created in B and one exclusive for the entity created in 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



*** Variables ***

${entity_payload_filename}                     interoperability/offstreet-parking2-no-location.jsonld

${full_entity_payload_filename}                interoperability/offstreet-parking2-full.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

${broker_A_url}

${broker_B_url}

${broker_C_url}
@@ -47,35 +39,19 @@ Setup Initial Context Source Registrations 


    ${entity_id}=    Generate Random Parking Entity Id

    Set Suite Variable    ${entity_id}

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

    Check Response Status Code    201    ${response.status_code}

    ${response}=    Create Entity    ${full_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}

    ...    ${inclusive_registration_payload_file_path}

    ...    entity_id=${entity_id}

    ...    broker_url=${broker_B_url}

    ...    mode=inclusive

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

    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}

    ...    ${exclusive_registration_payload_file_path}

    ...    entity_id=${entity_id}

    ...    broker_url=${broker_C_url}

    ...    mode=exclusive

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

    Check Response Status Code    201    ${response.status_code}

    ${response}=    Initialize Three Broker IOP Scenario For Second Retrieve

    ...    ${entity_id}

    ...    ${entity_id}

    ...    ${broker_A_url}

    ...    ${broker_B_url}

    ...    ${broker_C_url}



Delete Entities And Delete Registrations

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

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

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

    Delete Entity    ${entity_id}    broker_url=${broker_C_url}
 
 No newline at end of file
 


    ${response}=    Delete Three Broker IOP Scenario For Retrieve

    ...    ${broker_A_url}

    ...    ${broker_B_url}

    ...    ${broker_C_url}

    ...    ${entity_id}

    ...    ${entity_id}
 
 No newline at end of file

resources/IOPUtils/IOPRegistry.py

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ IOP_REGISTRY_URL = { 
    "parking": {

        "full_1": "interoperability/offstreet-parking1-full.jsonld",

        "full_2": "interoperability/offstreet-parking2-full.jsonld",

        "no_location_and_totalspotnumber_2": "interoperability/offstreet-parking2-no-location-and-totalspotsnumber.jsonld"

        "no_location_and_totalspotnumber_2": "interoperability/offstreet-parking2-no-location-and-totalspotsnumber.jsonld",

        "no_location_2": "interoperability/offstreet-parking2-no-location.jsonld"

    },

    "registration": {

        "inclusive_1": "csourceRegistrations/interoperability/context-source-registration-inclusive-1.jsonld",