Release merge

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "iofogcontroller",
-	"version": "1.0.31",
+	"version": "1.0.33",
 	"description": "ioFog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.",
 	"main": "./src/main.js",
 	"author": "Saeid Baghbidi",

src/cli/catalog.js

@@ -57,11 +57,11 @@ class Catalog extends BaseCLIHandler {
         group: [constants.CMD]
       },
       {
-        name: 'file', alias: 'f', type: String, description: 'Catalog item settings JSON file',
+        name: 'file', alias: 'f', type: String, description: 'Path to catalog item settings JSON file',
         group: [constants.CMD_ADD, constants.CMD_UPDATE]
       },
       {
-        name: 'item-id', alias: 'i', type: String, description: 'Catalog item ID',
+        name: 'item-id', alias: 'i', type: Number, description: 'Catalog item ID',
         group: [constants.CMD_UPDATE, constants.CMD_REMOVE, constants.CMD_INFO]
       },
       {

src/cli/flow.js

@@ -37,11 +37,11 @@ class Flow extends BaseCLIHandler {
       },
       {
         name: 'file', alias: 'f', type: String,
-        description: 'Application flow settings JSON file',
+        description: 'Path to application flow settings JSON file',
         group: [constants.CMD_ADD, constants.CMD_UPDATE]
       },
       {
-        name: 'flow-id', alias: 'i', type: String,
+        name: 'flow-id', alias: 'i', type: Number,
         description: 'Application flow ID',
         group: [constants.CMD_UPDATE, constants.CMD_REMOVE, constants.CMD_INFO]
       },

src/cli/iofog.js

@@ -53,7 +53,7 @@ class IOFog extends BaseCLIHandler {
         group: [constants.CMD]},
       {
         name: 'file', alias: 'f', type: String,
-        description: 'ioFog settings JSON file',
+        description: 'Path to ioFog settings JSON file',
         group: [constants.CMD_ADD, constants.CMD_UPDATE]
       },
       {
@@ -314,7 +314,7 @@ async function _deleteFog(obj, user) {
 }
 
 async function _getFogList(obj, user) {
-  const emptyFilters = []
+  const emptyFilters = [];
   const list = await FogService.getFogList(emptyFilters, user, true);
   logger.info(JSON.stringify(list, null, 2));
   logger.info('Fog list has been gotten successfully.');
@@ -359,8 +359,11 @@ async function _getHalHardwareInfo(obj) {
 
   logger.info("Parameters" + JSON.stringify(uuidObj));
 
-  const info = await FogService.getHalHardwareInfo(uuidObj, {}, true);
-  logger.info(JSON.stringify(info, null, 2));
+  const data = await FogService.getHalHardwareInfo(uuidObj, {}, true);
+  if (data.info) {
+    data.info = JSON.parse(data.info);
+  }
+  logger.info(JSON.stringify(data, null, 2));
   logger.info('Hardware info has been retrieved successfully.')
 }
 
@@ -371,8 +374,11 @@ async function _getHalUsbInfo(obj) {
 
   logger.info("Parameters" + JSON.stringify(uuidObj));
 
-  const info = await FogService.getHalHardwareInfo(uuidObj, {}, true);
-  logger.info(JSON.stringify(info, null, 2));
+  const data = await FogService.getHalUsbInfo(uuidObj, {}, true);
+  if (data.info) {
+    data.info = JSON.parse(data.info);
+  }
+  logger.info(JSON.stringify(data, null, 2));
   logger.info('Usb info has been retrieved successfully.')
 }
 

src/cli/microservice.js

@@ -78,7 +78,7 @@ class Microservice extends BaseCLIHandler {
         group: [constants.CMD]
       },
       {
-        name: 'file', alias: 'f', type: String, description: 'Microservice settings JSON file',
+        name: 'file', alias: 'f', type: String, description: 'Path to microservice settings JSON file',
         group: [constants.CMD_ADD, constants.CMD_UPDATE]
       },
       {

src/config/development.json

@@ -29,5 +29,4 @@
   "Diagnostics": {
     "DiagnosticDir": "diagnostic"
   }
-}
-
+}

src/helpers/app-helper.js

@@ -14,6 +14,7 @@
 const crypto = require('crypto');
 const Errors = require('./errors');
 
+const logger = require('../logger');
 const fs = require('fs');
 const Config = require('../config');
 const path = require('path');
@@ -278,7 +279,6 @@ function isEmpty(obj) {
   return true;
 }
 
-
 module.exports = {
   encryptText,
   decryptText,

src/helpers/error-messages.js

@@ -72,5 +72,7 @@ module.exports = {
     INVALID_INTERNAL_PORT: 'Internal parsing error. Please provide valid internal port.',
     INVALID_ROUTE: 'Route parsing error. Please provide valid route.'
   },
-  CONNECTOR_IS_IN_USE: 'You can\'t delete connector, because it is used for routing now.'
+  CONNECTOR_IS_IN_USE: 'You can\'t delete connector, because it is used for routing now.',
+  INVALID_VERSION_COMMAND_UPGRADE: 'Can\'t upgrade version now. Latest is already installed',
+  INVALID_VERSION_COMMAND_ROLLBACK: 'Can\'t rollback version now. There are no backups on agent'
 };

src/sequelize/managers/iofog-provision-key-manager.js

@@ -11,15 +11,15 @@
  *
  */
 
-const BaseManager = require('../managers/base-manager')
+const BaseManager = require('../managers/base-manager');
 const models = require('./../models');
-const FogProvisionKey = models.FogProvisionKey
+const FogProvisionKey = models.FogProvisionKey;
 
 class FogProvisionKeyManager extends BaseManager {
   getEntity() {
     return FogProvisionKey
   }
 }
 
-const instance = new FogProvisionKeyManager()
-module.exports = instance
+const instance = new FogProvisionKeyManager();
+module.exports = instance;

src/sequelize/managers/iofog-version-command-manager.js

@@ -11,15 +11,15 @@
  *
  */
 
-const BaseManager = require('../managers/base-manager')
+const BaseManager = require('../managers/base-manager');
 const models = require('./../models');
-const FogVersionCommand = models.FogVersionCommand
+const FogVersionCommand = models.FogVersionCommand;
 
 class FogVersionCommandManager extends BaseManager {
   getEntity() {
     return FogVersionCommand
   }
 }
 
-const instance = new FogVersionCommandManager()
-module.exports = instance
+const instance = new FogVersionCommandManager();
+module.exports = instance;

src/sequelize/managers/microservice-public-mode-manager.js

@@ -13,12 +13,28 @@
 
 const BaseManager = require('../managers/base-manager')
 const models = require('./../models');
-const MicroservicePublicMode = models.MicroservicePublicMode
+const MicroservicePublicMode = models.MicroservicePublicMode;
+const ConnectorPort = models.ConnectorPort;
 
 class MicroservicePublicModeManager extends BaseManager {
   getEntity() {
     return MicroservicePublicMode
   }
+
+  findAllMicroservicePublicModesByConnectorId(connectorId, transaction) {
+    return MicroservicePublicMode.findAll({
+      include: [
+        {
+          model: ConnectorPort,
+          as: 'connectorPort',
+          required: true
+        }
+      ],
+      where: {
+        '$connectorPort.connector_id$': connectorId
+      }
+    }, {transaction: transaction})
+  }
 }
 
 const instance = new MicroservicePublicModeManager()

src/sequelize/managers/routing-manager.js

@@ -14,11 +14,27 @@
 const BaseManager = require('./base-manager');
 const models = require('./../models');
 const Routing = models.Routing;
+const ConnectorPort = models.ConnectorPort;
 
 class RoutingManager extends BaseManager {
   getEntity() {
     return Routing;
   }
+
+  findAllRoutesByConnectorId(connectorId, transaction) {
+    return Routing.findAll({
+      include: [
+        {
+          model: ConnectorPort,
+          as: 'connectorPort',
+          required: true
+        }
+      ],
+      where: {
+        '$connectorPort.connector_id$': connectorId
+      }
+    }, {transaction: transaction})
+  }
 }
 
 const instance = new RoutingManager();

src/services/agent-service.js

@@ -36,6 +36,8 @@ const formidable = require('formidable');
 const Sequelize = require('sequelize');
 const Op = Sequelize.Op;
 
+const IncomingForm = formidable.IncomingForm;
+
 const agentProvision = async function (provisionData, transaction) {
 
   await Validator.validate(provisionData, Validator.schemas.agentProvision);
@@ -129,7 +131,7 @@ const updateAgentConfig = async function (updateData, fog, transaction) {
 
 const getAgentConfigChanges = async function (fog, transaction) {
 
-  const changeTracking = await ChangeTrackingService.getByFogId(fog.uuid, transaction);
+  const changeTracking = await ChangeTrackingService.getByIoFogUuid(fog.uuid, transaction);
   if (!changeTracking) {
     throw new Errors.NotFoundError(ErrorMessages.INVALID_NODE_ID)
   }
@@ -398,16 +400,16 @@ const putImageSnapshot = async function (req, fog, transaction) {
     throw new Errors.ValidationError(ErrorMessages.INVALID_CONTENT_TYPE);
   }
 
-  const form = new formidable.IncomingForm(opts);
+  const form = new IncomingForm(opts);
   form.uploadDir = path.join(appRoot, '../') + 'data';
   if (!fs.existsSync(form.uploadDir)) {
     fs.mkdirSync(form.uploadDir);
   }
-  await saveSnapShot(req, form,fog, transaction);
+  await _saveSnapShot(req, form, fog, transaction);
   return {};
 };
 
-const saveSnapShot = function (req, form, fog, transaction) {
+const _saveSnapShot = function (req, form, fog, transaction) {
   return new Promise((resolve, reject) => {
     form.parse(req, async function (error, fields, files) {
       const file = files['upstream'];