Skip to content

Commit

Permalink
Merge pull request #1700 from FIWARE/issue/1698
Browse files Browse the repository at this point in the history 
Not fixed but slightly improved the error of issue #1698
  • Loading branch information
@kzangeli
kzangeli authored Oct 22, 2024
2 parents ee49b2a + a8bbc36 commit e9c4a11
Show file tree
Hide file tree
Showing 5 changed files with 283 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGES_NEXT_RELEASE
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Fixed Issues:
#0000: nada
#1698: Not fixed, but making it almost usable. Real fix coming soon. Needs a complete rewrite.

## New Features:
* Support for ...
Expand Down
8 changes: 6 additions & 2 deletions docker/Dockerfile-ubi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ RUN /tmp/build.sh -b

FROM registry.access.redhat.com/ubi8/ubi

LABEL authors="Ken Zangelin - [email protected], Stefan Wiedemann - stefan.wiedemann@fiware.org" \
LABEL authors="Ken Zangelin - [email protected], Jose Ignacio Carretero - joseignacio.carretero@fiware.org" \
description="Orion-LD is a Context Broker which supports both the NGSI-LD and the NGSI-v2 APIs." \
maintainer="[email protected],stefan.wiedemann@fiware.org" \
maintainer="[email protected],[email protected]@fiware.org" \
vendor="FIWARE Foundation e.V." \
documentation="https://github.com/FIWARE/context.Orion-LD/tree/develop/doc" \
name="FIWARE Orion-LD" \
Expand All @@ -29,6 +29,10 @@ COPY --from=build-stage /usr/bin/orionld /usr/bin
COPY --from=build-stage /usr/local/lib/* /usr/lib64/
COPY --from=build-stage /usr/local/lib64/* /usr/lib64/
COPY --from=build-stage /opt/orion/ldcontexts/ /opt/orion/ldcontexts/
COPY --from=build-stage /usr/lib64/libtinyxml2.so.6 /usr/lib64/
COPY --from=build-stage /usr/lib64/libtinyxml2.so /usr/lib64/
COPY --from=build-stage /usr/lib64/libyaml-cpp.so.0.6 /usr/lib64/
COPY --from=build-stage /usr/lib64/libyaml-cpp.so /usr/lib64/

COPY docker/other-places.repo /etc/yum.repos.d/
COPY docker/ubi.repo /etc/yum.repos.d/
Expand Down
13 changes: 13 additions & 0 deletions src/lib/orionld/db/dbEntityTypesGet.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,19 @@ KjNode* dbEntityTypesGet(OrionldProblemDetails* pdP, bool details)
}
}

//
// See issue #1698
// I'd really need to rewrite the whole function.
// As cfreyth correctly comments, the pagination limit/offet are about entities (as mongocEntitiesGet is used)
// and NOT entity types.
//
// As a quick and dirty fix:
// * Allow limit/offset
// * Set default limit to 1000 (unless set to anything else by the user)
//
if (orionldState.uriParams.limit == 20)
orionldState.uriParams.limit = 1000; // Default limit of 20 is changed to 1000

//
// GET local types - i.e. from the "entities" collection
//
Expand Down
2 changes: 2 additions & 0 deletions src/lib/orionld/service/orionldServiceInit.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,8 @@ static void restServicePrepare(OrionLdRestService* serviceP, OrionLdRestServiceS
}
else if (serviceP->serviceRoutine == orionldGetEntityTypes)
{
serviceP->uriParams |= ORIONLD_URIPARAM_LIMIT;
serviceP->uriParams |= ORIONLD_URIPARAM_OFFSET;
serviceP->uriParams |= ORIONLD_URIPARAM_DETAILS;
}
else if (serviceP->serviceRoutine == orionldGetEntityType)
Expand Down
261 changes: 261 additions & 0 deletions test/functionalTest/cases/0000_ngsild/ngsild_issue_1698.test
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,261 @@
# Copyright 2024 FIWARE Foundation e.V.
#
# This file is part of Orion-LD Context Broker.
#
# Orion-LD Context Broker is free software: you can redistribute it and/or
# modify it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# Orion-LD Context Broker is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
# General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with Orion-LD Context Broker. If not, see http://www.gnu.org/licenses/.
#
# For those usages not covered by this license please contact with
# orionld at fiware dot org

# VALGRIND_READY - to mark the test ready for valgrindTestSuite.sh

--NAME--
Entity pagination

--SHELL-INIT--
dbInit CB
orionldStart CB -experimental

--SHELL--

#
# 01. Create 100 entities of types T001-T100
# 02. GET the first 10 types
# 03. GET the next 10 types
# 04. GET all (1000 is the pagination limit for entities in GET /types)
#

echo "01. Create 100 entities of types T001-T100"
echo "=========================================="
typeset -i eNo
eNo=1

while [ $eNo -le 100 ]
do
eId=$(printf "urn:E%03d" $eNo)
eType=$(printf "T%03d" $eNo)
eNo=$eNo+1

payload='{
"id": "'$eId'",
"type": "'$eType'",
"A1": {
"type": "Property",
"value": "E'$eNo':A1"
}
}'
orionCurl --url /ngsi-ld/v1/entities --payload "$payload" | grep 'Location:'
done | wc
echo
echo


echo "02. GET the first 10 types"
echo "=========================="
orionCurl --url /ngsi-ld/v1/types?limit=10
echo
echo


echo "03. GET the next 10 types"
echo "========================="
orionCurl --url "/ngsi-ld/v1/types?limit=10&offset=10"
echo
echo


echo "04. GET all (1000 is the pagination limit for entities in GET /types)"
echo "====================================================================="
orionCurl --url /ngsi-ld/v1/types
echo
echo


--REGEXPECT--
01. Create 100 entities of types T001-T100
==========================================
100 200 4000


02. GET the first 10 types
==========================
HTTP/1.1 200 OK
Content-Length: 179
Content-Type: application/json
Date: REGEX(.*)
Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)

{
"id": "urn:ngsi-ld:EntityTypeList:REGEX(.*)",
"type": "EntityTypeList",
"typeList": [
"T001",
"T002",
"T003",
"T004",
"T005",
"T006",
"T007",
"T008",
"T009",
"T010"
]
}


03. GET the next 10 types
=========================
HTTP/1.1 200 OK
Content-Length: 179
Content-Type: application/json
Date: REGEX(.*)
Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)

{
"id": "urn:ngsi-ld:EntityTypeList:REGEX(.*)",
"type": "EntityTypeList",
"typeList": [
"T011",
"T012",
"T013",
"T014",
"T015",
"T016",
"T017",
"T018",
"T019",
"T020"
]
}


04. GET all (1000 is the pagination limit for entities in GET /types)
=====================================================================
HTTP/1.1 200 OK
Content-Length: 809
Content-Type: application/json
Date: REGEX(.*)
Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)

{
"id": "urn:ngsi-ld:EntityTypeList:REGEX(.*)",
"type": "EntityTypeList",
"typeList": [
"T001",
"T002",
"T003",
"T004",
"T005",
"T006",
"T007",
"T008",
"T009",
"T010",
"T011",
"T012",
"T013",
"T014",
"T015",
"T016",
"T017",
"T018",
"T019",
"T020",
"T021",
"T022",
"T023",
"T024",
"T025",
"T026",
"T027",
"T028",
"T029",
"T030",
"T031",
"T032",
"T033",
"T034",
"T035",
"T036",
"T037",
"T038",
"T039",
"T040",
"T041",
"T042",
"T043",
"T044",
"T045",
"T046",
"T047",
"T048",
"T049",
"T050",
"T051",
"T052",
"T053",
"T054",
"T055",
"T056",
"T057",
"T058",
"T059",
"T060",
"T061",
"T062",
"T063",
"T064",
"T065",
"T066",
"T067",
"T068",
"T069",
"T070",
"T071",
"T072",
"T073",
"T074",
"T075",
"T076",
"T077",
"T078",
"T079",
"T080",
"T081",
"T082",
"T083",
"T084",
"T085",
"T086",
"T087",
"T088",
"T089",
"T090",
"T091",
"T092",
"T093",
"T094",
"T095",
"T096",
"T097",
"T098",
"T099",
"T100"
]
}


--TEARDOWN--
brokerStop CB
dbDrop CB

0 comments on commit e9c4a11

Please sign in to comment.