iotagent-node-lib 4.8.0 → 4.10.0

package/lib/commonConfig.js

@@ -157,9 +157,11 @@ function processEnvironmentVariables() {
         'IOTA_FALLBACK_PATH',
         'IOTA_LD_SUPPORT_NULL',
         'IOTA_LD_SUPPORT_DATASET_ID',
+        'IOTA_LD_SUPPORT_DATA_TYPE',
         'IOTA_EXPRESS_LIMIT',
         'IOTA_USE_CB_FLOW_CONTROL',
-        'IOTA_STORE_LAST_MEASURE'
+        'IOTA_STORE_LAST_MEASURE',
+        'IOTA_CMD_MODE'
     ];
     const iotamVariables = [
         'IOTA_IOTAM_URL',
@@ -264,7 +266,12 @@ function processEnvironmentVariables() {
         config.server.port = process.env.IOTA_NORTH_PORT;
     }
 
-    config.server.ldSupport = config.server.ldSupport || { null: true, datasetId: true, merge: false };
+    config.server.ldSupport = config.server.ldSupport || {
+        null: true,
+        datasetId: true,
+        merge: false,
+        dataType: 'none'
+    };
 
     if (process.env.IOTA_LD_SUPPORT_NULL) {
         config.server.ldSupport.null = process.env.IOTA_LD_SUPPORT_NULL === 'true';
@@ -275,6 +282,9 @@ function processEnvironmentVariables() {
     if (process.env.IOTA_LD_SUPPORT_MERGE) {
         config.server.ldSupport.datasetId = process.env.IOTA_LD_SUPPORT_MERGE === 'true';
     }
+    if (process.env.IOTA_LD_SUPPORT_DATA_TYPE) {
+        config.server.ldSupport.dataType = process.env.IOTA_LD_SUPPORT_DATA_TYPE;
+    }
 
     if (process.env.IOTA_PROVIDER_URL) {
         config.providerUrl = process.env.IOTA_PROVIDER_URL;
@@ -491,6 +501,9 @@ function processEnvironmentVariables() {
     } else {
         config.storeLastMeasure = config.storeLastMeasure === true;
     }
+    if (process.env.IOTA_CMD_MODE) {
+        config.cmdMode = process.env.IOTA_CMD_MODE;
+    }
 }
 
 function setConfig(newConfig) {
@@ -511,7 +524,7 @@ function getConfig() {
 function getConfigForTypeInformation() {
     // Just return relevant configuration flags
     // avoid to include server, authentication, mongodb, orion and iotamanger info
-    let conf = {
+    const conf = {
         timestamp: config.timestamp,
         defaultResource: config.defaultResource,
         explicitAttrs: config.explicitAttrs,

package/lib/model/Device.js

@@ -57,7 +57,9 @@ const Device = new Schema({
     useCBflowControl: Boolean,
     storeLastMeasure: Boolean,
     lastMeasure: Object,
-    oldCtxt: Object
+    oldCtxt: Object,
+    cmdMode: String,
+    subscriptionId: String
 });
 
 function load() {

package/lib/model/Group.js

@@ -67,7 +67,8 @@ const Group = new Schema({
     entityNameExp: String,
     payloadType: String,
     useCBflowControl: Boolean,
-    storeLastMeasure: Boolean
+    storeLastMeasure: Boolean,
+    cmdMode: String
 });
 
 function load() {

package/lib/services/common/domain.js

@@ -68,7 +68,7 @@ function requestDomain(req, res, next) {
     reqDomain.path = req.path;
     reqDomain.op = req.url;
     reqDomain.start = Date.now();
-
+    reqDomain.from = req.ip || req.connection.remoteAddress;
     reqDomain.add(req);
     reqDomain.add(res);
 
@@ -145,14 +145,15 @@ function ensureSouthboundTransaction(context, callback) {
         if (context.op) {
             reqDomain.op = context.op;
         }
-
         if (context.srv) {
             reqDomain.service = context.srv;
         }
-
         if (context.subsrv) {
             reqDomain.subservice = context.subsrv;
         }
+        if (context.from) {
+            reqDomain.from = context.from;
+        }
     }
 
     return reqDomain.run(callback);

package/lib/services/common/iotManagerService.js

@@ -65,7 +65,8 @@ function register(callback) {
             endpoint: service.endpoint,
             transport: service.transport,
             useCBflowControl: service.useCBflowControl,
-            storeLastMeasure: service.storeLastMeasure
+            storeLastMeasure: service.storeLastMeasure,
+            cmdMode: service.cmdMode
         };
     }
 

package/lib/services/devices/deviceRegistryMongoDB.js

@@ -59,7 +59,9 @@ const attributeList = [
     'subscriptions',
     'payloadType',
     'useCBflowControl',
-    'storeLastMeasure'
+    'storeLastMeasure',
+    'cmdMode',
+    'subscriptionId'
 ];
 
 /**
@@ -324,6 +326,8 @@ function update(previousDevice, device, callback) {
             data.useCBflowControl = device.useCBflowControl;
             data.storeLastMeasure = device.storeLastMeasure;
             data.lastMeasure = device.lastMeasure;
+            data.cmdMode = device.cmdMode;
+            data.subscriptionId = device.subscriptionId;
 
             /* eslint-disable-next-line  new-cap */
             const deviceObj = new Device.model(data);

package/lib/services/devices/deviceService.js

@@ -66,6 +66,17 @@ 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.
  *
@@ -187,6 +198,9 @@ function mergeDeviceWithConfiguration(fields, defaults, deviceData, configuratio
     if (configuration && configuration.storeLastMeasure !== undefined && deviceData.storeLastMeasure === undefined) {
         deviceData.storeLastMeasure = configuration.storeLastMeasure;
     }
+    if (configuration && configuration.cmdMode !== undefined && deviceData.cmdMode === undefined) {
+        deviceData.cmdMode = configuration.cmdMode;
+    }
     logger.debug(context, 'deviceData after merge with conf: %j', deviceData);
     callback(null, deviceData);
 }
@@ -361,13 +375,15 @@ function registerDevice(deviceObj, callback) {
         async.waterfall(
             [
                 apply(registrationUtils.sendRegistrations, false, deviceData),
-                apply(registrationUtils.processContextRegistration, deviceData)
+                apply(registrationUtils.processContextRegistration, deviceData),
+                apply(createInitialEntity, deviceData)
             ],
             function (error, results) {
                 if (error) {
                     callback(error);
                 } else {
                     deviceObj.registrationId = results.registrationId;
+                    deviceObj.subscriptionId = results.subscriptionId;
                     deviceObj.name = deviceData.name;
                     deviceObj.service = deviceData.service;
                     deviceObj.subservice = deviceData.subservice;

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

@@ -33,7 +33,6 @@ const logger = require('logops');
 const config = require('../../commonConfig');
 const ngsiLD = require('../ngsi/entities-NGSI-LD');
 const utils = require('../northBound/restUtils');
-const moment = require('moment');
 const _ = require('underscore');
 const registrationUtils = require('./registrationUtils');
 const NGSIv2 = require('./devices-NGSI-v2');
@@ -107,7 +106,7 @@ function updateEntityHandlerNgsiLD(deviceData, updatedDevice, callback) {
  * @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 createInitialEntityNgsiLDFake(deviceData, newDevice, callback) {
+function createInitialEntityNgsiLD(deviceData, newDevice, callback) {
     callback(null, newDevice);
 }
 
@@ -153,7 +152,7 @@ function updateEntityNgsiLD(deviceData, updatedDevice, callback) {
     ) {
         options.json[constants.TIMESTAMP_ATTRIBUTE] = {
             type: constants.TIMESTAMP_TYPE_NGSI2,
-            value: moment()
+            value: new Date().toISOString()
         };
     }
 
@@ -285,7 +284,7 @@ function updateRegisterDeviceNgsiLD(deviceObj, previousDevice, entityInfoUpdated
                     deviceObj.subservice
                 ),
                 apply(extractDeviceDifference, deviceObj),
-                createInitialEntityNgsiLDFake,
+                createInitialEntityNgsiLD,
                 apply(combineWithNewDevice, deviceObj),
                 apply(registrationUtils.sendRegistrations, false),
                 apply(registrationUtils.processContextRegistration, deviceObj),
@@ -315,4 +314,5 @@ function updateRegisterDeviceNgsiLD(deviceObj, previousDevice, entityInfoUpdated
     }
 }
 
+exports.createInitialEntity = createInitialEntityNgsiLD;
 exports.updateRegisterDevice = updateRegisterDeviceNgsiLD;

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

@@ -27,6 +27,21 @@ const config = require('../../commonConfig');
 const deviceHandlerLD = require('./devices-NGSI-LD');
 const deviceHandlerV2 = require('./devices-NGSI-v2');
 
+/**
+ * Creates the initial entity representing the device in the Context Broker using both NGSI-LD and NGSI-v2
+ * 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.
+ */
+function createInitialEntityNgsiMixed(deviceData, newDevice, callback) {
+    if (config.checkNgsiLD(deviceData)) {
+        deviceHandlerLD.createInitialEntity(deviceData, newDevice, callback);
+    } else {
+        deviceHandlerV2.createInitialEntity(deviceData, newDevice, callback);
+    }
+}
+
 /**
  * Updates the register of an existing device identified by the Id and Type in the Context Broker, and the internal
  * registry. It uses both NGSI-LD and NGSI-v2
@@ -46,4 +61,5 @@ function updateRegisterDeviceNgsiMixed(deviceObj, previousDevice, entityInfoUpda
     }
 }
 
+exports.createInitialEntity = createInitialEntityNgsiMixed;
 exports.updateRegisterDevice = updateRegisterDeviceNgsiMixed;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Telefonica Investigación y Desarrollo, S.A.U
+ * Copyright 2020 Telefonica Investigación y Desarrollo, S.A.U
  *
  * This file is part of fiware-iotagent-lib
  *
@@ -41,7 +41,6 @@ const registrationUtils = require('./registrationUtils');
 const _ = require('underscore');
 const utils = require('../northBound/restUtils');
 const NGSIv2 = require('../ngsi/entities-NGSI-v2');
-const moment = require('moment');
 const context = {
     op: 'IoTAgentNGSI.Devices-v2'
 };
@@ -165,12 +164,102 @@ function formatCommandsNgsi2(originalVector) {
     return attributeList;
 }
 
+function formatCommandsBySubsNgsi2(originalVector) {
+    const attributeList = {};
+
+    if (originalVector && originalVector.length) {
+        for (let i = 0; i < originalVector.length; i++) {
+            attributeList[originalVector[i].name] = {
+                type: 'command',
+                value: null
+            };
+        }
+    }
+
+    return attributeList;
+}
+
+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(newDevice.id, newDevice.type, body, response.statusCode);
+
+            callback(errorObj);
+        }
+    };
+}
+
 /*
  * This methods makes a bypass in updateRegisterDeviceNgsi2 to allow not change
  * extractDeviceDifference and combineWithNewDevice methods
  */
-function createInitialEntityNgsi2Fake(deviceData, newDevice, callback) {
-    callback(null, newDevice);
+function createInitialEntityNgsi2(newDevice, deviceObj, callback) {
+    logger.debug(context, 'createInitialEntityNgsiv2 called with newDevice: %j', newDevice);
+
+    const cmdModeConfig = config.getConfig().cmdMode;
+
+    const isLegacy =
+        (!newDevice.cmdMode && (!cmdModeConfig || cmdModeConfig === 'legacy')) || newDevice.cmdMode === 'legacy';
+    if (isLegacy) {
+        logger.debug(context, 'Old cmdMode with newDevice: %j', deviceObj);
+        return callback(null, deviceObj);
+    }
+
+    if (!Array.isArray(newDevice.commands) || newDevice.commands.length === 0) {
+        logger.debug(context, 'No initial entity due to no commands by subs in newDevice: %j', newDevice);
+        return callback(null, deviceObj);
+    }
+
+    const entityPayload = {
+        id: String(newDevice.name),
+        type: newDevice.type
+    };
+    jsonConcat(entityPayload, formatCommandsBySubsNgsi2(newDevice.commands));
+
+    let url = config.getConfig().contextBroker.url + '/v2/entities?options=upsert';
+    if (newDevice.cbHost) {
+        url = newDevice.cbHost.includes('://')
+            ? newDevice.cbHost + '/v2/entities?options=upsert'
+            : 'http://' + newDevice.cbHost + '/v2/entities?options=upsert';
+    }
+
+    const headers = {
+        'fiware-correlator': (domain.active && domain.active.corr) || uuid.v4()
+    };
+    if (newDevice.service) headers['fiware-service'] = newDevice.service;
+    if (newDevice.subservice) headers['fiware-servicepath'] = newDevice.subservice;
+
+    const options = { url, method: 'POST', json: entityPayload, headers };
+
+    logger.debug(context, 'Creating initial entity due to commands by subs with newDevice: %j', newDevice);
+    logger.debug(context, 'Creating initial entity in the Context Broker:\n %s', JSON.stringify(options, null, 4));
+
+    return utils.executeWithSecurity(
+        options,
+        newDevice,
+        createInitialEntityHandlerNgsi2(newDevice, deviceObj, callback)
+    );
 }
 
 /**
@@ -180,6 +269,7 @@ function createInitialEntityNgsi2Fake(deviceData, newDevice, callback) {
  * @param {Object} updatedDevice    Device object that will be stored in the database.
  */
 function updateEntityNgsi2(deviceData, updatedDevice, callback) {
+    logger.debug(context, 'updateEntityNgsi2 called with deviceData: %j updatedDevice: %j', deviceData, updatedDevice);
     const options = {
         url: config.getConfig().contextBroker.url + '/v2/entities/' + String(deviceData.name) + '/attrs',
         method: 'POST',
@@ -203,7 +293,14 @@ function updateEntityNgsi2(deviceData, updatedDevice, callback) {
 
     jsonConcat(options.json, formatAttributesNgsi2(deviceData.active, false));
     jsonConcat(options.json, formatAttributesNgsi2(deviceData.staticAttributes, true));
-    jsonConcat(options.json, formatCommandsNgsi2(deviceData.commands));
+    if (
+        (!updatedDevice.cmdMode && (!config.getConfig().cmdMode || config.getConfig().cmdMode === 'legacy')) ||
+        (updatedDevice && updatedDevice.cmdMode === 'legacy')
+    ) {
+        jsonConcat(options.json, formatCommandsNgsi2(deviceData.commands));
+    } else {
+        jsonConcat(options.json, formatCommandsBySubsNgsi2(deviceData.commands));
+    }
 
     for (const att in options.json) {
         try {
@@ -222,7 +319,7 @@ function updateEntityNgsi2(deviceData, updatedDevice, callback) {
     ) {
         options.json[constants.TIMESTAMP_ATTRIBUTE] = {
             type: constants.TIMESTAMP_TYPE_NGSI2,
-            value: moment()
+            value: new Date().toISOString()
         };
     }
 
@@ -253,7 +350,13 @@ function updateRegisterDeviceNgsi2(deviceObj, previousDevice, entityInfoUpdated,
         return;
     }
 
-    logger.debug(context, 'Update provisioned v2 device in Device Service %j %j', deviceObj, entityInfoUpdated);
+    logger.debug(
+        context,
+        'Update provisioned v2 device %j with Device %j entityInfoUpdated %j',
+        previousDevice,
+        deviceObj,
+        entityInfoUpdated
+    );
 
     function combineWithNewDevice(newDevice, oldDevice, callback) {
         logger.debug(context, 'combineWithNewDevice %j %j', newDevice, oldDevice);
@@ -291,6 +394,9 @@ function updateRegisterDeviceNgsi2(deviceObj, previousDevice, entityInfoUpdated,
             if ('storeLastMeasure' in newDevice && newDevice.storeLastMeasure !== undefined) {
                 oldDevice.storeLastMeasure = newDevice.storeLastMeasure;
             }
+            if ('cmdMode' in newDevice && newDevice.cmdMode !== undefined) {
+                oldDevice.cmdMode = newDevice.cmdMode;
+            }
             callback(null, oldDevice);
         } else {
             callback(new errors.DeviceNotFound(newDevice.id, newDevice));
@@ -338,7 +444,7 @@ function updateRegisterDeviceNgsi2(deviceObj, previousDevice, entityInfoUpdated,
         if (entityInfoUpdated) {
             jsonConcat(deviceData.active, oldDevice.active);
             jsonConcat(deviceData.lazy, oldDevice.lazy);
-            jsonConcat(deviceData.commands, oldDevice.commands);
+            deviceData.commands = deviceData.commands.concat(oldDevice.commands);
             jsonConcat(deviceData.staticAttributes, oldDevice.staticAttributes);
             if (oldDevice.name !== newDevice.name) {
                 deviceData.name = newDevice.name;
@@ -347,7 +453,13 @@ function updateRegisterDeviceNgsi2(deviceObj, previousDevice, entityInfoUpdated,
                 deviceData.type = newDevice.type;
             }
         }
-
+        logger.debug(
+            context,
+            'extractDeviceDifference newDevice %j oldDevice %j difference %j',
+            newDevice,
+            oldDevice,
+            deviceData
+        );
         callback(null, deviceData, oldDevice);
     }
 
@@ -362,7 +474,7 @@ function updateRegisterDeviceNgsi2(deviceObj, previousDevice, entityInfoUpdated,
                     deviceObj.subservice
                 ),
                 apply(extractDeviceDifference, deviceObj),
-                createInitialEntityNgsi2Fake,
+                createInitialEntityNgsi2,
                 apply(combineWithNewDevice, deviceObj),
                 apply(registrationUtils.sendRegistrations, false),
                 apply(registrationUtils.processContextRegistration, deviceObj),
@@ -392,6 +504,7 @@ function updateRegisterDeviceNgsi2(deviceObj, previousDevice, entityInfoUpdated,
     }
 }
 
+exports.createInitialEntity = createInitialEntityNgsi2;
 exports.updateRegisterDevice = updateRegisterDeviceNgsi2;
 exports.formatCommands = formatCommandsNgsi2;
 exports.formatAttributes = formatAttributesNgsi2;

package/lib/services/devices/registrationUtils.js

@@ -36,6 +36,7 @@ const context = {
 };
 const async = require('async');
 const utils = require('../northBound/restUtils');
+const subscriptionService = require('../ngsi/subscriptionService');
 
 const NGSI_LD_URN = 'urn:ngsi-ld:';
 
@@ -203,6 +204,23 @@ function sendUnregistrationsNgsiLD(deviceData, callback) {
     return callback(null, deviceData);
 }
 
+function formatAttributes(originalVector) {
+    const attributeList = [];
+    if (originalVector && originalVector.length) {
+        for (let i = 0; i < originalVector.length; i++) {
+            attributeList.push(originalVector[i].name);
+        }
+    }
+    return attributeList;
+}
+
+function mergeWithSameName(old, current) {
+    if (old.indexOf(current) < 0) {
+        old.push(current);
+    }
+    return old;
+}
+
 /**
  * Sends a Context Provider registration or unregistration request to the Context Broker using NGSIv2.
  *
@@ -210,26 +228,6 @@ function sendUnregistrationsNgsiLD(deviceData, callback) {
  * @param {Object} deviceData       Object containing all the deviceData needed to send the registration.
  */
 function sendRegistrationsNgsi2(unregister, deviceData, callback) {
-    function formatAttributes(originalVector) {
-        const attributeList = [];
-
-        if (originalVector && originalVector.length) {
-            for (let i = 0; i < originalVector.length; i++) {
-                attributeList.push(originalVector[i].name);
-            }
-        }
-
-        return attributeList;
-    }
-
-    function mergeWithSameName(old, current) {
-        if (old.indexOf(current) < 0) {
-            old.push(current);
-        }
-
-        return old;
-    }
-
     // FIXME: When https://github.com/telefonicaid/fiware-orion/issues/3007 is merged into master branch,
     // this function should use the new API. This is just a temporary solution which implies deleting the
     // registration and creating a new one.
@@ -299,6 +297,61 @@ function sendRegistrationsNgsi2(unregister, deviceData, callback) {
     utils.executeWithSecurity(options, deviceData, createRegistrationHandlerNgsi2(unregister, deviceData, callback));
 }
 
+function sendUnsubscriptionsNgsi2(deviceData, callback) {
+    if (deviceData.subscriptionId) {
+        logger.debug(
+            context,
+            'Sending v2 device unsubscriptions to Context Broker at [%s]',
+            config.getConfig().contextBroker.url
+        );
+        logger.debug(context, 'Using the following subscriptionId %j', deviceData.subscriptionId);
+        subscriptionService.unsubscribe(deviceData, deviceData.subscriptionId, callback);
+    } else {
+        logger.debug(context, 'No subscription found for unregister');
+        return callback(null, deviceData);
+    }
+}
+
+function sendSubscriptionsNgsi2(unregister, deviceData, callback) {
+    function updateSubscriptionNgsi2(deviceData, callback) {
+        const functions = [];
+
+        function removeSubscriptionId(deviceData, unregistrationResult, callback) {
+            delete deviceData.subscriptionId;
+            return callback(null, deviceData);
+        }
+
+        functions.push(async.apply(sendSubscriptionsNgsi2, true, deviceData));
+        functions.push(async.apply(removeSubscriptionId, deviceData));
+        functions.push(async.apply(sendSubscriptionsNgsi2, false));
+        async.waterfall(functions, callback);
+    }
+
+    if (unregister) {
+        return sendUnsubscriptionsNgsi2(deviceData, callback);
+    }
+    if (deviceData.subscriptionId) {
+        return updateSubscriptionNgsi2(deviceData, callback);
+    }
+    const attrs = [].concat(formatAttributes(deviceData.commands)).reduce(mergeWithSameName, []);
+
+    if (attrs.length === 0) {
+        logger.debug(context, 'Subscription is not needed. Device without commands');
+        return callback(null, deviceData);
+    }
+    const trigger = attrs; // one subscription for all commands
+    const content = attrs;
+    const attrsFormat = 'simplifiedNormalized';
+
+    logger.debug(
+        context,
+        'Sending v2 device subscriptions to Context Broker at [%s]',
+        config.getConfig().contextBroker.url
+    );
+    logger.debug(context, 'Using the following trigger %j and content %j', trigger, content);
+    subscriptionService.subscribe(deviceData, trigger, content, attrsFormat, callback);
+}
+
 /**
  * Sends a Context Provider registration or unregistration request to the Context Broker using NGSI-LD.
  *
@@ -323,14 +376,14 @@ function sendRegistrationsNgsiLD(unregister, deviceData, callback) {
         properties.push(element.name);
     });
 
-    if (lazy.length > 0){
-        operations.push('retrieveOps');  
+    if (lazy.length > 0) {
+        operations.push('retrieveOps');
     }
-    if (commands.length > 0){
-         operations.push('updateOps'); 
+    if (commands.length > 0) {
+        operations.push('updateOps');
     }
-    if (supportMerge){
-        operations.push('mergeEntity'); 
+    if (supportMerge) {
+        operations.push('mergeEntity');
     }
 
     if (properties.length === 0) {
@@ -368,8 +421,8 @@ function sendRegistrationsNgsiLD(unregister, deviceData, callback) {
             endpoint: config.getConfig().providerUrl,
             contextSourceInfo: [
                 {
-                    'key': 'jsonldContext',
-                    'value': config.getConfig().contextBroker.jsonLdContext
+                    key: 'jsonldContext',
+                    value: config.getConfig().contextBroker.jsonLdContext
                 }
             ],
             '@context': config.getConfig().contextBroker.jsonLdContext
@@ -405,7 +458,14 @@ function sendRegistrations(unregister, deviceData, callback) {
             sendRegistrationsNgsiLD(unregister, deviceData, callback);
             break;
         default:
-            sendRegistrationsNgsi2(unregister, deviceData, callback);
+            if (
+                (!deviceData.cmdMode && (!config.getConfig().cmdMode || config.getConfig().cmdMode === 'legacy')) ||
+                (deviceData && deviceData.cmdMode === 'legacy')
+            ) {
+                sendRegistrationsNgsi2(unregister, deviceData, callback);
+            } else {
+                sendSubscriptionsNgsi2(unregister, deviceData, callback);
+            }
             break;
     }
 }
@@ -421,7 +481,14 @@ function processContextRegistration(deviceData, body, callback) {
     const newDevice = _.clone(deviceData);
 
     if (body) {
-        newDevice.registrationId = body.registrationId;
+        if (
+            (!deviceData.cmdMode && (!config.getConfig().cmdMode || config.getConfig().cmdMode === 'legacy')) ||
+            (deviceData && deviceData.cmdMode === 'legacy')
+        ) {
+            newDevice.registrationId = body.registrationId;
+        } else {
+            newDevice.subscriptionId = body.subscriptionId;
+        }
     }
 
     callback(null, newDevice);

package/lib/services/groups/groupRegistryMongoDB.js

@@ -63,7 +63,8 @@ const attributeList = [
     'entityNameExp',
     'payloadType',
     'useCBflowControl',
-    'storeLastMeasure'
+    'storeLastMeasure',
+    'cmdMode'
 ];
 
 function createGroup(group, callback) {