Commit 2a4c6a6c authored by Giuseppe Tropea's avatar Giuseppe Tropea
Browse files

Merge remote-tracking branch 'origin/testsuitedata' into parsespec

parents dce737a0 237209b3

TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_09.robot

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Resource ${EXECDIR}/resources/ApiUtils/ContextSourceRegistration.reso 
Resource            ${EXECDIR}/resources/AssertionUtils.resource

Resource            ${EXECDIR}/resources/JsonUtils.resource



Suite Teardown      Delete Created Context Source Registrations

Test Teardown       Delete Created Context Source Registrations

Test Template       Query Context Source Registration Matching Temporal Query

data/csourceRegistrations/context-source-registration-location-sample.jsonld

+2 −5
Original line number Diff line number Diff line
@@ -11,11 +11,8 @@ 
      }

   ],

   "location":{

      "type":"GeoProperty",

      "value":{

     "type":"Point",

     "coordinates":[-8.521,41.2]

      }

   },

   "endpoint":"http://my.csource.org:1026",

   "@context":[

data/csourceRegistrations/expectations/context-source-registrations-037-08-expectation.json

+35 −12
Original line number Diff line number Diff line
@@ -6,11 +6,34 @@ 
         {

         "entities": [

             {

             "id": "urn:ngsi-ld:Vehicle:A456",

             "type": "Vehicle"

             }

            ]

         ],

         "propertyNames": ["brandName","speed"],

         "relationshipNames": ["isParked"]

         },

         {

         "entities": [

             {

                 "idPattern": ".*downtown$",

                 "type": "OffStreetParking"

             },

             {

                 "idPattern": ".*47$",

                 "type": "OffStreetParking"

             }

         ],

         "propertyNames": ["availableSpotNumber","totalSpotNumber"],

         "relationshipNames": ["isNextToBuilding"]

         }

     ],

      "endpoint":"http://my.csource.org:1026"

     "endpoint": "http://my.csource.org:1026",

     "location": {

         "type": "Polygon",

         "coordinates": [

             [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0],

             [100.0, 1.0], [100.0, 0.0]] ]

     }

  }

]
 
 No newline at end of file

doc/analysis/requests.py

+6 −2
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ class Requests: 
            },

            'Query Context Source Registrations': {

                'positions': [],

                'params': ['context', 'id', 'type', 'attrs',

                'params': ['context', 'id', 'type', 'idPattern', 'attrs',

                           'q', 'csf', 'georel', 'geometry',

                           'coordinates', 'geoproperty', 'timeproperty', 'timerel',

                           'timeAt', 'limit', 'page', 'accept']
@@ -1353,11 +1353,13 @@ class Requests: 


    @staticmethod

    def query_context_source_registrations(kwargs) -> str:

        expected_parameters = ['context', 'id', 'type', 'attrs',

        expected_parameters = ['context', 'id', 'type', 'idPattern', 'attrs',

                               'q', 'csf', 'georel', 'geometry',

                               'coordinates', 'geoproperty', 'timeproperty', 'timerel',

                               'timeAt', 'limit', 'page', 'accept']



        # kwargs = {key: kwargs.get(key, '${EMPTY}') for key in expected_parameters}



        result = [x for x in kwargs if x not in expected_parameters]

        response = "Retrieve Temporal Representation of Entity"

        for key, value in kwargs.items():
@@ -1370,6 +1372,8 @@ class Requests: 
                    response = f"{response} and\n    Query Parameter: type set to '{value}'"

                case 'attrs':

                    response = f"{response} and\n    Query Parameter: attrs set to '{value}'"

                case 'idPattern':

                    response = f"{response} and\n    Query Parameter: idPattern set to '{value}'"

                case 'q':

                    response = f"{response} and\n    Query Parameter: q set to '{value}'"

                case 'csf':

doc/files/ContextInformation/Provision/003_03.json

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
      "endpoint": "entityOperations/create"

    },

    {

      "name": "003_03_01 EmptyJson",

      "permutation_tp_id": "TP/NGSI-LD/CI/Prov/BE/003_03_01",

      "name": "003_03_02 EmptyJson",

      "permutation_tp_id": "TP/NGSI-LD/CI/Prov/BE/003_03_02",

      "doc": "Check that you cannot create a batch of entities with an invalid request",

      "tags": [

        "5_6_7",