Skip to content

Commit

Permalink
Merged PR 3786032: Onboard BackEndToRRouter and BackEndLeafRouter to …
Browse files Browse the repository at this point in the history
…BGPD templates.
  • Loading branch information
Ritika Chauhan authored and abdosi committed May 19, 2022
1 parent 2cdcf19 commit 8280a4c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
!
{% from "common/functions.conf.j2" import get_ipv4_loopback_address %}
!
{% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'ToRRouter' %}
{% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] in ['ToRRouter', 'BackEndToRRouter'] %}
!
neighbor {{ bgp_session['name'] }} peer-group
neighbor {{ bgp_session['name'] }} passive
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
!
! template: bgpd/templates/msft.dynamic/policies.conf.j2
!
{% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'ToRRouter' %}
{% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] in ['ToRRouter', 'BackEndToRRouter'] %}
!
route-map FROM_BGP_SPEAKER permit 10
!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
'admin_status' not in bgp_session and
'default_bgp_status' in CONFIG_DB__DEVICE_METADATA['localhost'] and
CONFIG_DB__DEVICE_METADATA['localhost']['default_bgp_status'] == 'down' and
CONFIG_DB__DEVICE_METADATA.localhost.type == 'LeafRouter' %}
CONFIG_DB__DEVICE_METADATA.localhost.type in ['LeafRouter', 'BackEndLeafRouter'] %}
{% from "bgpd/templates/msft.general/router.j2" import general_routing with context %}
{{ general_routing("instance") }}
!
Expand Down
12 changes: 6 additions & 6 deletions dockers/docker-fpm-frr/frr/bgpd/templates/msft.general/router.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
{% if neighbor_addr | ipv4 %}
{% if device_type == 'MgmtToRRouter' %}
{% include path_template % "v4.mgmttor" %}
{% elif device_type == 'ToRRouter' %}
{% elif device_type in ['ToRRouter', 'BackEndToRRouter'] %}
{% include path_template % "v4.tor" %}
{% elif device_type == 'LeafRouter' %}
{% elif device_type in ['LeafRouter', 'BackEndLeafRouter'] %}
{% if neighbor_type == 'SpineRouter' %}
{% include path_template % "v4.leaf.spine" %}
{% elif neighbor_type == 'ToRRouter' %}
{% elif neighbor_type in ['ToRRouter', 'BackEndToRRouter'] %}
{% if neighbor_deployment_id is defined and neighbor_deployment_id == '26' %}
{% include path_template % "v4.leaf.tor.tycoon" %}
{% else %}
Expand All @@ -25,12 +25,12 @@
{% if neighbor_addr | ipv6 %}
{% if device_type == 'MgmtToRRouter' %}
{% include path_template % "v6.mgmttor" %}
{% elif device_type == 'ToRRouter' %}
{% elif device_type in ['ToRRouter', 'BackEndToRRouter'] %}
{% include path_template % "v6.tor" %}
{% elif device_type == 'LeafRouter' %}
{% elif device_type in ['LeafRouter', 'BackEndLeafRouter'] %}
{% if neighbor_type == 'SpineRouter' %}
{% include path_template % "v6.leaf.spine" %}
{% elif neighbor_type == 'ToRRouter' %}
{% elif neighbor_type in ['ToRRouter', 'BackEndToRRouter'] %}
{% if neighbor_deployment_id is defined and neighbor_deployment_id == '26' %}
{% include path_template % "v6.leaf.tor.tycoon" %}
{% elif neighbor_deployment_id is defined and neighbor_deployment_id == '19' %}
Expand Down

0 comments on commit 8280a4c

Please sign in to comment.