eclipse-iofog · dbusel · Feb 7, 2019 · Jan 4, 2019 · Jan 25, 2019 · Jan 25, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -38,10 +38,11 @@ jobs:
     - sudo apt-get install sshpass
     script: 
     - sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP
-      "cd /Controller; NODE_ENV=production node src/main.js stop; git pull; npm i;
+      "cd /Controller; NODE_ENV=production node src/main.js stop; git checkout $TRAVIS_BRANCH; npm i;
       npm test; npm run postman_test; NODE_ENV=production node src/main.js start;"
   - stage: release
-    #before_install:
+    before_install:
+      - sudo apt-get install sshpass
       #- git clone "https://github.com/$TRAVIS_REPO_SLUG.git" "$TRAVIS_REPO_SLUG";
       #- cd "$TRAVIS_REPO_SLUG";
       #- git checkout -qf "$TRAVIS_COMMIT";

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "iofogcontroller",
-	"version": "1.0.35",
+	"version": "1.0.36",
 	"description": "ioFog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.",
 	"main": "./src/main.js",
 	"author": "Saeid Baghbidi",

diff --git a/src/cli/catalog.js b/src/cli/catalog.js
@@ -20,6 +20,7 @@ const AppHelper = require('../helpers/app-helper');
 const AuthDecorator = require('../decorators/cli-decorator');
 const Errors = require('../helpers/errors');
 const ErrorMessages = require('../helpers/error-messages');
+const CliDataTypes = require('./cli-data-types');
 
 const JSON_SCHEMA = AppHelper.stringifyCliJsonSchema({
   name: "string",
@@ -63,7 +64,7 @@ class Catalog extends BaseCLIHandler {
         group: [constants.CMD_ADD, constants.CMD_UPDATE]
       },
       {
-        name: 'item-id', alias: 'i', type: Number, numberType: 'integer', description: 'Catalog item ID',
+        name: 'item-id', alias: 'i', type: CliDataTypes.Integer, description: 'Catalog item ID',
         group: [constants.CMD_UPDATE, constants.CMD_REMOVE, constants.CMD_INFO]
       },
       {
@@ -91,12 +92,12 @@ class Catalog extends BaseCLIHandler {
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'disk-required', alias: 's', type: Number, numberType: 'integer',
+        name: 'disk-required', alias: 's', type: CliDataTypes.Integer,
         description: 'Amount of disk required to run the microservice (MB)',
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'ram-required', alias: 'r', type: Number, numberType: 'integer',
+        name: 'ram-required', alias: 'r', type: CliDataTypes.Integer,
         description: 'Amount of RAM required to run the microservice (MB)',
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
@@ -113,7 +114,7 @@ class Catalog extends BaseCLIHandler {
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'registry-id', alias: 'g', type: Number, numberType: 'integer',
+        name: 'registry-id', alias: 'g', type: CliDataTypes.Integer,
         description: 'Catalog item docker registry ID',
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
@@ -138,7 +139,7 @@ class Catalog extends BaseCLIHandler {
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'user-id', alias: 'u', type: Number, numberType: 'integer', description: 'User\'s id',
+        name: 'user-id', alias: 'u', type: CliDataTypes.Integer, description: 'User\'s id',
         group: [constants.CMD_ADD]
       },
     ];

diff --git a/src/cli/cli-data-types.js b/src/cli/cli-data-types.js
@@ -0,0 +1,31 @@
+/*
+ *  *******************************************************************************
+ *  * Copyright (c) 2018 Edgeworx, Inc.
+ *  *
+ *  * This program and the accompanying materials are made available under the
+ *  * terms of the Eclipse Public License v. 2.0 which is available at
+ *  * http://www.eclipse.org/legal/epl-2.0
+ *  *
+ *  * SPDX-License-Identifier: EPL-2.0
+ *  *******************************************************************************
+ *
+ */
+
+/**
+ * @return {number}
+ */
+function Integer(value) {
+  return Number(value)
+}
+
+/**
+ * @return {number}
+ */
+function Float(value) {
+  return Number(value)
+}
+
+module.exports = {
+  Integer: Integer,
+  Float: Float
+}
diff --git a/src/cli/config.js b/src/cli/config.js
@@ -20,6 +20,7 @@ const Validator = require('../schemas');
 const logger = require('../logger');
 const Tracking = require('../tracking');
 const TrackingEventType = require('../enums/tracking-event-type');
+const CliDataTypes = require('./cli-data-types');
 
 class Config extends BaseCLIHandler {
   constructor() {
@@ -32,7 +33,7 @@ class Config extends BaseCLIHandler {
         group: constants.CMD
       },
       {
-        name: 'port', alias: 'p', type: Number, numberType: 'integer', description: 'Port',
+        name: 'port', alias: 'p', type: CliDataTypes.Integer, description: 'Port',
         group: constants.CMD_ADD
       },
       {
@@ -74,7 +75,7 @@ class Config extends BaseCLIHandler {
         group: constants.CMD_ADD
       },
       {
-        name: 'log-size', alias: 'z', type: Number, numberType: 'integer',
+        name: 'log-size', alias: 'z', type: CliDataTypes.Integer,
         description: 'Log files size (MB)', group: constants.CMD_ADD
       },
       {

diff --git a/src/cli/diagnostics.js b/src/cli/diagnostics.js
@@ -17,6 +17,7 @@ const logger = require('../logger');
 const DiagnosticService = require('../services/diagnostic-service');
 const AppHelper = require('../helpers/app-helper');
 const AuthDecorator = require('../decorators/cli-decorator');
+const CliDataTypes = require('./cli-data-types');
 
 
 class Diagnostics extends BaseCLIHandler {
@@ -51,7 +52,7 @@ class Diagnostics extends BaseCLIHandler {
         group: [constants.CMD_STRACE_FTP_POST]
       },
       {
-        name: 'ftpPort', alias: 'p', type: Number, numberType: 'integer', description: 'FTP port',
+        name: 'ftpPort', alias: 'p', type: CliDataTypes.Integer, description: 'FTP port',
         group: [constants.CMD_STRACE_FTP_POST]
       },
       {

diff --git a/src/cli/flow.js b/src/cli/flow.js
@@ -18,6 +18,7 @@ const FlowService = require('../services/flow-service');
 const AppHelper = require('../helpers/app-helper');
 const logger = require('../logger');
 const fs = require('fs');
+const CliDataTypes = require('./cli-data-types');
 
 const JSON_SCHEMA = AppHelper.stringifyCliJsonSchema({
   name: "string",
@@ -41,7 +42,7 @@ class Flow extends BaseCLIHandler {
         group: [constants.CMD_ADD, constants.CMD_UPDATE]
       },
       {
-        name: 'flow-id', alias: 'i', type: Number, numberType: 'integer',
+        name: 'flow-id', alias: 'i', type: CliDataTypes.Integer,
         description: 'Application flow ID',
         group: [constants.CMD_UPDATE, constants.CMD_REMOVE, constants.CMD_INFO]
       },
@@ -66,7 +67,7 @@ class Flow extends BaseCLIHandler {
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'user-id', alias: 'u', type: Number, numberType: 'integer',
+        name: 'user-id', alias: 'u', type: CliDataTypes.Integer,
         description: 'User\'s id',
         group: [constants.CMD_ADD]
       }

diff --git a/src/cli/iofog.js b/src/cli/iofog.js
@@ -18,6 +18,7 @@ const fs = require('fs');
 const CliDecorator = require('../decorators/cli-decorator');
 const AppHelper = require('../helpers/app-helper');
 const FogService = require('../services/iofog-service');
+const CliDataTypes = require('./cli-data-types');
 
 const JSON_SCHEMA = AppHelper.stringifyCliJsonSchema({
   name: "string",
@@ -74,12 +75,12 @@ class IOFog extends BaseCLIHandler {
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'latitude', alias: 't', type: Number, numberType: 'float',
+        name: 'latitude', alias: 't', type: CliDataTypes.Float,
         description: 'ioFog node latitude',
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'longitude', alias: 'g', type: Number, numberType: 'float',
+        name: 'longitude', alias: 'g', type: CliDataTypes.Float,
         description: 'ioFog node longitude',
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
@@ -94,7 +95,7 @@ class IOFog extends BaseCLIHandler {
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'disk-limit', alias: 'M', type: Number, numberType: 'float',
+        name: 'disk-limit', alias: 'M', type: CliDataTypes.Float,
         description: 'ioFog node disk usage limit (MB)',
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
@@ -104,17 +105,17 @@ class IOFog extends BaseCLIHandler {
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'memory-limit', alias: 'm', type: Number, numberType: 'float',
+        name: 'memory-limit', alias: 'm', type: CliDataTypes.Float,
         description: 'ioFog node memory usage limit (MB)',
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'cpu-limit', alias: 'c', type: Number, numberType: 'float',
+        name: 'cpu-limit', alias: 'c', type: CliDataTypes.Float,
         description: 'ioFog node CPU usage limit (%)',
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'log-limit', alias: 'G', type: Number, numberType: 'float',
+        name: 'log-limit', alias: 'G', type: CliDataTypes.Float,
         description: 'ioFog node log size limit (MB)',
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
@@ -124,22 +125,22 @@ class IOFog extends BaseCLIHandler {
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'log-file-count', alias: 'C', type: Number, numberType: 'integer',
+        name: 'log-file-count', alias: 'C', type: CliDataTypes.Integer,
         description: 'ioFog node log files count',
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'status-frequency', alias: 's', type: Number, numberType: 'integer',
+        name: 'status-frequency', alias: 's', type: CliDataTypes.Integer,
         description: 'ioFog node status check frequency (seconds)',
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'change-frequency', alias: 'F', type: Number, numberType: 'integer',
+        name: 'change-frequency', alias: 'F', type: CliDataTypes.Integer,
         description: 'ioFog node configuration change check frequency (seconds)',
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'device-frequency', alias: 'Q', type: Number, numberType: 'integer',
+        name: 'device-frequency', alias: 'Q', type: CliDataTypes.Integer,
         description: 'ioFog node device scan frequency (seconds)',
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
@@ -179,7 +180,7 @@ class IOFog extends BaseCLIHandler {
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'fog-type', alias: 'y', type: Number, numberType: 'integer',
+        name: 'fog-type', alias: 'y', type: CliDataTypes.Integer,
         description: 'ioFog node architecture type',
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
@@ -189,7 +190,7 @@ class IOFog extends BaseCLIHandler {
         group: [constants.CMD_VERSION]
       },
       {
-        name: 'user-id', alias: 'u', type: Number, numberType: 'integer',
+        name: 'user-id', alias: 'u', type: CliDataTypes.Integer,
         description: 'User\'s id',
         group: [constants.CMD_ADD]
       }

diff --git a/src/cli/microservice.js b/src/cli/microservice.js
@@ -19,6 +19,7 @@ const MicroserviceService = require('../services/microservices-service');
 const fs = require('fs');
 const AppHelper = require('../helpers/app-helper');
 const CliDecorator = require('../decorators/cli-decorator');
+const CliDataTypes = require('./cli-data-types');
 
 const JSON_SCHEMA_ADD = AppHelper.stringifyCliJsonSchema(
   {
@@ -92,11 +93,11 @@ class Microservice extends BaseCLIHandler {
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'catalog-id', alias: 'c', type: Number, numberType: 'integer',  description: 'Catalog item ID',
+        name: 'catalog-id', alias: 'c', type: CliDataTypes.Integer,  description: 'Catalog item ID',
         group: [constants.CMD_ADD]
       },
       {
-        name: 'flow-id', alias: 'F', type: Number, numberType: 'integer', description: 'Application flow ID',
+        name: 'flow-id', alias: 'F', type: CliDataTypes.Integer, description: 'Application flow ID',
         group: [constants.CMD_ADD]
       },
       {
@@ -112,7 +113,7 @@ class Microservice extends BaseCLIHandler {
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
-        name: 'log-size', alias: 'l', type: Number, numberType: 'integer',  description: 'Log file size limit (MB)',
+        name: 'log-size', alias: 'l', type: CliDataTypes.Integer,  description: 'Log file size limit (MB)',
         group: [constants.CMD_UPDATE, constants.CMD_ADD]
       },
       {
@@ -142,7 +143,7 @@ class Microservice extends BaseCLIHandler {
         group: [constants.CMD_ROUTE_CREATE, constants.CMD_ROUTE_REMOVE]
       },
       {
-        name: 'internal-port', alias: 'b', type: Number, numberType: 'integer', description: 'Internal port',
+        name: 'internal-port', alias: 'b', type: CliDataTypes.Integer, description: 'Internal port',
         group: [constants.CMD_PORT_MAPPING_REMOVE]
       },
       {
@@ -154,11 +155,11 @@ class Microservice extends BaseCLIHandler {
         group: [constants.CMD_REMOVE]
       },
       {
-        name: 'user-id', alias: 'u', type: Number, numberType: 'integer', description: 'User\'s id',
+        name: 'user-id', alias: 'u', type: CliDataTypes.Integer, description: 'User\'s id',
         group: [constants.CMD_ADD]
       },
       {
-        name: 'mapping-id', alias: 'a', type: Number, numberType: 'integer', description: 'Volume mapping id',
+        name: 'mapping-id', alias: 'a', type: CliDataTypes.Integer, description: 'Volume mapping id',
         group: [constants.CMD_VOLUME_MAPPING_REMOVE]
       }
     ];
@@ -358,8 +359,7 @@ const _createVolumeMapping = async function (obj, user) {
 
 const _removePortMapping = async function (obj, user) {
   try {
-    const internalPort = parseInt(obj.internalPort);
-    await MicroserviceService.deletePortMapping(obj.microserviceUuid, internalPort, user, true);
+    await MicroserviceService.deletePortMapping(obj.microserviceUuid, obj.internalPort, user, true);
     logger.info('Port mapping has been removed successfully.');
   } catch (e) {
     logger.error(e.message);

diff --git a/src/cli/registry.js b/src/cli/registry.js
@@ -17,6 +17,7 @@ const logger = require('../logger');
 const CliDecorator = require('../decorators/cli-decorator');
 const RegistryService = require('../services/registry-service');
 const AppHelper = require('../helpers/app-helper');
+const CliDataTypes = require('./cli-data-types');
 
 class Registry extends BaseCLIHandler {
   constructor() {
@@ -69,12 +70,12 @@ class Registry extends BaseCLIHandler {
         group: [constants.CMD_ADD, constants.CMD_UPDATE]
       },
       {
-        name: 'user-id', alias: 'u', type: Number, numberType: 'integer',
+        name: 'user-id', alias: 'u', type: CliDataTypes.Integer,
         description: 'User\'s id',
         group: [constants.CMD_ADD]
       },
       {
-        name: 'item-id', alias: 'i', type: Number, numberType: 'integer',
+        name: 'item-id', alias: 'i', type: CliDataTypes.Integer,
         description: 'Item\'s id',
         group: [constants.CMD_REMOVE, constants.CMD_UPDATE]
       }

diff --git a/src/cli/tunnel.js b/src/cli/tunnel.js
@@ -20,7 +20,7 @@ const CliDecorator = require('../decorators/cli-decorator');
 const Errors = require('../helpers/errors');
 const ErrorMessages = require('../helpers/error-messages');
 const AppHelper = require('../helpers/app-helper');
-
+const CliDataTypes = require('./cli-data-types');
 
 class Tunnel extends BaseCLIHandler {
   constructor() {
@@ -54,7 +54,7 @@ class Tunnel extends BaseCLIHandler {
         group: [constants.CMD_UPDATE]
       },
       {
-        name: 'port', alias: 'o', type: Number, numberType: 'integer',
+        name: 'port', alias: 'o', type: CliDataTypes.Integer,
         description: 'Tunnel port',
         group: [constants.CMD_UPDATE]
       },