General route-maps and prefix_list manager fix

Signed-off-by: Mukul Chodhary <70460358+Muckthebuck@users.noreply.github.com>

Author: Muckthebuck

dockers/docker-fpm-frr/frr/bgpd/templates/general/peer-group.conf.j2

@@ -26,6 +26,10 @@
     neighbor PEER_V6 soft-reconfiguration inbound
     neighbor PEER_V6 route-map FROM_BGP_PEER_V6 in
     neighbor PEER_V6 route-map TO_BGP_PEER_V6 out
+{% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'SpineRouter' %}
+    table-map SELECTIVE_ROUTE_DOWNLOAD_V4
+    table-map SELECTIVE_ROUTE_DOWNLOAD_V6
+{% endif %}
   exit-address-family
 !
 ! end of template: bgpd/templates/general/peer-group.conf.j2

dockers/docker-fpm-frr/frr/bgpd/templates/general/policies.conf.j2

@@ -97,5 +97,44 @@ route-map TO_BGP_PEER_V6 permit 100
 !
 route-map CHECK_IDF_ISOLATION permit 10
 !
+!
+!
+{% if CONFIG_DB__DEVICE_METADATA and 'localhost' in CONFIG_DB__DEVICE_METADATA and 'type' in CONFIG_DB__DEVICE_METADATA['localhost'] and 'subtype' in CONFIG_DB__DEVICE_METADATA['localhost'] %}
+{% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'SpineRouter' and CONFIG_DB__DEVICE_METADATA['localhost']['subtype'] == 'UpstreamLC' %}
+bgp community-list standard ANCHOR_ROUTE_COMMUNITY permit {{ constants.bgp.anchor_route_community }}
+bgp community-list standard LOCAL_ANCHOR_ROUTE_COMMUNITY permit {{ constants.bgp.local_anchor_route_community }}
+bgp community-list standard ANCHOR_CONTRIBUTING_ROUTE_COMMUNITY permit {{ constants.bgp.anchor_contributing_route_community }}
+!
+route-map SELECTIVE_ROUTE_DOWNLOAD_V4 deny 10
+  match community LOCAL_ANCHOR_ROUTE_COMMUNITY
+!
+route-map SELECTIVE_ROUTE_DOWNLOAD_V4 permit 1000
+!
+route-map SELECTIVE_ROUTE_DOWNLOAD_V6 deny 10
+  match community LOCAL_ANCHOR_ROUTE_COMMUNITY
+!
+route-map SELECTIVE_ROUTE_DOWNLOAD_V6 permit 1000
+!
+route-map TAG_ANCHOR_COMMUNITY permit 10
+  set community {{ constants.bgp.local_anchor_route_community }} {{ constants.bgp.anchor_route_community }} additive
+!
+route-map TO_BGP_PEER_V6 permit 30
+  match ipv6 address prefix-list ANCHOR_CONTRIBUTING_ROUTES
+  set community {{ constants.bgp.anchor_contributing_route_community }} additive
+  on-match next
+!
+route-map TO_BGP_PEER_V6 permit 40
+  set comm-list LOCAL_ANCHOR_ROUTE_COMMUNITY delete
+!
+route-map TO_BGP_PEER_V4 permit 30
+  match ipv6 address prefix-list ANCHOR_CONTRIBUTING_ROUTES
+  set community {{ constants.bgp.anchor_contributing_route_community }} additive
+  on-match next
+!
+route-map TO_BGP_PEER_V4 permit 40
+  set comm-list LOCAL_ANCHOR_ROUTE_COMMUNITY delete
+!
+{% endif %}
+{% endif %}
 ! end of template: bgpd/templates/general/policies.conf.j2
 !

files/image_config/constants/constants.yml

@@ -9,6 +9,8 @@ constants:
     sentinel_community: 12345:12346
     internal_community_match_tag: 201
     local_anchor_route_community: 12345:555
+    anchor_route_community: 12345:666
+    anchor_contributing_route_community: 12345:777
     route_do_not_send_appdb_tag: 202
     route_eligible_for_fallback_to_default_tag: 203
     families:

src/sonic-bgpcfgd/bgpcfgd/managers_prefix_list.py

@@ -35,16 +35,20 @@ def generate_prefix_list_config(self, data, add):
         """
         cmd = "\n"
         metadata = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]
-        bgp_asn = metadata["bgp_asn"]
-        localhost_type = metadata["type"]
-        subtype = metadata["subtype"]
+        try:
+            bgp_asn = metadata["bgp_asn"]
+            localhost_type = metadata["type"]
+            subtype = metadata["subtype"]
+        except KeyError as e:
+            log_warn(f"PrefixListMgr:: Missing metadata key: {e}")
+            return False
 
         if data["prefix_list_name"] != "ANCHOR_PREFIX":
             log_warn("PrefixListMgr:: Prefix list %s is not supported" % data["prefix_list_name"])
-            return
+            return False
         if localhost_type != "SpineRouter" or subtype != "UpstreamLC":
             log_warn("PrefixListMgr:: Prefix list %s is only supported on UpstreamLC of SpineRouter" % data["prefix_list_name"])
-            return
+            return False
 
         # Add the anchor prefix to the radian configuration
         data["bgp_asn"] = bgp_asn
@@ -56,6 +60,7 @@ def generate_prefix_list_config(self, data, add):
             cmd += self.templates["del_radian"].render(data=data)
             log_debug("PrefixListMgr:: Anchor prefix %s removed from radian configuration" % data["prefix"])	
         self.cfg_mgr.push(cmd)
+        return True
 
 
 
@@ -72,11 +77,11 @@ def set_handler(self, key, data):
             data["prefix"] = str(prefix.cidr)
             data["ipv"] = self.get_ip_type(prefix)
             # Generate the prefix list configuration
-            self.generate_prefix_list_config(data, add=True)
-            log_info("PrefixListMgr:: %s %s configuration generated" % (prefix_list_name, data["prefix"]))
+            if self.generate_prefix_list_config(data, add=True):
+                log_info("PrefixListMgr:: %s %s configuration generated" % (prefix_list_name, data["prefix"]))
 
-            self.directory.put(self.db_name, self.table_name, key, data)
-            log_info("PrefixListMgr:: set %s" % key)
+                self.directory.put(self.db_name, self.table_name, key, data)
+                log_info("PrefixListMgr:: set %s" % key)
         return True
 
     def del_handler(self, key):
@@ -92,10 +97,11 @@ def del_handler(self, key):
             data["prefix_list_name"] = prefix_list_name
             data["prefix"] = str(prefix.cidr)
             data["ipv"] = self.get_ip_type(prefix)
-            self.generate_prefix_list_config(data, add=False)
-            log_info("PrefixListMgr:: %s %s configuration deleted" % (prefix_list_name, data["prefix"]))
-            self.directory.remove(self.db_name, self.table_name, key)
-            log_info("PrefixListMgr:: deleted %s" % key)
+            # remove the prefix list configuration
+            if self.generate_prefix_list_config(data, add=False):
+                log_info("PrefixListMgr:: %s %s configuration deleted" % (prefix_list_name, data["prefix"]))
+                self.directory.remove(self.db_name, self.table_name, key)
+                log_info("PrefixListMgr:: deleted %s" % key)
         # Implement deletion logic if necessary
         return True