Merge pull request #379 from telefonicaid/task/newEnvironmentVariables

ADD New environment variables

Author: XavierVal

CHANGES_NEXT_RELEASE

@@ -22,5 +22,5 @@
 - Fix Endpoint attribute not stored in mongo (#369)
 - Fix Add a prefix for all the environment variables (#375)
 - Assess command_result field (#374)
+- Environment IOTA_MONGO_REPLICASET missing (#378)
 - Add TimeInstant processing plugin (#380)
-

lib/commonConfig.js

@@ -56,9 +56,11 @@ function processEnvironmentVariables() {
              'IOTA_IOTAM_PATH',
              'IOTA_IOTAM_PROTOCOL',
              'IOTA_IOTAM_DESCRIPTION',
+             'IOTA_DEFAULT_RESOURCE',
              'IOTA_MONGO_HOST',
              'IOTA_MONGO_PORT',
-             'IOTA_MONGO_DB'
+             'IOTA_MONGO_DB',
+             'IOTA_MONGO_REPLICASET'
         ],
         iotamVariables = [
             'IOTA_IOTAM_HOST',
@@ -70,7 +72,8 @@ function processEnvironmentVariables() {
         mongoVariables = [
             'IOTA_MONGO_HOST',
             'IOTA_MONGO_PORT',
-            'IOTA_MONGO_DB'
+            'IOTA_MONGO_DB',
+            'IOTA_MONGO_REPLICASET'
         ];
 
     for (var i = 0; i < environmentVariables.length; i++) {
@@ -113,6 +116,10 @@ function processEnvironmentVariables() {
         config.timestamp = process.env.IOTA_TIMESTAMP === 'true';
     }
 
+    if (process.env.IOTA_DEFAULT_RESOURCE) {
+        config.defaultResource = process.env.IOTA_DEFAULT_RESOURCE;
+    }
+
     if (anyIsSet(iotamVariables)) {
         config.iotManager = {};
     }
@@ -152,6 +159,10 @@ function processEnvironmentVariables() {
     if (process.env.IOTA_MONGO_DB) {
         config.mongodb.db = process.env.IOTA_MONGO_DB;
     }
+
+    if (process.env.IOTA_MONGO_REPLICASET) {
+        config.mongodb.replicaSet = process.env.IOTA_MONGO_REPLICASET;
+    }
 }
 
 function setConfig(newConfig) {

test/unit/general/startup-test.js

@@ -110,6 +110,8 @@ describe('Startup tests', function() {
             process.env.IOTA_MONGO_HOST = 'mongohost';
             process.env.IOTA_MONGO_PORT = '5555';
             process.env.IOTA_MONGO_DB = 'themongodb';
+            process.env.IOTA_MONGO_REPLICASET = 'customReplica';
+            process.env.IOTA_DEFAULT_RESOURCE = '/iot/custom';
 
             nock.cleanAll();
 
@@ -135,6 +137,8 @@ describe('Startup tests', function() {
             delete process.env.IOTA_MONGO_HOST;
             delete process.env.IOTA_MONGO_PORT;
             delete process.env.IOTA_MONGO_DB;
+            delete process.env.IOTA_MONGO_REPLICASET;
+            delete process.env.IOTA_DEFAULT_RESOURCE;
         });
 
         afterEach(function(done) {
@@ -156,9 +160,11 @@ describe('Startup tests', function() {
                 config.getConfig().iotManager.path.should.equal('/iotampath');
                 config.getConfig().iotManager.protocol.should.equal('PDI_PROTOCOL');
                 config.getConfig().iotManager.description.should.equal('The IoTAM Protocol');
+                config.getConfig().defaultResource.should.equal('/iot/custom');
                 config.getConfig().mongodb.host.should.equal('mongohost');
                 config.getConfig().mongodb.port.should.equal('5555');
                 config.getConfig().mongodb.db.should.equal('themongodb');
+                config.getConfig().mongodb.replicaSet.should.equal('customReplica');
                 done();
             });
         });