Commit ff141358 authored by Benoit Orihuela's avatar Benoit Orihuela
Browse files

docs: upgrade all dependencies, fix TC issues related to doc generation and update generated doc

parent b488a9b3
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -50,10 +50,12 @@ ${expected_expanded_subscription_payload_file_path}= subscriptions/expectatio
    Check Response Body Is Empty    ${response}
    ${response1}=    Retrieve Subscription
    ...    id=${subscription_id}
    ${ignore_keys}=    Create List    jsonldContext    timesFailed    timesSent    notificationTrigger
    Check Response Body Containing Subscription element
    ...    ${expected_expanded_subscription_payload_file_path}
    ...    ${subscription_id}
    ...    ${response1.json()}
    ...    ${ignore_keys}


*** Keywords ***
+4 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/AssertionUtils.resource
Resource            ${EXECDIR}/resources/JsonUtils.resource

Suite Teardown      Delete Created Context Source Registrations
Test Template       Create Context Source Registration
Test Template       Create Context Source Registration With Expiration Date


*** Variables ***
@@ -31,14 +31,15 @@ ${registration_payload_file_path}= csourceRegistrations/context-source-regi


*** Keywords ***
Create Context Source Registration
Create Context Source Registration With Expiration Date
    [Documentation]    Check that one can create a context source registration with specific ID and expiration date
    [Arguments]    ${registration_payload_file_path}    ${has_mode}=${False}
    ${registration_id}=    Generate Random CSR Id
    Set Suite Variable    ${registration_id}
    ${payload}=    Load JSON From File    ${EXECDIR}/data/${registration_payload_file_path}
    ${registration_payload}=    Update Value To JSON    ${payload}    $.id    ${registration_id}
    ${response}=    Create Context Source Registration With Return    ${registration_payload}
    ${response}=    Create Context Source Registration With Return
    ...    ${registration_payload}
    Check Response Status Code    201    ${response.status_code}
    Check Response Headers Containing URI set to    ${registration_id}    ${response.headers}
    ${response1}=    Retrieve Context Source Registration
+14 −14
Original line number Diff line number Diff line
*** Settings ***
Documentation       Verify that an entity can be retrieved by Id with a queryEntity and a queryBatch while using an exclusive registration.

Resource            ${EXECDIR}/resources/ApiUtils/ContextSourceRegistration.resource
Resource            ${EXECDIR}/resources/ApiUtils/ContextSourceDiscovery.resource
Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationProvision.resource
@@ -8,8 +9,8 @@ Resource ${EXECDIR}/resources/AssertionUtils.resource
Resource            ${EXECDIR}/resources/JsonUtils.resource
Resource            ${EXECDIR}/resources/MockServerUtils.resource

Test Template      Setup Registration, Context Source Mock Server And Query The Context Broker With Type
Test Teardown       Delete Registration And Stop Context Source Mock Server
Test Template       Setup Registration And Context Source Mock Server And Query The Context Broker With Type


*** Variables ***
@@ -19,21 +20,21 @@ ${entity_speed_filename} vehicle-speed-attribute.json
${registration_id_prefix}               urn:ngsi-ld:Registration:
${registration_payload_file_path}       csourceRegistrations/context-source-registration-vehicle-speed-with-redirection-ops.jsonld


*** Test Cases ***
D011_02_01_exc Query The Context Broker With Type With queryEntity
D011_02_exc_01 Query The Context Broker With Type With queryEntity
    [Documentation]    Check that if one queries the Context Broker for type, 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_06    proxy-exclusive    4_3_6_3    5_7_2
    [Template]     Setup Registration, Context Source Mock Server And Query The Context Broker With Type    
    GET    /broker1/ngsi-ld/v1/entities?type=Vehicle

D011_02_02_exc Query The Context Broker With Type With queryBatch
D011_02_exc_02 Query The Context Broker With Type With queryBatch
    [Documentation]    Check that if one queries the Context Broker for type, 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_06    proxy-exclusive    4_3_6_3    5_7_2
    [Template]     Setup Registration, Context Source Mock Server And Query The Context Broker With Type
    POST    /broker1/ngsi-ld/v1/entityOperations/query


*** Keywords ***
Setup Registration, Context Source Mock Server And Query The Context Broker With Type
Setup Registration And Context Source Mock Server And Query The Context Broker With Type
    [Documentation]    Check that if one queries the Context Broker for type, and the registration only allows the requested operation, the request is forwarded as expected
    [Arguments]    ${method}    ${url}
    ${entity_id}=    Generate Random Vehicle Entity Id
    Set Suite Variable    ${entity_id}
@@ -67,7 +68,6 @@ Setup Registration, Context Source Mock Server And Query The Context Broker With
    Check Response Status Code    200    ${response.status_code}
    Check Response Body Containing Entities URIS set to    ${entities_id}    ${response.json()}


Delete Registration And Stop Context Source Mock Server
    Delete Context Source Registration    ${registration_id}
    Stop Context Source Mock Server
+5 −6
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource
Resource            ${EXECDIR}/resources/MockServerUtils.resource

Test Teardown       Delete Registration And Stop Context Source Mock Server
Test Template       Setup Registration, Context Source Mock Server And Query The Context Broker With Type
Test Template       Setup Registration And Context Source Mock Server And Query The Context Broker With Type


*** Variables ***
@@ -21,20 +21,19 @@ ${registration_payload_file_path} csourceRegistrations/context-source-regi


*** Test Cases ***
D011_02_01_red Query The Context Broker With Type With queryEntity
D011_02_red_01 Query The Context Broker With Type With queryEntity
    [Documentation]    Verify that when querying by entity type with a redirect registration that supports queryEntity, the request is forwarded to the Context Source and entities are retrieved correctly
    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_06    proxy-redirect    4_3_6_3    5_7_2
    [Template]    Setup Registration, Context Source Mock Server And Query The Context Broker With Type
    GET    /broker1/ngsi-ld/v1/entities?type=Vehicle
D011_02_02_red Query The Context Broker With Type With queryBatch
D011_02_red_02 Query The Context Broker With Type With queryBatch
    [Documentation]    Verify that when querying by entity type with a redirect registration that supports queryBatch, the request is forwarded to the Context Source and entities are retrieved correctly
    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_06    proxy-redirect    4_3_6_3    5_7_2
    [Template]    Setup Registration, Context Source Mock Server And Query The Context Broker With Type
    POST    /broker1/ngsi-ld/v1/entityOperations/query


*** Keywords ***
Setup Registration, Context Source Mock Server And Query The Context Broker With Type
Setup Registration And Context Source Mock Server And Query The Context Broker With Type
    [Documentation]    Verify that when querying by entity type with a redirect registration that supports the requested operation, the request is forwarded to the Context Source and entities are retrieved correctly
    [Arguments]    ${method}    ${url}
    ${entity_id}=    Generate Random Vehicle Entity Id

+5 −6
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource
Resource            ${EXECDIR}/resources/MockServerUtils.resource

Test Teardown       Delete Registration And Stop Context Source Mock Server
Test Template       Setup Registration, Context Source Mock Server And Query The Context Broker With Type
Test Template       Setup Registration And Context Source Mock Server And Query The Context Broker With Type


*** Variables ***
@@ -20,20 +20,19 @@ ${registration_payload_file_path} csourceRegistrations/context-source-regi


*** Test Cases ***
D011_03_01_inc Query The Context Broker By Id Using The queryEntity Operation
D011_03_inc_01 Query The Context Broker By Id Using The queryEntity Operation
    [Documentation]    Check that if one queries the Context Broker for type, 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_06    additive-inclusive    4_3_6_2    5_7_2
    [Template]    Setup Registration, Context Source Mock Server And Query The Context Broker With Type
    queryEntity    GET    /ngsi-ld/v1/entities?type=Vehicle
D011_03_02_inc Query The Context Broker By Id Using The queryBatch Operation
D011_03_inc_02 Query The Context Broker By Id Using The queryBatch Operation
    [Documentation]    Check that if one queries the Context Broker for type, 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_06    additive-inclusive    4_3_6_2    5_7_2
    [Template]    Setup Registration, Context Source Mock Server And Query The Context Broker With Type
    queryBatch    POST    /ngsi-ld/v1/entityOperations/query


*** Keywords ***
Setup Registration, Context Source Mock Server And Query The Context Broker With Type
Setup Registration And Context Source Mock Server And Query The Context Broker With Type
    [Documentation]    Check that if one queries the Context Broker for type, and the registration only allows the requested operation, the request is forwarded as expected
    [Arguments]    ${operation}    ${method}    ${url}
    ${entity_id}=    Generate Random Vehicle Entity Id

Loading