matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[frr]: RR client support in minigraph for FRR (#923)

Browse Source
This commit is contained in:
nikos-li 2017-09-12 15:48:38 -07:00 committed by Shuotian Cheng
parent c9cc7aea41
commit 686e227dcc
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dockers/docker-fpm-frr/bgpd.conf.j2
View File

@ -57,12 +57,18 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
{% if neighbor_addr | ipv4 %} {% if neighbor_addr | ipv4 %}
address-family ipv4 address-family ipv4
neighbor {{ neighbor_addr }} activate neighbor {{ neighbor_addr }} activate
{% if bgp_session['rrclient'] != 0 %}
neighbor {{ neighbor_addr }} route-reflector-client
{% endif %}
maximum-paths 64 maximum-paths 64
exit-address-family exit-address-family
{% endif %} {% endif %}
{% if neighbor_addr | ipv6 %} {% if neighbor_addr | ipv6 %}
address-family ipv6 address-family ipv6
neighbor {{ neighbor_addr }} activate neighbor {{ neighbor_addr }} activate
{% if bgp_session['rrclient'] != 0 %}
neighbor {{ neighbor_addr }} route-reflector-client
{% endif %}
maximum-paths 64 maximum-paths 64
exit-address-family exit-address-family
{% endif %} {% endif %}

5
src/sonic-config-engine/minigraph.py
View File

@ -233,6 +233,10 @@ def parse_cpg(cpg, hname):
for router in child.findall(str(QName(ns1, "BGPRouterDeclaration"))): for router in child.findall(str(QName(ns1, "BGPRouterDeclaration"))):
asn = router.find(str(QName(ns1, "ASN"))).text asn = router.find(str(QName(ns1, "ASN"))).text
hostname = router.find(str(QName(ns1, "Hostname"))).text hostname = router.find(str(QName(ns1, "Hostname"))).text
if router.find(str(QName(ns1, "RRClient"))):
rrclient = '1'
else:
rrclient = '0'
if hostname == hname: if hostname == hname:
myasn = int(asn) myasn = int(asn)
peers = router.find(str(QName(ns1, "Peers"))) peers = router.find(str(QName(ns1, "Peers")))
@ -251,6 +255,7 @@ def parse_cpg(cpg, hname):
bgp_session = bgp_sessions[peer] bgp_session = bgp_sessions[peer]
if hostname == bgp_session['name']: if hostname == bgp_session['name']:
bgp_session['asn'] = int(asn) bgp_session['asn'] = int(asn)
bgp_session['rrclient'] = int(rrclient)
return bgp_sessions, myasn, bgp_peers_with_range return bgp_sessions, myasn, bgp_peers_with_range