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

refactoring: centralize setup and teardown for first create configuration

parent 93baa13f

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

+2 −2
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 For Query

    Initialize Three Broker IOP Scenario For Query

    ...    ${entity_id}

    ...    ${second_entity_id}

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



Delete Entities And Delete Registrations

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

    Delete Three Broker IOP Scenario For Query

    ...    ${broker_A_url}

    ...    ${broker_B_url}

    ...    ${broker_C_url}

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

+2 −2
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 For Query

    Initialize Three Broker IOP Scenario For Query

    ...    ${entity_id}

    ...    ${second_entity_id}

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



Delete Entities And Delete Registrations

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

    Delete Three Broker IOP Scenario For Query

    ...    ${broker_A_url}

    ...    ${broker_B_url}

    ...    ${broker_C_url}

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

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

    Set Suite Variable    ${entity_id2}



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

    Initialize Three Broker IOP Scenario For First Retrieve

    ...    ${entity_id1}

    ...    ${entity_id2}

    ...    ${entity_id2}
@@ -49,7 +49,7 @@ Setup Initial Context Source Registrations 
    ...    ${broker_C_url}



Delete Entities And Delete Registrations

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

    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}

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

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

    Set Suite Variable    ${entity_id}



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

    Initialize Three Broker IOP Scenario For Second Retrieve

    ...    ${entity_id}

    ...    ${entity_id}

    ...    ${broker_A_url}
@@ -49,7 +49,7 @@ Setup Initial Context Source Registrations 


Delete Entities And Delete Registrations



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

    Delete Three Broker IOP Scenario For Retrieve

    ...    ${broker_A_url}

    ...    ${broker_B_url}

    ...    ${broker_C_url}

IOP_TP/NGSI-LD/Interoperability/Provision/CreateEntity/IOP_CNF_01_01.robot

+12 −35
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

Variables           ${EXECDIR}/resources/IOPUtils/IOPRegistry.py



Test Setup          Setup Initial Context Source Registrations

Test Teardown       Delete Entities and Delete Registrations



*** Variables ***

${entity_payload_filename}                        interoperability/offstreet-parking1-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}
@@ -25,8 +18,8 @@ IOP_CNF_01_01 Create OffStreetParking:1 
    [Tags]    since_v1.6.1    iop    4_3_3    cf_06    additive-inclusive    proxy-exclusive    4_3_6    5_6_1



    #Create OffStreetParking:1 in A and check for a successful response

    ${expected_payload}=    Load Entity    ${entity_payload_filename}    ${entity_id}

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

    ${expected_payload}=    Load Entity    ${IOP_REGISTRY_URL}[parking][full_1]    ${entity_id}

    ${response}=    Create Entity    ${IOP_REGISTRY_URL}[parking][full_1]    ${entity_id}    broker_url=${broker_A_url}

    Check Response Status Code    201    ${response.status_code}

    

    #Agent checks, with local=true, that the entity is created in A
@@ -53,29 +46,13 @@ Setup Initial Context Source Registrations 
    ${entity_id}=    Generate Random Parking Entity Id

    Set Suite Variable    ${entity_id}



    ${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}

    Initialize Three Broker IOP Scenario For Create

    ...    ${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_A_url}
 
 No newline at end of file
 
    Delete Three Broker IOP Scenario For Create

    ...    ${broker_A_url}

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