Support configuring source IPv6 for routes through FRR

Signed-off-by: Matej Feder <[email protected]>

Author: matofeder

dockers/docker-fpm-frr/frr/zebra/zebra.interfaces.conf.j2

@@ -17,6 +17,11 @@ exit
 vrf {{ vrf }}
  ip protocol bgp route-map {{ bgp_sess['route_map'] }}
 {%    endif %}
+{%    if 'route_map_ipv6' in bgp_sess %}
+!
+vrf {{ vrf }}
+ ipv6 protocol bgp route-map {{ bgp_sess['route_map_ipv6'] }}
+{%    endif %}
 {%   endfor %}
 {%  endif %}
 {%  if ROUTE_MAP is defined and ROUTE_MAP|length > 0 %}

src/sonic-frr-mgmt-framework/frrcfgd/frrcfgd.py

@@ -1755,7 +1755,8 @@ class BGPConfigDaemon:
                       ('confed_peers',                                  '{no:no-prefix}bgp confederation peers {}', hdl_confed_peers),
                       (['keepalive', 'holdtime'],                       '{no:no-prefix}timers bgp {} {}'),
                       (['max_med_admin', '+max_med_admin_val'],         '{no:no-prefix}bgp max-med administrative {}', ['true', 'false']),
-                      ('route_map',                                     '{no:no-prefix}ip protocol bgp route-map {}'),
+                      ('route_map',                                     '[zebra]{no:no-prefix}ip protocol bgp route-map {}'),
+                      ('route_map_ipv6',                                '[zebra]{no:no-prefix}ipv6 protocol bgp route-map {}'),
     ]
 
     global_af_key_map = [(['ebgp_route_distance',
@@ -1878,7 +1879,7 @@ class BGPConfigDaemon:
                          ('call_route_map',                 '{no:no-prefix}call {:enable-only}'),
                          ('set_origin',                     '[bgpd]{no:no-prefix}set origin {:tolower}'),
                          ('set_local_pref',                 '[bgpd]{no:no-prefix}set local-preference {}'),
-                         ('set_src',                        '{no:no-prefix}set src {}'),
+                         ('set_src',                        '[zebra]{no:no-prefix}set src {}'),
                          ('set_next_hop',                   '{no:no-prefix}set ip next-hop {}'),
                          ('set_ipv6_next_hop_global',       '[bgpd]{no:no-prefix}set ipv6 next-hop global {}'),
                          ('set_ipv6_next_hop_prefer_global', '[bgpd]{no:no-prefix}set ipv6 next-hop prefer-global', ['true', 'false']),
@@ -2644,12 +2645,13 @@ def __update_bgp(self, data_list):
                     if local_asn is None:
                         syslog.syslog(syslog.LOG_ERR, 'local ASN for VRF %s was not configured' % vrf)
                         continue
-                    if 'route_map' in data:
-                        # Route maps are configured in a different context, so they need a different cmd_prefix
-                        cmd_prefix = ['configure terminal', 'vrf {}'.format(vrf)]
-                        if not key_map.run_command(self, table, {'route_map': data['route_map']}, cmd_prefix):
-                            syslog.syslog(syslog.LOG_ERR, 'failed running BGP global config command')
-                        del data['route_map']
+                    for route_map_key in ['route_map', 'route_map_ipv6']:
+                        if route_map_key in data:
+                            # Route maps are configured in a different context, so they need a different cmd_prefix
+                            cmd_prefix = ['configure terminal', 'vrf {}'.format(vrf)]
+                            if not key_map.run_command(self, table, {route_map_key: data[route_map_key]}, cmd_prefix):
+                                syslog.syslog(syslog.LOG_ERR, 'failed running BGP global config command')
+                            del data[route_map_key]
                     cmd_prefix = ['configure terminal', 'router bgp {} vrf {}'.format(local_asn, vrf)]
                     if not key_map.run_command(self, table, data, cmd_prefix):
                         syslog.syslog(syslog.LOG_ERR, 'failed running BGP global config command')

src/sonic-frr/frr

@@ -2,6 +2,9 @@
     "BGP_GLOBAL_VALID": {
         "desc": "Configure BGP global table."
     },
+    "BGP_GLOBAL_ROUTE_MAP_VALID": {
+        "desc": "Configure BGP global table with route map."
+    },
     "BGP_NEIGHBOR_ALL_VALID": {
         "desc": "Configure BGP neighbor table."
     },

src/sonic-yang-models/tests/yang_model_tests/tests/bgp.json

@@ -82,6 +82,36 @@
         }
     },
 
+    "BGP_GLOBAL_ROUTE_MAP_VALID": {
+        "sonic-vrf:sonic-vrf":{
+            "sonic-vrf:VRF": {
+                "VRF_LIST": [
+                {
+                    "name":"Vrf1"
+                }
+                ]
+            }
+        },
+        "sonic-bgp-global:sonic-bgp-global": {
+            "sonic-bgp-global:BGP_GLOBALS": {
+                "BGP_GLOBALS_LIST": [
+                {
+                    "vrf_name":"default",
+                    "local_asn": 65001,
+                    "route_map": "RM_SET_SRC",
+                    "route_map_ipv6": "RM_SET_SRC6"
+                },
+                {
+                    "vrf_name":"Vrf1",
+                    "local_asn": 65001,
+                    "route_map": "RM_SET_SRC",
+                    "route_map_ipv6": "RM_SET_SRC6"
+                }
+                ]
+            }
+        }
+    },
+
     "BGP_NEIGHBOR_ALL_VALID": {
         "sonic-port:sonic-port": {
             "sonic-port:PORT": {

src/sonic-yang-models/tests/yang_model_tests/tests_config/bgp.json

@@ -320,7 +320,12 @@ module sonic-bgp-global {
 
                 leaf route_map {
                     type string;
-                    description "Route map to apply to BGP-learned routes in Zebra";
+                    description "IPv4 route map to apply to BGP-learned routes in Zebra";
+                }
+
+                leaf route_map_ipv6 {
+                    type string;
+                    description "IPv6 route map to apply to BGP-learned routes in Zebra";
                 }
             }
         }