Skip to content
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

frrcfgd: fix incorrect rendering of route-map references #14183

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

frrcfgd: fix incorrect rendering of route-map references #14183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 3 deletions src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.addr_family.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@
{% for rr_key, rr_val in ROUTE_REDISTRIBUTE.items() %}
{% if vrf == rr_key[0] and af_str == rr_key[3] %}
{% if 'route_map' in rr_val %}
{% for rmap in rr_val['route_map'] %}
redistribute {{rr_key[1]}} route-map {{rmap}}
{% endfor %}
redistribute {{rr_key[1]}} route-map {{rr_val['route_map']}}
{% else %}
redistribute {{rr_key[1]}}
{% endif %}
Expand Down
8 changes: 2 additions & 6 deletions src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.db.nbr_af.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,12 @@
{% endif %}
{# ------- route-map in --------------------------- #}
{% if 'route_map_in' in n_af_val %}
{% for map in n_af_val['route_map_in'] %}
neighbor {{nbr_name}} route-map {{map}} in
{% endfor %}
neighbor {{nbr_name}} route-map {{n_af_val['route_map_in']}} in
{% endif %}
{# ------- route-map in end --------------------------- #}
{# ------- route-map out --------------------------- #}
{% if 'route_map_out' in n_af_val %}
{% for map in n_af_val['route_map_out'] %}
neighbor {{nbr_name}} route-map {{map}} out
{% endfor %}
neighbor {{nbr_name}} route-map {{n_af_val['route_map_out']}} out
{% endif %}
{# ------- route-map out end --------------------------- #}
{% if 'unsuppress_map_name' in n_af_val %}
Expand Down