From ff83b66d2576b1f416bf70f0b48d0f48f2da652a Mon Sep 17 00:00:00 2001
From: Karl Grube <karl@hudlergrube.com>
Date: Wed, 8 Jan 2025 10:08:30 +0100
Subject: [PATCH] avernus_ranges now being added...

---
 templates/frr_conf.j2 | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/templates/frr_conf.j2 b/templates/frr_conf.j2
index 760e6df..055b3f3 100644
--- a/templates/frr_conf.j2
+++ b/templates/frr_conf.j2
@@ -82,10 +82,7 @@ router bgp {{bgp_asn}}
 {% endfor %}
 !
  address-family ipv6 unicast
-{% for range in dc_ranges %}
-  aggregate-address {{range}} route-map reject_local_origin
-{% endfor %}
-{% for range in anycast_ranges %}
+{% for range in (dc_ranges + anycast_ranges) %}
   aggregate-address {{range}} route-map reject_local_origin
 {% endfor %}
   network ::/0
@@ -157,14 +154,14 @@ ipv6 prefix-list internet seq 370 deny 2001:0:cb00:7100::/56 le 128
 ipv6 prefix-list internet seq 380 deny 2001:0:e000::/36 le 128
 ipv6 prefix-list internet seq 390 deny 2001:0:f000::/36 le 128
 ipv6 prefix-list internet seq 400 deny 2001:0:ffff:ffff::/64 le 128
-{% for prefix in dc_ranges%}
+{% for prefix in dc_ranges %}
 ipv6 prefix-list internet seq {{(loop.index|int)*10+400}} deny {{prefix|regex_replace('ge.*','')|regex_replace('le.*','')}} le 128
 {%   if loop.last %}
 ipv6 prefix-list internet seq {{(loop.index|int)*10+410}} permit any
 {%   endif %}
 {% endfor %}
 !
-{% for range in dc_ranges + anycast_ranges %}
+{% for range in dc_ranges + anycast_ranges + avernus_ranges %}
 ipv6 prefix-list my-networks seq {{(loop.index|int)*10}} permit {{range}}
 {%   if loop.last %}
 ipv6 prefix-list my-networks seq {{(loop.index|int)*10+10}} deny any
@@ -172,7 +169,7 @@ ipv6 prefix-list my-networks seq {{(loop.index|int)*10+10}} deny any
 {% endfor %}
 !
 ipv6 prefix-list nat64 seq 10 permit 64:ff9b::/96
-{% for range in dc_ranges + anycast_ranges %}
+{% for range in dc_ranges + anycast_ranges + avernus_ranges %}
 ipv6 prefix-list internal seq {{(loop.index|int)*20-10}} permit {{range}}
 ipv6 prefix-list internal seq {{(loop.index|int)*20}} permit {{range}} ge {{((range|regex_replace('.*/',''))|int)+1}}
 {%   if loop.last %}
-- 
GitLab