iotagent-node-lib 3.3.0 → 3.4.1

package/lib/services/devices/devices-NGSI-v2.js

@@ -61,46 +61,6 @@ function jsonConcat(json1, json2) {
     }
 }
 
-/**
- * Creates the response handler for the initial entity creation request using NGSIv2.
- * This handler basically deals with the errors that could have been rised during
- * the communication with the Context Broker.
- *
- * @param {Object} deviceData       Object containing all the deviceData needed to send the registration.
- * @param {Object} newDevice        Device object that will be stored in the database.
- * @return {function}               Handler to pass to the request() function.
- */
-function createInitialEntityHandlerNgsi2(deviceData, newDevice, callback) {
-    return function handleInitialEntityResponse(error, response, body) {
-        if (error) {
-            logger.error(
-                context,
-                'ORION-001: Connection error creating inital entity in the Context Broker: %s',
-                error
-            );
-
-            alarms.raise(constants.ORION_ALARM, error);
-
-            callback(error);
-        } else if (response && response.statusCode === 204) {
-            alarms.release(constants.ORION_ALARM);
-            logger.debug(context, 'Initial entity created successfully.');
-            callback(null, newDevice);
-        } else {
-            logger.error(
-                context,
-                'Protocol error connecting to the Context Broker [%d]: %s',
-                response.statusCode,
-                body
-            );
-
-            const errorObj = new errors.EntityGenericError(deviceData.id, deviceData.type, body, response.statusCode);
-
-            callback(errorObj);
-        }
-    };
-}
-
 /**
  * Creates the response handler for the update entity request using NGSIv2. This handler basically deals with the errors
  * that could have been rised during the communication with the Context Broker.
@@ -199,62 +159,12 @@ function formatCommandsNgsi2(originalVector) {
     return attributeList;
 }
 
-/**
- * Creates the initial entity representing the device in the Context Broker using NGSIv2.
- * This is important mainly to allow the rest of the updateContext operations to be performed.
- *
- * @param {Object} deviceData       Object containing all the deviceData needed to send the registration.
- * @param {Object} newDevice        Device object that will be stored in the database.
+/*
+ * This methods makes a bypass in updateRegisterDeviceNgsi2 to allow not change
+ * extractDeviceDifference and combineWithNewDevice methods
  */
-function createInitialEntityNgsi2(deviceData, newDevice, callback) {
-    const options = {
-        url: config.getConfig().contextBroker.url + '/v2/entities?options=upsert',
-        method: 'POST',
-        json: {
-            id: String(deviceData.name),
-            type: deviceData.type
-        },
-        headers: {
-            'fiware-service': deviceData.service,
-            'fiware-servicepath': deviceData.subservice,
-            'fiware-correlator': (domain.active && domain.active.corr) || uuid.v4()
-        }
-    };
-
-    if (deviceData.cbHost && deviceData.cbHost.indexOf('://') !== -1) {
-        options.url = deviceData.cbHost + '/v2/entities?options=upsert';
-    } else if (deviceData.cbHost && deviceData.cbHost.indexOf('://') === -1) {
-        options.url = 'http://' + deviceData.cbHost + '/v2/entities?options=upsert';
-    }
-
-    jsonConcat(options.json, formatAttributesNgsi2(deviceData.active, false));
-    jsonConcat(options.json, formatAttributesNgsi2(deviceData.staticAttributes, true));
-    jsonConcat(options.json, formatCommandsNgsi2(deviceData.commands));
-
-    for (const att in options.json) {
-        try {
-            // Format any GeoJSON attrs properly
-            options.json[att] = NGSIv2.formatGeoAttrs(options.json[att]);
-        } catch (error) {
-            return callback(new errors.BadGeocoordinates(JSON.stringify(options.json)));
-        }
-    }
-
-    logger.debug(context, 'Creating initial entity with deviceData: %j', deviceData);
-    if (
-        ('timestamp' in deviceData && deviceData.timestamp !== undefined
-            ? deviceData.timestamp
-            : config.getConfig().timestamp) &&
-        !utils.isTimestampedNgsi2(options.json)
-    ) {
-        logger.debug(context, 'config.timestamp %s %s', deviceData.timestamp, config.getConfig().timestamp);
-        options.json[constants.TIMESTAMP_ATTRIBUTE] = {
-            type: constants.TIMESTAMP_TYPE_NGSI2,
-            value: moment()
-        };
-    }
-    logger.debug(context, 'Creating initial entity in the Context Broker:\n %s', JSON.stringify(options, null, 4));
-    utils.executeWithSecurity(options, newDevice, createInitialEntityHandlerNgsi2(deviceData, newDevice, callback));
+function createInitialEntityNgsi2Fake(deviceData, newDevice, callback) {
+    callback(null, newDevice);
 }
 
 /**
@@ -337,9 +247,10 @@ function updateRegisterDeviceNgsi2(deviceObj, entityInfoUpdated, callback) {
         return;
     }
 
-    logger.debug(context, 'Update provisioned v2 device in Device Service');
+    logger.debug(context, 'Update provisioned v2 device in Device Service %j %j', deviceObj, entityInfoUpdated);
 
     function combineWithNewDevice(newDevice, oldDevice, callback) {
+        logger.debug(context, 'combineWithNewDevice %j %j', newDevice, oldDevice);
         if (oldDevice) {
             oldDevice.internalId = newDevice.internalId;
             oldDevice.lazy = newDevice.lazy;
@@ -424,9 +335,15 @@ function updateRegisterDeviceNgsi2(deviceObj, entityInfoUpdated, callback) {
     if (entityInfoUpdated) {
         async.waterfall(
             [
-                apply(config.getRegistry().get, deviceObj.id, deviceObj.service, deviceObj.subservice),
+                apply(
+                    config.getRegistry().get,
+                    deviceObj.id,
+                    deviceObj.apikey,
+                    deviceObj.service,
+                    deviceObj.subservice
+                ),
                 apply(extractDeviceDifference, deviceObj),
-                createInitialEntityNgsi2,
+                createInitialEntityNgsi2Fake,
                 apply(combineWithNewDevice, deviceObj),
                 apply(registrationUtils.sendRegistrations, false),
                 apply(registrationUtils.processContextRegistration, deviceObj),
@@ -437,7 +354,13 @@ function updateRegisterDeviceNgsi2(deviceObj, entityInfoUpdated, callback) {
     } else {
         async.waterfall(
             [
-                apply(config.getRegistry().get, deviceObj.id, deviceObj.service, deviceObj.subservice),
+                apply(
+                    config.getRegistry().get,
+                    deviceObj.id,
+                    deviceObj.apikey,
+                    deviceObj.service,
+                    deviceObj.subservice
+                ),
                 apply(extractDeviceDifference, deviceObj),
                 updateEntityNgsi2,
                 apply(combineWithNewDevice, deviceObj),
@@ -450,7 +373,6 @@ function updateRegisterDeviceNgsi2(deviceObj, entityInfoUpdated, callback) {
     }
 }
 
-exports.createInitialEntity = createInitialEntityNgsi2;
 exports.updateRegisterDevice = updateRegisterDeviceNgsi2;
 exports.formatCommands = formatCommandsNgsi2;
 exports.formatAttributes = formatAttributesNgsi2;

package/lib/services/groups/groupService.js

@@ -172,7 +172,7 @@ function remove(service, subservice, resource, apikey, device, callback) {
     }
 
     function unregisterDevice(device, cb) {
-        deviceService.unregister(device.id, service, subservice, function (error) {
+        deviceService.unregister(device.id, device.apikey, service, subservice, function (error) {
             if (error) {
                 cb(error);
             }

package/lib/services/ngsi/entities-NGSI-v2.js

@@ -354,11 +354,7 @@ function sendUpdateValueNgsi2(entityName, attributes, typeInformation, token, ca
         payload.entities[0].type = typeInformation.type;
     }
 
-    if (config.getConfig().appendMode === false) {
-        payload.actionType = 'update';
-    } else {
-        payload.actionType = 'append';
-    }
+    payload.actionType = 'append';
 
     let options = NGSIUtils.createRequestObject(url, typeInformation, token);
 
@@ -680,8 +676,9 @@ function sendUpdateValueNgsi2(entityName, attributes, typeInformation, token, ca
         try {
             logger.debug(context, 'sendUpdateValueNgsi2 entityNameExp %j ', typeInformation.entityNameExp);
             entityName = expressionPlugin.applyExpression(typeInformation.entityNameExp, ctxt, typeInformation);
-            payload.entities[0].id = entityName;
-            ctxt['entity_name'] = entityName;
+            // CB entity id should be always a String
+            payload.entities[0].id = String(entityName);
+            ctxt['entity_name'] = String(entityName);
         } catch (e) {
             logger.debug(
                 context,
@@ -762,9 +759,14 @@ function sendUpdateValueNgsi2(entityName, attributes, typeInformation, token, ca
                     if (expressionPlugin.contextAvailable(attr.expression, ctxt, typeInformation)) {
                         res = expressionPlugin.applyExpression(attr.expression, ctxt, typeInformation);
                         if (
-                            // By default undefined is equivalent to null: should not progress
-                            (attr.skipValue === undefined && res === null) ||
-                            (attr.skipValue !== undefined && res === attr.skipValue)
+                            // By default undefined is handled like null: should not progress
+                            // Some op results (like nonexistent * 2) are a kind of null with a number type
+                            // but NaN value
+                            (attr.skipValue === undefined &&
+                                (res === null || (typeof res === 'number' && isNaN(res)))) ||
+                            (attr.skipValue !== undefined &&
+                                (res === attr.skipValue ||
+                                    (typeof res === 'number' && isNaN(res) && attr.skipValue === null)))
                         ) {
                             logger.debug(
                                 context,
@@ -987,25 +989,10 @@ function sendUpdateValueNgsi2(entityName, attributes, typeInformation, token, ca
         // only in the first case
         if (options.json.entities.length === 1) {
             // recreate options object to use single entity update
-            url = '/v2/entities';
-            if (config.getConfig().appendMode === false) {
-                url += '/' + entityName + '/attrs';
-                if (typeInformation && typeInformation.type) {
-                    url += '?type=' + typeInformation.type;
-                }
-            } else {
-                // appendMode === true
-                url += '?options=upsert';
-            }
+            url = '/v2/entities?options=upsert';
             options = NGSIUtils.createRequestObject(url, typeInformation, token);
             options.json = payload.entities[0];
-            if (config.getConfig().appendMode === false) {
-                options.method = 'PATCH';
-                delete options.json.id;
-                delete options.json.type;
-            } else {
-                options.method = 'POST';
-            }
+            options.method = 'POST';
         } // else: keep current options object created for a batch update
         logger.debug(context, 'Updating device value in the Context Broker at [%s]', options.url);
         logger.debug(context, 'Using the following NGSI v2 request:\n\n%s\n\n', JSON.stringify(options, null, 4));

package/lib/services/northBound/deviceProvisioningServer.js

@@ -251,6 +251,7 @@ function handleListDevices(req, res, next) {
 function handleGetDevice(req, res, next) {
     deviceService.getDevice(
         req.params.deviceId,
+        req.query.apikey,
         req.headers['fiware-service'],
         req.headers['fiware-servicepath'],
         function (error, device) {
@@ -269,8 +270,8 @@ function handleGetDevice(req, res, next) {
  * This middleware handles the removal of a particular device specified with the deviceId.
  */
 function handleRemoveDevice(req, res, next) {
-    function getDevice(deviceId, service, subservice, callback) {
-        deviceService.getDevice(deviceId, service, subservice, function (error, device) {
+    function getDevice(deviceId, apikey, service, subservice, callback) {
+        deviceService.getDevice(deviceId, apikey, service, subservice, function (error, device) {
             if (error) {
                 callback(error);
             } else if (device) {
@@ -289,18 +290,25 @@ function handleRemoveDevice(req, res, next) {
         }
     }
 
-    function unregisterDevice(deviceId, service, subservice, device, callback) {
-        return deviceService.unregister(deviceId, service, subservice, callback);
+    function unregisterDevice(deviceId, apikey, service, subservice, device, callback) {
+        return deviceService.unregister(deviceId, apikey, service, subservice, callback);
     }
 
     async.waterfall(
         [
             apply(statsRegistry.add, 'deviceRemovalRequests', 1),
-            apply(getDevice, req.params.deviceId, req.headers['fiware-service'], req.headers['fiware-servicepath']),
+            apply(
+                getDevice,
+                req.params.deviceId,
+                req.query.apikey,
+                req.headers['fiware-service'],
+                req.headers['fiware-servicepath']
+            ),
             applyRemoveDeviceHandler,
             apply(
                 unregisterDevice,
                 req.params.deviceId,
+                req.query.apikey,
                 req.headers['fiware-service'],
                 req.headers['fiware-servicepath']
             )
@@ -334,6 +342,7 @@ function handleUpdateDevice(req, res, next) {
     } else {
         deviceService.getDevice(
             req.params.deviceId,
+            req.query.apikey,
             req.headers['fiware-service'],
             req.headers['fiware-servicepath'],
             function (error, device) {

package/mkdocs.yml

@@ -13,15 +13,10 @@ pages:
   - Home: 'index.md'
   - 'Getting Started' : 'getting-started.md'
   - 'User & Programmers Manual':
-    - 'Architecture' : 'architecture.md'
     - 'IoT Agent API' : 'api.md'
-    - 'Advanced Topics' : 'advanced-topics.md'
-    - 'Library Functions': 'usermanual.md'
-    - 'Measurement Transformation Expression Language': 'expressionLanguage.md'
-    - 'How to develop a new IoT Agent': 'howto.md'
-    - 'North Port - NGSI Interactions': 'northboundinteractions.md'
-    - 'Development Documentation': development.md
-  - 'Installation & Administration Manual': 
-    - 'Installation Guide': 'installationguide.md'
-    - 'Operations (logs & alarms)': 'operations.md'
-    
+    - 'Installation and administration manual': 'admin.md'
+  - 'Development documentation': 
+    - 'Development manual': 'devel/development.md'
+    - 'Contributing guide': 'devel/contribution-guidelines.md'
+    - 'Architecture' : 'devel/architecture.md'
+    - 'North Port - NGSI Interactions': 'devel/northboundinteractions.md'

package/package.json

@@ -2,7 +2,7 @@
   "name": "iotagent-node-lib",
   "license": "AGPL-3.0-only",
   "description": "IoT Agent library to interface with NGSI Context Broker",
-  "version": "3.3.0",
+  "version": "3.4.1",
   "homepage": "https://github.com/telefonicaid/iotagent-node-lib",
   "keywords": [
     "fiware",
@@ -51,7 +51,7 @@
     "logops": "2.1.2",
     "moment": "~2.29.2",
     "moment-timezone": "~0.5.34",
-    "mongoose": "5.13.14",
+    "mongoose": "5.13.20",
     "query-string": "7.1.1",
     "revalidator": "~0.3.1",
     "underscore": "~1.13.4",
@@ -65,7 +65,7 @@
     "husky": "~4.2.5",
     "lint-staged": "~12.3.8",
     "mocha": "10.0.0",
-    "mongodb": "4.7.0",
+    "mongodb": "4.17.0",
     "nock": "13.2.7",
     "nyc": "~15.1.0",
     "prettier": "~2.7.1",

package/scripts/legacy_expression_tool/README.md

@@ -82,34 +82,50 @@ python legacy_expression_tool.py \
 
 The list of possible arguments that the scripts accepts are:
 
-| Argument               | Description                                                                                              | Default value                | Mandatory |
-| ---------------------- | -------------------------------------------------------------------------------------------------------- | ---------------------------- | --------- |
-| `--mongouri`           | The MongoDB URI to connect to                                                                            | `mongodb://localhost:27017/` | No        |
-| `--database`           | The database name to replace the expressions                                                             | NA                           | Yes       |
-| `--collection`         | The collection name to replace the expressions                                                           | NA                           | Yes       |
-| `--translation`        | The translation dictionary file to replace the expressions                                               | `translation.json`           | No        |
-| `--debug`              | Enable debug mode                                                                                        | `False`                      | No        |
-| `--commit`             | Commit the changes to the database                                                                       | `False`                      | No        |
+| Argument               | Description                                                                                                                           | Default value                | Mandatory |
+| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------- | --------- |
+| `--mongouri`           | The MongoDB URI to connect to                                                                                                         | `mongodb://localhost:27017/` | No        |
+| `--database`           | The database name to replace the expressions                                                                                          | NA                           | Yes       |
+| `--collection`         | The collection name to replace the expressions                                                                                        | NA                           | Yes       |
+| `--translation`        | The translation dictionary file to replace the expressions                                                                            | `translation.json`           | No        |
+| `--debug`              | Enable debug mode                                                                                                                     | `False`                      | No        |
+| `--commit`             | Commit the changes to the database                                                                                                    | `False`                      | No        |
 | `--expressionlanguage` | What to do with the expression language field. Possibles values: `delete`, `ignore`, `jexl` or `jexlall`. More detail on this bellow. | `ignore`                     | No        |
-| `--statistics`         | Print match statistics. Aggregation modes are the possible values: `service` and `subservice`            | `service`                    | No        |
-| `--service`            | The fiware service filter to replace the expressions                                                     | All subservices              | No        |
-| `--service-path`       | The fiware service path filter to replace the expressions                                                | All subservices              | No        |
-| `--deviceid`           | The device id filter to replace the expressions                                                          | All devices                  | No        |
-| `--entitytype`         | The entity type filter to replace the expressions                                                        | All entity types             | No        |
-| `--regexservice`       | The fiware service regex filter to replace the expressions                                               | All subservices              | No        |
-| `--regexservicepath`   | The fiware service path regex filter to replace the expressions                                          | All subservices              | No        |
-| `--regexdeviceid`      | The device id regex filter to replace the expressions                                                    | All devices                  | No        |
-| `--regexentitytype`    | The entity type regex filter to replace the expressions                                                  | All entity types             | No        |
+| `--statistics`         | Print match statistics. Aggregation modes are the possible values: `service` and `subservice`                                         | `service`                    | No        |
+| `--service`            | The fiware service filter to replace the expressions                                                                                  | All subservices              | No        |
+| `--service-path`       | The fiware service path filter to replace the expressions                                                                             | All subservices              | No        |
+| `--deviceid`           | The device id filter to replace the expressions                                                                                       | All devices                  | No        |
+| `--entitytype`         | The entity type filter to replace the expressions                                                                                     | All entity types             | No        |
+| `--regexservice`       | The fiware service regex filter to replace the expressions                                                                            | All subservices              | No        |
+| `--regexservicepath`   | The fiware service path regex filter to replace the expressions                                                                       | All subservices              | No        |
+| `--regexdeviceid`      | The device id regex filter to replace the expressions                                                                                 | All devices                  | No        |
+| `--regexentitytype`    | The entity type regex filter to replace the expressions                                                                               | All entity types             | No        |
 
 Note that filters (`--service`, `--service-path`, `--deviceid` and `--entitytype`, and the regex versions) are
 interpreted in additive way (i.e. like a logical AND).
 
 With regards to `--expressionlanguage`:
 
-* `delete`: changes expressions from legacy to JEXL equivalence in the [fields where expressions may be used](#fields-in-which-expressions-may-be-used) (based on the translation dictionary specified by `--translations`). In addition, deletes the `expressionLanguage` field (no matter its value) in the case it exists in the group/device.
-* `ignore`: changes expressions from legacy to JEXL equivalence in the [fields where expressions may be used](#fields-in-which-expressions-may-be-used) (based on the translation dictionary specified by `--translations`). In addition, it leaves untouched the `expressionLanguage` field. This may cause inconsistencies, if the value of the `expressionLanguage` is `legacy`, as detailed [in this section](#replacing-expression-without-setting-jexl-at-group-or-device-level).
-* `jexl`: changes expressions from legacy to JEXL equivalence in the [fields where expressions may be used](#fields-in-which-expressions-may-be-used) (based on the translation dictionary specified by `--translations`). In addition, it set `expressionLanguage` field to `jexl` (no matter if the field originally exists in the group/device or not) **if some JEXL expression were translated**.
-* `jexlall`: changes expression from legacy to JEXL equivalence in the [fields where expressions may be used](#fields-in-which-expressions-may-be-used) (based on the translation dictionary specified by `--translations`). In addition, it set `expressionLanguage` field to `jexl` (no matter if the field originally exists in the group/device or not). The difference between `jexl`and `jexlall` is in the second case, the script is not only looking for documents that contains legacy expressions, it also includes all groups/devices that have `expressionLanguage` field defined. The `expressionLanguage` field on those documents (and also on the documents that contains legacy expresions) is set to `jexl`.
+-   `delete`: changes expressions from legacy to JEXL equivalence in the
+    [fields where expressions may be used](#fields-in-which-expressions-may-be-used) (based on the translation
+    dictionary specified by `--translations`). In addition, deletes the `expressionLanguage` field (no matter its value)
+    in the case it exists in the group/device.
+-   `ignore`: changes expressions from legacy to JEXL equivalence in the
+    [fields where expressions may be used](#fields-in-which-expressions-may-be-used) (based on the translation
+    dictionary specified by `--translations`). In addition, it leaves untouched the `expressionLanguage` field. This may
+    cause inconsistencies, if the value of the `expressionLanguage` is `legacy`, as detailed
+    [in this section](#replacing-expression-without-setting-jexl-at-group-or-device-level).
+-   `jexl`: changes expressions from legacy to JEXL equivalence in the
+    [fields where expressions may be used](#fields-in-which-expressions-may-be-used) (based on the translation
+    dictionary specified by `--translations`). In addition, it set `expressionLanguage` field to `jexl` (no matter if
+    the field originally exists in the group/device or not) **if some JEXL expression were translated**.
+-   `jexlall`: changes expression from legacy to JEXL equivalence in the
+    [fields where expressions may be used](#fields-in-which-expressions-may-be-used) (based on the translation
+    dictionary specified by `--translations`). In addition, it set `expressionLanguage` field to `jexl` (no matter if
+    the field originally exists in the group/device or not). The difference between `jexl`and `jexlall` is in the second
+    case, the script is not only looking for documents that contains legacy expressions, it also includes all
+    groups/devices that have `expressionLanguage` field defined. The `expressionLanguage` field on those documents (and
+    also on the documents that contains legacy expresions) is set to `jexl`.
 
 ## Usage
 
@@ -231,32 +247,34 @@ All                                                    1        1   2
 
 The script implements expression detection and translation in the following fields in group/device documents at DB:
 
-* active.expression
-* active.entity_name
-* active.reverse
-* attributes.expression
-* attributes.entity_name
-* attributes.expression
-* commands.expression
-* endpoint
-* entityNameExp
-* explicitAttrs
+-   active.expression
+-   active.entity_name
+-   active.reverse
+-   attributes.expression
+-   attributes.entity_name
+-   attributes.expression
+-   commands.expression
+-   endpoint
+-   entityNameExp
+-   explicitAttrs
 
 ### Known issues
 
 #### Execution with `expressionlanguage` set to `jexlall`
 
 When executing the script with `expressionlanguage` set to `jexlall`, the script will look for all the documents
-containing legacy expressions (in some of the [expression capable fields](#fields-in-which-expressions-may-be-used)) or the existence of the `expressionLanguage` field.
-This would change the number of documents found, and the statistics will include extra documents.
+containing legacy expressions (in some of the [expression capable fields](#fields-in-which-expressions-may-be-used)) or
+the existence of the `expressionLanguage` field. This would change the number of documents found, and the statistics
+will include extra documents.
 
 Running the script with the option set to `jexl` would not include such extra documents in statistics.
 
 #### Replacing expression without setting jexl at group or device level
 
-When executing the script setting `--expressionlanguage` to `ignore` (or when `--expressionlanguage` is not used), the script will not
-change the`expressionLanguage` field in the document. This means that the legacy expressions will be replaced, but the
-`expressionLanguage` field will still be set to the default value or legacy. This would make expression evaluation to
-fail, propagating the value of the attribute as the expression literal to the context broker.
+When executing the script setting `--expressionlanguage` to `ignore` (or when `--expressionlanguage` is not used), the
+script will not change the`expressionLanguage` field in the document. This means that the legacy expressions will be
+replaced, but the `expressionLanguage` field will still be set to the default value or legacy. This would make
+expression evaluation to fail, propagating the value of the attribute as the expression literal to the context broker.
 
-To avoid this, it is recommended use always the `--expressionlangauge` parameter set to `jexl`, so doing it a value different from `ignore` will be used.
+To avoid this, it is recommended use always the `--expressionlangauge` parameter set to `jexl`, so doing it a value
+different from `ignore` will be used.

package/test/unit/general/contextBrokerKeystoneSecurityAccess-test.js

@@ -293,7 +293,7 @@ describe('NGSI-v2 - Secured access to the Context Broker with Keystone', functio
         });
 
         it('subscribe requests use auth header', function (done) {
-            iotAgentLib.getDevice('Light1', 'smartgondor', 'electricity', function (error, device) {
+            iotAgentLib.getDevice('Light1', null, 'smartgondor', 'electricity', function (error, device) {
                 iotAgentLib.subscribe(device, ['dimming'], null, function (error) {
                     should.not.exist(error);
 
@@ -314,7 +314,7 @@ describe('NGSI-v2 - Secured access to the Context Broker with Keystone', functio
                     'X-Subject-Token': '12345679ABCDEF'
                 });
 
-            iotAgentLib.getDevice('Light1', 'smartgondor', 'electricity', function (error, device) {
+            iotAgentLib.getDevice('Light1', null, 'smartgondor', 'electricity', function (error, device) {
                 iotAgentLib.subscribe(device, ['dimming'], null, function (error) {
                     iotAgentLib.unsubscribe(device, '51c0ac9ed714fb3b37d7d5a8', function (error) {
                         contextBrokerMock.done();

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

@@ -387,7 +387,7 @@ describe('NGSI-v2 - MongoDB Device Registry', function () {
         });
 
         it('should be removed from MongoDB', function (done) {
-            iotAgentLib.unregister(device1.id, 'smartgondor', 'gardens', function (error) {
+            iotAgentLib.unregister(device1.id, null, 'smartgondor', 'gardens', function (error) {
                 iotAgentDb
                     .db()
                     .collection('devices')