Skip to content

[VRF]: FRR config templates support VRF #3047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 19 commits into from
Closed

[VRF]: FRR config templates support VRF #3047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
bfaaba1
Merge pull request #1 from Azure/master
tylerlinp Jun 12, 2019
79b5b6d
Merge branch 'master' of https://github.com/Azure/sonic-buildimage in…
Jun 19, 2019
6efb614
FRR config templates support VRF
Jun 19, 2019
8b46015
Revise FRR FRR config templates support VRF
Jul 23, 2019
17ab945
Merge https://github.com/Azure/sonic-buildimage into frr-config
Jul 23, 2019
f64b9e6
fix t2-chassis-fe test failure
Jul 23, 2019
0d3e9f1
Merge https://github.com/Azure/sonic-buildimage into frr-config
Sep 24, 2019
15c8e36
Merge https://github.com/Azure/sonic-buildimage into frr-config
Oct 9, 2019
08b660e
Merge https://github.com/Azure/sonic-buildimage into frr-config
Oct 31, 2019
d78027a
Merge https://github.com/Azure/sonic-buildimage into frr-config
Oct 31, 2019
ab5daf8
FRR config templates support VRF
Oct 31, 2019
c94031f
sample_output changes because of '!' at file tail
Nov 1, 2019
c284668
Merge https://github.com/Azure/sonic-buildimage into frr-config
Nov 6, 2019
4a587eb
Merge https://github.com/Azure/sonic-buildimage into frr-config
Nov 8, 2019
d5a9fe3
address review comments
Nov 8, 2019
a76bb38
Merge https://github.com/Azure/sonic-buildimage into frr-config
Dec 6, 2019
74d3203
remove extra spaces
Dec 6, 2019
1525d29
Merge https://github.com/Azure/sonic-buildimage into frr-config
Jan 7, 2020
c42fd70
Merge https://github.com/Azure/sonic-buildimage into frr-config
Apr 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dockers/docker-fpm-frr/bgpcfgd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,15 +408,15 @@ class BGPPeerMgr(Manager):
@staticmethod
def load_peers():
vrfs = []
command = ["vtysh", "-c", "show bgp vrfs json"]
command = ["vtysh", "-c", "show bgp vrfs json"]
rc, out, err = run_command(command)
if rc == 0:
js_vrf = json.loads(out)
vrfs = js_vrf['vrfs'].keys()

peers = set()
for vrf in vrfs:
command = ["vtysh", "-c", 'show bgp vrf {} neighbors json'.format(vrf)]
command = ["vtysh", "-c", 'show bgp vrf {} neighbors json'.format(vrf)]
rc, out, err = run_command(command)
if rc == 0:
js_bgp = json.loads(out)
Expand Down
105 changes: 85 additions & 20 deletions dockers/docker-fpm-frr/bgpd.conf.default.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
!
{% block bgp %}
{% if DEVICE_METADATA['localhost'].has_key('bgp_asn') %}
{% block bgp_init %}
{# block bgp_init #}
!
! bgp multiple-instance
!
Expand Down Expand Up @@ -50,7 +51,53 @@ route-map ISOLATE permit 10
route-map set-next-hop-global-v6 permit 10
set ipv6 next-hop prefer-global
!
{% set vrf_lo_intf = {} %}
{% for (name, prefix) in LOOPBACK_INTERFACE|pfx_filter %}
{% set intf_vrf = 'default' %}
{% if LOOPBACK_INTERFACE.has_key(name) and LOOPBACK_INTERFACE[name].has_key('vrf_name') %}
{% set intf_vrf = LOOPBACK_INTERFACE[name]['vrf_name'] %}
{% endif %}
{% if vrf_lo_intf.has_key(intf_vrf) or vrf_lo_intf.update({intf_vrf:[]}) %}
{% endif %}
{% if name not in vrf_lo_intf[intf_vrf] and vrf_lo_intf[intf_vrf].append(name) %}
{% endif %}
{% endfor %}
{% set vrf_routers = [] %}
{% set vrf_bgp_nbr = {} %}
{% for nbr_key in BGP_NEIGHBOR %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest to put this into bgpd.peer template.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can not move out because peer-group PEER_V4/PEER_V6 need config in these vrfs.

{% if nbr_key | length == 2 %}
{% set nbr_vrf = nbr_key[0] %}
{% set nbr_addr = nbr_key[1] %}
{% else %}
{% set nbr_vrf = 'default' %}
{% set nbr_addr = nbr_key %}
{% endif %}
{% if nbr_vrf in vrf_routers or vrf_routers.append(nbr_vrf) %}
{% endif %}
{% if vrf_bgp_nbr.has_key(nbr_vrf) or vrf_bgp_nbr.update({nbr_vrf:{}}) %}
{% endif %}
{% if vrf_bgp_nbr[nbr_vrf].update({nbr_addr:BGP_NEIGHBOR[nbr_key]}) %}
{% endif %}
{% endfor %}
{% set vrf_bgp_pr = {} %}
{% for pr_key in BGP_PEER_RANGE %}
{% set pr_vrf = 'default' %}
{% if BGP_PEER_RANGE[pr_key].has_key('vrf_name') %}
{% set pr_vrf = BGP_PEER_RANGE[pr_key]['vrf_name'] %}
{% endif %}
{% if pr_vrf not in vrf_routers and vrf_routers.append(pr_vrf) %}
{% endif %}
{% if vrf_bgp_pr.has_key(pr_vrf) or vrf_bgp_pr.update({pr_vrf:{}}) %}
{% endif %}
{% if vrf_bgp_pr[pr_vrf].update({pr_key:BGP_PEER_RANGE[pr_key]}) %}
{% endif %}
{% endfor %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to put all the code inside of bgpcfgd?
Currently this change put a huge amount of logic inside of the jinja2.
Can we put all the logic into bgpcfgd?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not just peer_range, there are configs even peer. If to aware vrf in conf, we have to loop all vrfs. Now vrfs get from BGP_NEIGHBOR and BGP_PEER_RANGE. Theoretically speaking, all can be put into bgpcfgd, then no j2 template left. But that would be a huge work.

{% for vrf in vrf_routers|sort %}
{% if vrf == 'default' %}
router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
{% else %}
router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }} vrf {{ vrf }}
{% endif %}
{% if DEVICE_METADATA['localhost']['type'] == 'InternalFrontend' %}
redistribute connected route-map HIDE_INTERNAL
{% endif %}
Expand All @@ -62,43 +109,52 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
{% if DEVICE_METADATA['localhost']['type'] == 'ToRRouter' %}
bgp graceful-restart preserve-fw-state
{% endif %}
{% set vrf_lo0 = "" %}
{% if vrf_lo_intf[vrf] | length > 0 %}
{% set vrf_lo0 = vrf_lo_intf[vrf][0] %}
{% endif %}
{% for (name, prefix) in LOOPBACK_INTERFACE|pfx_filter %}
{% if prefix | ipv4 and name == 'Loopback0' %}
{% if prefix | ipv4 and name == vrf_lo0 %}
bgp router-id {{ prefix | ip }}
{% endif %}
{% endfor %}
{# advertise loopback #}
{% for (name, prefix) in LOOPBACK_INTERFACE|pfx_filter %}
{% if prefix | ipv4 and name == 'Loopback0' %}
{% if prefix | ipv4 and name == vrf_lo0 %}
network {{ prefix | ip }}/32
{% elif prefix | ipv6 and name == 'Loopback0' %}
{% elif prefix | ipv6 and name == vrf_lo0 %}
address-family ipv6
network {{ prefix | ip }}/64
exit-address-family
{% endif %}
{% endfor %}
{% endblock bgp_init %}
{% endif %}
{% block vlan_advertisement %}
{# endblock bgp_init #}
{# block vlan_advertisement #}
{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
{% set vlan_intf_vrf = 'default' %}
{% if VLAN_INTERFACE.has_key(name) and VLAN_INTERFACE[name].has_key('vrf_name') %}
{% set vlan_intf_vrf = VLAN_INTERFACE[name]['vrf_name'] %}
{% endif %}
{% if vlan_intf_vrf == vrf %}
{% if prefix | ipv4 %}
network {{ prefix }}
{% elif prefix | ipv6 %}
address-family ipv6
network {{ prefix }}
exit-address-family
{% endif %}
{% endif %}
{% endfor %}
{% endblock vlan_advertisement %}
{% block maximum_paths %}
{# endblock vlan_advertisement #}
{# block maximum_paths #}
address-family ipv4
maximum-paths 64
exit-address-family
address-family ipv6
maximum-paths 64
exit-address-family
{% endblock maximum_paths %}
{% block peers_peer_group %}
{# endblock maximum_paths #}
{# block peers_peer_group #}
neighbor PEER_V4 peer-group
neighbor PEER_V6 peer-group
address-family ipv4
Expand All @@ -115,10 +171,10 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
neighbor PEER_V6 soft-reconfiguration inbound
neighbor PEER_V6 route-map TO_BGP_PEER_V6 out
exit-address-family
{% endblock peers_peer_group %}
{% block bgp_peers_with_range %}
{% if BGP_PEER_RANGE %}
{% for bgp_peer in BGP_PEER_RANGE.values() %}
{# endblock peers_peer_group #}
{# block bgp_peers_with_range #}
{% if vrf_bgp_pr.has_key(vrf) %}
{% for peer_key, bgp_peer in vrf_bgp_pr[vrf]|dictsort %}
neighbor {{ bgp_peer['name'] }} peer-group
neighbor {{ bgp_peer['name'] }} passive
{% if bgp_peer['peer_asn'] is defined %}
Expand All @@ -131,8 +187,12 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
{% if bgp_peer['src_address'] is defined %}
neighbor {{ bgp_peer['name'] }} update-source {{ bgp_peer['src_address'] | ip }}
{% else %}
{% set vrf_lo1 = "" %}
{% if vrf_lo_intf[vrf] | length > 1 %}
{% set vrf_lo1 = vrf_lo_intf[vrf][1] %}
{% endif %}
{% for (name, prefix) in LOOPBACK_INTERFACE|pfx_filter %}
{% if name == 'Loopback1' %}
{% if name == vrf_lo1 %}
neighbor {{ bgp_peer['name'] }} update-source {{ prefix | ip }}
{% endif %}
{% endfor %}
Expand All @@ -150,12 +210,13 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
exit-address-family
{% endfor %}
{% endif %}
{% endblock bgp_peers_with_range %}
{% block bgp_monitors %}
{# endblock bgp_peers_with_range #}
{# block bgp_monitors #}
{% if vrf == 'default' %}
{% if BGP_MONITORS is defined and BGP_MONITORS|length > 0 %}
neighbor BGPMON peer-group
{% for (name, prefix) in LOOPBACK_INTERFACE|pfx_filter %}
{% if prefix | ipv4 and name == 'Loopback0' %}
{% if prefix | ipv4 and name == vrf_lo0 %}
neighbor BGPMON update-source {{ prefix | ip }}
{% endif %}
{% endfor %}
Expand All @@ -176,5 +237,9 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
exit-address-family
{% endfor %}
{% endif %}
{% endblock bgp_monitors %}
{% endif %}
{# endblock bgp_monitors #}
!
{% endfor %}
{% endif %}
{% endblock bgp %}
1 change: 1 addition & 0 deletions dockers/docker-fpm-frr/frr.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ agentx
{% include "zebra.interfaces.conf.j2" %}
!
{% include "staticd.default_route.conf.j2" %}
{% include "staticd.static_route.conf.j2" %}
!
{% include "bgpd.conf.default.j2" %}
!
1 change: 1 addition & 0 deletions dockers/docker-fpm-frr/staticd.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
{% include "daemons.common.conf.j2" %}
!
{% include "staticd.default_route.conf.j2" %}
{% include "staticd.static_route.conf.j2" %}
!
52 changes: 52 additions & 0 deletions dockers/docker-fpm-frr/staticd.static_route.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{% block static_route %}
{% if STATIC_ROUTE %}
{% set glb_rt = {} %}
{% set vrf_rt = {} %}
{% for rt_key in STATIC_ROUTE %}
{% if rt_key is not string() %}
{% if vrf_rt.has_key(rt_key[0]) or vrf_rt.update({rt_key[0]:{}}) %}
{% endif %}
{% if vrf_rt[rt_key[0]].update({rt_key[1]:STATIC_ROUTE[rt_key]}) %}
{% endif %}
{% else %}
{% if glb_rt.update({rt_key:STATIC_ROUTE[rt_key]}) %}
{% endif %}
{% endif %}
{% endfor %}
{% for rt_key, rt_attr in glb_rt|dictsort %}
{% if rt_attr.has_key('distance') and rt_attr['distance'] | int != 1 %}
{% if rt_attr.has_key('nexthop-vrf') %}
ip route {{ rt_key }} {{ rt_attr['nexthop'] }} {{ rt_attr['distance'] }} nexthop-vrf {{ rt_attr['nexthop-vrf'] }}
{% else %}
ip route {{ rt_key }} {{ rt_attr['nexthop'] }} {{ rt_attr['distance'] }}
{% endif %}
{% else %}
{% if rt_attr.has_key('nexthop-vrf') %}
ip route {{ rt_key }} {{ rt_attr['nexthop'] }} nexthop-vrf {{ rt_attr['nexthop-vrf'] }}
{% else %}
ip route {{ rt_key }} {{ rt_attr['nexthop'] }}
{% endif %}
{% endif %}
{% endfor %}
!
{% for vrf, rt in vrf_rt|dictsort %}
vrf {{ vrf }}
{% for rt_key, rt_attr in rt|dictsort %}
{% if rt_attr.has_key('distance') and rt_attr['distance'] | int != 1 %}
{% if rt_attr.has_key('nexthop-vrf') %}
ip route {{ rt_key }} {{ rt_attr['nexthop'] }} {{ rt_attr['distance'] }} nexthop-vrf {{ rt_attr['nexthop-vrf'] }}
{% else %}
ip route {{ rt_key }} {{ rt_attr['nexthop'] }} {{ rt_attr['distance'] }}
{% endif %}
{% else %}
{% if rt_attr.has_key('nexthop-vrf') %}
ip route {{ rt_key }} {{ rt_attr['nexthop'] }} nexthop-vrf {{ rt_attr['nexthop-vrf'] }}
{% else %}
ip route {{ rt_key }} {{ rt_attr['nexthop'] }}
{% endif %}
{% endif %}
{% endfor %}
!
{% endfor %}
{% endif %}
{% endblock static_route %}
3 changes: 2 additions & 1 deletion src/sonic-config-engine/tests/sample_output/bgpd_frr.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,5 @@ router bgp 65100
address-family ipv6
neighbor 10.20.30.40 activate
exit-address-family
!!
!
!
3 changes: 2 additions & 1 deletion src/sonic-config-engine/tests/sample_output/frr.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,5 @@ router bgp 65100
address-family ipv6
neighbor 10.20.30.40 activate
exit-address-family
!!
!
!
3 changes: 2 additions & 1 deletion src/sonic-config-engine/tests/sample_output/t2-chassis-fe-bgpd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,5 @@ router bgp 4000
neighbor PEER_V6 soft-reconfiguration inbound
neighbor PEER_V6 route-map TO_BGP_PEER_V6 out
exit-address-family
!!
!
!