From df8c74627b35cb5819af33ca816f57b969c6b9c1 Mon Sep 17 00:00:00 2001 From: sam Date: Thu, 5 Mar 2026 19:45:34 -0700 Subject: [PATCH] Dynamic port rendering for multi-port NID devices Replace hardcoded 4-port loops in renderPanel(), renderSfp(), and renderLldp() with dynamic iteration over connectors data. Devices like the AMO-10000-LT-S with more than 4 ports now render all ports automatically. Management port detected by connector name. Co-Authored-By: Claude Opus 4.6 --- build_nid_viewer.py | 59 +++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/build_nid_viewer.py b/build_nid_viewer.py index 4da0e86..3e00a89 100644 --- a/build_nid_viewer.py +++ b/build_nid_viewer.py @@ -734,6 +734,23 @@ function formatUptime(sec) {{ p.push(s+'s'); return p.join(' '); }} +// Derive data ports and management port from connectors dynamically +function getPortLists() {{ + const connectors = DATA.connectors || {{}}; + const keys = Object.keys(connectors).sort((a,b) => parseInt(a) - parseInt(b)); + const dataPorts = []; + let mgmtPort = null; + for (const k of keys) {{ + const c = connectors[k]; + if (c.name && c.name.toLowerCase() === 'management') {{ + mgmtPort = k; + }} else {{ + dataPorts.push(k); + }} + }} + return {{ dataPorts, mgmtPort }}; +}} + function sevLabel(s) {{ return {{'0':'INFO','1':'MINOR','2':'MAJOR','3':'CRITICAL'}}[s] || s; }} @@ -1150,15 +1167,15 @@ function renderPanel() {{ return {{ label, alias }}; }} - // Build port slots dynamically from connectors 1-4 + // Build port slots dynamically from connectors + const {{ dataPorts, mgmtPort }} = getPortLists(); let slots = ''; - for (let i = 1; i <= 4; i++) {{ - const idx = String(i); + for (const idx of dataPorts) {{ const conn = connectors[idx] || {{}}; const isSfp = connType(idx) === 'sfp'; const state = slotState(idx); const pi = portInfo(idx); - const slotName = conn.name || (isSfp ? `SFP-${{i}}` : `RJ45-${{i}}`); + const slotName = conn.name || (isSfp ? `SFP-${{idx}}` : `RJ45-${{idx}}`); let icon, detail; if (isSfp) {{ @@ -1178,7 +1195,7 @@ function renderPanel() {{ ? `
${{labelParts.join('
')}}
` : ''; slots += `
-
+
${{icon}}${{esc(slotName)}} ${{esc(detail)}}
@@ -1187,7 +1204,7 @@ function renderPanel() {{ }} // Management port - const mgmtIf = ifaces['5']; + const mgmtIf = mgmtPort ? ifaces[mgmtPort] : null; const mgmtUp = mgmtIf && isUp(mgmtIf.ifOperStatus); const mgmtSlot = `
MGMT @@ -1311,20 +1328,20 @@ function renderSfp() {{ const sfpDiag = DATA.sfp_diagnostics || {{}}; const sfpThresh = DATA.sfp_thresholds || {{}}; + const {{ dataPorts }} = getPortLists(); let cards = ''; - for (let i = 1; i <= 4; i++) {{ - const si = String(i); + for (const si of dataPorts) {{ const info = sfpInfo[si]; const diag = sfpDiag[si] || {{}}; const thresh = sfpThresh[si] || {{}}; const conn = connectors[si] || {{}}; if (!info || info.present !== '1') {{ - cards += `
+ cards += `
-
SFP-${{i}} — Not Present
+
${{esc(conn.name || 'Port ' + si)}} — Not Present
`; @@ -1365,10 +1382,10 @@ function renderSfp() {{ const wl = info.wavelength && info.wavelength !== '0' ? info.wavelength + ' nm' : 'N/A (copper)'; const mfgDate = [info.mfgYear, String(info.mfgMonth||'').padStart(2,'0'), String(info.mfgDay||'').padStart(2,'0')].join('-'); - cards += `
+ cards += `
- SFP-${{i}}: ${{esc(info.vendor)}} ${{esc(info.vendorPn)}} + ${{esc(conn.name || 'Port ' + si)}}: ${{esc(info.vendor)}} ${{esc(info.vendorPn)}} ${{ddmBadge}}
@@ -1409,7 +1426,7 @@ function renderSfp() {{
Click an SFP slot in the front panel above, or select below: - ${{[1,2,3,4].map(i => ``).join('')}} + ${{dataPorts.map(k => ``).join('')}}
${{cards}}
@@ -1818,23 +1835,23 @@ function renderLldp() {{
`; }} - // Build vertical columns for ports 1-4 + // Build vertical columns for data ports + const {{ dataPorts, mgmtPort }} = getPortLists(); let colsHtml = ''; - for (let i = 1; i <= 4; i++) {{ - const portKey = String(i); + for (const portKey of dataPorts) {{ const conn = connectors[portKey] || {{}}; const isSfp = conn.type === '14'; const nbr = neighborByPort[portKey]; const state = slotState(portKey); const iface = ifaces[portKey] || {{}}; const localUp = isUp(iface.ifOperStatus); - const slotName = conn.name || (isSfp ? `SFP-${{i}}` : `RJ45-${{i}}`); + const slotName = conn.name || (isSfp ? `SFP-${{portKey}}` : `RJ45-${{portKey}}`); const icon = isSfp ? (state === 'empty' ? '' : state === 'present-link' ? '' : '') : ''; - const portLabel = iface.ifName || 'Port ' + i; + const portLabel = iface.ifName || 'Port ' + portKey; if (nbr) {{ const linkClass = localUp ? 'up' : 'down'; @@ -1861,10 +1878,10 @@ function renderLldp() {{ }} }} - // MGMT column (port 5) - const mgmtNbr = neighborByPort['5']; + // MGMT column + const mgmtNbr = mgmtPort ? neighborByPort[mgmtPort] : null; if (mgmtNbr) {{ - const mgmtIface = ifaces['5'] || {{}}; + const mgmtIface = ifaces[mgmtPort] || {{}}; const mgmtUp = isUp(mgmtIface.ifOperStatus); colsHtml += `
`; colsHtml += `