iotagent-node-lib 2.25.0 → 3.0.0

package/test/unit/ngsi-ld/expressions/jexlBasedTransformations-test.js

@@ -293,13 +293,10 @@ const iotAgentConfigTS = {
 
 describe('NGSI-LD: JEXL', function () {
     beforeEach(function (done) {
-        logger.setLevel('FATAL');
+        //logger.setLevel('FATAL');
 
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.expressionTransformation.update);
                 done();
             });
         });
@@ -964,9 +961,6 @@ describe('NGSI-LD: JEXL - Timestamps', function () {
 
         iotAgentLib.activate(iotAgentConfigTS, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.expressionTransformation.update);
                 done();
             });
         });

package/test/unit/ngsi-ld/general/startup-test.js

@@ -66,7 +66,7 @@ describe('NGSI-LD - Startup tests', function () {
         beforeEach(function () {
             process.env.IOTA_CB_HOST = 'cbhost';
             process.env.IOTA_CB_PORT = '1111';
-            process.env.IOTA_CB_NGSI_VERSION = 'v2';
+            process.env.IOTA_CB_NGSI_VERSION = 'ld';
             process.env.IOTA_NORTH_HOST = 'localhost';
             process.env.IOTA_NORTH_PORT = '2222';
             process.env.IOTA_PROVIDER_URL = 'provider:3333';
@@ -83,6 +83,11 @@ describe('NGSI-LD - Startup tests', function () {
             process.env.IOTA_MONGO_DB = 'themongodb';
             process.env.IOTA_MONGO_REPLICASET = 'customReplica';
             process.env.IOTA_DEFAULT_RESOURCE = '/iot/custom';
+            process.env.IOTA_JSON_LD_CONTEXT = 'http://context.jsonld';
+            process.env.IOTA_FALLBACK_TENANT = 'openiot';
+            process.env.IOTA_FALLBACK_PATH = 'smartgondor';
+            process.env.IOTA_LD_SUPPORT_NULL = 'false';
+            process.env.IOTA_LD_SUPPORT_DATASET_ID = 'false';
 
             nock.cleanAll();
 
@@ -114,6 +119,11 @@ describe('NGSI-LD - Startup tests', function () {
             delete process.env.IOTA_MONGO_DB;
             delete process.env.IOTA_MONGO_REPLICASET;
             delete process.env.IOTA_DEFAULT_RESOURCE;
+            delete process.env.IOTA_JSON_LD_CONTEXT;
+            delete process.env.IOTA_FALLBACK_TENANT;
+            delete process.env.IOTA_FALLBACK_PATH;
+            delete process.env.IOTA_LD_SUPPORT_NULL;
+            delete process.env.IOTA_LD_SUPPORT_DATASET_ID;
         });
 
         afterEach(function (done) {
@@ -123,7 +133,12 @@ describe('NGSI-LD - Startup tests', function () {
         it('should load the correct configuration parameters', function (done) {
             iotAgentLib.activate(iotAgentConfig, function (error) {
                 config.getConfig().contextBroker.url.should.equal('http://cbhost:1111');
-                config.getConfig().contextBroker.ngsiVersion.should.equal('v2');
+                config.getConfig().contextBroker.ngsiVersion.should.equal('ld');
+                config.getConfig().contextBroker.jsonLdContext.should.equal('http://context.jsonld');
+                config.getConfig().contextBroker.fallbackTenant.should.equal( 'openiot');
+                config.getConfig().contextBroker.fallbackPath.should.equal('smartgondor');
+                config.getConfig().server.ldSupport.null.should.equal(false);
+                config.getConfig().server.ldSupport.datasetId.should.equal(false);
                 config.getConfig().server.host.should.equal('localhost');
                 config.getConfig().server.port.should.equal('2222');
                 config.getConfig().providerUrl.should.equal('provider:3333');

package/test/unit/ngsi-ld/lazyAndCommands/command-test.js

@@ -184,7 +184,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -287,7 +286,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -368,7 +366,7 @@ describe('NGSI-LD - Command functionalities', function () {
     describe('When a sequential command with datasetId updates via PATCH  /attrs/attr-name arrives to the IoT Agent', function () {
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/ngsi-ld/v1/entities/urn:ngsi-ld:Robot:r2d2/attrs',
-            method: 'PUT',
+            method: 'PATCH',
             json: {
                 position: [
                     {
@@ -390,7 +388,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -496,7 +493,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -594,7 +590,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -691,7 +686,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -794,7 +788,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -902,7 +895,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -1006,7 +998,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -1104,7 +1095,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -1246,7 +1236,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });

package/test/unit/ngsi-ld/lazyAndCommands/merge-patch-test.js

@@ -0,0 +1,249 @@
+/*
+ * Copyright 2020 Telefonica Investigación y Desarrollo, S.A.U
+ *
+ * This file is part of fiware-iotagent-lib
+ *
+ * fiware-iotagent-lib 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.
+ *
+ * fiware-iotagent-lib 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 fiware-iotagent-lib.
+ * If not, seehttp://www.gnu.org/licenses/.
+ *
+ * For those usages not covered by the GNU Affero General Public License
+ * please contact with::[contacto@tid.es]
+ *
+ * Modified by: Jason Fox - FIWARE Foundation
+ */
+
+/* eslint-disable no-unused-vars */
+
+const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
+const utils = require('../../../tools/utils');
+const request = utils.request;
+const should = require('should');
+const logger = require('logops');
+const nock = require('nock');
+const mongoUtils = require('../../mongodb/mongoDBUtils');
+
+const timekeeper = require('timekeeper');
+let contextBrokerMock;
+let statusAttributeMock;
+const iotAgentConfig = {
+    contextBroker: {
+        host: '192.168.1.1',
+        port: '1026',
+        ngsiVersion: 'ld',
+        jsonLdContext: 'http://context.json-ld'
+    },
+    server: {
+        port: 4041,
+        ldSupport: {
+            null: true,
+            datasetId: false,
+            merge: true
+        }
+    },
+    types: {
+        Robot: {
+            internalAttributes:[],
+            commands:[
+                {
+                    name: 'position',
+                    object_id: 'pos',
+                    type: 'Object'
+                },
+                {
+                    name: 'orientation',
+                    type: 'Object'
+                }
+            ],
+            lazy: [
+                {
+                    name: 'batteryLevel',
+                    type: 'Object'
+                }
+            ],
+            staticAttributes: [],
+            active: []
+        }
+    },
+    service: 'smartgondor',
+    providerUrl: 'http://smartgondor.com'
+};
+const device3 = {
+    id: 'r2d2',
+    type: 'Robot',
+    service: 'smartgondor'
+};
+
+describe('NGSI-LD - Merge-Patch functionalities', function () {
+    beforeEach(function (done) {
+        const time = new Date(1438760101468); // 2015-08-05T07:35:01.468+00:00
+        timekeeper.freeze(time);
+        nock.cleanAll();
+
+        contextBrokerMock = nock('http://192.168.1.1:1026')
+            .matchHeader('fiware-service', 'smartgondor')
+            .post(
+                '/ngsi-ld/v1/csourceRegistrations/',
+                utils.readExampleFile(
+                    './test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgentCommandsAndLazy.json'
+                )
+            )
+            .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d' });
+
+        contextBrokerMock
+            .matchHeader('fiware-service', 'smartgondor')
+            .post('/ngsi-ld/v1/entityOperations/upsert/')
+            .reply(204);
+
+        iotAgentLib.activate(iotAgentConfig, done);
+    });
+
+    afterEach(function (done) {
+        timekeeper.reset();
+        delete device3.registrationId;
+        iotAgentLib.clearAll(function () {
+            iotAgentLib.deactivate(function () {
+                mongoUtils.cleanDbs(function () {
+                    nock.cleanAll();
+                    iotAgentLib.setDataUpdateHandler();
+                    iotAgentLib.setCommandHandler();
+                    done();
+                });
+            });
+        });
+    });
+
+    describe('When a merge-patch PATCH  arrives to the IoT Agent as Context Provider', function () {
+        const options = {
+            url:
+                'http://localhost:' +
+                iotAgentConfig.server.port +
+                '/ngsi-ld/v1/entities/urn:ngsi-ld:Robot:r2d2',
+            method: 'PATCH',
+            json: {
+                "position": {
+                    "type": "Property",
+                    "value": {
+                        "moveTo" : [12,34],
+                        "observedAt": "urn:ngsi-ld:null",
+                        "precision": {
+                            "value": 0.95,
+                            "unitCode": "C62"
+                        } 
+                    } 
+                },
+                "orientation" : "urn:ngsi-ld:null"
+            },
+            headers: {
+                'fiware-service': 'smartgondor',
+                'content-type': 'application/ld+json'
+            }
+        };
+
+        beforeEach(function (done) {
+            iotAgentLib.register(device3, function (error) {
+                done();
+            });
+        });
+
+        it('should call the client handler once', function (done) {
+            let handlerCalled = 0;
+
+            iotAgentLib.setMergePatchHandler(function (id, type, service, subservice, attributes, callback) {
+                id.should.equal('urn:ngsi-ld:' + device3.type + ':' + device3.id);
+                type.should.equal(device3.type);
+                attributes[0].name.should.equal('position');
+                attributes[1].name.should.equal('orientation');
+                should.equal(attributes[1].value, null);
+                handlerCalled++;
+                callback(null, {
+                    id,
+                    type,
+                    attributes: [
+                        {
+                            name: 'position',
+                            type: 'Array',
+                            value: '[28, -104, 23]'
+                        }
+                    ]
+                });
+            });
+
+            request(options, function (error, response, body) {
+                should.not.exist(error);
+                response.statusCode.should.equal(200);
+                handlerCalled.should.equal(1);
+                done();
+            });
+        });
+    });
+
+
+    xdescribe('When a partial update PATCH with an NGSI-LD Null arrives to the IoT Agent as Context Provider', function () {
+        const options = {
+            url:
+                'http://localhost:' +
+                iotAgentConfig.server.port +
+                '/ngsi-ld/v1/entities/urn:ngsi-ld:Robot:r2d2/attrs/position',
+            method: 'PATCH',
+            json: {
+                "type": "Property",
+                "value": "urn:ngsi-ld:null"
+            },
+            headers: {
+                'fiware-service': 'smartgondor',
+                'content-type': 'application/ld+json'
+            }
+        };
+
+        beforeEach(function (done) {
+            logger.setLevel('FATAL');
+            iotAgentLib.register(device3, function (error) {
+                done();
+            });
+        });
+
+        it('should call the client handler once', function (done) {
+            let handlerCalled = 0;
+
+            iotAgentLib.setCommandHandler(function (id, type, service, subservice, attributes, callback) {
+                id.should.equal('urn:ngsi-ld:' + device3.type + ':' + device3.id);
+                type.should.equal(device3.type);
+                attributes[0].name.should.equal('position');
+                should.equal(attributes[0].value, null);
+                handlerCalled++;
+                callback(null, {
+                    id,
+                    type,
+                    attributes: [
+                        {
+                            name: 'position',
+                            type: 'Array',
+                            value: null
+                        }
+                    ]
+                });
+            });
+
+            request(options, function (error, response, body) {
+                console.error(error)
+                should.not.exist(error);
+
+
+                response.statusCode.should.equal(204);
+                handlerCalled.should.equal(1);
+                done();
+            });
+        });
+    });
+});

package/test/unit/ngsi-ld/ngsiService/autocast-test.js

@@ -75,6 +75,18 @@ const iotAgentConfig = {
                 {
                     name: 'configuration',
                     type: 'Object'
+                },
+                {
+                    name: 'date',
+                    type: 'Date'
+                },
+                {
+                    name: 'time',
+                    type: 'Time'
+                },
+                {
+                    name: 'dateTime',
+                    type: 'DateTime'
                 }
             ]
         }
@@ -327,7 +339,7 @@ describe('NGSI-LD - JSON native types autocast test', function () {
     describe('When the IoT Agent receives new information from a device. Observation with Time type', function () {
         const values = [
             {
-                name: 'configuration',
+                name: 'time',
                 type: 'Time',
                 value: '2016-04-30T14:59:46.000Z'
             }
@@ -360,7 +372,7 @@ describe('NGSI-LD - JSON native types autocast test', function () {
     describe('When the IoT Agent receives new information from a device. Observation with DateTime type', function () {
         const values = [
             {
-                name: 'configuration',
+                name: 'dateTime',
                 type: 'DateTime',
                 value: '2016-04-30Z'
             }
@@ -393,7 +405,7 @@ describe('NGSI-LD - JSON native types autocast test', function () {
     describe('When the IoT Agent receives new information from a device. Observation with Date type', function () {
         const values = [
             {
-                name: 'configuration',
+                name: 'date',
                 type: 'Date',
                 value: '2016-04-30T14:59:46.000Z'
             }

package/test/unit/ngsi-ld/ngsiService/unsupported-endpoints-test.js

@@ -29,6 +29,7 @@ const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
 const request = utils.request;
 const should = require('should');
+const nock = require('nock');
 
 let contextBrokerMock;
 const iotAgentConfig = {
@@ -47,6 +48,50 @@ const iotAgentConfig = {
     providerUrl: 'http://smartgondor.com'
 };
 
+
+const iotAgentConfigWithLimitedSupport = {
+    contextBroker: {
+        host: '192.168.1.1',
+        port: '1026',
+        ngsiVersion: 'ld',
+        jsonLdContext: 'http://context.json-ld'
+    },
+    server: {
+        port: 4041,
+        ldSupport : {
+           null: false,
+           datasetId: false
+       }
+    },
+    types: {
+        Robot: {
+            commands: [
+                {
+                    name: 'position',
+                    type: 'Array'
+                },
+                {
+                    name: 'orientation',
+                    type: 'Array'
+                }
+            ],
+            lazy: [],
+            staticAttributes: [],
+            active: []
+        }
+    },
+    service: 'smartgondor',
+    subservice: 'gardens',
+    providerUrl: 'http://smartgondor.com'
+};
+
+const device = {
+    id: 'r2d2',
+    type: 'Robot',
+    service: 'smartgondor'
+};
+
+
 describe('NGSI-LD - Unsupported Endpoints', function () {
     beforeEach(function (done) {
         iotAgentLib.activate(iotAgentConfig, function () {
@@ -107,5 +152,131 @@ describe('NGSI-LD - Unsupported Endpoints', function () {
                 done();
             });
         });
+
+
+        it('PUT /entities/<entity-id> includes an NGSI-LD Null should return a valid NSGI-LD error message', function (done) {
+            const options = {
+                url:
+                    'http://localhost:' +
+                    iotAgentConfig.server.port +
+                    '/ngsi-ld/v1/entities/urn:ngsi-ld:entity/attrs/att',
+                method: 'PUT',
+                json: {
+                    "value":  "urn:ngsi-ld:null"
+                },
+                headers: {
+                    'fiware-service': 'smartgondor',
+                    'content-type': 'application/ld+json'
+                }
+            };
+            request(options, function (error, response, body) {
+                response.statusCode.should.equal(400);
+                done();
+            });
+        });
+    });
+});
+
+describe('NGSI-LD - Limiting Support', function () {
+    beforeEach(function (done) {
+        contextBrokerMock = nock('http://192.168.1.1:1026')
+            .matchHeader('fiware-service', 'smartgondor')
+            .post(
+                '/ngsi-ld/v1/csourceRegistrations/',
+                utils.readExampleFile(
+                    './test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgentCommands.json'
+                )
+            )
+            .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d' });
+
+        contextBrokerMock
+            .matchHeader('fiware-service', 'smartgondor')
+            .post('/ngsi-ld/v1/entityOperations/upsert/')
+            .reply(204);
+
+
+        iotAgentLib.activate(iotAgentConfigWithLimitedSupport, function () {
+            iotAgentLib.clearAll(function () {
+                done();
+            });
+        });
+    });
+
+    afterEach(function (done) {
+        iotAgentLib.clearAll(function () {
+            iotAgentLib.deactivate(done);
+        });
     });
+
+    describe('When sending sending an NGSI-LD Null when nulls are unsupported', function () {
+        it('should return a valid NSGI-LD error message', function (done) {
+            const options = {
+                url:
+                    'http://localhost:' +
+                    iotAgentConfig.server.port +
+                    '/ngsi-ld/v1/entities/urn:ngsi-ld:Robot:r2d2/attrs/position',
+                method: 'PATCH',
+                json: {
+                    "value":  "urn:ngsi-ld:null"
+                },
+                headers: {
+                    'fiware-service': 'smartgondor',
+                    'content-type': 'application/ld+json'
+                }
+            };
+
+            iotAgentLib.setCommandHandler(function (id, type, service, subservice, attributes, callback) {
+                callback(null, {});
+            });
+
+            iotAgentLib.register(device, function (error) {
+                request(options, function (error, response, body) {
+                    response.statusCode.should.equal(400);
+                    done();
+                });
+            });
+
+        });
+    });   
+    describe('When sending a payload including a datasetId when datasetIds are unsupported ', function () {
+        it('should return a valid NSGI-LD error message', function (done) {
+            const options = {
+                url:
+                    'http://localhost:' +
+                    iotAgentConfig.server.port +
+                    '/ngsi-ld/v1/entities/urn:ngsi-ld:Robot:r2d2/attrs/',
+                method: 'PATCH',
+                json: {
+                    position: [
+                        {
+                            type: 'Property',
+                            value: [1, 2, 3],
+                            datasetId: 'urn:ngsi-ld:this'
+                        },
+                        {
+                            type: 'Property',
+                            value: [28, -104, 23],
+                            datasetId: 'urn:ngsi-ld:that'
+                        }
+                    ]
+                },
+                headers: {
+                    'fiware-service': 'smartgondor',
+                    'content-type': 'application/ld+json'
+                }
+            };
+
+            iotAgentLib.setCommandHandler(function (id, type, service, subservice, attributes, callback) {
+                callback(null, {});
+            });
+
+            iotAgentLib.register(device, function (error) {
+                request(options, function (error, response, body) {
+                    response.statusCode.should.equal(400);
+                    done();
+                });
+            });
+
+        });
+    });    
 });

package/test/unit/ngsi-ld/plugins/alias-plugin_test.js

@@ -117,8 +117,6 @@ describe('NGSI-LD - Attribute alias plugin', function () {
 
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
                 done();
             });
         });