Commit ca2f1fed authored by thomas Bousselin's avatar thomas Bousselin
Browse files

feat: remove ngsi-ld/v1 from configuration

parent 334dd6d0

README.md

+9 −9
Original line number Diff line number Diff line
@@ -58,10 +58,10 @@ taking into account the content of `requirements.txt` file. Further details on e 


In the `resources/variables.py` file, configure the following parameters:



- `url` : It is the url of the context broker which is to be tested (including the `/ngsi-ld/v1` path, 

e.g., http://localhost:8080/ngsi-ld/v1).

- `url` : It is the base URL of the context broker which is to be tested (without the `/ngsi-ld/v1` path,

e.g., http://localhost:8080).

- `temporal_api_url` : This is the url of the GET temporal operation API, in case that a Context Broker splits 

this portion of the API (e.g., http://localhost:8080/ngsi-ld/v1).

this portion of the API (without the `/ngsi-ld/v1` path, e.g., http://localhost:8080).

- `ngsild_test_suite_context` : This is the url of the default context used in the ETSI NGSI-LD requests 

(e.g. 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld').

- `notification_server_host` and `notification_server_port` : This is the address and port used to create the local
@@ -170,11 +170,11 @@ test launch command followed by the file name. 
  The following example shows how to run an interoperability test with multiple brokers: 



  ```

    robot --variable broker_A_url:http://localhost:8080/ngsi-ld/v1 \

      --variable broker_B_url:http://localhost:8081/ngsi-ld/v1 \

      --variable broker_C_url:http://localhost:8082/ngsi-ld/v1 \

      --variable broker_D_url:http://localhost:8083/ngsi-ld/v1 \

      --variable broker_E_url:http://localhost:8084/ngsi-ld/v1 \

    robot --variable broker_A_url:http://localhost:8080 \

      --variable broker_B_url:http://localhost:8081 \

      --variable broker_C_url:http://localhost:8082 \

      --variable broker_D_url:http://localhost:8083 \

      --variable broker_E_url:http://localhost:8084 \

      ./TP/NGSI-LD/Interoperability/Provision/Entities/CreateEntity/IOP_CNF_01_01.robot

  ```

itb/ITBTestCases/resources/template.json

+3 −3
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
    "testName": "${testName}",

    "excludeOption": "${exclude}",

    "parameters": {

        "url": "${url}/ngsi-ld/v1",

        "temporal_api_url": "${temporalApiUrl}/ngsi-ld/v1",

        "url": "${url}",

        "temporal_api_url": "${temporalApiUrl}",

        "ngsild_test_suite_context": "${ngsildTestSuiteContext}",

        "notification_server_host": "${notificationServerHost}",

        "notification_server_port": "${notificationServerPort}",

itb/ITBTestCases/testSuite/resources/test-request.json

+3 −3
Original line number Diff line number Diff line 
{

    "testName": "${testName}",

    "parameters": {

        "url": "${url}/ngsi-ld/v1",

        "temporal_api_url": "${temporalApiUrl}/ngsi-ld/v1",

        "url": "${url}",

        "temporal_api_url": "${temporalApiUrl}",

        "ngsild_test_suite_context": "${ngsildTestSuiteContext}",

        "notification_server_host": "${notificationServerHost}",

        "notification_server_port": "${notificationServerPort}",

itb/robot-processing/test-runner-service/src/main/resources/test-request.json

+3 −3
Original line number Diff line number Diff line 
{

    "testName": "${testName}",

    "parameters": {

        "url": "${url}/ngsi-ld/v1",

        "temporal_api_url": "${temporalApiUrl}/ngsi-ld/v1",

        "url": "${url}",

        "temporal_api_url": "${temporalApiUrl}",

        "ngsild_test_suite_context": "${ngsildTestSuiteContext}",

        "notification_server_host": "${notificationServerHost}",

        "notification_server_port": "${notificationServerPort}",

resources/ApiUtils/Common.resource

+6 −4
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ Library String 




*** Variables ***

${NGSI_LD_API_PATH}                     /ngsi-ld/v1



${BUILDING_ID_PREFIX}                   urn:ngsi-ld:Building:

${BUS_ID_PREFIX}                        urn:ngsi-ld:Bus:

${CITY_ID_PREFIX}                       urn:ngsi-ld:City:
@@ -82,24 +84,24 @@ Call Api Endpoint With Invalid Parameter 
    # No multi method request function in the robotframework-requests library

    IF    "${method}"=="GET"

        ${response}=    GET

        ...    url=${url}/${endpoint}${params}

        ...    url=${url}${NGSI_LD_API_PATH}/${endpoint}${params}

        ...    headers=${headers}

        ...    expected_status=any

    ELSE IF    "${method}"=="POST"

        ${response}=    POST

        ...    url=${url}/${endpoint}${params}

        ...    url=${url}${NGSI_LD_API_PATH}/${endpoint}${params}

        ...    json=${file_content}

        ...    headers=${headers}

        ...    expected_status=any

    ELSE IF    "${method}"=="PUT"

        ${response}=    PUT

        ...    url=${url}/${endpoint}${params}

        ...    url=${url}${NGSI_LD_API_PATH}/${endpoint}${params}

        ...    json=${file_content}

        ...    headers=${headers}

        ...    expected_status=any

    ELSE IF    "${method}"=="DELETE"

        ${response}=    DELETE

        ...    url=${url}/${endpoint}${params}

        ...    url=${url}${NGSI_LD_API_PATH}/${endpoint}${params}

        ...    headers=${headers}

        ...    expected_status=any

    END