diff options
author | Kristian Lyngstol <kly@kly.gondul.gathering.org> | 2019-01-03 17:42:03 +0100 |
---|---|---|
committer | Kristian Lyngstol <kly@kly.gondul.gathering.org> | 2019-01-03 17:42:03 +0100 |
commit | de584bed994024371f89bce200298139f3615296 (patch) | |
tree | 9d06ab4ba5df08739901890f9aef685333db7f69 /web/js/nms-map-handlers.js | |
parent | 27fb87647ee68117f4ea13b470ad31b723bcdc69 (diff) |
First step to major cleanup
Fixes #150
Fixe #88
Closes #3
Probably lots of bugs introduced, will fix ASAP.
Diffstat (limited to 'web/js/nms-map-handlers.js')
-rw-r--r-- | web/js/nms-map-handlers.js | 83 |
1 files changed, 63 insertions, 20 deletions
diff --git a/web/js/nms-map-handlers.js b/web/js/nms-map-handlers.js index 423b449..90f6922 100644 --- a/web/js/nms-map-handlers.js +++ b/web/js/nms-map-handlers.js @@ -92,6 +92,11 @@ var handler_mgmt = { tag:"mgmt", name:"Management info" }; +var handler_net = { + getInfo:networkInfo, + tag:"net", + name:"Network info" +}; var handler_snmpup = { getInfo:snmpUpInfo, tag:"snmpup", @@ -131,6 +136,7 @@ var handlerInfo = function(tag,desc) { var handlers = [ handler_health, handler_mgmt, + handler_net, handler_uplinks, handler_temp, handler_ping, @@ -875,20 +881,69 @@ function tagged(sw, tag) { return false; } +function networkInfo(sw) { + var ret = new handlerInfo("net","Network info"); + ret.score = 0; + ret.why = "All good"; + if (testTree(nmsData,['smanagement','switches',sw])) { + var i = 0; + var mg = nmsData.smanagement.switches[sw]; + var objs = [{ + d: "Management", + v: setTree(nmsData,['networks','networks',mg.mgmt_vlan],undefined) + },{ + d: "Traffic", + v: setTree(nmsData,['networks','networks',mg.traffic_vlan],undefined) + } + ]; + for (var x in objs) { + a = objs[x]; + if (a.v == undefined) { + ret.data[i++] = { + value: 'Not set', + description: a.d + ' network' + }; + continue; + } + + ret.data[i++] = { + value: a.v.name || "Not set", + description: a.d + " network" + } + ret.data[i++] = { + value: a.v.vlan || "Not set", + description: a.d + " vlan" + } + ret.data[i++] = { + value: a.v.subnet4 || "Not set", + description: a.d + " subnet IPv4" + } + ret.data[i++] = { + value: a.v.gw4 || "Not set", + description: a.d + " gw IPv4" + } + ret.data[i++] = { + value: a.v.subnet6 || "Not set", + description: a.d + " subnet IPv6" + } + ret.data[i++] = { + value: a.v.gw6 || "Not set", + description: a.d + " gw IPv6" + } + ret.data[i++] = { + value: a.v.router || "Not set", + description: a.d + " net router" + } + } + } + return ret; +} function mgmtInfo(sw) { var ret = new handlerInfo("mgmt","Management info"); ret.score = 0; ret.why = "All good"; if (testTree(nmsData,['smanagement','switches',sw])) { var mg = nmsData.smanagement.switches[sw]; - var traffic_vlan = "N/A"; - var mgmt_vlan = "N/A"; - if (testTree(nmsData,['networks','networks',mg.traffic_vlan,"vlan"])) { - traffic_vlan = nmsData["networks"]["networks"][mg.traffic_vlan]["vlan"]; - } - if (testTree(nmsData,['networks','networks',mg.mgmt_vlan,"vlan"])) { - mgmt_vlan = nmsData["networks"]["networks"][mg.mgmt_vlan]["vlan"]; - } ret.data = [{ value: mg.mgmt_v4_addr || "N/A", @@ -897,20 +952,8 @@ function mgmtInfo(sw) { value: mg.mgmt_v6_addr || "N/A", description: "Management IP (v6)" }, { - value: mg.subnet4 || "N/A", - description: "Subnet (v4)" - }, { - value: mg.subnet6 || "N/A", - description: "Subnet (v6)" - }, { value: mg.distro_name || "N/A", description: "Distro" - }, { - value: traffic_vlan || "N/A", - description: "Client VLAN" - }, { - value: mgmt_vlan || "N/A", - description: "Management VLAN" } ]; if ((mg.mgmt_v4_addr == undefined || mg.mgmt_v4_addr == "") && (mg.mgmt_v6_addr == undefined || mg.mgmt_v6_addr == "")) { |