From bcea10bc7f41c7599de4cf458321c35a19876b4c Mon Sep 17 00:00:00 2001 From: Sergio Betanzos Date: Thu, 15 Jul 2021 13:38:36 +0200 Subject: [PATCH] F OpenNebula/one#5422: Fix delete provider --- src/fireedge/src/server/routes/api/provision/functions.js | 3 ++- .../src/server/routes/api/provision/provider-functions.js | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/fireedge/src/server/routes/api/provision/functions.js b/src/fireedge/src/server/routes/api/provision/functions.js index 9f73c8c810..7a3b5ce3d0 100644 --- a/src/fireedge/src/server/routes/api/provision/functions.js +++ b/src/fireedge/src/server/routes/api/provision/functions.js @@ -330,8 +330,9 @@ const executeCommand = (command = '', resource = '', options = {}) => { let rtn = { success: false, data: null } const { cmd, rsc } = addPrependCommand(command, resource) const execute = spawnSync(cmd, rsc, options) + if (execute) { - if (execute.stdout) { + if (execute.stdout && execute.status === 0) { rtn = { success: true, data: execute.stdout.toString() } } else if (execute.stderr && execute.stderr.length > 0) { rtn = { success: false, data: execute.stderr.toString() } diff --git a/src/fireedge/src/server/routes/api/provision/provider-functions.js b/src/fireedge/src/server/routes/api/provision/provider-functions.js index b08f79fc0a..abd6f11f72 100644 --- a/src/fireedge/src/server/routes/api/provision/provider-functions.js +++ b/src/fireedge/src/server/routes/api/provision/provider-functions.js @@ -261,11 +261,9 @@ const deleteProvider = (res = {}, next = defaultEmptyFunction, params = {}, user const data = executedCommand.data || '' try { if (executedCommand && executedCommand.success) { - if (executedCommand.data.length === 0) { - res.locals.httpCode = httpResponse(ok) - } else { - res.locals.httpCode = httpResponse(internalServerError, '', executedCommand.data) - } + res.locals.httpCode = httpResponse(ok) + } else { + res.locals.httpCode = httpResponse(internalServerError, '', executedCommand.data) } next() return