proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-25 23:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14898 from chiragshah6/mdev

Browse Source 
tools: fix frr-reload for nbr deletion
This commit is contained in:
Donatas Abraitis 2024-02-29 09:26:13 +02:00 committed by GitHub
commit 36ae7f331a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/frr-reload.py
View File

@ -992,16 +992,17 @@ def bgp_delete_move_lines(lines_to_add, lines_to_del):
del_dict[ctx_keys[0]][re_pg.group(1)] = list() del_dict[ctx_keys[0]][re_pg.group(1)] = list()
found_pg_del_cmd = True found_pg_del_cmd = True
# move neighbor remote-as lines at the end
for ctx_keys, line in lines_to_del_to_app:
lines_to_del.remove((ctx_keys, line))
lines_to_del.append((ctx_keys, line))
if found_pg_del_cmd == False: if found_pg_del_cmd == False:
bgp_delete_inst_move_line(lines_to_del) bgp_delete_inst_move_line(lines_to_del)
if del_nbr_dict: if del_nbr_dict:
bgp_remove_neighbor_cfg(lines_to_del, del_nbr_dict) bgp_remove_neighbor_cfg(lines_to_del, del_nbr_dict)
return (lines_to_add, lines_to_del) return (lines_to_add, lines_to_del)
for ctx_keys, line in lines_to_del_to_app:
lines_to_del.remove((ctx_keys, line))
lines_to_del.append((ctx_keys, line))
# {'router bgp 65001': {'PG': ['10.1.1.2'], 'PG1': ['10.1.1.21']}, # {'router bgp 65001': {'PG': ['10.1.1.2'], 'PG1': ['10.1.1.21']},
# 'router bgp 65001 vrf vrf1': {'PG': ['10.1.1.2'], 'PG1': ['10.1.1.21']}} # 'router bgp 65001 vrf vrf1': {'PG': ['10.1.1.2'], 'PG1': ['10.1.1.21']}}
for ctx_keys, line in lines_to_del: for ctx_keys, line in lines_to_del: