Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow to send to CB batch update for multimeasures for NGSI-LD #1623

Merged
merged 8 commits into from
Jun 26, 2024
Merged

Allow to send to CB batch update for multimeasures for NGSI-LD #1623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
29f8380
Update NGSI-LD Entities
jason-fox Jun 25, 2024
581f5df
Update NGSI-LD Entities
jason-fox Jun 25, 2024
013e218
Fixing expectations
jason-fox Jun 25, 2024
8118a65
Formatting
jason-fox Jun 25, 2024
1e2f061
remove dead code
jason-fox Jun 25, 2024
079bb44
Deleting irrelevant tests cases/
jason-fox Jun 26, 2024
ec9d0bd
Merge commit '093c96fd46f9a04a034e767a87b38e2f90975415' into fix-ld-e…
jason-fox Jun 26, 2024
8de86c7
Update CNR.
jason-fox Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES_NEXT_RELEASE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
- Fix: service header to use uppercase in case of update and delete (#1528)
- Fix: Allow to send to CB batch update for multimeasures for NGSI-LD (#1623)
890 changes: 320 additions & 570 deletions lib/services/ngsi/entities-NGSI-LD.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin1a.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:WeatherStation:ws1",
"type": "WeatherStation",
"pressure": {
"type": "Property",
"value": 1040
Expand All @@ -9,10 +11,8 @@
"type": "Property",
"value": {
"@type": "Summary",
"@value": "Humidity NaN and pressure 1040"
"@value": "Humidity NaN and pressure 20800"
}
},
"id": "urn:ngsi-ld:WeatherStation:ws1",
"type": "WeatherStation"
}
}
]
44 changes: 22 additions & 22 deletions test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
[
{
"@context": "http://context.json-ld",
"humidity": {
"type": "Property",
"value": {
"@type": "Percentage",
"@value": "12"
}
},
"id": "urn:ngsi-ld:WeatherStation:ws1",
"pressure": {
"type": "Property",
"value": 1040
},
"type": "WeatherStation",
"weather": {
"type": "Property",
"value": {
"@type": "Summary",
"@value": "Humidity 6 and pressure 1040"
}
}
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:WeatherStation:ws1",
"type": "WeatherStation",
"pressure": {
"type": "Property",
"value": 1040
},
"humidity": {
"type": "Property",
"value": {
"@type": "Percentage",
"@value": "12"
}
},
"weather": {
"type": "Property",
"value": {
"@type": "Summary",
"@value": "Humidity 6 and pressure 20800"
}
}
}
]
8 changes: 4 additions & 4 deletions test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin29.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:WeatherStation:ws1",
"type": "WeatherStation",
"pressure": {
"type": "Property",
"value": 1040
Expand All @@ -9,10 +11,8 @@
"type": "Property",
"value": {
"@type": "Summary",
"@value": "Humidity NaN and pressure 1040"
"@value": "Humidity NaN and pressure 20800"
}
},
"id": "urn:ngsi-ld:WeatherStation:ws1",
"type": "WeatherStation"
}
}
]
29 changes: 14 additions & 15 deletions test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin32.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
[
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:GPS:gps1",
"type": "GPS",
"location": {
"type": "GeoProperty",
"value": {
"coordinates": [
13,
52
],
"type": "Point"
},
"observedAt": "1970-01-01T00:00:00.001Z"
}
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:GPS:gps1",
"type": "GPS",
"location": {
"type": "GeoProperty",
"value": {
"coordinates": [
13,
52
],
"type": "Point"
}
}
}
]
46 changes: 23 additions & 23 deletions test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
[
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:WeatherStation:ws4",
"pressure": {
"type": "Property",
"value": {
"@type": "Hgmm",
"@value": "52"
}
},
"type": "WeatherStation"
},
{
"@context": "http://context.json-ld",
"humidity": {
"type": "Property",
"value": {
"@type": "Percentage",
"@value": "12"
}
},
"id": "urn:ngsi-ld:Higrometer:Higro2000",
"type": "Higrometer"
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:WeatherStation:ws4",
"type": "WeatherStation",
"pressure": {
"type": "Property",
"value": {
"@type": "Hgmm",
"@value": "52"
}
}
},
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:Higrometer:Higro2000",
"type": "Higrometer",
"humidity": {
"type": "Property",
"value": {
"@type": "Percentage",
"@value": "12"
}
}
}
]
5 changes: 0 additions & 5 deletions test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin15.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
[
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:GPS:gps1",
"type": "GPS"
},
{
"@context": "http://context.json-ld",
"explicit": {
Expand Down
27 changes: 11 additions & 16 deletions test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
[
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:WeatherStation:ws5",
"type": "WeatherStation"
},
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:Higrometer:Higro2000",
"pressure": {
"type": "Property",
"value": {
"@type": "Hgmm",
"@value": "16"
}
},
"type": "Higrometer"
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:Higrometer:Higro2000",
"type": "Higrometer",
"pressure": {
"type": "Property",
"value": {
"@type": "Hgmm",
"@value": "16"
}
}
}
]
51 changes: 23 additions & 28 deletions test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,26 @@
[
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:WeatherStation:ws6",
"type": "WeatherStation"
},
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:Higrometer:Higro2000",
"type": "Higrometer",
"pressure": {
"type": "Property",
"value": {
"@type": "Hgmm",
"@value": "16"
}
}
},
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:Higrometer:Higro2002",
"type": "Higrometer",
"pressure": {
"type": "Property",
"value": {
"@type": "Hgmm",
"@value": "17"
}
}
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:Higrometer:Higro2002",
"type": "Higrometer",
"pressure": {
"type": "Property",
"value": {
"@type": "Hgmm",
"@value": "17"
}
}
},
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:Higrometer:Higro2000",
"type": "Higrometer",
"pressure": {
"type": "Property",
"value": {
"@type": "Hgmm",
"@value": "16"
}
}
}
]
21 changes: 8 additions & 13 deletions test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
[
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:Sensor:Sensor",
"type": "Sensor"
},
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:WM:SO1",
"type": "WM",
"vol": {
"type": "Property",
"value": 38
}
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:WM:SO1",
"type": "WM",
"vol": {
"type": "Property",
"value": 38
}
}
]
5 changes: 0 additions & 5 deletions test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
[
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:Sensor:Sensor",
"type": "Sensor"
},
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:WM:SO1",
Expand Down
53 changes: 24 additions & 29 deletions test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,27 @@
[
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:WeatherStation:ws7",
"type": "WeatherStation"
},
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:Higrometer:Higro2000",
"type": "Higrometer",
"pressure": {
"type": "Property",
"value": {
"@type": "Hgmm",
"@value": "16"
}
}
},
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:Higrometer:Higro2002",
"type": "Higrometer",
"pressure": {
"type": "Property",
"value": {
"@type": "Hgmm",
"@value": "17"
},
"unitCode": "Hgmm"
}
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:Higrometer:Higro2002",
"type": "Higrometer",
"pressure": {
"type": "Property",
"value": {
"@type": "Hgmm",
"@value": "17"
},
"unitCode": "Hgmm"
}
},
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:Higrometer:Higro2000",
"type": "Higrometer",
"pressure": {
"type": "Property",
"value": {
"@type": "Hgmm",
"@value": "16"
}
}
}
]
29 changes: 12 additions & 17 deletions test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityTimestampPlugin2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
[
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:WeatherStation:ws4",
"type": "WeatherStation"
},
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:Higrometer:Higro2000",
"type": "Higrometer",
"humidity": {
"type": "Property",
"value": {
"@type": "Percentage",
"@value": "12"
},
"observedAt": "2023-03-21T16:54:11.464Z"
}
{
"@context": "http://context.json-ld",
"id": "urn:ngsi-ld:Higrometer:Higro2000",
"type": "Higrometer",
"humidity": {
"type": "Property",
"value": {
"@type": "Percentage",
"@value": "12"
},
"observedAt": "2024-06-25T16:04:13.914Z"
}
}
]
Loading
Loading