-
Notifications
You must be signed in to change notification settings - Fork 89
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1623 from jason-fox/fix-ld-entities
Allow to send to CB batch update for multimeasures for NGSI-LD
- Loading branch information
Showing
19 changed files
with
482 additions
and
1,012 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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) |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 22 additions & 22 deletions
44
test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin2.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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" | ||
| } | ||
| } | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 14 additions & 15 deletions
29
test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin32.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
46
test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin1.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
5
test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin15.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 11 additions & 16 deletions
27
test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin4.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
51
test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin5.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
21
test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin6.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
5
test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin7.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 24 additions & 29 deletions
53
test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin8.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
29
test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityTimestampPlugin2.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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" | ||
| } | ||
| } | ||
| ] |
Oops, something went wrong.