eclipse-iofog
diff --git a/‎package.json‎
Lines changed: 1 addition & 1 deletion b/‎package.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/cli/catalog.js‎
Lines changed: 2 additions & 2 deletions b/‎src/cli/catalog.js‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/cli/flow.js‎
Lines changed: 2 additions & 2 deletions b/‎src/cli/flow.js‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/cli/iofog.js‎
Lines changed: 1 addition & 1 deletion b/‎src/cli/iofog.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/cli/microservice.js‎
Lines changed: 1 addition & 1 deletion b/‎src/cli/microservice.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/helpers/app-helper.js‎
Lines changed: 1 addition & 0 deletions b/‎src/helpers/app-helper.js‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/helpers/error-messages.js‎
Lines changed: 2 additions & 1 deletion b/‎src/helpers/error-messages.js‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/sequelize/managers/iofog-provision-key-manager.js‎
Lines changed: 4 additions & 4 deletions b/‎src/sequelize/managers/iofog-provision-key-manager.js‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/sequelize/managers/iofog-version-command-manager.js‎
Lines changed: 4 additions & 4 deletions b/‎src/sequelize/managers/iofog-version-command-manager.js‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/services/agent-service.js‎
Lines changed: 6 additions & 4 deletions b/‎src/services/agent-service.js‎
Lines changed: 6 additions & 4 deletions
@@ -1,6 +1,6 @@
 {
 	"name": "iofogcontroller",
-	"version": "1.0.31",
+	"version": "1.0.32",
 	"description": "ioFog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.",
 	"main": "./src/main.js",
 	"author": "Saeid Baghbidi",
 
@@ -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]
       },
       {
 
@@ -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]
       },
 
@@ -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]
       },
       {
 
@@ -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]
       },
       {
 
@@ -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');
 
@@ -72,5 +72,6 @@ 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: 'Can\'t {} version now.'
 };
@@ -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;
@@ -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;
@@ -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'];
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "iofogcontroller",`
`3`		`- "version": "1.0.31",`
	`3`	`+ "version": "1.0.32",`
`4`	`4`	`"description": "ioFog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.",`
`5`	`5`	`"main": "./src/main.js",`
`6`	`6`	`"author": "Saeid Baghbidi",`
Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,11 @@ class Catalog extends BaseCLIHandler {`
`57`	`57`	`group: [constants.CMD]`
`58`	`58`	`},`
`59`	`59`	`{`
`60`		`- name: 'file', alias: 'f', type: String, description: 'Catalog item settings JSON file',`
	`60`	`+ name: 'file', alias: 'f', type: String, description: 'Path to catalog item settings JSON file',`
`61`	`61`	`group: [constants.CMD_ADD, constants.CMD_UPDATE]`
`62`	`62`	`},`
`63`	`63`	`{`
`64`		`- name: 'item-id', alias: 'i', type: String, description: 'Catalog item ID',`
	`64`	`+ name: 'item-id', alias: 'i', type: Number, description: 'Catalog item ID',`
`65`	`65`	`group: [constants.CMD_UPDATE, constants.CMD_REMOVE, constants.CMD_INFO]`
`66`	`66`	`},`
`67`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,11 @@ class Flow extends BaseCLIHandler {`
`37`	`37`	`},`
`38`	`38`	`{`
`39`	`39`	`name: 'file', alias: 'f', type: String,`
`40`		`- description: 'Application flow settings JSON file',`
	`40`	`+ description: 'Path to application flow settings JSON file',`
`41`	`41`	`group: [constants.CMD_ADD, constants.CMD_UPDATE]`
`42`	`42`	`},`
`43`	`43`	`{`
`44`		`- name: 'flow-id', alias: 'i', type: String,`
	`44`	`+ name: 'flow-id', alias: 'i', type: Number,`
`45`	`45`	`description: 'Application flow ID',`
`46`	`46`	`group: [constants.CMD_UPDATE, constants.CMD_REMOVE, constants.CMD_INFO]`
`47`	`47`	`},`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class IOFog extends BaseCLIHandler {`
`53`	`53`	`group: [constants.CMD]},`
`54`	`54`	`{`
`55`	`55`	`name: 'file', alias: 'f', type: String,`
`56`		`- description: 'ioFog settings JSON file',`
	`56`	`+ description: 'Path to ioFog settings JSON file',`
`57`	`57`	`group: [constants.CMD_ADD, constants.CMD_UPDATE]`
`58`	`58`	`},`
`59`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ class Microservice extends BaseCLIHandler {`
`78`	`78`	`group: [constants.CMD]`
`79`	`79`	`},`
`80`	`80`	`{`
`81`		`- name: 'file', alias: 'f', type: String, description: 'Microservice settings JSON file',`
	`81`	`+ name: 'file', alias: 'f', type: String, description: 'Path to microservice settings JSON file',`
`82`	`82`	`group: [constants.CMD_ADD, constants.CMD_UPDATE]`
`83`	`83`	`},`
`84`	`84`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,15 @@`
`11`	`11`	`*`
`12`	`12`	`*/`
`13`	`13`
`14`		`-const BaseManager = require('../managers/base-manager')`
	`14`	`+const BaseManager = require('../managers/base-manager');`
`15`	`15`	`const models = require('./../models');`
`16`		`-const FogProvisionKey = models.FogProvisionKey`
	`16`	`+const FogProvisionKey = models.FogProvisionKey;`
`17`	`17`
`18`	`18`	`class FogProvisionKeyManager extends BaseManager {`
`19`	`19`	`getEntity() {`
`20`	`20`	`return FogProvisionKey`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`-const instance = new FogProvisionKeyManager()`
`25`		`-module.exports = instance`
	`24`	`+const instance = new FogProvisionKeyManager();`
	`25`	`+module.exports = instance;`