summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJannik Schönartz2020-05-08 00:03:26 +0200
committerJannik Schönartz2020-05-08 00:03:26 +0200
commit2bc74d4d36f5320bb535db972a43fd46cd45a93b (patch)
treeed8eb1fd4e44e999001c07f4d44265ff1a096be6 /server
parent[server/registration] Manual registration: Add client to the manual selected ... (diff)
downloadbas-2bc74d4d36f5320bb535db972a43fd46cd45a93b.tar.gz
bas-2bc74d4d36f5320bb535db972a43fd46cd45a93b.tar.xz
bas-2bc74d4d36f5320bb535db972a43fd46cd45a93b.zip
[webapp/external-backends] Remove step 3 from stepper & eslint fixes
Diffstat (limited to 'server')
-rw-r--r--server/api/registration.js2
-rw-r--r--server/lib/external-backends/backends/infoblox-backend.js14
2 files changed, 8 insertions, 8 deletions
diff --git a/server/api/registration.js b/server/api/registration.js
index 3a88bee..86bf185 100644
--- a/server/api/registration.js
+++ b/server/api/registration.js
@@ -510,7 +510,7 @@ function buildIpxeMenu (id, name, groups, parents) {
// Add client menu
script += 'item select Add client to ' + toAscii(name) + '\r\n'
menuscript += `:select\r\necho Enter client name\r\nread clientname\r\nparams\r\n`
- menuscript += `param client { "name": "\${clientname}", "type": "CLIENT", "uuid": "\${uuid}", "purpose": "Pool PC", "parents": [` + parents[parents.length -1].id + `], "networks": [{ "ip": "\${net0/ip}", "mac": "\${net0/mac}" }] }\r\n`
+ menuscript += `param client { "name": "\${clientname}", "type": "CLIENT", "uuid": "\${uuid}", "purpose": "Pool PC", "parents": [` + parents[parents.length - 1].id + `], "networks": [{ "ip": "\${net0/ip}", "mac": "\${net0/mac}" }] }\r\n`
menuscript += 'param ipxe true\r\n'
menuscript += 'chain --replace ' + basUrl + '/api/registration/clients##params\r\n\r\n'
diff --git a/server/lib/external-backends/backends/infoblox-backend.js b/server/lib/external-backends/backends/infoblox-backend.js
index 71f0a4b..ca7a7f9 100644
--- a/server/lib/external-backends/backends/infoblox-backend.js
+++ b/server/lib/external-backends/backends/infoblox-backend.js
@@ -34,21 +34,21 @@ class InfobloxBackend extends ExternalBackends {
})
// Add custom timeout to the infoblox login
- return await Promise.race([
+ return Promise.race([
new Promise(async (resolve, reject) => {
try {
const result = await ipam.login(c.username, c.password)
- if (!result) resolve({ error: 'LOGIN_FAILED', message: 'Login failed' })
- else resolve(result)
+ if (!result) resolve({ error: 'LOGIN_FAILED', message: 'Login failed' })
+ else resolve(result)
} catch (e) {
resolve({ error: 'LOGIN_FAILED', message: e })
}
}),
new Promise((resolve, reject) => {
- let wait = setTimeout(() => {
- clearTimeout(wait)
- resolve({ error: 'LOGIN_FAILED', message: 'Timeout' })
- }, 15000)
+ let wait = setTimeout(() => {
+ clearTimeout(wait)
+ resolve({ error: 'LOGIN_FAILED', message: 'Timeout' })
+ }, 15000)
})])
}