Fix issues in bgp templates for general peers

Author: pavel-shirshov

dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2

@@ -19,14 +19,6 @@ route-map HIDE_INTERNAL permit 10
   set community local-AS
 !
 {% endif %}
-{% if DEVICE_METADATA['localhost']['type'] == 'InternalBackend' %}
-route-map OVERRIDE_ORIGINATOR_ID permit 10
-{%   for (name, prefix) in LOOPBACK_INTERFACE|pfx_filter %}
-{%     if prefix | ipv4 and name == 'Loopback0' %}
-  set originator-id {{ prefix | ip }}
-{%     endif %}
-{%   endfor %}
-{% endif %}
 !
 router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
 !

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

@@ -8,32 +8,34 @@
       or  (bgp_session['holdtime'] is defined  and bgp_session['holdtime']  | int != 180) %}
   neighbor {{ neighbor_addr }} timers {{ bgp_session['keepalive'] }} {{ bgp_session['holdtime'] }}
 {% endif %}
+!
 {% if bgp_session.has_key('admin_status') and bgp_session['admin_status'] == 'down' or not bgp_session.has_key('admin_status') and CONFIG_DB__DEVICE_METADATA['localhost'].has_key('default_bgp_status') and CONFIG_DB__DEVICE_METADATA['localhost']['default_bgp_status'] == 'down' %}
   neighbor {{ neighbor_addr }} shutdown
 {% endif %}
+!
 {% if neighbor_addr | ipv4 %}
   address-family ipv4
     neighbor {{ neighbor_addr }} peer-group PEER_V4
+{%   if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'InternalBackend' %}
+    neighbor {{ neighbor_addr }} route-map FROM_BGP_PEER_V4_INT in
+{%   endif %}
 {% elif neighbor_addr | ipv6 %}
   address-family ipv6
-{% if bgp_session['asn'] != bgp_asn %}
-    neighbor {{ neighbor_addr }} route-map set-next-hop-global-v6 in
-{% endif %}
     neighbor {{ neighbor_addr }} peer-group PEER_V6
+{%   if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'InternalBackend' %}
+    neighbor {{ neighbor_addr }} route-map FROM_BGP_PEER_V6_INT in
+{%   endif %}
 {% endif %}
+!
 {% if bgp_session['rrclient'] | int != 0 %}
     neighbor {{ neighbor_addr }} route-reflector-client
 {% endif %}
+!
 {% if bgp_session['nhopself'] | int != 0 %}
     neighbor {{ neighbor_addr }} next-hop-self
 {% endif %}
 !
-{% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'InternalBackend' %}
-  neighbor {{ neighbor_addr }} route-map OVERRIDE_ORIGINATOR_ID in
-{% endif %}
-!
-{% if bgp_session["asn"] == bgp_asn
-   and CONFIG_DB__DEVICE_METADATA['localhost']['type'] == "SpineChassisFrontendRouter" %}
+{% if bgp_session["asn"] == bgp_asn and CONFIG_DB__DEVICE_METADATA['localhost']['type'] == "SpineChassisFrontendRouter" %}
   address-family l2vpn evpn
     neighbor {{ neighbor_addr }} activate
     advertise-all-vni

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

@@ -8,13 +8,15 @@
     neighbor PEER_V4 allowas-in 1
 {% endif %}
     neighbor PEER_V4 soft-reconfiguration inbound
+    neighbor PEER_V4 route-map FROM_BGP_PEER_V4 in
     neighbor PEER_V4 route-map TO_BGP_PEER_V4 out
   exit-address-family
   address-family ipv6
 {% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'ToRRouter' %}
     neighbor PEER_V6 allowas-in 1
 {% endif %}
     neighbor PEER_V6 soft-reconfiguration inbound
+    neighbor PEER_V4 route-map FROM_BGP_PEER_V6 in
     neighbor PEER_V6 route-map TO_BGP_PEER_V6 out
   exit-address-family
 !

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

@@ -2,13 +2,29 @@
 ! template: bgpd/templates/general/policies.conf.j2
 !
 !
+!
+route-map FROM_BGP_PEER_V4 permit 100
+!
 route-map TO_BGP_PEER_V4 permit 100
 !
 !
-route-map TO_BGP_PEER_V6 permit 1
-  set ipv6 next-hop prefer-global
+route-map FROM_BGP_PEER_V6 permit 1
+ set ipv6 next-hop prefer-global
+!
+route-map FROM_BGP_PEER_V6 permit 100
+!
 route-map TO_BGP_PEER_V6 permit 100
 !
+{% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'InternalBackend' %}
+route-map FROM_BGP_PEER_V4_INT permit 2
+ set originator-id {{ loopback0_ipv4 | ip }}
+!
+route-map FROM_BGP_PEER_V6_INT permit 1
+ set ipv6 next-hop prefer-global
+!
+route-map FROM_BGP_PEER_V6_INT permit 2
+ set originator-id {{ loopback0_ipv4 | ip }}
+{% endif %}
 !
 ! end of template: bgpd/templates/general/policies.conf.j2
 !