summaryrefslogtreecommitdiffstats
path: root/server/lib
diff options
context:
space:
mode:
authorUdo Walter2019-04-19 02:31:57 +0200
committerUdo Walter2019-04-19 02:31:57 +0200
commitafe392ae7eb52a4bef06719c31e5c86a0e11b55a (patch)
tree319c8a71e5aa33e906dce1beac1f59525bdfbfc5 /server/lib
parent[server] add rrule npm module; new eventhelper (untested and WIP) (diff)
parent[server/external-backends] Parseint in the idoit update method because of ext... (diff)
downloadbas-afe392ae7eb52a4bef06719c31e5c86a0e11b55a.tar.gz
bas-afe392ae7eb52a4bef06719c31e5c86a0e11b55a.tar.xz
bas-afe392ae7eb52a4bef06719c31e5c86a0e11b55a.zip
merge
Diffstat (limited to 'server/lib')
-rw-r--r--server/lib/external-backends/backends/idoit-backend.js9
-rw-r--r--server/lib/external-backends/backends/infoblox-backend.js2
2 files changed, 8 insertions, 3 deletions
diff --git a/server/lib/external-backends/backends/idoit-backend.js b/server/lib/external-backends/backends/idoit-backend.js
index 8a283b8..160e7fe 100644
--- a/server/lib/external-backends/backends/idoit-backend.js
+++ b/server/lib/external-backends/backends/idoit-backend.js
@@ -245,7 +245,7 @@ class IdoitBackend extends ExternalBackends {
],
'C__CATG__LOCATION': {
'data': {
- 'parent': parseInt(client.parentId),
+ 'parent': client.parentId,
'option': client.location.option,
'insertion': client.location.insertion,
'pos': client.location.slot
@@ -275,7 +275,8 @@ class IdoitBackend extends ExternalBackends {
if (client.uuid) params.categories.C__CATG__MODEL = { 'data': { 'productid': client.uuid } }
if (client.networks) {
params.categories.C__CATG__IP = []
- for (let network of client.networks) {
+ for (let index in client.networks) {
+ const network = client.networks[index]
let networkparams = {}
if (network.ip) networkparams.ipv4_address = network.ip
if (network.hostname) networkparams.hostname = network.hostname
@@ -352,6 +353,10 @@ class IdoitBackend extends ExternalBackends {
const headers = await this.getHeaders(c)
if (headers.error) return headers
+ // Parse needed because db values are strings. (Other backends need strings as external ids)
+ client.id = parseInt(client.id)
+ client.parentId = parseInt(client.parentId)
+
let bodies = []
// workaround for the fucking idoit shit. -.-
let requestResults = []
diff --git a/server/lib/external-backends/backends/infoblox-backend.js b/server/lib/external-backends/backends/infoblox-backend.js
index b81c76f..3165b05 100644
--- a/server/lib/external-backends/backends/infoblox-backend.js
+++ b/server/lib/external-backends/backends/infoblox-backend.js
@@ -135,7 +135,7 @@ class InfobloxBackend extends ExternalBackends {
return { error: 'ERROR_INFOBLOX', msg: createHost.text }
} else {
if (!name) return { ip: createHost.result.ipv4addr }
- else return { host: createHost.result.ipv4addrs[0].host, ip: createHost.result.ipv4addrs[0].ipv4addr, id: createHost.result._ref }
+ else return { host: createHost.result.ipv4addrs[0].host, ip: createHost.result.ipv4addrs[0].ipv4addr, id: createHost.result._ref, domain: domain }
}
}