iotagent-node-lib 3.2.0 → 3.3.0

package/doc/howto.md

@@ -75,12 +75,12 @@ folder of your project. Remember to change the Context Broker IP to your local C
 Now we can begin with the code of our IoT Agent. The very minimum code we need to start an IoT Agent is the following:
 
 ```javascript
-var iotAgentLib = require("iotagent-node-lib"),
-    config = require("./config");
+var iotAgentLib = require('iotagent-node-lib'),
+    config = require('./config');
 
 iotAgentLib.activate(config, function (error) {
     if (error) {
-        console.log("There was an error activating the IOTA");
+        console.log('There was an error activating the IOTA');
         process.exit(1);
     }
 });
@@ -112,10 +112,10 @@ In order to add the Express dependency to your project, add the following line t
 The require section would end up like this (the standard `http` module is also needed):
 
 ```javascript
-var iotAgentLib = require("iotagent-node-lib"),
-    http = require("http"),
-    express = require("express"),
-    config = require("./config");
+var iotAgentLib = require('iotagent-node-lib'),
+    http = require('http'),
+    express = require('express'),
+    config = require('./config');
 ```
 
 And install the dependencies as usual with `npm install`. You will have to require both `express` and `http` in your
@@ -129,16 +129,16 @@ function initSouthbound(callback) {
     southboundServer = {
         server: null,
         app: express(),
-        router: express.Router(),
+        router: express.Router()
     };
 
-    southboundServer.app.set("port", 8080);
-    southboundServer.app.set("host", "0.0.0.0");
+    southboundServer.app.set('port', 8080);
+    southboundServer.app.set('host', '0.0.0.0');
 
-    southboundServer.router.get("/iot/d", manageULRequest);
+    southboundServer.router.get('/iot/d', manageULRequest);
     southboundServer.server = http.createServer(southboundServer.app);
-    southboundServer.app.use("/", southboundServer.router);
-    southboundServer.server.listen(southboundServer.app.get("port"), southboundServer.app.get("host"), callback);
+    southboundServer.app.use('/', southboundServer.router);
+    southboundServer.server.listen(southboundServer.app.get('port'), southboundServer.app.get('host'), callback);
 }
 ```
 
@@ -154,18 +154,18 @@ function manageULRequest(req, res, next) {
     iotAgentLib.retrieveDevice(req.query.i, req.query.k, function (error, device) {
         if (error) {
             res.status(404).send({
-                message: "Couldn't find the device: " + JSON.stringify(error),
+                message: "Couldn't find the device: " + JSON.stringify(error)
             });
         } else {
             values = parseUl(req.query.d, device);
-            iotAgentLib.update(device.name, device.type, "", values, device, function (error) {
+            iotAgentLib.update(device.name, device.type, '', values, device, function (error) {
                 if (error) {
                     res.status(500).send({
-                        message: "Error updating the device",
+                        message: 'Error updating the device'
                     });
                 } else {
                     res.status(200).send({
-                        message: "Device successfully updated",
+                        message: 'Device successfully updated'
                     });
                 }
             });
@@ -190,17 +190,17 @@ function parseUl(data, device) {
     }
 
     function createAttribute(element) {
-        var pair = element.split("|"),
+        var pair = element.split('|'),
             attribute = {
                 name: pair[0],
                 value: pair[1],
-                type: findType(pair[0]),
+                type: findType(pair[0])
             };
 
         return attribute;
     }
 
-    return data.split(",").map(createAttribute);
+    return data.split(',').map(createAttribute);
 }
 ```
 
@@ -227,14 +227,14 @@ show the modifications in the `activate()` function:
 ```javascript
 iotAgentLib.activate(config, function (error) {
     if (error) {
-        console.log("There was an error activating the IOTA");
+        console.log('There was an error activating the IOTA');
         process.exit(1);
     } else {
         initSouthbound(function (error) {
             if (error) {
-                console.log("Could not initialize South bound API due to the following error: %s", error);
+                console.log('Could not initialize South bound API due to the following error: %s', error);
             } else {
-                console.log("Both APIs started successfully");
+                console.log('Both APIs started successfully');
             }
         });
     }
@@ -286,7 +286,7 @@ A HTTP request library will be needed in order to make those calls. To this exte
 used. In order to do so, add the following require statement to the initialization code:
 
 ```javascript
-request = require("request");
+request = require('request');
 ```
 
 and add the `request` dependency to the `package.json` file:
@@ -303,11 +303,11 @@ and add the `request` dependency to the `package.json` file:
 The require section should now look like this:
 
 ```javascript
-var iotAgentLib = require("iotagent-node-lib"),
-    http = require("http"),
-    express = require("express"),
-    request = require("request"),
-    config = require("./config");
+var iotAgentLib = require('iotagent-node-lib'),
+    http = require('http'),
+    express = require('express'),
+    request = require('request'),
+    config = require('./config');
 ```
 
 ### Implementation
@@ -321,11 +321,11 @@ for the context provisioning requests. At this point, we should provide two hand
 ```javascript
 function queryContextHandler(id, type, service, subservice, attributes, callback) {
     var options = {
-        url: "http://127.0.0.1:9999/iot/d",
-        method: "GET",
+        url: 'http://127.0.0.1:9999/iot/d',
+        method: 'GET',
         qs: {
-            q: attributes.join(),
-        },
+            q: attributes.join()
+        }
     };
 
     request(options, function (error, response, body) {
@@ -350,21 +350,21 @@ attributes). Here is the code for the `createResponse()` function:
 
 ```javascript
 function createResponse(id, type, attributes, body) {
-    var values = body.split(","),
+    var values = body.split(','),
         responses = [];
 
     for (var i = 0; i < attributes.length; i++) {
         responses.push({
             name: attributes[i],
-            type: "string",
-            value: values[i],
+            type: 'string',
+            value: values[i]
         });
     }
 
     return {
         id: id,
         type: type,
-        attributes: responses,
+        attributes: responses
     };
 }
 ```
@@ -374,11 +374,11 @@ function createResponse(id, type, attributes, body) {
 ```javascript
 function updateContextHandler(id, type, service, subservice, attributes, callback) {
     var options = {
-        url: "http://127.0.0.1:9999/iot/d",
-        method: "GET",
+        url: 'http://127.0.0.1:9999/iot/d',
+        method: 'GET',
         qs: {
-            d: createQueryFromAttributes(attributes),
-        },
+            d: createQueryFromAttributes(attributes)
+        }
     };
 
     request(options, function (error, response, body) {
@@ -388,31 +388,31 @@ function updateContextHandler(id, type, service, subservice, attributes, callbac
             callback(null, {
                 id: id,
                 type: type,
-                attributes: attributes,
+                attributes: attributes
             });
         }
     });
 }
 ```
 
-The updateContext handler deals with the modification requests that arrive at the North Port of the IoT Agent via `/v2/op/update`. It is
-invoked once for each entity requested (note that a single request can contain multiple entity updates), with the same
-parameters used in the queryContext handler. The only difference is the value of the attributes array, now containing a
-list of attribute objects, each containing name, type and value. The handler must also make use of the callback to
-return a list of updated attributes.
+The updateContext handler deals with the modification requests that arrive at the North Port of the IoT Agent via
+`/v2/op/update`. It is invoked once for each entity requested (note that a single request can contain multiple entity
+updates), with the same parameters used in the queryContext handler. The only difference is the value of the attributes
+array, now containing a list of attribute objects, each containing name, type and value. The handler must also make use
+of the callback to return a list of updated attributes.
 
 For this handler we have used a helper function called `createQueryFromAttributes()`, that transforms the NGSI
 representation of the attributes to the UL type expected by the device:
 
 ```javascript
 function createQueryFromAttributes(attributes) {
-    var query = "";
+    var query = '';
 
     for (var i in attributes) {
-        query += attributes[i].name + "|" + attributes[i].value;
+        query += attributes[i].name + '|' + attributes[i].value;
 
         if (i != attributes.length - 1) {
-            query += ",";
+            query += ',';
         }
     }
 
@@ -544,10 +544,6 @@ request/seconds that can be manage by the server. It's important to remark that
 included in the IoT Agent Node Lib but it is not mandatory that you activate this functionality. In this example, we
 will see how to use this functionality to deploy an IoT Agent in multi-thread environment.
 
-**WARNING:** it has been observed in Orion-IOTA integration tests some fails in bidirectional plugin usage scenarios in
-multi-thread mode. The fail has not been confirmed yet (it could be a glitch of the testing environment). However, take
-this into account if you use multi-thread in combination with bidirectional plugin.
-
 In order to activate the functionality, you have two options, configure the `config.js` file to add the following line:
 
 ```javascript
@@ -563,9 +559,9 @@ variable and afterward the value of the multiCore in the `config.js` file. The r
 (the standard `http` module is also needed):
 
 ```javascript
-var iotAgent = require("../lib/iotagent-implementation"),
-    iotAgentLib = require("iotagent-node-lib"),
-    config = require("./config");
+var iotAgent = require('../lib/iotagent-implementation'),
+    iotAgentLib = require('iotagent-node-lib'),
+    config = require('./config');
 ```
 
 It is important to mention the purpose of the `iotAgent` variable. It is the proper implementation of the IoT Agent
@@ -581,9 +577,9 @@ about starting the IoTAgent:
 ```javascript
 iotAgentLib.startServer(config, iotAgent, function (error) {
     if (error) {
-        console.log(context, "Error starting IoT Agent: [%s] Exiting process", error);
+        console.log(context, 'Error starting IoT Agent: [%s] Exiting process', error);
     } else {
-        console.log(context, "IoT Agent started");
+        console.log(context, 'IoT Agent started');
     }
 });
 ```
@@ -610,7 +606,7 @@ handlers themselves. Here we can see the definition of the configuration handler
 
 ```javascript
 function configurationHandler(configuration, callback) {
-    console.log("\n\n* REGISTERING A NEW CONFIGURATION:\n%s\n\n", JSON.stringify(configuration, null, 4));
+    console.log('\n\n* REGISTERING A NEW CONFIGURATION:\n%s\n\n', JSON.stringify(configuration, null, 4));
     callback(null, configuration);
 }
 ```
@@ -627,8 +623,8 @@ feature, let's use the provisioning handler to change the value of the type of t
 
 ```javascript
 function provisioningHandler(device, callback) {
-    console.log("\n\n* REGISTERING A NEW DEVICE:\n%s\n\n", JSON.stringify(device, null, 4));
-    device.type = "CertifiedType";
+    console.log('\n\n* REGISTERING A NEW DEVICE:\n%s\n\n', JSON.stringify(device, null, 4));
+    device.type = 'CertifiedType';
     callback(null, device);
 }
 ```

package/doc/installationguide.md

@@ -249,10 +249,6 @@ used for the same purpose. For instance:
     'http://192.168.56.1:4041'.
 -   **iotaVersion**: indicates the version of the IoTA that will be displayed in the about method (it should be filled
     automatically by each IoTA).
--   **appendMode**: if this flag is activated, the update requests to the Context Broker will be performed always with
-    APPEND type, instead of the default UPDATE. This have implications in the use of attributes with Context Providers,
-    so this flag should be used with care. This flag is overwritten by `autoprovision` flag in group or device
-    provision.
 -   **dieOnUnexpectedError**: if this flag is activated, the IoTAgent will not capture global exception, thus dying upon
     any unexpected error.
 -   **singleConfigurationMode**: enables the Single Configuration mode for backwards compatibility (see description in
@@ -352,7 +348,6 @@ overrides.
 | IOTA_MONGO_SSL                       | `mongodb.ssl`                   |
 | IOTA_MONGO_EXTRAARGS                 | `mongodb.extraArgs`             |
 | IOTA_SINGLE_MODE                     | `singleConfigurationMode`       |
-| IOTA_APPEND_MODE                     | `appendMode`                    |
 | IOTA_POLLING_EXPIRATION              | `pollingExpiration`             |
 | IOTA_POLLING_DAEMON_FREQ             | `pollingDaemonFrequency`        |
 | IOTA_AUTOCAST                        | `autocast`                      |

package/doc/requirements.txt

@@ -1,4 +1,4 @@
 mkdocs==1.2.3
-Pygments==2.9.0
+Pygments==2.15.0
 Markdown==3.3.4
 jinja2==3.0.0

package/docker/Mosquitto/Dockerfile

@@ -1,4 +1,4 @@
-ARG  IMAGE_TAG=11.3-slim
+ARG  IMAGE_TAG=12.1-slim
 FROM debian:${IMAGE_TAG}
 
 ARG CLEAN_DEV_TOOLS

package/lib/model/Device.js

@@ -51,7 +51,6 @@ const Device = new Schema({
     creationDate: { type: Date, default: Date.now },
     internalAttributes: Object,
     autoprovision: Boolean,
-    expressionLanguage: String,
     explicitAttrs: Group.ExplicitAttrsType,
     ngsiVersion: String
 });

package/lib/model/Group.js

@@ -59,7 +59,6 @@ const Group = new Schema({
     attributes: Array,
     internalAttributes: Array,
     autoprovision: Boolean,
-    expressionLanguage: String,
     explicitAttrs: ExplicitAttrsType,
     defaultEntityNameConjunction: String,
     ngsiVersion: String,

package/lib/model/dbConn.js

@@ -106,13 +106,7 @@ function init(host, db, port, options, callback) {
     }
 
     function connectionAttempt(url, options, callback) {
-        logger.info(
-            context,
-            'Attempting to connect to MongoDB instance with url %j and options %j. Attempt %d',
-            url,
-            options,
-            retries
-        );
+        logger.info(context, 'Attempting to connect to MongoDB instance with url %j. Attempt %d', url, retries);
         // FIXME: useNewUrlParser is no longer used in underlying mongodb driver 4.x
         // (see https://github.com/mongodb/node-mongodb-native/blob/HEAD/etc/notes/CHANGES_4.0.0.md)
         // but not sure if current mongoose version is still using mongodb 3.x internally

package/lib/plugins/jexlParser.js

@@ -77,7 +77,7 @@ function extractVariables(expression) {
         variables = tokens.filter(function (token, index, array) {
             return (
                 (token.type === ' ' && array[index - 1].type !== 'dot') ||
-                (token.type === 'identifier' && array[index + 1].type !== 'openParen')
+                (token.type === 'identifier' && array[index + 1] && array[index + 1].type !== 'openParen')
             );
         });
 

package/lib/services/common/iotManagerService.js

@@ -58,7 +58,6 @@ function register(callback) {
             timestamp: service.timestamp,
             autoprovision: service.autoprovision,
             explicitAttrs: service.explicitAttrs,
-            expressionLanguage: service.expressionLanguage,
             defaultEntityNameConjunction: service.defaultEntityNameConjunction,
             ngsiVersion: service.ngsiVersion,
             entityNameExp: service.entityNameExp

package/lib/services/devices/deviceRegistryMongoDB.js

@@ -55,7 +55,6 @@ const attributeList = [
     'polling',
     'timestamp',
     'explicitAttrs',
-    'expressionLanguage',
     'ngsiVersion'
 ];
 
@@ -176,15 +175,15 @@ function listDevices(type, service, subservice, limit, offset, callback) {
         query.skip(parseInt(offset, 10));
     }
 
-    async.series([query.exec.bind(query), Device.model.countDocuments.bind(Device.model, condition)], function (
-        error,
-        results
-    ) {
-        callback(error, {
-            count: results[1],
-            devices: results[0]
-        });
-    });
+    async.series(
+        [query.exec.bind(query), Device.model.countDocuments.bind(Device.model, condition)],
+        function (error, results) {
+            callback(error, {
+                count: results[1],
+                devices: results[0]
+            });
+        }
+    );
 }
 
 function findOneInMongoDB(queryParams, id, callback) {
@@ -303,6 +302,7 @@ function update(device, callback) {
             data.registrationId = device.registrationId;
             data.explicitAttrs = device.explicitAttrs;
             data.ngsiVersion = device.ngsiVersion;
+            data.timestamp = device.timestamp;
 
             /* eslint-disable-next-line  new-cap */
             const deviceObj = new Device.model(data);

package/lib/services/devices/deviceService.js

@@ -72,7 +72,12 @@ function init() {
  * @param {Object} newDevice        Device object that will be stored in the database.
  */
 function createInitialEntity(deviceData, newDevice, callback) {
-    deviceHandler.createInitialEntity(deviceData, newDevice, callback);
+    if (config.getConfig().appendMode === false || config.ngsiVersion() === 'ld' || deviceData.ngsiVersion === 'ld') {
+        deviceHandler.createInitialEntity(deviceData, newDevice, callback);
+    } else {
+        logger.debug(context, 'Skip create initial entity due appendMode is false or ngsiLD.');
+        callback(null, newDevice);
+    }
 }
 
 /**
@@ -178,13 +183,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);
 }
@@ -265,7 +269,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;
@@ -362,9 +366,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 +378,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);
                 }
             }
@@ -618,19 +623,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 &&

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

@@ -240,7 +240,7 @@ function createInitialEntityNgsi2(deviceData, newDevice, callback) {
         }
     }
 
-    logger.debug(context, 'deviceData: %j', deviceData);
+    logger.debug(context, 'Creating initial entity with deviceData: %j', deviceData);
     if (
         ('timestamp' in deviceData && deviceData.timestamp !== undefined
             ? deviceData.timestamp
@@ -356,11 +356,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;
 

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,10 +354,10 @@ function sendUpdateValueNgsi2(entityName, attributes, typeInformation, token, ca
         payload.entities[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';
     }
 
     let options = NGSIUtils.createRequestObject(url, typeInformation, token);
@@ -675,6 +675,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
@@ -970,18 +987,24 @@ 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';
+            if (config.getConfig().appendMode === false) {
+                url += '/' + entityName + '/attrs';
+                if (typeInformation && typeInformation.type) {
+                    url += '?type=' + typeInformation.type;
+                }
+            } else {
+                // appendMode === true
+                url += '?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 {
+            if (config.getConfig().appendMode === false) {
                 options.method = 'PATCH';
+                delete options.json.id;
+                delete options.json.type;
+            } else {
+                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);

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
     };

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"
           },