iotagent-node-lib 2.21.0 → 2.24.0

package/test/unit/mongodb/mongodb-group-registry-test.js

@@ -179,7 +179,7 @@ describe('MongoDB Group Registry test', function () {
     beforeEach(function (done) {
         mongoUtils.cleanDbs(function () {
             iotAgentLib.activate(iotAgentConfig, function () {
-                mongo.connect('mongodb://localhost:27017/iotagent', { useNewUrlParser: true }, function (err, db) {
+                mongo.connect('mongodb://localhost:27017/iotagent', function (err, db) {
                     iotAgentDb = db;
                     done();
                 });
@@ -448,4 +448,28 @@ describe('MongoDB Group Registry test', function () {
             });
         });
     });
+    
+    describe('When the device info request with name and type', function () {
+        beforeEach(function (done) {
+            async.series([async.apply(request, optionsCreation)], done);
+        });
+        
+        afterEach(function (done) {
+            iotAgentLib.clearRegistry(done);
+        });
+        
+        it('should return the name and type of device', function (done) {
+            request(optionsGet, function (error, response, body) {
+                should.exist(body);
+                should.exist(body.count);
+                body.count.should.equal(1);
+                should.exist(body.services);
+                should.exist(body.services.length);
+                body.services.length.should.equal(1);
+                should.exist(body.services[0].entity_type);
+                body.services[0].entity_type.should.equal('Light');
+                done();
+            });
+        });
+    });
 });

package/test/unit/mongodb/mongodb-registry-test.js

@@ -25,7 +25,6 @@
 
 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 mongo = require('mongodb').MongoClient;
@@ -191,7 +190,7 @@ describe('NGSI-v2 - MongoDB Device Registry', function () {
         logger.setLevel('FATAL');
 
         mongoUtils.cleanDbs(function () {
-            mongo.connect('mongodb://localhost:27017/iotagent', { useNewUrlParser: true }, function (err, db) {
+            mongo.connect('mongodb://localhost:27017/iotagent', function (err, db) {
                 iotAgentDb = db;
                 done();
             });
@@ -204,7 +203,7 @@ describe('NGSI-v2 - MongoDB Device Registry', function () {
             iotAgentDb
                 .db()
                 .collection('devices')
-                .deleteOne(function (error) {
+                .deleteOne({}, function (error) {
                     iotAgentDb.close(function (error) {
                         mongoUtils.cleanDbs(done);
                     });
@@ -508,4 +507,53 @@ describe('NGSI-v2 - MongoDB Device Registry', function () {
             });
         });
     });
+    
+     describe('When the device is queried with the name and type', function () {
+        beforeEach(function (done) {
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .post('/v2/entities?options=upsert')
+                .times(10)
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .reply(204);
+
+            const devices = [];
+
+            for (let i = 0; i < 10; i++) {
+                devices.push({
+                    id: 'id' + i,
+                    type: 'Light' + i,
+                    internalId: 'internal' + i,
+                    service: 'smartgondor',
+                    subservice: 'gardens',
+                    active: [
+                        {
+                            id: 'attrId',
+                            type: 'attrType' + i,
+                            value: i
+                        }
+                    ]
+                });
+            }
+            iotAgentLib.activate(iotAgentConfig, function (error) {
+                async.map(devices, iotAgentLib.register, function (error, results) {
+                    done();
+                });
+            });
+        });
+        afterEach(function (done) {
+            iotAgentLib.clearRegistry(done);
+        });
+        it('should return the device with name and type', function (done) {
+            iotAgentLib.getDeviceByNameAndType('Light4:id4', 'Light4', 'smartgondor', 'gardens', function ( error, device ) {
+                should.not.exist(error);
+                should.exist(device);
+                should.exist(device.name);
+                should.exist(device.type);
+                device.name.should.equal('Light4:id4');
+                device.type.should.equal('Light4');
+                done();
+            });
+        });
+    });
 });

package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgentCommands.json

@@ -10,7 +10,8 @@
                 }
             ],
             "properties": [
-                "position"
+                "position",
+                "orientation"
             ]
         }
     ],

package/test/unit/ngsi-ld/examples/contextRequests/updateContextLanguageProperties1.json

@@ -0,0 +1,15 @@
+[
+  {
+    "@context": "http://context.json-ld",
+    "name": {
+      "type": "LanguageProperty",
+      "languageMap": {
+        "el": "Κωνσταντινούπολις",
+        "en": "Constantinople",
+        "tr": "İstanbul"
+      }
+    },
+    "id": "urn:ngsi-ld:Light:light1",
+    "type": "Light"
+  }
+]

package/test/unit/ngsi-ld/examples/subscriptionRequests/bidirectionalNotificationWithDatasetId.json

@@ -0,0 +1,21 @@
+{
+    "data": [
+        {
+            "id": "TheFirstLight",
+            "location": [
+              {
+                    "type": "GeoProperty",
+                    "value": "12.4, -9.6",
+                    "datasetId": "urn:ngsi-ld:Property:do-this"
+              },
+              {
+                    "type": "GeoProperty",
+                    "value": "6, 10",
+                    "datasetId": "urn:ngsi-ld:Property:then-do-this"
+              }
+            ],
+            "type": "TheLightType"
+        }
+    ],
+    "subscriptionId": "51c0ac9ed714fb3b37d7d5a8"
+}

package/test/unit/ngsi-ld/examples/subscriptionRequests/bidirectionalNotificationWithMetadata.json

@@ -0,0 +1,17 @@
+{
+    "data": [
+        {
+            "id": "TheFirstLight",
+            "location": {
+                "type": "GeoProperty",
+                "value": "12.4, -9.6",
+                "qos": {
+                  "type": "Property",
+                  "value": 1
+                }
+            },
+            "type": "TheLightType"
+        }
+    ],
+    "subscriptionId": "51c0ac9ed714fb3b37d7d5a8"
+}