Add NGSI-LD basic Command support #848

jason-fox · 2020-02-27T08:48:23Z

This PR adds basic Command and Lazy Attribute support

Split out NGSI-v1, v2 and LD handlers into separate files.
Add support for PATCH incoming commands.
Add support for standard NGSI-LD Headers
Amend tests ( replace /v2/op/update/ with NGSI-LD PATCH)
Amend tests ( replace /v2/op/query/ with NGSI-LD GET)
Amend test expectations to NGSI-LD format

- Split out NGSI-v1, v2 and LD handlers into separate files. - Add support for PATCH incoming commands. - Amend tests ( replace `/v2/op/update/` with NGSI-LD PATCH) - Amend test expectations to NGSI-LD format

jason-fox · 2020-02-27T08:49:06Z

This may also be working with polling commands, but the tests haven't been updated yet.

jason-fox · 2020-02-27T09:03:46Z

By splitting the NGSI Handlers by type it is easier to compare coverage - as you can see the only real drop is in the NGSI-LD context server which is where lazy attributes are processed.

Merge branch 'feature/ngsi-ld-multimeasure' into feature/ngsi-ld-command

- Do not create additional context - Upsert responds with 204 - Pass context in the body not Link Header - Improve debug - display stringified responses from broker

Merge branch 'feature/ngsi-ld-multimeasure' into feature/ngsi-ld-command

- Amend handler - Enabler test - Amend expectations if necessary.

fgalan · 2020-03-04T17:17:24Z

Once #847, I have change base branch in this PR to telefonicaid:feature/842_ngsi_ld

Please updgrade jason-fox:feature/ngsi-ld-command with telefonicaid:feature/842_ngsi_ld and tune the usual things (CNR, minimal documentation if applicable, etc.) to make this PR ready to merge.

…ngsi-ld-command

jason-fox · 2020-03-04T19:02:48Z

I've documented the new configuration options only and left it at that for now.

northboundinteractions.md is massively out of date and needs a full rewrite. All references to NGSI v1 need to be removed and replaced with v2 and LD equivalents.

fgalan · 2020-03-09T11:27:38Z

doc/installationguide.md

    the IoTAgent runs in a single thread. For more details about multi-core functionality, please refer to the
    [Cluster](https://nodejs.org/api/cluster.html) module in Node.js and
    [this section](howto.md#iot-agent-in-multi-thread-mode) of the library documentation.
+-  **jsonLdContext**: the location of the NGSI-LD `@context` element which provides additional information allowing the computer to


What is the difference with contextBroker.jsonLdContext field? Is not the same?

The documentation of contextBroker.jsonLdContext was missed in the previous PR - I've just added it in this PR instead. This is not another new configuration attribute, just adding the missing documentation for the existing one.

The same text is duplicated in L44-45. I'd suggest to avoid duplication and have it only in one place and that place should be L44-45 as it is the place closer to the configuration object in which jsonLdContext is being used (i.e. contextBroker).

Fixed e099b84

doc/installationguide.md

fgalan · 2020-03-09T11:33:13Z

lib/services/northBound/contextServerUtils.js

@@ -0,0 +1,183 @@
+var async = require('async'),


Missing license header.

Fixed 263588b

fgalan · 2020-03-09T11:35:45Z

test/unit/ngsi-ld/examples/contextRequests/updateContextCommandStatus1.json

@@ -0,0 +1 @@
+[{"@context":"http://context.json-ld","id":"urn:ngsi-ld:Robot:r2d2","type":"Robot","position_status":{"type":"Property","value":{"@type":"commandStatus","@value":"UNKNOWN"}},"position_info":{"type":"Property","value":{"@type":"commandResult","@value":" "}}}]


Better to have the .json in pretty printed form, as the others.

Fixed: cac4d5f

fgalan · 2020-03-09T11:36:42Z

test/unit/ngsi-ld/lazyAndCommands/polling-commands-test.js

    });

-    xdescribe('When a command update arrives to the IoT Agent for a device with polling', function() {
+    describe('When a command update arrives to the IoT Agent for a device with polling', function() {


All the xdescribe() and xit() has been solved in this PR? Or is there any pending after it?

There are following PRs - I haven't completely duplicated v2 tests here. see - #848 (comment) - I'm not entirely sure how Nock would work on this test so better to leave a disabled test than delete the use case. Someone should check to see if polling is working manually.

Note that this is because NGSI-LD is using entity upsert for both create and update so the expectations can't just be duplicated from v2.

Thanks for the clarification. NTC.

fgalan · 2020-03-09T11:41:08Z

lib/services/northBound/contextServer.js

-    var updateMiddlewaresNgsi1 = [
-            middlewares.ensureType,
-            middlewares.validateJson(updateContextTemplateNgsi1),
-            handleUpdateNgsi1,
-            updateErrorHandlingNgsi1
-        ],
-        updateMiddlewaresNgsi2 = [
-            middlewares.ensureType,
-            middlewares.validateJson(updateContextTemplateNgsi2),
-            handleUpdateNgsi2,
-            updateErrorHandlingNgsi2
-        ],
-        updateMiddlewaresNgsiLD = [
-            middlewares.ensureType,
-            middlewares.validateJson(updateContextTemplateNgsiLD),
-            handleUpdateNgsiLD,
-            updateErrorHandlingNgsiLD
-        ],
-        queryMiddlewaresNgsi1 = [
-            middlewares.ensureType,
-            middlewares.validateJson(queryContextTemplate),
-            handleQueryNgsi1,
-            queryErrorHandlingNgsi1
-        ],
-        queryMiddlewaresNgsi2 = [
-            handleQueryNgsi2,
-            queryErrorHandlingNgsi2
-        ],
-        queryMiddlewaresNgsiLD = [
-            handleQueryNgsiLD,
-            queryErrorHandlingNgsiLD
-        ],
-        updatePathsNgsi1 = [
-            '/v1/updateContext',
-            '/NGSI10/updateContext',
-            '//updateContext'
-        ],
-        updatePathsNgsi2 = [
-            '/v2/op/update',
-            '//op/update'
-        ],
-        updatePathsNgsiLD = [
-            '/ngsi-ld/v1/entities/:id/attrs/:attr'
-        ],
-        queryPathsNgsi1 = [
-            '/v1/queryContext',
-            '/NGSI10/queryContext',
-            '//queryContext'
-        ],
-        queryPathsNgsi2 = [
-            '/v2/op/query',
-            '//op/query'
-        ],
-        queryPathsNgsiLD = [
-            '/ngsi-ld/v1/entities/:id'
-        ];


Where this routes configuration has been moved now? I have tried to find the new place, but I'm being unable...

The routes are defined in contextSever-NGSI-LD.js and the equivalent v1 and v2 files. Line 41,42 or thereabouts.

Co-Authored-By: Fermín Galán Márquez <[email protected]>

fgalan

LGTM

Basic Command support

64f0123

- Split out NGSI-v1, v2 and LD handlers into separate files. - Add support for PATCH incoming commands. - Amend tests ( replace `/v2/op/update/` with NGSI-LD PATCH) - Amend test expectations to NGSI-LD format

jason-fox mentioned this pull request Feb 27, 2020

Adding NGSI-LD support #842

Closed

jason-fox added 13 commits February 27, 2020 14:31

More JavaDoc NGSI-v2 => NSGI-LD

51cda9e

Merge branch 'feature/ngsi-ld-multimeasure' into feature/ngsi-ld-command

Fix expectations to match responses from a real context broker.

2594bc8

- Do not create additional context - Upsert responds with 204 - Pass context in the body not Link Header - Improve debug - display stringified responses from broker

More JavaDoc - add missing headers

6f7a077

Merge branch 'feature/ngsi-ld-multimeasure' into feature/ngsi-ld-command

Merge branch 'feature/ngsi-ld-multimeasure' into feature/ngsi-ld-command

91235cd

Add default NGSI-LD Tenant and NGSI-LD Path headers.

d32eedf

Add JavaDoc

09e5b88

Add return

f863c19

Add lazy attribute support

3751368

- Amend handler - Enabler test - Amend expectations if necessary.

Fix test - add missing handler

9d5edb8

Enabling more tests and linting

9428a5e

Enabling tests

c0c9d0d

Move version checking flag to initialization.

2f2caea

Linting - remove unused files.

283ac4b

fgalan changed the base branch from master to feature/842_ngsi_ld March 4, 2020 17:16

jason-fox added 3 commits March 4, 2020 19:28

Merge commit '8399d52cc34cec0acad20624da0e8f26d31d024f' into feature/…

b292f1c

…ngsi-ld-command

Update CNR

accb670

Document new configuration variables.

104526f

fgalan reviewed Mar 9, 2020

View reviewed changes

doc/installationguide.md Outdated Show resolved Hide resolved

fgalan reviewed Mar 9, 2020

View reviewed changes

Update doc/installationguide.md

9da6a10

Co-Authored-By: Fermín Galán Márquez <[email protected]>

jason-fox added 3 commits March 9, 2020 17:44

Add header

263588b

Format JSON

cac4d5f

Remove text

e099b84

fgalan approved these changes Mar 10, 2020

View reviewed changes

fgalan merged commit 24e08f5 into telefonicaid:feature/842_ngsi_ld Mar 10, 2020

This was referenced Mar 10, 2020

[e2e testing] NGSI-LD #849

Merged

Update NGSI support to use ES6 syntax. #850

Merged

jason-fox deleted the feature/ngsi-ld-command branch March 10, 2020 20:09

		@@ -0,0 +1 @@
		[{"@context":"http://context.json-ld","id":"urn:ngsi-ld:Robot:r2d2","type":"Robot","position_status":{"type":"Property","value":{"@type":"commandStatus","@value":"UNKNOWN"}},"position_info":{"type":"Property","value":{"@type":"commandResult","@value":" "}}}]

Add NGSI-LD basic Command support #848

Add NGSI-LD basic Command support #848

Uh oh!

Conversation

jason-fox commented Feb 27, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jason-fox commented Feb 27, 2020

Uh oh!

jason-fox commented Feb 27, 2020

Uh oh!

fgalan commented Mar 4, 2020

Uh oh!

jason-fox commented Mar 4, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jason-fox Mar 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fgalan left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jason-fox commented Feb 27, 2020 •

edited

Loading

jason-fox commented Mar 4, 2020 •

edited

Loading

jason-fox Mar 9, 2020 •

edited

Loading