iotagent-node-lib 2.19.0 → 2.22.0

package/lib/services/devices/deviceService.js

@@ -38,6 +38,8 @@ const logger = require('logops');
 const config = require('../../commonConfig');
 const registrationUtils = require('./registrationUtils');
 const subscriptions = require('../ngsi/subscriptionService');
+const expressionPlugin = require('./../../plugins/expressionPlugin');
+const pluginUtils = require('./../../plugins/pluginUtils');
 const _ = require('underscore');
 const context = {
     op: 'IoTAgentNGSI.DeviceService'
@@ -214,7 +216,13 @@ function findConfigurationGroup(deviceObj, callback) {
     } else {
         config
             .getGroupRegistry()
-            .findTypeSilently(deviceObj.service, deviceObj.subservice, deviceObj.type, deviceObj.apikey, handlerGroupFindByType);
+            .findTypeSilently(
+                deviceObj.service,
+                deviceObj.subservice,
+                deviceObj.type,
+                deviceObj.apikey,
+                handlerGroupFindByType
+            );
     }
 }
 
@@ -274,22 +282,32 @@ function registerDevice(deviceObj, callback) {
         }
 
         if (!deviceData.name) {
-            let conjunction;
-            if (configuration && configuration.defaultEntityNameConjunction !== undefined) {
-                conjunction = configuration.defaultEntityNameConjunction;
+            if (configuration && configuration.entityNameExp !== undefined) {
+                // Add device ID, TYPE, S, SS to the context for the JEXL expression
+                let attrList = pluginUtils.getIdTypeServSubServiceFromDevice(deviceData);
+                attrList = deviceData.staticAttributes ? attrList.concat(deviceData.staticAttributes) : attrList;
+                let ctxt = expressionPlugin.extractContext(attrList, deviceData);
+                let entityName = expressionPlugin.applyExpression(configuration.entityNameExp, ctxt, deviceData);
+                deviceData.name = entityName ? entityName : configuration.entityNameExp;
             } else {
-                conjunction = config.getConfig().defaultEntityNameConjunction;
-            }
-            deviceData.name = deviceData.type + conjunction + deviceData.id;
-            if (config.checkNgsiLD(configuration)) {
-                deviceData.name = 'urn:ngsi-ld:' + deviceData.type + conjunction + deviceData.id;
+                let conjunction;
+                if (configuration && configuration.defaultEntityNameConjunction !== undefined) {
+                    conjunction = configuration.defaultEntityNameConjunction;
+                } else {
+                    conjunction = config.getConfig().defaultEntityNameConjunction;
+                }
+                deviceData.name = deviceData.type + conjunction + deviceData.id;
+
+                if (config.checkNgsiLD(configuration)) {
+                    deviceData.name = 'urn:ngsi-ld:' + deviceData.type + conjunction + deviceData.id;
+                }
+                logger.debug(
+                    context,
+                    'Device name not found, falling back to deviceType%sdeviceId [%s]',
+                    conjunction,
+                    deviceData.name
+                );
             }
-            logger.debug(
-                context,
-                'Device name not found, falling back to deviceType%sdeviceId [%s]',
-                conjunction,
-                deviceData.name
-            );
         }
 
         if (!configuration && config.getConfig().types[deviceData.type]) {
@@ -513,6 +531,18 @@ function getDeviceByName(deviceName, service, subservice, callback) {
     config.getRegistry().getByName(deviceName, service, subservice, callback);
 }
 
+/**
+ * Retrieve a device from the registry based on its entity name and type
+ *
+ * @param {String} deviceName       Name of the entity associated to a device.
+ * @param {String} deviceType       Type of the entity associated to a device.
+ * @param {String} service          Service the device belongs to.
+ * @param {String} subservice       Division inside the service.
+ */
+function getDeviceByNameAndType(deviceName, deviceType, service, subservice, callback) {
+    config.getRegistry().getByNameAndType(deviceName, deviceType, service, subservice, callback);
+}
+
 /**
  * Retrieve a device from the registry based on the value of a given attribute.
  *
@@ -581,7 +611,12 @@ function findOrCreate(deviceId, group, callback) {
                     callback(error, device, group);
                 });
             } else {
-                logger.info(context, 'Device %j not provisioned due autoprovision is disabled by its conf %j', newDevice, group);
+                logger.info(
+                    context,
+                    'Device %j not provisioned due autoprovision is disabled by its conf %j',
+                    newDevice,
+                    group
+                );
                 callback(new errors.DeviceNotFound(deviceId));
             }
         } else {
@@ -632,6 +667,7 @@ exports.getDevice = intoTrans(context, checkRegistry)(getDevice);
 exports.getDeviceSilently = intoTrans(context, checkRegistry)(getDeviceSilently);
 exports.getDevicesByAttribute = intoTrans(context, checkRegistry)(getDevicesByAttribute);
 exports.getDeviceByName = intoTrans(context, checkRegistry)(getDeviceByName);
+exports.getDeviceByNameAndType = intoTrans(context, checkRegistry)(getDeviceByNameAndType);
 exports.register = intoTrans(context, registerDevice);
 exports.updateRegister = intoTrans(context, updateRegisterDevice);
 exports.unregister = intoTrans(context, unregisterDevice);

package/lib/services/groups/groupRegistryMongoDB.js

@@ -57,7 +57,8 @@ const attributeList = [
     'explicitAttrs',
     'expressionLanguage',
     'defaultEntityNameConjunction',
-    'ngsiVersion'
+    'ngsiVersion',
+    'entityNameExp'
 ];
 
 /**
@@ -299,21 +300,21 @@ function clear(callback) {
     dbService.db.db.dropDatabase(callback);
 }
 
-exports.create = alarmsInt(constants.MONGO_ALARM, intoTrans(context, createGroup));
-exports.list = alarmsInt(constants.MONGO_ALARM, intoTrans(context, listGroups));
-exports.init = alarmsInt(constants.MONGO_ALARM, intoTrans(context, init));
-exports.find = alarmsInt(constants.MONGO_ALARM, intoTrans(context, find));
+exports.create = alarmsInt(constants.MONGO_ALARM + '_01', intoTrans(context, createGroup));
+exports.list = alarmsInt(constants.MONGO_ALARM + '_02', intoTrans(context, listGroups));
+exports.init = alarmsInt(constants.MONGO_ALARM + '_03', intoTrans(context, init));
+exports.find = alarmsInt(constants.MONGO_ALARM + '_04', intoTrans(context, find));
 exports.findType = alarmsInt(
-    constants.MONGO_ALARM,
+    constants.MONGO_ALARM + '_05',
     intoTrans(context, findBy(['service', 'subservice', 'type', 'apikey']))
 );
 exports.findTypeSilently = intoTrans(context, findBy(['service', 'subservice', 'type', 'apikey']));
 exports.findSilently = intoTrans(context, findBy(['service', 'subservice', 'apikey']));
-exports.findBy = alarmsInt(constants.MONGO_ALARM, intoTrans(context, findBy));
-exports.get = alarmsInt(constants.MONGO_ALARM, intoTrans(context, findBy(['resource', 'apikey'])));
+exports.findBy = alarmsInt(constants.MONGO_ALARM + '_06', intoTrans(context, findBy));
+exports.get = alarmsInt(constants.MONGO_ALARM + '_07', intoTrans(context, findBy(['resource', 'apikey'])));
 exports.getSilently = intoTrans(context, findBy(['resource', 'apikey']));
-exports.getType = alarmsInt(constants.MONGO_ALARM, intoTrans(context, findBy(['type'])));
+exports.getType = alarmsInt(constants.MONGO_ALARM + '_08', intoTrans(context, findBy(['type'])));
 exports.getTypeSilently = intoTrans(context, findBy(['type']));
-exports.update = alarmsInt(constants.MONGO_ALARM, intoTrans(context, update));
-exports.remove = alarmsInt(constants.MONGO_ALARM, intoTrans(context, remove));
-exports.clear = alarmsInt(constants.MONGO_ALARM, intoTrans(context, clear));
+exports.update = alarmsInt(constants.MONGO_ALARM + '_09', intoTrans(context, update));
+exports.remove = alarmsInt(constants.MONGO_ALARM + '_10', intoTrans(context, remove));
+exports.clear = alarmsInt(constants.MONGO_ALARM + '_11', intoTrans(context, clear));

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

@@ -160,6 +160,13 @@ function convertAttrNGSILD(attr) {
             delete obj.value;
             break;
 
+        // LanguageProperties
+        case 'languageproperty':
+            obj.type = 'LanguageProperty';
+            obj.languageMap = attr.value;
+            delete obj.value;
+            break;
+
         default:
             obj.value = { '@type': attr.type, '@value': attr.value };
     }
@@ -410,8 +417,9 @@ function addLinkedEntities(typeInformation, json) {
  * @param {Object} typeInformation  Configuration information for the device.
  */
 function removeHiddenAttrsFromMultiEntity(entities, typeInformation) {
-    var explicitAttrsList = [];
+    let explicitAttrsList;
     if (typeInformation.explicitAttrs) {
+        explicitAttrsList = [];
         explicitAttrsList.push('type');
         explicitAttrsList.push('id');
         if (typeof typeInformation.explicitAttrs === 'boolean') {
@@ -437,7 +445,7 @@ function removeHiddenAttrsFromMultiEntity(entities, typeInformation) {
             });
         }
     }
-    if (explicitAttrsList.length > 0) {
+    if (explicitAttrsList && explicitAttrsList.length >= 0) {
         entities.forEach((entity) => {
             const hidden = _.difference(_.keys(entity), explicitAttrsList);
             hidden.forEach((attr) => {
@@ -457,8 +465,9 @@ function removeHiddenAttrsFromMultiEntity(entities, typeInformation) {
 function removeHiddenAttrs(result, typeInformation) {
     delete result.id;
     delete result.type;
-    var explicitAttrsList = [];
+    let explicitAttrsList;
     if (typeInformation.explicitAttrs && typeof typeInformation.explicitAttrs === 'boolean') {
+        explicitAttrsList = [];
         if (typeInformation.timestamp) {
             explicitAttrsList.push(constants.TIMESTAMP_ATTRIBUTE);
         }
@@ -478,7 +487,7 @@ function removeHiddenAttrs(result, typeInformation) {
         const res = jexlParser.parse(typeInformation.explicitAttrs, ctx);
         explicitAttrsList = res;
     }
-    if (explicitAttrsList.length > 0) {
+    if (explicitAttrsList && explicitAttrsList.length >= 0) {
         const hidden = _.difference(_.keys(result), explicitAttrsList);
         hidden.forEach((attr) => {
             delete result[attr];

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

@@ -321,8 +321,9 @@ function sendQueryValueNgsi2(entityName, attributes, typeInformation, token, cal
  * @param {Object} typeInformation  Configuration information for the device.
  */
 function removeHiddenAttrsFromMultiEntity(entities, typeInformation) {
-    var explicitAttrsList = [];
+    let explicitAttrsList;
     if (typeInformation.explicitAttrs) {
+        explicitAttrsList = [];
         explicitAttrsList.push('type');
         explicitAttrsList.push('id');
         if (typeof typeInformation.explicitAttrs === 'boolean') {
@@ -349,10 +350,10 @@ function removeHiddenAttrsFromMultiEntity(entities, typeInformation) {
             });
         }
     }
-    if (explicitAttrsList.length > 0) {
-        logger.debug(context, 'removeHiddenAttrsFromMultiEntity %s', explicitAttrsList);
+    if (explicitAttrsList && explicitAttrsList.length >= 0) {
         entities.forEach((entity) => {
             const hidden = _.difference(_.keys(entity), explicitAttrsList);
+            logger.debug(context, 'removeHiddenAttrsFromMultiEntity %s from entity %s', hidden, entity);
             hidden.forEach((attr) => {
                 delete entity[attr];
             });
@@ -369,8 +370,9 @@ function removeHiddenAttrsFromMultiEntity(entities, typeInformation) {
 function removeHiddenAttrs(result, typeInformation) {
     delete result.id;
     delete result.type;
-    var explicitAttrsList = [];
+    let explicitAttrsList;
     if (typeInformation.explicitAttrs && typeof typeInformation.explicitAttrs === 'boolean') {
+        explicitAttrsList = [];
         if (typeInformation.timestamp) {
             explicitAttrsList.push(constants.TIMESTAMP_ATTRIBUTE);
         }
@@ -390,9 +392,9 @@ function removeHiddenAttrs(result, typeInformation) {
         const res = jexlParser.applyExpression(typeInformation.explicitAttrs, ctx, typeInformation);
         explicitAttrsList = res;
     }
-    if (explicitAttrsList.length > 0) {
-        logger.debug(context, 'removeHiddenAttrs %s', explicitAttrsList);
+    if (explicitAttrsList && explicitAttrsList.length >= 0) {
         const hidden = _.difference(_.keys(result), explicitAttrsList);
+        logger.debug(context, 'removeHiddenAttrs %s', hidden);
         hidden.forEach((attr) => {
             delete result[attr];
         });

package/lib/services/ngsi/ngsiService.js

@@ -133,7 +133,7 @@ function executeWithDeviceInformation(operationFunction) {
             deviceInformation
         );
         const currentType = type ? type : deviceInformation.type;
-        config.getGroupRegistry().getType(currentType, function (error, deviceGroup) {
+        config.getGroupRegistry().getTypeSilently(currentType, function (error, deviceGroup) {
             let typeInformation;
             const configDeviceInfo = config.getConfig().types[currentType];
             if (error) {
@@ -177,7 +177,7 @@ function executeWithDeviceInformation(operationFunction) {
 
 /**
  * Update the result of a command in the Context Broker. The result of the command has two components: the result
- * of the command itself will be represented with the sufix '_result' in the entity while the status is updated in the
+ * of the command itself will be represented with the sufix '_info' in the entity while the status is updated in the
  * attribute with the '_status' sufix.
  *
  * @param {String} entityName           Name of the entity holding the command.
@@ -234,7 +234,7 @@ function setCommandResult(
         }
 
         if (commandInfo.length === 1) {
-            exports.update(entityName, resource, apikey, attributes, typeInformation, callback);
+            exports.update(entityName, typeInformation.type, apikey, attributes, typeInformation, callback);
         } else {
             callback(new errors.CommandNotFound(commandName));
         }

package/lib/services/northBound/contextServer-NGSI-LD.js

@@ -42,7 +42,8 @@ const notificationTemplateNgsiLD = require('../../templates/notificationTemplate
 const contextServerUtils = require('./contextServerUtils');
 const ngsiLD = require('../ngsi/entities-NGSI-LD');
 
-const updatePaths = ['/ngsi-ld/v1/entities/:entity/attrs/:attr'];
+const overwritePaths = ['/ngsi-ld/v1/entities/:entity/attrs', '/ngsi-ld/v1/entities/:entity/attrs/:attr'];
+const updatePaths = ['/ngsi-ld/v1/entities/:entity/attrs', '/ngsi-ld/v1/entities/:entity/attrs/:attr'];
 const queryPaths = ['/ngsi-ld/v1/entities/:entity'];
 
 /**
@@ -55,8 +56,10 @@ const queryPaths = ['/ngsi-ld/v1/entities/:entity'];
 function generateUpdateActionsNgsiLD(req, contextElement, callback) {
     let entityId;
     let entityType;
+
     const attribute = req.params.attr;
     const value = req.body.value;
+    const incomingAttrs = !req.params.attr ? _.keys(req.body) : [];
 
     if (contextElement.id && contextElement.type) {
         entityId = contextElement.id;
@@ -79,6 +82,13 @@ function generateUpdateActionsNgsiLD(req, contextElement, callback) {
                         name: attribute
                     });
                     found = true;
+                } else if (incomingAttrs.includes(device.commands[j].name)) {
+                    commands.push({
+                        type: device.commands[j].type,
+                        value: req.body[device.commands[j].name].value,
+                        name: device.commands[j].name
+                    });
+                    found = true;
                 }
             }
         }
@@ -573,6 +583,15 @@ function loadContextRoutesNGSILD(router) {
             updateErrorHandlingNgsiLD
         ]);
     }
+
+    for (i = 0; i < overwritePaths.length; i++) {
+        router.put(overwritePaths[i], [
+            middlewares.ensureType,
+            middlewares.validateJson(updateContextTemplateNgsiLD),
+            handleUpdateNgsiLD,
+            updateErrorHandlingNgsiLD
+        ]);
+    }
     for (i = 0; i < queryPaths.length; i++) {
         router.get(queryPaths[i], [handleQueryNgsiLD, queryErrorHandlingNgsiLD]);
     }

package/lib/services/northBound/contextServer-NGSI-v2.js

@@ -159,29 +159,32 @@ function generateUpdateActionsNgsi2(req, contextElement, callback) {
         callback(null, updateActions);
     }
 
-    deviceService.getDeviceByName(entityId, req.headers['fiware-service'], req.headers['fiware-servicepath'], function (
-        error,
-        deviceObj
-    ) {
-        if (error) {
-            callback(error);
-        } else {
-            async.waterfall(
-                [
-                    apply(deviceService.findConfigurationGroup, deviceObj),
-                    apply(
-                        deviceService.mergeDeviceWithConfiguration,
-                        ['lazy', 'internalAttributes', 'active', 'staticAttributes', 'commands', 'subscriptions'],
-                        [null, null, [], [], [], [], []],
-                        deviceObj
-                    ),
-                    splitUpdates,
-                    createActionsArray
-                ],
-                callback
-            );
+    deviceService.getDeviceByNameAndType(
+        entityId,
+        entityType,
+        req.headers['fiware-service'],
+        req.headers['fiware-servicepath'],
+        function (error, deviceObj) {
+            if (error) {
+                callback(error);
+            } else {
+                async.waterfall(
+                    [
+                        apply(deviceService.findConfigurationGroup, deviceObj),
+                        apply(
+                            deviceService.mergeDeviceWithConfiguration,
+                            ['lazy', 'internalAttributes', 'active', 'staticAttributes', 'commands', 'subscriptions'],
+                            [null, null, [], [], [], [], []],
+                            deviceObj
+                        ),
+                        splitUpdates,
+                        createActionsArray
+                    ],
+                    callback
+                );
+            }
         }
-    });
+    );
 }
 
 /** Express middleware to manage incoming update requests using NGSIv2.
@@ -214,7 +217,11 @@ function handleUpdateNgsi2(req, res, next) {
             }
         );
     } else {
-        logger.error(context, 'Tried to handle an update request before the update handler was stablished.');
+        logger.error(
+            context,
+            'Tried to handle an update request [%j] before the update handler was stablished.',
+            req.body
+        );
 
         const errorNotFound = new Error({
             message: 'Update handler not found'
@@ -238,8 +245,7 @@ function defaultQueryHandlerNgsi2(id, type, service, subservice, attributes, cal
         type,
         id
     };
-
-    deviceService.getDeviceByName(id, service, subservice, function (error, ngsiDevice) {
+    deviceService.getDeviceByNameAndType(id, type, service, subservice, function (error, ngsiDevice) {
         if (error) {
             callback(error);
         } else {
@@ -285,8 +291,9 @@ function handleNotificationNgsi2(req, res, next) {
                 }
             }
         }
-        deviceService.getDeviceByName(
+        deviceService.getDeviceByNameAndType(
             dataElement.id,
+            dataElement.type,
             req.headers['fiware-service'],
             req.headers['fiware-servicepath'],
             function (error, device) {
@@ -378,7 +385,7 @@ function queryErrorHandlingNgsi2(error, req, res, next) {
 function updateErrorHandlingNgsi2(error, req, res, next) {
     let code = 500;
 
-    logger.debug(context, 'Update NGSIv2 error [%s] handing request: %s', error.name, error.message);
+    logger.debug(context, 'Update NGSIv2 error [%j] handing request: %j', error, req.body);
 
     if (error.code && String(error.code).match(/^[2345]\d\d$/)) {
         code = error.code;
@@ -448,6 +455,7 @@ function handleQueryNgsi2(req, res, next) {
         }
 
         deviceService.findConfigurationGroup(device, function (error, group) {
+            logger.debug(context, 'finishQueryForDevice %j', group);
             const executeCompleteAttributes = apply(completeAttributes, attributes, group);
             const executeQueryHandler = apply(
                 actualHandler,
@@ -474,8 +482,9 @@ function handleQueryNgsi2(req, res, next) {
 
         if (contextEntity.id) {
             getFunction = apply(
-                deviceService.getDeviceByName,
+                deviceService.getDeviceByNameAndType,
                 contextEntity.id,
+                contextEntity.type,
                 req.headers['fiware-service'],
                 req.headers['fiware-servicepath']
             );
@@ -504,7 +513,7 @@ function handleQueryNgsi2(req, res, next) {
             } else {
                 deviceList = [innerDevice];
             }
-
+            logger.debug(context, 'handleFindDevice from %j', deviceList);
             async.map(
                 deviceList,
                 async.apply(finishQueryForDevice, attributes, contextEntity, actualHandler),
@@ -528,7 +537,7 @@ function handleQueryNgsi2(req, res, next) {
             logger.debug(context, 'There was an error handling the query: %s.', error);
             next(error);
         } else {
-            logger.debug(context, 'Query from [%s] handled successfully.', req.get('host'));
+            logger.debug(context, 'Query from [%s] handled successfully. req %s', req.get('host'), req);
             res.status(200).json(result);
         }
     }

package/lib/services/northBound/contextServerUtils.js

@@ -41,10 +41,10 @@ const commands = require('../commands/commandService');
  * @return {String}                 The Tenant decribed in the request headers
  */
 function getLDTenant(req) {
-    if (req.headers['NGSILD-Tenant']) {
-        return req.headers['NGSILD-Tenant'];
-    } else if (req.headers['fiware-service']) {
-        return req.headers['fiware-service'];
+    if (req.header('NGSILD-Tenant')) {
+        return req.header('NGSILD-Tenant');
+    } else if (req.header('fiware-service')) {
+        return req.header('fiware-service');
     }
     return config.getConfig().contextBroker.fallbackTenant;
 }
@@ -56,10 +56,10 @@ function getLDTenant(req) {
  * obliged to offer service headers - this is still being defined in the NGSI-LD specifications.
  */
 function getLDPath(req) {
-    if (req.headers['NGSILD-Path']) {
-        return req.headers['NGSILD-Path'];
-    } else if (req.headers['fiware-servicepath']) {
-        return req.headers['fiware-servicepath'];
+    if (req.header('NGSILD-Path')) {
+        return req.header('NGSILD-path');
+    } else if (req.header('fiware-servicepath')) {
+        return req.header('fiware-servicepath');
     }
     return config.getConfig().contextBroker.fallbackPath;
 }
@@ -91,7 +91,7 @@ function executeUpdateSideEffects(device, id, type, service, subservice, attribu
                     ];
 
                     sideEffects.push(
-                        apply(ngsi.update, device.name, device.resource, device.apikey, newAttributes, device)
+                        apply(ngsi.update, device.name, device.type, device.apikey, newAttributes, device)
                     );
                 }
             }
@@ -112,7 +112,7 @@ function executeUpdateSideEffects(device, id, type, service, subservice, attribu
  * @param {Array}  attributes       List of attributes to update with their types and values.
  */
 function pushCommandsToQueue(device, id, type, service, subservice, attributes, callback) {
-    async.map(attributes, apply(commands.add, service, subservice, device.id), callback);
+    async.map(attributes, apply(commands.addCmd, service, subservice, device), callback);
 }
 
 exports.notificationMiddlewares = [];

package/lib/services/northBound/deviceProvisioningServer.js

@@ -63,7 +63,8 @@ const provisioningAPITranslation = {
     autoprovision: 'autoprovision',
     explicitAttrs: 'explicitAttrs',
     expressionLanguage: 'expressionLanguage',
-    ngsiVersion: 'ngsiVersion'
+    ngsiVersion: 'ngsiVersion',
+    entityNameExp: 'entityNameExp'
 };
 
 /**
@@ -184,6 +185,8 @@ function attributeToProvisioningAPIFormat(attribute) {
         entity_name: attribute.entity_name,
         entity_type: attribute.entity_type,
         mqtt: attribute.mqtt,
+        payloadType: attribute.payloadType,
+        contentType: attribute.contentType,
         metadata: attribute.metadata
     };
 }

package/lib/templates/createDevice.json

@@ -41,8 +41,7 @@
             "type": "string"
           },
           "explicitAttrs": {
-            "description": "Flag about only provisioned attributes will be processed to Context Broker",
-            "type": "boolean"
+            "description": "Flag about only provisioned attributes will be processed to Context Broker"
           },
           "ngsiVersion": {
             "description": "NGSI Interface for this device",
@@ -173,6 +172,18 @@
                   "type": "string",
                   "pattern": "^([^<>();'=\"]+)*$"
                 },
+                "expression": {
+                  "description": "Optional expression for command transformation",
+                  "type": "string"
+                },
+                "payloadType": {
+                    "description": "Payload type",
+                    "type": "string"
+                },
+                "contentType": {
+                    "description": "Content type",
+                    "type": "string"
+                },
                 "mqtt": {
                   "description": "Mqtt properties",
                   "type": "object",

package/lib/templates/createDeviceLax.json

@@ -41,8 +41,7 @@
             "type": "boolean"
           },
           "explicitAttrs": {
-            "description": "Flag about only provisioned attributes will be processed to Context Broker",
-            "type": "boolean"
+            "description": "Flag about only provisioned attributes will be processed to Context Broker"
           },
           "ngsiVersion": {
             "description": "NGSI Interface for this device",
@@ -181,4 +180,4 @@
       }
     }
   }
-}
+}

package/lib/templates/updateDevice.json

@@ -158,6 +158,18 @@
             "type": "string",
             "pattern": "^([^<>();'=\"]+)*$"
           },
+          "expression": {
+              "description": "Optional expression for command transformation",
+              "type": "string"
+          },
+          "payloadType": {
+              "description": "Payload type",
+              "type": "string"
+          },
+          "contentType": {
+              "description": "Content type",
+              "type": "string"
+          },
           "mqtt": {
               "description": "Mqtt properties",
               "type": "object",
@@ -186,8 +198,7 @@
       "type": "array"
     },
     "explicitAttrs": {
-      "description": "Flag to decide update of active attributes only",
-      "type": "Boolean"
+      "description": "Flag to decide update of active attributes only"
     },
     "ngsiVersion": {
         "description": "NGSI Interface for this device",