From 26f2933072f8c13e7b294b8edf4cc18ea639b4a7 Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Sun, 1 Dec 2019 16:08:28 +0000 Subject: [server/infoblox] Fix unreachable code bug / fix eslint --- server/lib/external-backends/backends/infoblox-backend.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/server/lib/external-backends/backends/infoblox-backend.js b/server/lib/external-backends/backends/infoblox-backend.js index b4c69e5..9cedfb7 100644 --- a/server/lib/external-backends/backends/infoblox-backend.js +++ b/server/lib/external-backends/backends/infoblox-backend.js @@ -77,13 +77,12 @@ class InfobloxBackend extends ExternalBackends { // Get the host and check the leased state let host = JSON.parse(await ipam.getHost(ipv4))[0] - if (host && host.lease_state && host.lease_state === 'ACTIVE') { + if (!host) return { error: 'HOST_NOT_FOUND' } + if (host.lease_state && host.lease_state === 'ACTIVE') { // If leased return the next 20 free ips of the subnet. const dhcpNetwork = JSON.parse(await ipam.getNetworkFromIp(ipv4)) const nextIps = await ipam.getNext(dhcpNetwork[0]._ref, 20) return { leased: true, nextIps: nextIps } - } else { - return { error: 'HOST_NOT_FOUND' } } let response = { leased: false, id: host._ref } @@ -105,11 +104,11 @@ class InfobloxBackend extends ExternalBackends { if (setNextIp) { try { const network = JSON.parse(await ipam.getNetworkFromIp(ipv4)) + ipv4 = 'func:nextavailableip:' + network[0].network } catch (e) { - console.log(e) + console.log(e) return { error: 'ERROR_INFOBLOX', msg: 'No network found. Missing permissions?' } } - ipv4 = 'func:nextavailableip:' + network[0].network } const domain = (await ipam.getDomain())[0] -- cgit v1.2.3-55-g7522