fix(loraserver.io #70): MQTT topics updated to versions after v1

Atos-Research-and-Innovation · Jun 13, 2019 · 6e40ec9 · 6e40ec9
1 parent c92c7f4
commit 6e40ec9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/lib/applicationServers/loraserverioAppService.js b/lib/applicationServers/loraserverioAppService.js
@@ -140,7 +140,7 @@ class LoraserverIoService extends appService.AbstractAppService {
             throw new Error('Missing mandatory configuration attributes for lorawan:dev_eui');
         }
 
-        var mqttTopic = 'application/' + this.applicationId + '/node/' + devEUI.toLowerCase() + '/rx';
+        var mqttTopic = 'application/' + this.applicationId + '/device/' + devEUI.toLowerCase() + '/rx';
         this.mqttClient.subscribeTopic(mqttTopic);
         winston.info('Mqtt topic subscribed:%s', mqttTopic);
     }
@@ -153,7 +153,7 @@ class LoraserverIoService extends appService.AbstractAppService {
      * @param      {<type>}  deviceObject  The device object
      */
     stopObservingDevice(devId, devEUI, deviceObject) {
-        var mqttTopic = 'application/' + this.applicationId + '/node/' + devEUI.toLowerCase() + '/rx';
+        var mqttTopic = 'application/' + this.applicationId + '/device/' + devEUI.toLowerCase() + '/rx';
         this.mqttClient.unSubscribeTopic(mqttTopic);
         winston.info('Mqtt topic unsubscribed:%s', mqttTopic);
     }
@@ -162,7 +162,7 @@ class LoraserverIoService extends appService.AbstractAppService {
      * It observes all devices
      */
     observeAllDevices() {
-        var mqttTopic = 'application/' + this.applicationId + '/node/+/rx';
+        var mqttTopic = 'application/' + this.applicationId + '/device/+/rx';
         this.mqttClient.subscribeTopic(mqttTopic);
         winston.info('Mqtt topic subscribed:%s', mqttTopic);
     }
@@ -171,7 +171,7 @@ class LoraserverIoService extends appService.AbstractAppService {
      * It stops observing all devices.
      */
     stopObserveAllDevices() {
-        var mqttTopic = 'application/' + this.applicationId + '/node/+/rx';
+        var mqttTopic = 'application/' + this.applicationId + '/device/+/rx';
         this.mqttClient.unSubscribeTopic(mqttTopic);
         winston.info('Mqtt topic unsubscribed:%s', mqttTopic);
     }

diff --git a/test/unit/deviceProvisioningLoRaServerIo.js b/test/unit/deviceProvisioningLoRaServerIo.js
@@ -149,7 +149,7 @@ describe('Device provisioning API: Provision devices', function() {
                 client.publish(
                     'application/' +
                         options.json.devices[0]['internal_attributes']['lorawan']['application_id'] +
-                        '/node/' +
+                        '/device/' +
                         options.json.devices[0]['internal_attributes']['lorawan']['dev_eui'].toLowerCase() +
                         '/rx',
                     JSON.stringify(attributesExample)
@@ -240,7 +240,7 @@ describe('Device provisioning API: Provision devices', function() {
                 client.publish(
                     'application/' +
                         options.json.devices[0]['internal_attributes']['lorawan']['application_id'] +
-                        '/node/' +
+                        '/device/' +
                         options.json.devices[0]['internal_attributes']['lorawan']['dev_eui'].toLowerCase() +
                         '/rx',
                     JSON.stringify(attributesExample)
@@ -266,7 +266,7 @@ describe('Device provisioning API: Provision devices', function() {
             var attributesExample = utils.readExampleFile('./test/activeAttributes/cayenneLpp_bad_json.json', true);
             var client = mqtt.connect('mqtt://' + testMosquittoHost);
             client.on('connect', function() {
-                client.publish('application/1/node/3339343752356A14/rx', JSON.stringify(attributesExample));
+                client.publish('application/1/device/3339343752356A14/rx', JSON.stringify(attributesExample));
                 setTimeout(function() {
                     client.end();
                     done();
@@ -281,7 +281,7 @@ describe('Device provisioning API: Provision devices', function() {
             );
             var client = mqtt.connect('mqtt://' + testMosquittoHost);
             client.on('connect', function() {
-                client.publish('application/1/node/3339343752356A14/rx', JSON.stringify(attributesExample));
+                client.publish('application/1/device/3339343752356A14/rx', JSON.stringify(attributesExample));
                 setTimeout(function() {
                     client.end();
                     done();

diff --git a/test/unit/groupProvisioningLoRaServerIo.js b/test/unit/groupProvisioningLoRaServerIo.js
@@ -190,7 +190,7 @@ describe('Configuration provisioning API: Provision groups', function() {
                 client.publish(
                     'application/' +
                         options.json.services[0]['internal_attributes']['lorawan']['application_id'] +
-                        '/node/' +
+                        '/device/' +
                         attributesExample.devEUI +
                         '/rx',
                     JSON.stringify(attributesExample)
@@ -218,7 +218,7 @@ describe('Configuration provisioning API: Provision groups', function() {
                 client.publish(
                     'application/' +
                         options.json.services[0]['internal_attributes']['lorawan']['application_id'] +
-                        '/node/' +
+                        '/device/' +
                         attributesExample.devEUI +
                         '/rx',
                     JSON.stringify(attributesExample)
@@ -300,7 +300,7 @@ describe('Configuration provisioning API: Provision groups', function() {
                     client.publish(
                         'application/' +
                             options.json.services[0]['internal_attributes']['lorawan']['application_id'] +
-                            '/node/' +
+                            '/device/' +
                             attributesExample.devEUI +
                             '/rx',
                         JSON.stringify(attributesExample)

diff --git a/test/unit/staticProvisioningLoRaServerIo.js b/test/unit/staticProvisioningLoRaServerIo.js
@@ -195,7 +195,7 @@ describe('Static provisioning', function() {
                 client.publish(
                     'application/' +
                         sensorType['internalAttributes']['lorawan']['application_id'] +
-                        '/node/' +
+                        '/device/' +
                         attributesExample.devEUI +
                         '/rx',
                     JSON.stringify(attributesExample)