proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 17:40:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools: frr-reload fix list value not present

Browse Source 
Check for value present in list before removing
as in certain python3 ValueError traceback is observed.

Traceback (most recent call last):
  File "/usr/lib/frr/frr-reload.py",
		line 2278, in <module>
    (lines_to_add, lines_to_del, restart_frr)
	= compare_context_objects(newconf, running)
  File "/usr/lib/frr/frr-reload.py",
		line 1933, in compare_context_objects
    lines_to_add, lines_to_del
  File "/usr/lib/frr/frr-reload.py",
		line 1549, in ignore_delete_re_add_lines
    lines_to_del.remove((ctx_keys, line))
ValueError: list.remove(x): x not in list

Ticket:#3389979
Issue:3389979

Testing Done:
With fix perform frr-relaod on frr.conf config where earlier
traceback was seen.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Signed-off-by: Chirag Shah <chirag@nvidia.com>
(cherry picked from commit 1543f58b55)
This commit is contained in:
Chirag Shah 2023-03-14 21:32:40 -07:00 committed by Mergify
parent 86a5e5a04d
commit 082061db90
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/frr-reload.py
View File

@ -1490,10 +1490,12 @@ def ignore_delete_re_add_lines(lines_to_add, lines_to_del):
lines_to_add_to_del.append((tmp_ctx_keys, line)) lines_to_add_to_del.append((tmp_ctx_keys, line))
for (ctx_keys, line) in lines_to_del_to_del: for (ctx_keys, line) in lines_to_del_to_del:
lines_to_del.remove((ctx_keys, line)) if line is not None:
lines_to_del.remove((ctx_keys, line))
for (ctx_keys, line) in lines_to_add_to_del: for (ctx_keys, line) in lines_to_add_to_del:
lines_to_add.remove((ctx_keys, line)) if line is not None:
lines_to_add.remove((ctx_keys, line))
return (lines_to_add, lines_to_del) return (lines_to_add, lines_to_del)