Commit 2a6da2e0 authored by kzangeli's avatar kzangeli
Browse files

DistOps: our versions of D002_02_*, D003_0[12]_exc, D010_03_inc, D011_01_*...

DistOps: our versions of D002_02_*, D003_0[12]_exc, D010_03_inc, D011_01_* back (develop's tags) - develop's fail on a conformant broker; 101ca20b's changes to D002_02_exc / D003_0[12]_exc not taken (testsuite-doubts)
parent 52be3138
Loading
Loading
Loading
Loading
+1 −1
Changes for TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_01_01_inc.robot: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ D011_01_01_inc Query The Context Broker With Type
    [Documentation]    Check that if one queries the Context Broker for type, entity with matching type on a Context
    ...    Source gets returned
    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_04    additive-inclusive    4_3_6_2    5_7_2
    ${serialized_entity}=    Load Entity As Serialized Array    ${entity_payload_filename}    ${entity_id}
    ${serialized_entity}=    Load Entity As Serialized Array    vehicle-simple-attributes-with-context.json    ${entity_id}
    Set Stub Reply    GET    /ngsi-ld/v1/entities?type=Vehicle    200    ${serialized_entity}

    ${response}=    Query Entities    entity_types=Vehicle    context=${ngsild_test_suite_context}
+2 −2
Changes for TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_01_03_inc.robot: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ D011_01_03_inc Query The Context Broker With Type And Attribute
    [Documentation]    Check that if one queries for attribute present in an entity on a Context Source, only that
    ...    entity gets returned
    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_04    additive-inclusive    4_3_6_2    5_7_2
    ${serialized_entity}=    Load Entity As Serialized Array    ${entity_payload_filename2}    ${second_entity_id}
    Set Stub Reply    GET    /ngsi-ld/v1/entities?attrs=isParked2&type=Vehicle    200    ${serialized_entity}
    ${serialized_entity}=    Load Entity As Serialized Array    vehicle-simple-attributes-second-with-context.json    ${second_entity_id}
    Set Stub Reply    GET    /ngsi-ld/v1/entities?pick=isParked2&type=Vehicle    200    ${serialized_entity}

    ${response}=    Query Entities    entity_types=Vehicle    attrs=isParked2    context=${ngsild_test_suite_context}

+1 −1
Changes for TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_01_05_inc.robot: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ D011_01_05_inc Query The Context Broker With Type
    [Documentation]    Check that entities on the Context Broker and Context Source with the same id get merged and
    ...    returned as one entity
    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_04    additive-inclusive    4_3_6_2    5_7_2
    ${serialized_entity}=    Load Entity As Serialized Array    ${entity_payload_filename}    ${entity_id}
    ${serialized_entity}=    Load Entity As Serialized Array    vehicle-simple-attributes-with-context.json    ${entity_id}
    Set Stub Reply    GET    /ngsi-ld/v1/entities?type=Vehicle    200    ${serialized_entity}

    ${response}=    Query Entities    entity_types=Vehicle    context=${ngsild_test_suite_context}
+1 −1
Changes for TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_01_red.robot: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ D011_01_red Query The Context Broker With Type
    [Documentation]    Check that if one queries the Context Broker for type, entity with matching type on a Context
    ...    Source gets returned
    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_04    proxy-redirect    4_3_6_3    5_7_2
    ${serialized_entity}=    Load Entity As Serialized Array    ${entity_payload_filename}    ${entity_id}
    ${serialized_entity}=    Load Entity As Serialized Array    vehicle-simple-attributes-with-context.json    ${entity_id}
    Set Stub Reply    GET    /broker1/ngsi-ld/v1/entities?type=Vehicle    200    ${serialized_entity}

    ${response}=    Query Entities    entity_types=Vehicle    context=${ngsild_test_suite_context}
+5 −2
Changes for TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_03_inc.robot: 5 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -27,7 +27,10 @@ D010_03_inc_01 Retrieve Entity By Id Using The retrieveEntity Operation
D010_03_inc_02 Retrieve Entity By Id Using The queryEntity Operation
    [Documentation]    Check that if one retrieves entity living on a Context Source from a Context Broker, and the registration only allows the queryEntity operation, the request is forwarded as expected
    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_04    additive-inclusive    4_3_6_2    5_7_1
    queryEntity    GET    /ngsi-ld/v1/entities?type=Vehicle
    # A retrieve converted to the queryEntity form selects by ENTITY ID —
    # the broker knows the target id, not necessarily a type it can
    # compact for the receiver. The keyword appends the generated id.
    queryEntity    GET    /ngsi-ld/v1/entities?id=
D010_03_inc_03 Retrieve Entity By Id Using The queryBatch Operation
    [Documentation]    Check that if one retrieves entity living on a Context Source from a Context Broker, and the registration only allows the queryBatch operation, the request is forwarded as expected
    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_04    additive-inclusive    4_3_6_2    5_7_1
@@ -40,7 +43,7 @@ Setup Registration And Context Source Mock Server And Retrieve Entity
    [Arguments]    ${operation}    ${method}    ${url}
    ${entity_id}=    Generate Random Vehicle Entity Id

    IF    '${operation}' == 'retrieveEntity'
    IF    '${operation}' == 'retrieveEntity' or '${operation}' == 'queryEntity'
        ${url}=    Set Variable    ${url}${entity_id}
    END

Loading