iotagent-node-lib 3.2.0 → 3.4.0

package/lib/services/devices/deviceService.js

@@ -64,17 +64,6 @@ function init() {
     }
 }
 
-/**
- * Creates the initial entity representing the device in the Context Broker. This is important mainly to allow the
- * rest of the updateContext operations to be performed using an UPDATE action instead of an APPEND one.
- *
- * @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.
- */
-function createInitialEntity(deviceData, newDevice, callback) {
-    deviceHandler.createInitialEntity(deviceData, newDevice, callback);
-}
-
 /**
  * If the object_id or the name of the attribute is missing, complete it with the other piece of data.
  *
@@ -178,13 +167,12 @@ function mergeDeviceWithConfiguration(fields, defaults, deviceData, configuratio
     if (configuration && configuration.ngsiVersion) {
         deviceData.ngsiVersion = configuration.ngsiVersion;
     }
-    if (configuration && configuration.expressionLanguage && deviceData.expressionLanguage === undefined) {
-        deviceData.expressionLanguage = configuration.expressionLanguage;
-    }
     if (configuration && configuration.explicitAttrs !== undefined && deviceData.explicitAttrs === undefined) {
         deviceData.explicitAttrs = configuration.explicitAttrs;
     }
-
+    if (configuration && configuration.entityNameExp !== undefined) {
+        deviceData.entityNameExp = configuration.entityNameExp;
+    }
     logger.debug(context, 'deviceData after merge with conf: %j', deviceData);
     callback(null, deviceData);
 }
@@ -249,6 +237,7 @@ function registerDevice(deviceObj, callback) {
     function checkDuplicates(deviceObj, innerCb) {
         config.getRegistry().getSilently(
             deviceObj.id,
+            deviceObj.apikey,
             deviceObj.service,
             deviceObj.subservice,
             /* eslint-disable-next-line no-unused-vars */
@@ -265,7 +254,7 @@ function registerDevice(deviceObj, callback) {
     function prepareDeviceData(deviceObj, configuration, callback) {
         const deviceData = _.clone(deviceObj);
         let selectedConfiguration;
-
+        logger.debug(context, 'Prepare device data:\n%s', JSON.stringify(deviceData, null, 4));
         if (!deviceData.type) {
             if (configuration && configuration.type) {
                 deviceData.type = configuration.type;
@@ -350,8 +339,7 @@ function registerDevice(deviceObj, callback) {
         async.waterfall(
             [
                 apply(registrationUtils.sendRegistrations, false, deviceData),
-                apply(registrationUtils.processContextRegistration, deviceData),
-                apply(createInitialEntity, deviceData)
+                apply(registrationUtils.processContextRegistration, deviceData)
             ],
             function (error, results) {
                 if (error) {
@@ -362,9 +350,9 @@ function registerDevice(deviceObj, callback) {
                     deviceObj.service = deviceData.service;
                     deviceObj.subservice = deviceData.subservice;
                     deviceObj.type = deviceData.type;
-                    deviceObj.staticAttributes = deviceData.staticAttributes;
-                    deviceObj.commands = deviceData.commands;
-                    deviceObj.lazy = deviceData.lazy;
+                    deviceObj.staticAttributes = deviceObj.staticAttributes ? deviceObj.staticAttributes : [];
+                    deviceObj.commands = deviceObj.commands ? deviceObj.commands : [];
+                    deviceObj.lazy = deviceObj.lazy ? deviceObj.lazy : [];
                     if ('timestamp' in deviceData && deviceData.timestamp !== undefined) {
                         deviceObj.timestamp = deviceData.timestamp;
                     }
@@ -374,6 +362,7 @@ function registerDevice(deviceObj, callback) {
                     if ('apikey' in deviceData && deviceData.apikey !== undefined) {
                         deviceObj.apikey = deviceData.apikey;
                     }
+                    logger.debug(context, 'Storing device :\n%s', JSON.stringify(deviceObj, null, 4));
                     config.getRegistry().store(deviceObj, callback);
                 }
             }
@@ -414,7 +403,7 @@ function removeAllSubscriptions(device, callback) {
  * @param {String} service      Service of the device to unregister.
  * @param {String} subservice   Subservice inside the service for the unregisterd device.
  */
-function unregisterDevice(id, service, subservice, callback) {
+function unregisterDevice(id, apikey, service, subservice, callback) {
     function processContextUnregister(body, innerCallback) {
         innerCallback(null);
     }
@@ -423,9 +412,9 @@ function unregisterDevice(id, service, subservice, callback) {
         innerCallback(null);
     }
 
-    logger.debug(context, 'Removing device register in Device Service');
+    logger.debug(context, 'Removing device %j %j %j %j register in Device Service', id, apikey, service, subservice);
 
-    config.getRegistry().get(id, service, subservice, function (error, device) {
+    config.getRegistry().get(id, apikey, service, subservice, function (error, device) {
         if (error) {
             callback(error);
         } else {
@@ -449,7 +438,7 @@ function unregisterDevice(id, service, subservice, callback) {
                                 processUnsubscribes,
                                 apply(registrationUtils.sendRegistrations, true, mergedDevice),
                                 processContextUnregister,
-                                apply(config.getRegistry().remove, id, service, subservice)
+                                apply(config.getRegistry().remove, id, apikey, service, subservice)
                             ],
                             callback
                         );
@@ -524,8 +513,17 @@ function listDevices(service, subservice, limit, offset, callback) {
  * @param {String} service          Service for which the requested device.
  * @param {String} subservice       Subservice inside the service for which the device is requested.
  */
-function getDevice(deviceId, service, subservice, callback) {
-    config.getRegistry().get(deviceId, service, subservice, callback);
+function getDevice(deviceId, apikey, service, subservice, callback) {
+    config.getRegistry().get(deviceId, apikey, service, subservice, callback);
+}
+
+/**
+ * Update a device from the device registry.
+ *
+ * @param {String} device           JSON object contain the device to update.
+ */
+function updateDevice(device, callback) {
+    config.getRegistry().update(device, callback);
 }
 
 /**
@@ -535,8 +533,8 @@ function getDevice(deviceId, service, subservice, callback) {
  * @param {String} service          Service for which the requested device.
  * @param {String} subservice       Subservice inside the service for which the device is requested.
  */
-function getDeviceSilently(deviceId, service, subservice, callback) {
-    config.getRegistry().getSilently(deviceId, service, subservice, callback);
+function getDeviceSilently(deviceId, apikey, service, subservice, callback) {
+    config.getRegistry().getSilently(deviceId, apikey, service, subservice, callback);
 }
 
 /**
@@ -603,10 +601,22 @@ function checkRegistry(fn) {
     };
 }
 
-function findOrCreate(deviceId, group, callback) {
-    getDeviceSilently(deviceId, group.service, group.subservice, function (error, device) {
+function findOrCreate(deviceId, apikey, group, callback) {
+    getDeviceSilently(deviceId, apikey, group.service, group.subservice, function (error, device) {
         if (!error && device) {
-            callback(null, device, group);
+            if (
+                (!('apikey' in device) || device.apikey === undefined) &&
+                'apikey' in group &&
+                group.apikey !== undefined
+            ) {
+                logger.info(context, 'Update provisioned device %j with measure/group apikey %j', device, group.apikey);
+                device.apikey = group.apikey; // group apikey is the same of current measure apikey
+                updateDevice(device, function (error) {
+                    callback(error, device, group);
+                });
+            } else {
+                callback(null, device, group);
+            }
         } else if (error.name === 'DEVICE_NOT_FOUND') {
             const newDevice = {
                 id: deviceId,
@@ -618,19 +628,9 @@ function findOrCreate(deviceId, group, callback) {
             if (config.getConfig().iotManager && config.getConfig().iotManager.protocol) {
                 newDevice.protocol = config.getConfig().iotManager.protocol;
             }
-
-            if ('timestamp' in group && group.timestamp !== undefined) {
-                newDevice.timestamp = group.timestamp;
-            }
             if ('ngsiVersion' in group && group.ngsiVersion !== undefined) {
                 newDevice.ngsiVersion = group.ngsiVersion;
             }
-            if ('explicitAttrs' in group && group.explicitAttrs !== undefined) {
-                newDevice.explicitAttrs = group.explicitAttrs;
-            }
-            if ('expressionLanguage' in group && group.expressionLanguage !== undefined) {
-                newDevice.expressionLanguage = group.expressionLanguage;
-            }
             if (
                 (!('apikey' in newDevice) || newDevice.apikey === undefined) &&
                 'apikey' in group &&
@@ -683,7 +683,7 @@ function retrieveDevice(deviceId, apiKey, callback) {
         async.waterfall(
             [
                 apply(groupService.get, config.getConfig().defaultResource || '', apiKey),
-                apply(findOrCreate, deviceId),
+                apply(findOrCreate, deviceId, apiKey),
                 apply(
                     mergeDeviceWithConfiguration,
                     ['lazy', 'active', 'staticAttributes', 'commands', 'subscriptions'],
@@ -698,6 +698,7 @@ function retrieveDevice(deviceId, apiKey, callback) {
 exports.listDevices = intoTrans(context, checkRegistry)(listDevices);
 exports.listDevicesWithType = intoTrans(context, checkRegistry)(listDevicesWithType);
 exports.getDevice = intoTrans(context, checkRegistry)(getDevice);
+exports.updateDevice = intoTrans(context, checkRegistry)(updateDevice);
 exports.getDeviceSilently = intoTrans(context, checkRegistry)(getDeviceSilently);
 exports.getDevicesByAttribute = intoTrans(context, checkRegistry)(getDevicesByAttribute);
 exports.getDeviceByName = intoTrans(context, checkRegistry)(getDeviceByName);

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

@@ -369,7 +369,13 @@ function updateRegisterDeviceNgsiLD(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),
                 createInitialEntityNgsiLD,
                 apply(combineWithNewDevice, deviceObj),
@@ -382,7 +388,13 @@ function updateRegisterDeviceNgsiLD(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),
                 updateEntityNgsiLD,
                 apply(combineWithNewDevice, deviceObj),

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

@@ -37,8 +37,6 @@ const deviceHandlerV2 = require('./devices-NGSI-v2');
 function createInitialEntityNgsiMixed(deviceData, newDevice, callback) {
     if (config.checkNgsiLD(deviceData)) {
         deviceHandlerLD.createInitialEntity(deviceData, newDevice, callback);
-    } else {
-        deviceHandlerV2.createInitialEntity(deviceData, newDevice, callback);
     }
 }
 

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, '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;
@@ -356,11 +267,8 @@ function updateRegisterDeviceNgsi2(deviceObj, entityInfoUpdated, callback) {
             if ('explicitAttrs' in newDevice && newDevice.explicitAttrs !== undefined) {
                 oldDevice.explicitAttrs = newDevice.explicitAttrs;
             }
-            if ('expressionLanguage' in newDevice && newDevice.expressionLanguage !== undefined) {
-                oldDevice.expressionLanguage = newDevice.expressionLanguage;
-            }
             if ('apikey' in newDevice && newDevice.apikey !== undefined) {
-                oldDevice.explicitAttrs = newDevice.apikey;
+                oldDevice.apikey = newDevice.apikey;
             }
             oldDevice.endpoint = newDevice.endpoint || oldDevice.endpoint;
 
@@ -427,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),
@@ -440,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),
@@ -453,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-LD.js

@@ -439,10 +439,10 @@ function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, c
         payload[0].type = typeInformation.type;
     }
 
-    if (config.getConfig().appendMode === true) {
-        payload.actionType = 'append';
-    } else {
+    if (config.getConfig().appendMode === false) {
         payload.actionType = 'update';
+    } else {
+        payload.actionType = 'append';
     }
 
     const options = NGSIUtils.createRequestObject(url, typeInformation, token);

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 === true) {
-        payload.actionType = 'append';
-    } else {
-        payload.actionType = 'update';
-    }
+    payload.actionType = 'append';
 
     let options = NGSIUtils.createRequestObject(url, typeInformation, token);
 
@@ -675,6 +671,23 @@ function sendUpdateValueNgsi2(entityName, attributes, typeInformation, token, ca
         }
     }
 
+    // Evaluate entityNameExp with a context including measures
+    if (typeInformation.entityNameExp !== undefined && typeInformation.entityNameExp !== '') {
+        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;
+        } catch (e) {
+            logger.debug(
+                context,
+                'Error evaluating expression for entityName: %s with context: %s',
+                typeInformation.entityNameExp,
+                ctxt
+            );
+        }
+    }
+
     logger.debug(context, 'sendUpdateValueNgsi2 currentEntity sorted %j ', currentEntity);
     let timestampValue = undefined;
     // Loop for each final attribute to apply alias, multientity and expressions
@@ -745,9 +758,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,
@@ -970,19 +988,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/' + entityName + '/attrs';
-            if (typeInformation && typeInformation.type) {
-                url += '?type=' + typeInformation.type;
-            }
+            url = '/v2/entities?options=upsert';
             options = NGSIUtils.createRequestObject(url, typeInformation, token);
             options.json = payload.entities[0];
-            delete options.json.id;
-            delete options.json.type;
-            if (config.getConfig().appendMode === true) {
-                options.method = 'POST';
-            } else {
-                options.method = 'PATCH';
-            }
+            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

@@ -62,7 +62,6 @@ const provisioningAPITranslation = {
     static_attributes: 'staticAttributes',
     autoprovision: 'autoprovision',
     explicitAttrs: 'explicitAttrs',
-    expressionLanguage: 'expressionLanguage',
     ngsiVersion: 'ngsiVersion',
     entityNameExp: 'entityNameExp'
 };
@@ -142,7 +141,6 @@ function handleProvision(req, res, next) {
             internalId: null,
             autoprovision: body.autoprovision,
             explicitAttrs: body.explicitAttrs,
-            expressionLanguage: body.expressionLanguage,
             ngsiVersion: body.ngsiVersion
         });
     }
@@ -219,7 +217,6 @@ function toProvisioningAPIFormat(device) {
         internal_attributes: device.internalAttributes,
         protocol: device.protocol,
         autoprovision: device.autoprovision,
-        expressionLanguage: device.expressionLanguage,
         explicitAttrs: device.explicitAttrs,
         ngsiVersion: device.ngsiVersion
     };
@@ -254,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) {
@@ -272,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) {
@@ -292,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']
             )
@@ -337,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/lib/templates/createDevice.json

@@ -36,10 +36,6 @@
             "description": "Transport protocol used by the platform to communicate with the device",
             "type": "string"
           },
-          "expressionLanguage": {
-            "description": "Expression language used to apply expressions for this device",
-            "type": "string"
-          },
           "explicitAttrs": {
             "description": "Flag about only provisioned attributes will be processed to Context Broker"
           },

package/lib/templates/createDeviceLax.json

@@ -36,10 +36,6 @@
             "description": "Transport protocol used by the platform to communicate with the device",
             "type": "string"
           },
-          "expressionLanguage": {
-            "description": "Expression language used to apply expressions for this device",
-            "type": "string"
-          },
           "explicitAttrs": {
             "description": "Flag about only provisioned attributes will be processed to Context Broker"
           },

package/lib/templates/deviceGroup.json

@@ -37,10 +37,6 @@
             "description": "list of lazy attributes of the devices",
             "type": "array"
           },
-          "expressionLanguage": {
-            "description": "Expression language used to for the group of devices",
-            "type": "string"
-          },
           "ngsiVersion": {
             "description": "NGSI Interface for this group of devices",
             "type": "string"
@@ -81,4 +77,4 @@
       }
     }
   }
-}
+}

package/lib/templates/updateDevice.json

@@ -200,6 +200,10 @@
       "description": "Free form array of data to be appended to the target entity",
       "type": "array"
     },
+    "timestamp": {
+      "description": "Timestamp",
+      "type": "boolean"
+    },
     "explicitAttrs": {
       "description": "Flag to decide update of active attributes only"
     },