Commit 0fdf46eb authored by kzangeli's avatar kzangeli
Browse files

Merge remote-tracking branch 'origin/develop' into integration/all-fixes

parents 3f772fdc 56e721d0

TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_01_aux.robot

+1 −1
Changes for TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_01_aux.robot: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ ${expected_attribute} brandName 


*** Test Cases ***

D010_01_aux Retrieve Entity That Exists On Both The Context Source And The Context Broker From The Context Broker

    [Documentation]    Check that if one retrieves entity living on on both the Context Broker and a Context Source, entities get merged correctly

    [Documentation]    Check that if one retrieves entity living on both the Context Broker and a Context Source, entities get merged correctly

    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_04    additive-auxiliary    4_3_6_2    5_7_1

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

    ${entity_fragment}=    Load JSON From File    ${EXECDIR}/data/entities/fragmentEntities/${fragment_filename}

TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_01_exc.robot

+1 −1
Changes for TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_01_exc.robot: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Verify that, when one has an exclusive registration on a Context Broker and an entity only on a Context Source, a retrieval request to the Context Broker the request is forwarded correcty to the Context Source

Documentation       Verify that, when one has an exclusive registration on a Context Broker and an entity only on a Context Source, a retrieval request to the Context Broker the request is forwarded correctly to the Context Source



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

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

TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_03_inc.robot

+1 −1
Changes for TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_03_inc.robot: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Verify that, when one has an inclusive registration on a Context Broker and an entity only on a Context Source, a retrieval request to the Context Broker the request is forwarded correcty to the Context Source using the appropriate operation

Documentation       Verify that, when one has an inclusive registration on a Context Broker and an entity only on a Context Source, a retrieval request to the Context Broker the request is forwarded correctly to the Context Source using the appropriate operation



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

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

TP/NGSI-LD/DistributedOperations/Provision/Entities/CreateEntity/D001_03_03_inc.robot

+1 −1
Changes for TP/NGSI-LD/DistributedOperations/Provision/Entities/CreateEntity/D001_03_03_inc.robot: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ ${registration_payload_file_path} csourceRegistrations/context-source-regi 


*** Test Cases ***

D001_03_03_inc Create Entity Already Existing Remotely On The Context Broker

    [Documentation]    Check that if one requests the Context Broker to create an entity that matches an inclusive registration and already exists remotely, this raises an error on the Context Source, but it works just fine on the Context Broker

    [Documentation]    Check that if one requests the Context Broker to create an entity that matches an inclusive registration and already exists remotely, the creation is successful on the Context Broker and that an error is returned from the Context Source.

    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_04    additive-inclusive    4_3_6_2    5_6_1    6_3_3

    Set Stub Reply    POST    /ngsi-ld/v1/entities    409

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

TP/NGSI-LD/DistributedOperations/Provision/Entities/DeleteEntity/D002_03_inc.robot

+2 −1
Changes for TP/NGSI-LD/DistributedOperations/Provision/Entities/DeleteEntity/D002_03_inc.robot: 2 added lines, 1 removed line.
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Verify that, when one has an inclusive registration on a Context Broker, one is able to delete an entity with local flag and the operation should not be forwarded to the Context Source.

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

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

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource
@@ -17,7 +18,7 @@ ${registration_payload_file_path} csourceRegistrations/context-source-regi 


*** Test Cases ***

D002_03_inc Delete Entity With Local Flag

    [Documentation]    Verify that, when one has an inclusive registration on a Context Broker, one is able to delete an entity with local flag and the operation should not be forwarded to the Context Source

    [Documentation]    Check that the deletion happens locally and is not forwarded to the remote Context Source due to the local flag being set in the request.

    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_04    additive-inclusive    4_3_6_2    5_6_6    6_3_18

    ${response}=    Delete Entity    ${entity_id}    local=true

    Check Response Status Code    204    ${response.status_code}