From 78a12019df6bd188c85218754d9ff18434f6c503 Mon Sep 17 00:00:00 2001 From: maksimchepelev Date: Thu, 29 Nov 2018 14:23:25 +0300 Subject: [PATCH 1/6] EWC-373 microservice cli error message for volume mapping fix --- src/cli/microservice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli/microservice.js b/src/cli/microservice.js index 33b982fab..ea3550546 100644 --- a/src/cli/microservice.js +++ b/src/cli/microservice.js @@ -376,7 +376,7 @@ const _removeVolumeMapping = async function (obj, user) { await MicroserviceService.deleteVolumeMapping(obj.microserviceId, obj.mappingId, user, true); logger.info('Volume mapping has been deleted successfully.'); } catch (e) { - logger.error(ErrorMessages.CLI.INVALID_VOLUME_MAPPING); + logger.error(e.message); } }; From 019d87136c92a35b6966fcb83b9d6b11c54eca63 Mon Sep 17 00:00:00 2001 From: maksimchepelev Date: Thu, 29 Nov 2018 15:15:30 +0300 Subject: [PATCH 2/6] EWC-361 logger not found in microservice service fix --- src/services/connector-service.js | 2 -- src/services/microservices-service.js | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/services/connector-service.js b/src/services/connector-service.js index b0e19853b..b30176b9a 100644 --- a/src/services/connector-service.js +++ b/src/services/connector-service.js @@ -180,8 +180,6 @@ async function _getRandomConnector(transaction) { } async function closePortOnConnector(connector, ports, transaction) { - console.log(ports); - let data = qs.stringify({ mappingid: ports.mappingId }); diff --git a/src/services/microservices-service.js b/src/services/microservices-service.js index fa5e6d2c4..6149c740c 100644 --- a/src/services/microservices-service.js +++ b/src/services/microservices-service.js @@ -11,6 +11,7 @@ * */ +const logger = require('../logger') const TransactionDecorator = require('../decorators/transaction-decorator'); const MicroserviceManager = require('../sequelize/managers/microservice-manager'); const MicroserviceStatusManager = require('../sequelize/managers/microservice-status-manager'); From 18d8e59630a14cdac2ab83f3d109ec8e8a72d765 Mon Sep 17 00:00:00 2001 From: maksimchepelev Date: Thu, 29 Nov 2018 15:19:42 +0300 Subject: [PATCH 3/6] EWC-361 abbility to delete route without closing ports on connector --- src/services/microservices-service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/microservices-service.js b/src/services/microservices-service.js index 6149c740c..19665431f 100644 --- a/src/services/microservices-service.js +++ b/src/services/microservices-service.js @@ -528,7 +528,7 @@ async function _deleteRouteOverConnector(route, transaction) { try { await ConnectorService.closePortOnConnector(connector, ports, transaction); } catch (e) { - logger.warn(`Can't close ports pair ${ports.mappingId} on connector ${connector.publicIp}. Delete manually in needed`); + logger.warn(`Can't close ports pair ${ports.mappingId} on connector ${connector.publicIp}. Delete manually if necessary`); } await RoutingManager.delete({id: route.id}, transaction) From cdf1b69795c5b888acbdb9b89b86caa3e427c722 Mon Sep 17 00:00:00 2001 From: maksimchepelev Date: Thu, 29 Nov 2018 15:21:22 +0300 Subject: [PATCH 4/6] EWC-361 recreating routes on update microservice only if necessary --- src/services/microservices-service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/microservices-service.js b/src/services/microservices-service.js index 19665431f..dbfe389db 100644 --- a/src/services/microservices-service.js +++ b/src/services/microservices-service.js @@ -188,7 +188,7 @@ async function _updateMicroservice(microserviceUuid, microserviceData, user, isC await _updateVolumeMappings(microserviceDataUpdate.volumeMappings, microserviceUuid, transaction); } - if (microserviceDataUpdate.iofogUuid !== microservice.iofogUuid) { + if (microserviceDataUpdate.iofogUuid && microserviceDataUpdate.iofogUuid !== microservice.iofogUuid) { const routes = await _getLogicalNetworkRoutesByFog(microservice.iofogUuid, transaction); for (let route of routes) { await _deleteRoute(route.sourceMicroserviceUuid, route.destMicroserviceUuid, user, isCLI, transaction); From bef67855c1e4e3df7cae3837b3bc499ecf233a49 Mon Sep 17 00:00:00 2001 From: maksimchepelev Date: Thu, 29 Nov 2018 15:47:27 +0300 Subject: [PATCH 5/6] EWC-384 connector devMode verification before using certificate --- src/services/connector-service.js | 2 +- src/services/microservices-service.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/connector-service.js b/src/services/connector-service.js index b30176b9a..bd522e6ac 100644 --- a/src/services/connector-service.js +++ b/src/services/connector-service.js @@ -160,7 +160,7 @@ async function openPortsOnConnector(connector, isPublicAccess, transaction) { 'Content-Length': Buffer.byteLength(data) } }; - if (connector.cert && connector.isSelfSignedCert === true) { + if (!connector.devMode && connector.cert && connector.isSelfSignedCert === true) { const ca = fs.readFileSync(connector.cert); options.ca = new Buffer(ca); } diff --git a/src/services/microservices-service.js b/src/services/microservices-service.js index dbfe389db..7b4707c5e 100644 --- a/src/services/microservices-service.js +++ b/src/services/microservices-service.js @@ -387,7 +387,7 @@ async function _createRouteOverConnector(sourceMicroservice, destMicroservice, u const networkCatalogItem = await CatalogService.getNetworkCatalogItem(transaction) let cert; - if (connector.cert) { + if (!connector.devMode && connector.cert) { cert = AppHelper.trimCertificate(fs.readFileSync(connector.cert, "utf-8")) } @@ -618,7 +618,7 @@ async function _createPortMappingOverConnector(microservice, portMappingData, us const networkCatalogItem = await CatalogService.getNetworkCatalogItem(transaction) let cert; - if (connector.cert) { + if (!connector.devMode && connector.cert) { cert = AppHelper.trimCertificate(fs.readFileSync(connector.cert, "utf-8")); } //create netw ms1 From 3ffc0ba06630def15af55ba424dddf44c46608b5 Mon Sep 17 00:00:00 2001 From: maksimchepelev Date: Thu, 29 Nov 2018 16:46:51 +0300 Subject: [PATCH 6/6] EWC-377 cli config add ssl-key message fix --- src/cli/config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cli/config.js b/src/cli/config.js index f9626c70a..ce42ea944 100644 --- a/src/cli/config.js +++ b/src/cli/config.js @@ -156,15 +156,15 @@ const _addConfigOption = async function (options) { onSuccess(); }); - if (options.sslKey) { + await updateConfig(options.sslKey, 'ssl-key', 'Server:SslKey', (onSuccess) => { const sslKey = options.sslKey; if (!AppHelper.isFileExists(sslKey)) { logger.error(ErrorMessages.INVALID_FILE_PATH); return; } config.set('Server:SslKey', sslKey); - logger.info('Config option ssl-key has been updated.'); - } + onSuccess(); + }); await updateConfig(options.intermediateCert, 'intermediate-cert', 'Server:IntermediateCert', (onSuccess) => { const intermediateCert = options.intermediateCert;