From 8471025e0281d8aa6e44f9058ef3cb032b91fb36 Mon Sep 17 00:00:00 2001 From: kuanyu_chen Date: Mon, 28 Sep 2020 17:10:38 +0800 Subject: [PATCH 1/2] Fix fast-reboot-dump.py ipaddress error --- scripts/fast-reboot-dump.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/fast-reboot-dump.py b/scripts/fast-reboot-dump.py index eebb2a8a5e..4ec6945173 100644 --- a/scripts/fast-reboot-dump.py +++ b/scripts/fast-reboot-dump.py @@ -39,9 +39,12 @@ def generate_neighbor_entries(filename, all_available_macs): arp_output.append(obj) ip_addr = key.split(':')[2] - if ipaddress.ip_interface(ip_addr).ip.version != 4: + try: + ipaddress.IPv4Address(ip_addr) + except ipaddress.AddressValueError: #This is ipv6 address ip_addr = key.replace(key.split(':')[0] + ':' + key.split(':')[1] + ':', '') + neighbor_entries.append((vlan_name, mac, ip_addr)) syslog.syslog(syslog.LOG_INFO, "Neighbor entry: [Vlan: %s, Mac: %s, Ip: %s]" % (vlan_name, mac, ip_addr)) From 0824a0a051c776353269fbbe1b59195f5a5ee65e Mon Sep 17 00:00:00 2001 From: kuanyu_chen Date: Thu, 8 Oct 2020 09:53:42 +0800 Subject: [PATCH 2/2] [fast-reboot-dump.py] Decode the ipaddress when calling ipaddress --- scripts/fast-reboot-dump.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/fast-reboot-dump.py b/scripts/fast-reboot-dump.py index 4ec6945173..340ecae1cc 100644 --- a/scripts/fast-reboot-dump.py +++ b/scripts/fast-reboot-dump.py @@ -40,7 +40,7 @@ def generate_neighbor_entries(filename, all_available_macs): ip_addr = key.split(':')[2] try: - ipaddress.IPv4Address(ip_addr) + ipaddress.IPv4Address(ip_addr.decode()) except ipaddress.AddressValueError: #This is ipv6 address ip_addr = key.replace(key.split(':')[0] + ':' + key.split(':')[1] + ':', '')