From 085228d7fdf431d12431ada4803e69170e956276 Mon Sep 17 00:00:00 2001 From: Bruno Marin Date: Thu, 17 Apr 2025 12:32:07 +0200 Subject: [PATCH 1/5] fix: ipv6 any --- capirca/lib/nokia.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/capirca/lib/nokia.py b/capirca/lib/nokia.py index 1df646d1..908dc4aa 100644 --- a/capirca/lib/nokia.py +++ b/capirca/lib/nokia.py @@ -778,6 +778,8 @@ def _GeneratePrefixLists(self, config): # Nokia workaround for 0.0.0.0/0 in prefix list, expands to 2 /31s, IPv6 works with 2000::/3 if str(ip) == "0.0.0.0/0": write_ips = [ "0.0.0.0/1", "128.0.0.0/1" ] + if str(ip) == "::0/0": + write_ips = [ "::/1", "8::/1" ] else: write_ips = [ str(ip) ] From 575c24c59bf683e9d5d88a84acf50eb10b4b6cf8 Mon Sep 17 00:00:00 2001 From: Bruno Marin Date: Thu, 17 Apr 2025 13:50:23 +0200 Subject: [PATCH 2/5] fix: output --- capirca/lib/nokia.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capirca/lib/nokia.py b/capirca/lib/nokia.py index 908dc4aa..e9459c1e 100644 --- a/capirca/lib/nokia.py +++ b/capirca/lib/nokia.py @@ -778,7 +778,7 @@ def _GeneratePrefixLists(self, config): # Nokia workaround for 0.0.0.0/0 in prefix list, expands to 2 /31s, IPv6 works with 2000::/3 if str(ip) == "0.0.0.0/0": write_ips = [ "0.0.0.0/1", "128.0.0.0/1" ] - if str(ip) == "::0/0": + if str(ip) == "::/0": write_ips = [ "::/1", "8::/1" ] else: write_ips = [ str(ip) ] From df65f0ab49a28497e285a7ab10f18472ff1771ed Mon Sep 17 00:00:00 2001 From: Bruno Marin Date: Thu, 17 Apr 2025 15:12:53 +0200 Subject: [PATCH 3/5] fix: elif --- capirca/lib/nokia.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capirca/lib/nokia.py b/capirca/lib/nokia.py index e9459c1e..0b4aa0e0 100644 --- a/capirca/lib/nokia.py +++ b/capirca/lib/nokia.py @@ -778,7 +778,7 @@ def _GeneratePrefixLists(self, config): # Nokia workaround for 0.0.0.0/0 in prefix list, expands to 2 /31s, IPv6 works with 2000::/3 if str(ip) == "0.0.0.0/0": write_ips = [ "0.0.0.0/1", "128.0.0.0/1" ] - if str(ip) == "::/0": + elif str(ip) == "::/0": write_ips = [ "::/1", "8::/1" ] else: write_ips = [ str(ip) ] From d4838c12ee5f764b28631c61187b31b773f8ad52 Mon Sep 17 00:00:00 2001 From: Bruno Marin Date: Thu, 17 Apr 2025 16:55:56 +0200 Subject: [PATCH 4/5] fix: comment --- capirca/lib/nokia.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capirca/lib/nokia.py b/capirca/lib/nokia.py index 0b4aa0e0..412cd9cd 100644 --- a/capirca/lib/nokia.py +++ b/capirca/lib/nokia.py @@ -775,7 +775,7 @@ def _GeneratePrefixLists(self, config): # Write out prefix lists for ip in self.prefixlists[name]: - # Nokia workaround for 0.0.0.0/0 in prefix list, expands to 2 /31s, IPv6 works with 2000::/3 + # Nokia workaround for /0 in prefix list, expands to 2 /1s for IPv4 and IPv6 if str(ip) == "0.0.0.0/0": write_ips = [ "0.0.0.0/1", "128.0.0.0/1" ] elif str(ip) == "::/0": From 903bcf9a61f9bd40f136eb27c42926895e04d3fb Mon Sep 17 00:00:00 2001 From: Bruno Marin Date: Tue, 22 Apr 2025 15:26:10 +0200 Subject: [PATCH 5/5] fix: SROS ipv6 syntax --- capirca/lib/nokia.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capirca/lib/nokia.py b/capirca/lib/nokia.py index 412cd9cd..9ed462cf 100644 --- a/capirca/lib/nokia.py +++ b/capirca/lib/nokia.py @@ -779,7 +779,7 @@ def _GeneratePrefixLists(self, config): if str(ip) == "0.0.0.0/0": write_ips = [ "0.0.0.0/1", "128.0.0.0/1" ] elif str(ip) == "::/0": - write_ips = [ "::/1", "8::/1" ] + write_ips = [ "::/1", "8000::/1" ] else: write_ips = [ str(ip) ]