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/iofog.js‎
Lines changed: 11 additions & 5 deletions b/‎src/cli/iofog.js‎
Lines changed: 11 additions & 5 deletions
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/config/development.json‎
Lines changed: 1 addition & 2 deletions b/‎src/config/development.json‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎src/controllers/microservices-controller.js‎
Lines changed: 1 addition & 1 deletion b/‎src/controllers/microservices-controller.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/helpers/app-helper.js‎
Lines changed: 7 additions & 14 deletions b/‎src/helpers/app-helper.js‎
Lines changed: 7 additions & 14 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/microservice-public-mode-manager.js‎
Lines changed: 17 additions & 1 deletion b/‎src/sequelize/managers/microservice-public-mode-manager.js‎
Lines changed: 17 additions & 1 deletion
diff --git a/‎src/sequelize/managers/routing-manager.js‎
Lines changed: 16 additions & 0 deletions b/‎src/sequelize/managers/routing-manager.js‎
Lines changed: 16 additions & 0 deletions
diff --git a/‎src/services/connector-port-service.js‎
Lines changed: 153 additions & 0 deletions b/‎src/services/connector-port-service.js‎
Lines changed: 153 additions & 0 deletions
@@ -1,6 +1,6 @@
 {
 	"name": "iofogcontroller",
-	"version": "1.0.32",
+	"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",
 
@@ -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.')
 }
 
 
@@ -421,7 +421,7 @@ const _createMicroservice = async function (obj, user) {
 
   logger.info(JSON.stringify(microservice));
 
-  const result = await MicroserviceService.createMicroserviceOnFog(microservice, user, true);
+  const result = await MicroserviceService.createMicroservice(microservice, user, true);
   logger.info(JSON.stringify(result));
   logger.info('Microservice has been created successfully.');
 };
 
@@ -29,5 +29,4 @@
   "Diagnostics": {
     "DiagnosticDir": "diagnostic"
   }
-}
-
+}
@@ -20,7 +20,7 @@ const createMicroserviceOnFogEndPoint = async function (req, user) {
 
   logger.info("Parameters:" + JSON.stringify(microservice));
 
-  return await MicroservicesService.createMicroserviceOnFog(microservice, user, false)
+  return await MicroservicesService.createMicroservice(microservice, user, false)
 };
 
 const getMicroserviceEndPoint = async function (req, user) {
 
@@ -78,13 +78,7 @@ const findAvailablePort = async function (hostname) {
   }
   let portBounds = portRange.split("-").map(i => parseInt(i));
   return await portscanner.findAPortNotInUse(portBounds[0], portBounds[1], hostname);
-}
-
-/**
- * @desc generates a random String of the size specified by the input param
- * @param Integer - size
- * @return String - returns random string
- */
+};
 
 function isFileExists(filePath) {
   if (path.extname(filePath).indexOf(".") >= 0) {
@@ -109,7 +103,7 @@ function isValidDomain(domain) {
 }
 
 const isValidPublicIP = function (publicIP) {
-  let re = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$|^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/;
+  const re = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$|^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/;
   return re.test(publicIP);
 };
 
@@ -142,7 +136,7 @@ function deleteUndefinedFields(obj) {
     } else if (obj[fld] instanceof Object) {
       obj[fld] = deleteUndefinedFields(obj[fld])
     }
-  })
+  });
 
   return obj
 }
@@ -191,11 +185,11 @@ function trimCertificate(cert) {
 function validateParameters(command, commandDefinitions, args) {
   // 1st argument = command
   args.shift();
-  
+
   const possibleAliasesList = _getPossibleAliasesList(command, commandDefinitions);
   const possibleArgsList = _getPossibleArgsList(command, commandDefinitions);
 
-  for (let arg of args) {
+  for (const arg of args) {
     // arg is [argument, alias, value]
 
     if (arg.startsWith("--")) { // argument
@@ -272,14 +266,13 @@ function isTest() {
 }
 
 function isEmpty(obj) {
-  for(let key in obj) {
-    if(obj.hasOwnProperty(key))
+  for (const key in obj) {
+    if (obj.hasOwnProperty(key))
       return false;
   }
   return true;
 }
 
-
 module.exports = {
   encryptText,
   decryptText,
 
@@ -73,5 +73,6 @@ module.exports = {
     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.',
-  INVALID_VERSION_COMMAND: 'Can\'t {} version 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'
 };
@@ -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()
 
@@ -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();
 
@@ -0,0 +1,153 @@
+/*
+ *  *******************************************************************************
+ *  * 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
+ *  *******************************************************************************
+ *
+ */
+
+const ConnectorManager = require('../sequelize/managers/connector-manager');
+const https = require('https');
+const http = require('http');
+const constants = require('../helpers/constants');
+const logger = require('../logger');
+const qs = require('qs');
+const fs = require('fs');
+
+async function openPortOnRandomConnector(isPublicAccess, transaction) {
+  let isConnectorPortOpen = false;
+  let ports = null;
+  let connector = null;
+  const maxAttempts = 5;
+  for (let i = 0; i < maxAttempts; i++) {
+    try {
+      connector = await _getRandomConnector(transaction);
+      ports = await _openPortsOnConnector(connector, isPublicAccess);
+      if (ports) {
+        isConnectorPortOpen = true;
+        break;
+      }
+    } catch (e) {
+      logger.warn(`Failed to open ports on Connector. Attempts ${i + 1}/${maxAttempts}`)
+    }
+  }
+  if (!isConnectorPortOpen) {
+    throw new Error('Not able to open port on remote Connector. Gave up after 5 attempts.')
+  }
+  ports.connectorId = connector.id;
+  return {ports: ports, connector: connector}
+}
+
+async function _openPortsOnConnector(connector, isPublicAccess) {
+  let data = isPublicAccess
+    ? await qs.stringify({
+      mapping: '{"type":"public","maxconnections":60,"heartbeatabsencethreshold":200000}'
+    })
+    : await qs.stringify({
+      mapping: '{"type":"private","maxconnectionsport1":1, "maxconnectionsport2":1, ' +
+      '"heartbeatabsencethresholdport1":200000, "heartbeatabsencethresholdport2":200000}'
+    });
+
+  let port = connector.devMode ? constants.CONNECTOR_HTTP_PORT : constants.CONNECTOR_HTTPS_PORT;
+
+  let options = {
+    host: connector.domain,
+    port: port,
+    path: '/api/v2/mapping/add',
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+      'Content-Length': Buffer.byteLength(data)
+    }
+  };
+  if (!connector.devMode && connector.cert && connector.isSelfSignedCert === true) {
+    const ca = fs.readFileSync(connector.cert);
+    options.ca = new Buffer.from(ca);
+  }
+
+  const ports = await _makeRequest(connector, options, data);
+  return ports
+}
+
+async function _getRandomConnector(transaction) {
+  const connectors = await ConnectorManager.findAll({}, transaction);
+
+  if (connectors && connectors.length > 0) {
+    const randomNumber = Math.round((Math.random() * (connectors.length - 1)));
+    return connectors[randomNumber]
+  } else {
+    throw new Error('no connectors defined')
+  }
+}
+
+async function closePortOnConnector(connector, ports) {
+  let data = qs.stringify({
+    mappingid: ports.mappingId
+  });
+  console.log(data);
+
+  let port = connector.devMode ? constants.CONNECTOR_HTTP_PORT : constants.CONNECTOR_HTTPS_PORT;
+
+  let options = {
+    host: connector.domain,
+    port: port,
+    path: '/api/v2/mapping/remove',
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+      'Content-Length': Buffer.byteLength(data)
+    }
+  };
+  if (!connector.devMode && connector.cert && connector.isSelfSignedCert === true) {
+    const ca = fs.readFileSync(connector.cert);
+    options.ca = new Buffer.from(ca);
+  }
+
+
+  await _makeRequest(connector, options, data)
+}
+
+async function _makeRequest(connector, options, data) {
+  return new Promise((resolve, reject) => {
+    let httpreq = (connector.devMode ? http : https).request(options, function (response) {
+      console.log(response.statusCode);
+      let output = '';
+      response.setEncoding('utf8');
+
+      response.on('data', function (chunk) {
+        output += chunk;
+      });
+
+      response.on('end', function () {
+        let responseObj = JSON.parse(output);
+        console.log(responseObj);
+        if (responseObj.errormessage) {
+          return reject(new Error(responseObj.errormessage));
+        } else {
+          return resolve(responseObj);
+        }
+      });
+    });
+
+    httpreq.on('error', function (err) {
+      console.log(err);
+      if (err instanceof Error)
+        return reject(new Error(err.message));
+      else
+        return reject(new Error(JSON.stringify(err)));
+    });
+
+    httpreq.write(data);
+    httpreq.end();
+  })
+}
+
+module.exports = {
+  openPortOnRandomConnector: openPortOnRandomConnector,
+  closePortOnConnector: closePortOnConnector
+};
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "iofogcontroller",`
`3`		`- "version": "1.0.32",`
	`3`	`+ "version": "1.0.33",`
`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
`@@ -29,5 +29,4 @@`
`29`	`29`	`"Diagnostics": {`
`30`	`30`	`"DiagnosticDir": "diagnostic"`
`31`	`31`	`}`
`32`		`-}`
`33`		`-`
	`32`	`+}`