theater/tendrils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge snmp-discovered interfaces with existing node found by ip

Browse Source 
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Ian Gulliver
2026-01-18 14:23:21 -08:00
parent 6d50ee30aa
commit 8cb605b817
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nodes.go
View File

@@ -233,6 +233,10 @@ func (n *Nodes) mergeNodes(keepID, mergeID int) {
keep := n.nodes[keepID] keep := n.nodes[keepID]
merge := n.nodes[mergeID] merge := n.nodes[mergeID]
if keep == nil || merge == nil {
return
}
if merge.Name != "" && keep.Name == "" { if merge.Name != "" && keep.Name == "" {
keep.Name = merge.Name keep.Name = merge.Name
} }
@@ -243,6 +247,7 @@ func (n *Nodes) mergeNodes(keepID, mergeID int) {
ips = append(ips, ip) ips = append(ips, ip)
} }
n.updateNodeInterface(keep, keepID, iface.MAC, ips, iface.Name) n.updateNodeInterface(keep, keepID, iface.MAC, ips, iface.Name)
n.macIndex[iface.MAC.String()] = keepID
} }
delete(n.nodes, mergeID) delete(n.nodes, mergeID)

8
snmp.go
View File

@@ -207,6 +207,14 @@ func (t *Tendrils) queryInterfaceMACs(snmp *gosnmp.GoSNMP, deviceIP net.IP) {
t.nodes.Update(iface.mac, nil, iface.name, "", "snmp-ifmac") t.nodes.Update(iface.mac, nil, iface.name, "", "snmp-ifmac")
macs = append(macs, iface.mac) macs = append(macs, iface.mac)
} }
existingNode := t.nodes.GetByIP(deviceIP)
if existingNode != nil {
for _, iface := range existingNode.Interfaces {
macs = append(macs, iface.MAC)
}
}
if len(macs) > 1 { if len(macs) > 1 {
t.nodes.Merge(macs, "snmp-ifmac") t.nodes.Merge(macs, "snmp-ifmac")
} }