cnbugs/network-topology-discovery
1
0
Fork 0
Koodi Ongelmat Pull-pyynnöt Toiminta

feat: 增强拓扑匹配算法，支持多重匹配策略

Selaa lähdekoodia 
- 添加5重匹配策略：IP直连、主机名、MAC地址、子网匹配、接口描述
- 实现智能子网匹配：仅当网段只有2台设备时才使用（避免歧义）
- 修复JSON配置文件尾随逗号问题
- 修复devices.json解析错误
- 优化邻居匹配逻辑，提升拓扑连接准确性

修复问题：
- 解决LLDP邻居MAC无法匹配设备的问题
- 解决ARP表解析返回0条记录的问题
- 解决设备之间无法建立拓扑连接的问题

当前成果：
- 5个设备节点正确显示
- 3条拓扑边正确建立（172.16.8.6↔172.16.8.1, 172.16.8.8↔172.16.8.6, 172.16.8.9↔172.16.8.6）
This commit is contained in:
Your Name
2026-04-26 05:45:00 +08:00
vanhempi 6d2323b5b6
commit e2f804ac52
3 muutettua tiedostoa jossa 3834 lisäystä ja 113 poistoa
Download Patch File Download Diff File Expand all files Collapse all files
internal/device/h3c.go
+82 -97
Näytä tiedosto
@@ -16,23 +16,24 @@ type H3CParser struct {
// GetCommands 获取H3C设备命令列表
func (p *H3CParser) GetCommands() []string {
return []string{
"screen-length disable", // 禁用分页（H3C/华为设备必需）
"screen-length disable", // 禁用分页（H3C/华为设备必需）
"display version",
"display interface",
"display interface brief", // 接口简要信息（包含VLAN和物理接口状态）
"display lldp neighbor-information verbose", // LLDP邻居详细信息（包含System name和Management address）
"display interface brief", // 接口简要信息（包含VLAN和物理接口状态）
"display lldp neighbor-information", // 使用非verbose格式（v1.0.0验证可行）
"display arp", // ARP表用于解析邻居IP
}
}
// Parse 解析H3C设备输出
func (p *H3CParser) Parse(device *models.Device, outputs []string) error {
if len(outputs) < 5 {
if len(outputs) < 6 {
return fmt.Errorf("insufficient command outputs")
}
// outputs[0] 是 screen-length disable 的输出（通常为空）
p.parseVersion(device, outputs[1]) // outputs[1] 是 display version
p.parseVersion(device, outputs[1]) // outputs[1] 是 display version
// outputs[2] 是 display interface
fmt.Printf("[H3C DEBUG] display interface output length: %d\n", len(outputs[2]))
if len(outputs[2]) > 0 {
@@ -45,17 +46,17 @@ func (p *H3CParser) Parse(device *models.Device, outputs []string) error {
} else {
fmt.Printf("[H3C DEBUG] display interface output is EMPTY!\n")
}
if outputs[2] == "" {
fmt.Printf("Warning: 'display interface' output is empty for device %s\n", device.IP)
} else {
// outputs[3] 是 display interface brief
device.Interfaces = p.parseInterfaces(outputs[2], outputs[3])
if len(device.Interfaces) == 0 {
fmt.Printf("Warning: parsed 0 interfaces for device %s (output length: %d)\n",
fmt.Printf("Warning: parsed 0 interfaces for device %s (output length: %d)\n",
device.IP, len(outputs[2]))
}
// 收集所有接口的MAC地址（用于邻居匹配）
macSet := make(map[string]bool)
for _, iface := range device.Interfaces {
@@ -70,12 +71,24 @@ func (p *H3CParser) Parse(device *models.Device, outputs []string) error {
}
fmt.Printf(" Collected %d unique MAC addresses for device %s\n", len(macSet), device.IP)
}
// outputs[4] 是 display lldp neighbor-information
// 解析LLDP邻居
device.Neighbors = p.parseNeighbors(outputs[4], nil)
// outputs[5] 是 display arp
// 解析ARP表
fmt.Printf("[H3C ARP DEBUG] Raw ARP output length: %d bytes\n", len(outputs[5]))
if len(outputs[5]) > 0 && len(outputs[5]) <= 1000 {
fmt.Printf("[H3C ARP DEBUG] Raw ARP output:\n%s\n", outputs[5])
} else if len(outputs[5]) > 1000 {
fmt.Printf("[H3C ARP DEBUG] Raw ARP output (first 1000 bytes):\n%s\n", outputs[5][:1000])
}
arpTable := p.parseARPTable(outputs[5])
fmt.Printf("[H3C ARP DEBUG] Parsed ARP table: %d entries\n", len(arpTable))
// 解析LLDP邻居（传入ARP表）
device.Neighbors = p.parseNeighbors(outputs[4], arpTable)
fmt.Printf("Device %s: %d interfaces, %d neighbors\n",
device.IP, len(device.Interfaces), len(device.Neighbors))
@@ -197,12 +210,12 @@ func (p *H3CParser) parseInterfaces(interfaceOutput, briefOutput string) []model
func cidrToMask(cidr string) string {
var mask int
fmt.Sscanf(cidr, "%d", &mask)
s := uint32(0)
for i := 0; i < mask; i++ {
s |= (1 << (31 - uint(i)))
}
return fmt.Sprintf("%d.%d.%d.%d",
(s>>24)&0xFF,
(s>>16)&0xFF,
@@ -217,10 +230,10 @@ func (p *H3CParser) parseARPTable(output string) map[string]string {
for _, line := range lines {
// 跳过空行和标题行
if strings.TrimSpace(line) == "" ||
strings.Contains(line, "Type:") ||
strings.Contains(line, "------") ||
strings.Contains(line, "IP address") {
if strings.TrimSpace(line) == "" ||
strings.Contains(line, "Type:") ||
strings.Contains(line, "------") ||
strings.Contains(line, "IP address") {
continue
}
@@ -230,10 +243,14 @@ func (p *H3CParser) parseARPTable(output string) map[string]string {
if len(fields) >= 2 {
ip := fields[0]
mac := strings.ToLower(fields[1])
// 标准化MAC地址（统一为aabb-ccdd-eeff格式）
mac = normalizeMACFormat(mac)
// 验证是有效的IP和MAC
if isValidIP(ip) && isValidMAC(mac) {
macToIP[mac] = ip
fmt.Printf("[H3C ARP DEBUG] Added MAC->IP: %s -> %s\n", mac, ip)
}
}
}
@@ -241,6 +258,24 @@ func (p *H3CParser) parseARPTable(output string) map[string]string {
return macToIP
}
// normalizeMACFormat 标准化MAC地址格式（统一为aabb-ccdd-eeff）
func normalizeMACFormat(mac string) string {
// 去除所有分隔符
clean := ""
for _, c := range mac {
if c != '-' && c != ':' && c != '.' {
clean += string(c)
}
}
// 重新格式化为aabb-ccdd-eeff
if len(clean) == 12 {
return fmt.Sprintf("%s-%s-%s", clean[0:4], clean[4:8], clean[8:12])
}
return mac
}
func (p *H3CParser) parseInterfaceBrief(output string) map[string]models.Interface {
interfaces := make(map[string]models.Interface)
lines := strings.Split(output, "\n")
@@ -276,7 +311,7 @@ func (p *H3CParser) parseNeighbors(output string, arpTable map[string]string) []
if currentNeighbor != nil && currentNeighbor.RemoteInterface != "" {
neighbors = append(neighbors, *currentNeighbor)
}
matches := portRegex.FindStringSubmatch(line)
localInterface = matches[1]
currentNeighbor = &models.Neighbor{
@@ -287,24 +322,7 @@ func (p *H3CParser) parseNeighbors(output string, arpTable map[string]string) []
}
if currentNeighbor != nil {
// 提取 ChassisID (MAC地址)
// Verbose格式: Chassis ID: 642f-c7e0-0333
if strings.Contains(line, "Chassis ID:") && !strings.Contains(line, "ChassisID/subtype") {
parts := strings.SplitN(line, ":", 2)
if len(parts) == 2 {
mac := strings.TrimSpace(strings.ToLower(parts[1]))
if isValidMAC(mac) {
currentNeighbor.RemoteMAC = mac
// 如果还没有RemoteDevice，先使用MAC作为占位符（后续可能被System name覆盖）
if currentNeighbor.RemoteDevice == "" {
currentNeighbor.RemoteDevice = mac
}
fmt.Printf(" [LLDP] Parsed neighbor MAC (verbose): %s\n", mac)
}
}
}
// 非verbose格式: ChassisID/subtype: a4bb-6de2-62cd/MAC address
// 提取 ChassisID (MAC地址) - 非verbose格式
if strings.Contains(line, "ChassisID/subtype") {
parts := strings.SplitN(line, ":", 2)
if len(parts) == 2 {
@@ -312,61 +330,33 @@ func (p *H3CParser) parseNeighbors(output string, arpTable map[string]string) []
// 格式: a4bb-6de2-62cd/MAC address
if macParts := strings.Split(value, "/"); len(macParts) > 0 {
mac := strings.TrimSpace(strings.ToLower(macParts[0]))
// 标准化MAC地址格式
mac = normalizeMACFormat(mac)
// 保存MAC地址
currentNeighbor.RemoteMAC = mac
if currentNeighbor.RemoteDevice == "" {
currentNeighbor.RemoteDevice = mac
fmt.Printf(" Parsed neighbor MAC: %s (from line: %s)\n", mac, line)
// 使用MAC地址作为设备标识
currentNeighbor.RemoteDevice = mac
// 通过ARP表查找IP地址
if arpTable != nil {
if ip, found := arpTable[mac]; found {
currentNeighbor.RemoteIP = ip
fmt.Printf(" ✓ Found IP for MAC %s: %s\n", mac, ip)
} else {
fmt.Printf(" ✗ No IP found for MAC %s in ARP table\n", mac)
}
}
fmt.Printf(" [LLDP] Parsed neighbor MAC: %s\n", mac)
}
}
}
// 提取 System name (verbose格式)
if strings.Contains(line, "System name:") {
parts := strings.SplitN(line, ":", 2)
if len(parts) == 2 {
systemName := strings.TrimSpace(parts[1])
if systemName != "" {
// System name 是最可靠的匹配方式，覆盖之前的MAC地址占位符
currentNeighbor.RemoteDevice = systemName
fmt.Printf(" [LLDP] Parsed neighbor System name: %s\n", systemName)
}
}
}
// 提取 Management address (verbose格式)
if strings.Contains(line, "Management address:") {
parts := strings.SplitN(line, ":", 2)
if len(parts) == 2 {
mgmtAddr := strings.TrimSpace(parts[1])
if isValidIP(mgmtAddr) {
// 如果还没有RemoteIP，使用Management address
if currentNeighbor.RemoteIP == "" {
currentNeighbor.RemoteIP = mgmtAddr
fmt.Printf(" [LLDP] Parsed neighbor Management address: %s\n", mgmtAddr)
}
}
}
}
// 提取 PortID (远程接口)
// Verbose格式: Port ID: GigabitEthernet1/0/48 或 Port ID: a4bb-6de2-62cd (MAC地址)
if strings.Contains(line, "Port ID:") && !strings.Contains(line, "PortID/subtype") && !strings.Contains(line, "Port ID type") {
parts := strings.SplitN(line, ":", 2)
if len(parts) == 2 {
portID := strings.TrimSpace(parts[1])
// 检查Port ID是否是MAC地址（格式: a4bb-6de2-62cd）
if isValidMAC(portID) {
// Port ID是MAC地址，不赋值给RemoteInterface
fmt.Printf(" [LLDP] Port ID is MAC address (not interface): %s\n", portID)
} else {
// Port ID是接口名
currentNeighbor.RemoteInterface = portID
fmt.Printf(" WARNING: Could not parse MAC from ChassisID line: %s\n", line)
}
} else {
fmt.Printf(" WARNING: ChassisID line has no colon: %s\n", line)
}
}
// 非verbose格式: PortID/subtype: GigabitEthernet0/0/1/Interface name
// 提取 PortID (远程接口) - 非verbose格式
if strings.Contains(line, "PortID/subtype") {
parts := strings.SplitN(line, ":", 2)
if len(parts) == 2 {
@@ -375,20 +365,15 @@ func (p *H3CParser) parseNeighbors(output string, arpTable map[string]string) []
if portParts := strings.Split(value, "/"); len(portParts) >= 3 {
// 取前3部分作为接口名: GigabitEthernet0/0/1
currentNeighbor.RemoteInterface = strings.Join(portParts[:3], "/")
fmt.Printf(" Parsed neighbor interface: %s\n", currentNeighbor.RemoteInterface)
}
}
}
}
}
// 添加最后一个邻居（修改：只要有RemoteDevice或RemoteInterface就添加）
if currentNeighbor != nil && (currentNeighbor.RemoteDevice != "" || currentNeighbor.RemoteInterface != "") {
// 如果Port ID是MAC地址而不是接口名，将MAC赋值给RemoteInterface（如果为空）
if currentNeighbor.RemoteInterface == "" && currentNeighbor.RemoteMAC != "" {
// 检查Port ID是否是MAC地址（在解析过程中可能已经将MAC作为Port ID）
// 这种情况发生在Port ID type为MAC address时
fmt.Printf(" [LLDP] Neighbor has no interface name, using MAC as identifier: %s\n", currentNeighbor.RemoteMAC)
}
// 添加最后一个邻居
if currentNeighbor != nil && currentNeighbor.RemoteInterface != "" {
neighbors = append(neighbors, *currentNeighbor)
}