Skip to content

Commit 9920fff

Browse files
committed
change multi_npu to multi_asic
1 parent 094e52b commit 9920fff

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ipv6 prefix-list PL_LoopbackV6 permit {{ get_ipv6_loopback_address(LOOPBACK_INTE
1414
{% endif %}
1515
!
1616
!
17-
{% if multi_npu() %}
17+
{% if multi_asic() %}
1818
route-map HIDE_INTERNAL permit 10
1919
set community local-AS
2020
!
@@ -37,15 +37,15 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
3737
{% endif %}
3838
!
3939
{# set router-id #}
40-
{% if multi_npu() %}
40+
{% if multi_asic() %}
4141
bgp router-id {{ get_ipv4_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") | ip }}
4242
{% else %}
4343
bgp router-id {{ get_ipv4_loopback_address(LOOPBACK_INTERFACE, "Loopback0") | ip }}
4444
{% endif %}
4545
!
4646
{# advertise loopback #}
4747
network {{ get_ipv4_loopback_address(LOOPBACK_INTERFACE, "Loopback0") | ip }}/32
48-
{% if multi_npu() %}
48+
{% if multi_asic() %}
4949
network {{ get_ipv4_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") | ip }}/32 route-map HIDE_INTERNAL
5050
{% endif %}
5151
!
@@ -54,7 +54,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
5454
network {{ get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback0") | ip }}/64
5555
exit-address-family
5656
{% endif %}
57-
{% if multi_npu() %}
57+
{% if multi_asic() %}
5858
{% if get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") != 'None' %}
5959
address-family ipv6
6060
network {{ get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") | ip }}/64 route-map HIDE_INTERNAL

src/sonic-config-engine/sonic-cfggen

+1-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ def main():
327327
for attr in ['ip', 'network', 'prefixlen', 'netmask', 'broadcast']:
328328
env.filters[attr] = partial(prefix_attr, attr)
329329
# Pass the is_multi_npu function as global
330-
env.globals['multi_npu'] = is_multi_npu
330+
env.globals['multi_asic'] = is_multi_npu
331331
template = env.get_template(template_file)
332332
print(template.render(sort_data(data)))
333333

0 commit comments

Comments
 (0)