iotagent-node-lib 2.15.1 → 2.19.0

package/lib/services/devices/deviceRegistryMongoDB.js

@@ -54,7 +54,6 @@ const attributeList = [
     'transport',
     'polling',
     'timestamp',
-    'autoprovision',
     'explicitAttrs',
     'expressionLanguage',
     'ngsiVersion'
@@ -188,26 +187,11 @@ function listDevices(type, service, subservice, limit, offset, callback) {
     });
 }
 
-/**
- * Internal function used to find a device in the DB.
- *
- * @param {String} id           ID of the Device to find.
- * @param {String} service      Service the device belongs to (optional).
- * @param {String} subservice   Division inside the service (optional).
- */
-function getDeviceById(id, service, subservice, callback) {
-    const queryParams = {
-        id,
-        service,
-        subservice
-    };
-    context = fillService(context, queryParams);
-    logger.debug(context, 'Looking for device with id [%s].', id);
-
+function findOneInMongoDB(queryParams, id, callback) {
     const query = Device.model.findOne(queryParams);
     query.select({ __v: 0 });
 
-    query.exec(function handleGet(error, data) {
+    query.lean().exec(function handleGet(error, data) {
         if (error) {
             logger.debug(context, 'Internal MongoDB Error getting device: %s', error);
 
@@ -224,6 +208,24 @@ function getDeviceById(id, service, subservice, callback) {
     });
 }
 
+/**
+ * Internal function used to find a device in the DB.
+ *
+ * @param {String} id           ID of the Device to find.
+ * @param {String} service      Service the device belongs to (optional).
+ * @param {String} subservice   Division inside the service (optional).
+ */
+function getDeviceById(id, service, subservice, callback) {
+    const queryParams = {
+        id,
+        service,
+        subservice
+    };
+    context = fillService(context, queryParams);
+    logger.debug(context, 'Looking for device with id [%s].', id);
+    findOneInMongoDB(queryParams, id, callback);
+}
+
 /**
  * Retrieves a device using it ID, converting it to a plain Object before calling the callback.
  *
@@ -236,7 +238,7 @@ function getDevice(id, service, subservice, callback) {
         if (error) {
             callback(error);
         } else {
-            callback(null, data.toObject());
+            callback(null, data);
         }
     });
 }
@@ -253,13 +255,13 @@ function getByName(name, service, servicepath, callback) {
 
     query.select({ __v: 0 });
 
-    query.exec(function handleGet(error, data) {
+    query.lean().exec(function handleGet(error, data) {
         if (error) {
             logger.debug(context, 'Internal MongoDB Error getting device: %s', error);
 
             callback(new errors.InternalDbError(error));
         } else if (data) {
-            callback(null, data.toObject());
+            callback(null, data);
         } else {
             logger.debug(context, 'Device [%s] not found.', name);
 
@@ -284,8 +286,10 @@ function update(device, callback) {
             data.active = device.active;
             data.internalId = device.internalId;
             data.staticAttributes = device.staticAttributes;
+            data.internalAttributes = device.internalAttributes;
             data.commands = device.commands;
             data.endpoint = device.endpoint;
+            data.polling = device.polling;
             data.name = device.name;
             data.type = device.type;
             data.apikey = device.apikey;
@@ -293,7 +297,10 @@ function update(device, callback) {
             data.explicitAttrs = device.explicitAttrs;
             data.ngsiVersion = device.ngsiVersion;
 
-            data.save(saveDeviceHandler(callback));
+            /* eslint-disable-next-line  new-cap */
+            const deviceObj = new Device.model(data);
+            deviceObj.isNew = false;
+            deviceObj.save(saveDeviceHandler(callback));
         }
     });
 }

package/lib/services/devices/deviceService.js

@@ -54,14 +54,11 @@ function init() {
         case 'ld':
             deviceHandler = require('./devices-NGSI-LD');
             break;
-        case 'v2':
-            deviceHandler = require('./devices-NGSI-v2');
-            break;
         case 'mixed':
             deviceHandler = require('./devices-NGSI-mixed');
             break;
         default:
-            deviceHandler = require('./devices-NGSI-v1');
+            deviceHandler = require('./devices-NGSI-v2');
     }
 }
 
@@ -172,6 +169,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;
+    }
 
     logger.debug(context, 'deviceData after merge with conf: %j', deviceData);
     callback(null, deviceData);
@@ -184,6 +187,16 @@ function mergeDeviceWithConfiguration(fields, defaults, deviceData, configuratio
  * @param {Object} deviceObj        Device data.
  */
 function findConfigurationGroup(deviceObj, callback) {
+    function handlerGroupFindByType(error, group) {
+        if (!group) {
+            config
+                .getGroupRegistry()
+                .findSilently(deviceObj.service, deviceObj.subservice, deviceObj.apikey, handlerGroupFind);
+        } else {
+            handlerGroupFind(error, group);
+        }
+    }
+
     function handlerGroupFind(error, group) {
         let effectiveGroup = group;
 
@@ -201,13 +214,7 @@ function findConfigurationGroup(deviceObj, callback) {
     } else {
         config
             .getGroupRegistry()
-            .findTypeSilently(
-                deviceObj.service,
-                deviceObj.subservice,
-                deviceObj.type,
-                deviceObj.apikey,
-                handlerGroupFind
-            );
+            .findTypeSilently(deviceObj.service, deviceObj.subservice, deviceObj.type, deviceObj.apikey, handlerGroupFindByType);
     }
 }
 
@@ -225,14 +232,19 @@ function findConfigurationGroup(deviceObj, callback) {
  */
 function registerDevice(deviceObj, callback) {
     function checkDuplicates(deviceObj, innerCb) {
-        /* eslint-disable-next-line no-unused-vars */
-        config.getRegistry().get(deviceObj.id, deviceObj.service, deviceObj.subservice, function (error, device) {
-            if (!error) {
-                innerCb(new errors.DuplicateDeviceId(deviceObj.id));
-            } else {
-                innerCb();
+        config.getRegistry().getSilently(
+            deviceObj.id,
+            deviceObj.service,
+            deviceObj.subservice,
+            /* eslint-disable-next-line no-unused-vars */
+            function (error, device) {
+                if (!error) {
+                    innerCb(new errors.DuplicateDeviceId(deviceObj.id));
+                } else {
+                    innerCb();
+                }
             }
-        });
+        );
     }
 
     function prepareDeviceData(deviceObj, configuration, callback) {
@@ -262,17 +274,22 @@ function registerDevice(deviceObj, callback) {
         }
 
         if (!deviceData.name) {
-            var conjunction;
+            let conjunction;
             if (configuration && configuration.defaultEntityNameConjunction !== undefined) {
-                 conjunction = configuration.defaultEntityNameConjunction;
+                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]) {
@@ -310,9 +327,6 @@ function registerDevice(deviceObj, callback) {
                     if ('timestamp' in deviceData && deviceData.timestamp !== undefined) {
                         deviceObj.timestamp = deviceData.timestamp;
                     }
-                    if ('autoprovision' in deviceData && deviceData.autoprovision !== undefined) {
-                        deviceObj.autoprovision = deviceData.autoprovision;
-                    }
                     if ('explicitAttrs' in deviceData && deviceData.explicitAttrs !== undefined) {
                         deviceObj.explicitAttrs = deviceData.explicitAttrs;
                     }
@@ -402,8 +416,8 @@ function unregisterDevice(id, service, subservice, callback) {
     });
 }
 
-function updateRegisterDevice(deviceObj, callback) {
-    deviceHandler.updateRegisterDevice(deviceObj, callback);
+function updateRegisterDevice(deviceObj, entityInfoUpdated, callback) {
+    deviceHandler.updateRegisterDevice(deviceObj, entityInfoUpdated, callback);
 }
 
 /**
@@ -552,15 +566,24 @@ function findOrCreate(deviceId, group, callback) {
             if ('timestamp' in group && group.timestamp !== undefined) {
                 newDevice.timestamp = group.timestamp;
             }
-            if ('autoprovision' in group && group.autoprovision !== undefined) {
-                newDevice.autoprovision = group.autoprovision;
-            }
             if ('ngsiVersion' in group && group.ngsiVersion !== undefined) {
                 newDevice.ngsiVersion = group.ngsiVersion;
             }
-            registerDevice(newDevice, function (error, device) {
-                callback(error, device, group);
-            });
+            if ('explicitAttrs' in group && group.explicitAttrs !== undefined) {
+                newDevice.explicitAttrs = group.explicitAttrs;
+            }
+            if ('expressionLanguage' in group && group.expressionLanguage !== undefined) {
+                newDevice.expressionLanguage = group.expressionLanguage;
+            }
+            // Check autoprovision flag in order to register or not device
+            if (group.autoprovision === undefined || group.autoprovision === true) {
+                registerDevice(newDevice, function (error, device) {
+                    callback(error, device, group);
+                });
+            } else {
+                logger.info(context, 'Device %j not provisioned due autoprovision is disabled by its conf %j', newDevice, group);
+                callback(new errors.DeviceNotFound(deviceId));
+            }
         } else {
             callback(error);
         }

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

@@ -23,7 +23,7 @@
  * Modified by: Jason Fox - FIWARE Foundation
  */
 
-const request = require('request');
+const request = require('../../request-shim');
 const async = require('async');
 const apply = async.apply;
 const constants = require('../../constants');
@@ -275,7 +275,7 @@ function updateEntityNgsiLD(deviceData, updatedDevice, callback) {
  *
  * @param {Object} deviceObj                    Object with all the device information (mandatory).
  */
-function updateRegisterDeviceNgsiLD(deviceObj, callback) {
+function updateRegisterDeviceNgsiLD(deviceObj, entityInfoUpdated, callback) {
     if (!deviceObj.id || !deviceObj.type) {
         callback(new errors.MissingAttributes('Id or device missing'));
         return;
@@ -350,21 +350,49 @@ function updateRegisterDeviceNgsiLD(deviceObj, callback) {
         deviceData.commands = getAttributeDifference(oldDevice.commands, newDevice.commands);
         deviceData.staticAttributes = getAttributeDifference(oldDevice.staticAttributes, newDevice.staticAttributes);
 
+        if (entityInfoUpdated) {
+            jsonConcat(deviceData.active, oldDevice.active);
+            jsonConcat(deviceData.lazy, oldDevice.lazy);
+            jsonConcat(deviceData.commands, oldDevice.commands);
+            jsonConcat(deviceData.staticAttributes, oldDevice.staticAttributes);
+            if (oldDevice.name !== newDevice.name) {
+                deviceData.name = newDevice.name;
+            }
+            if (oldDevice.type !== newDevice.type) {
+                deviceData.type = newDevice.type;
+            }
+        }
+
         callback(null, deviceData, oldDevice);
     }
 
-    async.waterfall(
-        [
-            apply(config.getRegistry().get, deviceObj.id, deviceObj.service, deviceObj.subservice),
-            apply(extractDeviceDifference, deviceObj),
-            updateEntityNgsiLD,
-            apply(combineWithNewDevice, deviceObj),
-            apply(registrationUtils.sendRegistrations, false),
-            apply(registrationUtils.processContextRegistration, deviceObj),
-            config.getRegistry().update
-        ],
-        callback
-    );
+    if (entityInfoUpdated) {
+        async.waterfall(
+            [
+                apply(config.getRegistry().get, deviceObj.id, deviceObj.service, deviceObj.subservice),
+                apply(extractDeviceDifference, deviceObj),
+                createInitialEntityNgsiLD,
+                apply(combineWithNewDevice, deviceObj),
+                apply(registrationUtils.sendRegistrations, false),
+                apply(registrationUtils.processContextRegistration, deviceObj),
+                config.getRegistry().update
+            ],
+            callback
+        );
+    } else {
+        async.waterfall(
+            [
+                apply(config.getRegistry().get, deviceObj.id, deviceObj.service, deviceObj.subservice),
+                apply(extractDeviceDifference, deviceObj),
+                updateEntityNgsiLD,
+                apply(combineWithNewDevice, deviceObj),
+                apply(registrationUtils.sendRegistrations, false),
+                apply(registrationUtils.processContextRegistration, deviceObj),
+                config.getRegistry().update
+            ],
+            callback
+        );
+    }
 }
 
 exports.createInitialEntity = createInitialEntityNgsiLD;

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

@@ -53,11 +53,11 @@ function createInitialEntityNgsiMixed(deviceData, newDevice, callback) {
  *
  * @param {Object} deviceObj                    Object with all the device information (mandatory).
  */
-function updateRegisterDeviceNgsiMixed(deviceObj, callback) {
+function updateRegisterDeviceNgsiMixed(deviceObj, entityInfoUpdated, callback) {
     if (config.checkNgsiLD(deviceObj)) {
-        deviceHandlerLD.updateRegisterDevice(deviceObj, callback);
+        deviceHandlerLD.updateRegisterDevice(deviceObj, entityInfoUpdated, callback);
     } else {
-        deviceHandlerV2.updateRegisterDevice(deviceObj, callback);
+        deviceHandlerV2.updateRegisterDevice(deviceObj, entityInfoUpdated, callback);
     }
 }
 

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

@@ -27,7 +27,7 @@
 
 /* eslint-disable consistent-return */
 
-const request = require('request');
+const request = require('../../request-shim');
 const async = require('async');
 const apply = async.apply;
 const uuid = require('uuid');
@@ -94,7 +94,7 @@ function createInitialEntityHandlerNgsi2(deviceData, newDevice, callback) {
                 body
             );
 
-            const errorObj = new errors.EntityGenericError(deviceData.id, deviceData.type, body);
+            const errorObj = new errors.EntityGenericError(deviceData.id, deviceData.type, body, response.statusCode);
 
             callback(errorObj);
         }
@@ -112,11 +112,7 @@ function createInitialEntityHandlerNgsi2(deviceData, newDevice, callback) {
 function updateEntityHandlerNgsi2(deviceData, updatedDevice, callback) {
     return function handleEntityResponse(error, response, body) {
         if (error) {
-            logger.error(
-                context,
-                'ORION-001: Connection error creating inital entity in the Context Broker: %s',
-                error
-            );
+            logger.error(context, 'ORION-001: Connection error updating entity in the Context Broker: %s', error);
 
             alarms.raise(constants.ORION_ALARM, error);
 
@@ -133,7 +129,7 @@ function updateEntityHandlerNgsi2(deviceData, updatedDevice, callback) {
                 body
             );
 
-            const errorObj = new errors.EntityGenericError(deviceData.id, deviceData.type, body);
+            const errorObj = new errors.EntityGenericError(deviceData.id, deviceData.type, body, response.statusCode);
 
             callback(errorObj);
         }
@@ -335,7 +331,7 @@ function updateEntityNgsi2(deviceData, updatedDevice, callback) {
  *
  * @param {Object} deviceObj                    Object with all the device information (mandatory).
  */
-function updateRegisterDeviceNgsi2(deviceObj, callback) {
+function updateRegisterDeviceNgsi2(deviceObj, entityInfoUpdated, callback) {
     if (!deviceObj.id || !deviceObj.type) {
         callback(new errors.MissingAttributes('Id or device missing'));
         return;
@@ -357,12 +353,12 @@ function updateRegisterDeviceNgsi2(deviceObj, callback) {
             if ('timestamp' in newDevice && newDevice.timestamp !== undefined) {
                 oldDevice.timestamp = newDevice.timestamp;
             }
-            if ('autoprovision' in newDevice && newDevice.autoprovision !== undefined) {
-                oldDevice.autoprovision = newDevice.autoprovision;
-            }
             if ('explicitAttrs' in newDevice && newDevice.explicitAttrs !== undefined) {
                 oldDevice.explicitAttrs = newDevice.explicitAttrs;
             }
+            if ('expressionLanguage' in newDevice && newDevice.expressionLanguage !== undefined) {
+                oldDevice.expressionLanguage = newDevice.expressionLanguage;
+            }
 
             oldDevice.endpoint = newDevice.endpoint || oldDevice.endpoint;
 
@@ -410,21 +406,49 @@ function updateRegisterDeviceNgsi2(deviceObj, callback) {
         deviceData.commands = getAttributeDifference(oldDevice.commands, newDevice.commands);
         deviceData.staticAttributes = getAttributeDifference(oldDevice.staticAttributes, newDevice.staticAttributes);
 
+        if (entityInfoUpdated) {
+            jsonConcat(deviceData.active, oldDevice.active);
+            jsonConcat(deviceData.lazy, oldDevice.lazy);
+            jsonConcat(deviceData.commands, oldDevice.commands);
+            jsonConcat(deviceData.staticAttributes, oldDevice.staticAttributes);
+            if (oldDevice.name !== newDevice.name) {
+                deviceData.name = newDevice.name;
+            }
+            if (oldDevice.type !== newDevice.type) {
+                deviceData.type = newDevice.type;
+            }
+        }
+
         callback(null, deviceData, oldDevice);
     }
 
-    async.waterfall(
-        [
-            apply(config.getRegistry().get, deviceObj.id, deviceObj.service, deviceObj.subservice),
-            apply(extractDeviceDifference, deviceObj),
-            updateEntityNgsi2,
-            apply(combineWithNewDevice, deviceObj),
-            apply(registrationUtils.sendRegistrations, false),
-            apply(registrationUtils.processContextRegistration, deviceObj),
-            config.getRegistry().update
-        ],
-        callback
-    );
+    if (entityInfoUpdated) {
+        async.waterfall(
+            [
+                apply(config.getRegistry().get, deviceObj.id, deviceObj.service, deviceObj.subservice),
+                apply(extractDeviceDifference, deviceObj),
+                createInitialEntityNgsi2,
+                apply(combineWithNewDevice, deviceObj),
+                apply(registrationUtils.sendRegistrations, false),
+                apply(registrationUtils.processContextRegistration, deviceObj),
+                config.getRegistry().update
+            ],
+            callback
+        );
+    } else {
+        async.waterfall(
+            [
+                apply(config.getRegistry().get, deviceObj.id, deviceObj.service, deviceObj.subservice),
+                apply(extractDeviceDifference, deviceObj),
+                updateEntityNgsi2,
+                apply(combineWithNewDevice, deviceObj),
+                apply(registrationUtils.sendRegistrations, false),
+                apply(registrationUtils.processContextRegistration, deviceObj),
+                config.getRegistry().update
+            ],
+            callback
+        );
+    }
 }
 
 exports.createInitialEntity = createInitialEntityNgsi2;

package/lib/services/devices/registrationUtils.js

@@ -31,7 +31,6 @@ const logger = require('logops');
 const _ = require('underscore');
 const intoTrans = require('../common/domain').intoTrans;
 const config = require('../../commonConfig');
-const ngsiUtils = require('./../ngsi/ngsiUtils');
 const context = {
     op: 'IoTAgentNGSI.Registration'
 };
@@ -40,45 +39,6 @@ const utils = require('../northBound/restUtils');
 
 const NGSI_LD_URN = 'urn:ngsi-ld:';
 
-/**
- * Generates a handler for the registration requests that checks all the possible errors derived from the registration.
- * The parameter information is needed in order to fulfill error information.
- *
- * @param {Boolen} unregister       Indicates whether this registration is an unregistration or register.
- * @param {Object} deviceData       Object containing all the deviceData needed to send the registration.
- * @return {Function}              The generated handler.
- */
-function createRegistrationHandler(unregister, deviceData, callback) {
-    return function handleRegistrationResponse(error, response, body) {
-        if (error) {
-            logger.error(context, 'ORION-002: Connection error sending registrations to the Context Broker: %s', error);
-            callback(error);
-        } else if (response && body && response.statusCode === 200) {
-            const errorField = ngsiUtils.getErrorField(body);
-
-            if (errorField) {
-                logger.error(context, 'Registration error connecting to the Context Broker: %j', errorField);
-                callback(new errors.BadRequest(JSON.stringify(errorField)));
-            } else {
-                logger.debug(context, 'Registration success.');
-                callback(null, body);
-            }
-        } else {
-            let errorObj;
-
-            logger.error(context, 'ORION-003: Protocol error connecting to the Context Broker: %j', errorObj);
-
-            if (unregister) {
-                errorObj = new errors.UnregistrationError(deviceData.id, deviceData.type);
-            } else {
-                errorObj = new errors.RegistrationError(deviceData.id, deviceData.type);
-            }
-
-            callback(errorObj);
-        }
-    };
-}
-
 /**
  * Generates a handler for the registration requests that checks all the possible errors derived from the registration.
  * The parameter information is needed in order to fulfill error information.
@@ -161,93 +121,6 @@ function createRegistrationHandlerNgsi2(unregister, deviceData, callback) {
     };
 }
 
-/**
- * Sends a Context Provider registration or unregistration request to the Context Broker using NGSIv1.
- * As registrations cannot be removed, an unregistration consists of an update of the existent registration
- * to make reduce its duration to 1 second.
- *
- * The entity type, entity name and lazy attributes list are needed in order to send the registration:
- *
- * @param {Boolen} unregister       Indicates whether this registration is an unregistration or register.
- * @param {Object} deviceData       Object containing all the deviceData needed to send the registration.
- */
-function sendRegistrationsNgsi1(unregister, deviceData, callback) {
-    let cbHost = config.getConfig().contextBroker.url;
-    if (deviceData.cbHost && deviceData.cbHost.indexOf('://') !== -1) {
-        cbHost = deviceData.cbHost;
-    } else if (deviceData.cbHost && deviceData.cbHost.indexOf('://') === -1) {
-        cbHost = 'http://' + deviceData.cbHost;
-    }
-
-    const options = {
-        url: cbHost + '/NGSI9/registerContext',
-        method: 'POST',
-        json: {
-            contextRegistrations: [
-                {
-                    entities: [
-                        {
-                            type: deviceData.type,
-                            isPattern: 'false',
-                            id: String(deviceData.name)
-                        }
-                    ],
-                    attributes: [],
-                    providingApplication: config.getConfig().providerUrl
-                }
-            ],
-            duration: unregister ? 'PT1S' : config.getConfig().deviceRegistrationDuration
-        },
-        headers: {
-            'fiware-service': deviceData.service,
-            'fiware-servicepath': deviceData.subservice
-        }
-    };
-
-    function formatAttributes(originalVector) {
-        const attributeList = [];
-
-        if (originalVector && originalVector.length) {
-            for (let i = 0; i < originalVector.length; i++) {
-                attributeList.push({
-                    name: originalVector[i].name,
-                    type: originalVector[i].type
-                });
-            }
-        }
-
-        return attributeList;
-    }
-
-    function mergeWithSameName(old, current) {
-        const keys = _.pluck(old, 'name');
-
-        if (keys.indexOf(current.name) < 0) {
-            old.push(current);
-        }
-
-        return old;
-    }
-
-    if (deviceData.registrationId) {
-        options.json.registrationId = deviceData.registrationId;
-    }
-
-    options.json.contextRegistrations[0].attributes = options.json.contextRegistrations[0].attributes
-        .concat(formatAttributes(deviceData.lazy), formatAttributes(deviceData.commands))
-        .reduce(mergeWithSameName, []);
-
-    if (options.json.contextRegistrations[0].attributes.length === 0) {
-        logger.debug(context, 'No Context Provider registrations found for unregister');
-        callback(null, deviceData);
-    } else {
-        logger.debug(context, 'Sending v1 device registrations to Context Broker at [%s]', options.url);
-        logger.debug(context, 'Using the following request:\n\n%s\n\n', JSON.stringify(options, null, 4));
-
-        utils.executeWithSecurity(options, deviceData, createRegistrationHandler(unregister, deviceData, callback));
-    }
-}
-
 /**
  * Sends a Context Provider unregistration request to the Context Broker using NGSIv2.
  *
@@ -263,7 +136,6 @@ function sendUnregistrationsNgsi2(deviceData, callback) {
     const options = {
         url: cbHost + '/v2/registrations/' + deviceData.registrationId,
         method: 'DELETE',
-        json: true,
         headers: {
             'fiware-service': deviceData.service,
             'fiware-servicepath': deviceData.subservice
@@ -304,7 +176,6 @@ function sendUnregistrationsNgsiLD(deviceData, callback) {
     const options = {
         url: cbHost + '/ngsi-ld/v1/csourceRegistrations/' + deviceData.registrationId,
         method: 'DELETE',
-        json: true,
         headers: {
             'fiware-service': deviceData.service,
             'fiware-servicepath': deviceData.subservice,
@@ -469,7 +340,6 @@ function sendRegistrationsNgsiLD(unregister, deviceData, callback) {
         logger.debug(context, 'Amending id to a valid URN: %s', id);
     }
 
-
     const options = {
         url: cbHost + '/ngsi-ld/v1/csourceRegistrations/',
         method: 'POST',
@@ -514,11 +384,9 @@ function sendRegistrations(unregister, deviceData, callback) {
         case 'ld':
             sendRegistrationsNgsiLD(unregister, deviceData, callback);
             break;
-        case 'v2':
+        default:
             sendRegistrationsNgsi2(unregister, deviceData, callback);
             break;
-        default:
-            sendRegistrationsNgsi1(unregister, deviceData, callback);
     }
 }
 
@@ -540,5 +408,4 @@ function processContextRegistration(deviceData, body, callback) {
 }
 
 exports.sendRegistrations = intoTrans(context, sendRegistrations);
-exports.createRegistrationHandler = intoTrans(context, createRegistrationHandler);
 exports.processContextRegistration = processContextRegistration;