proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-27 20:33:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14103 from opensourcerouting/reload-keychain

Browse Source 
tools: fix key chain reload removal
This commit is contained in:
Donald Sharp 2023-07-29 14:01:31 -04:00 committed by GitHub
commit f3a4a85da7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/frr-reload.py
View File

@ -1567,6 +1567,7 @@ def compare_context_objects(newconf, running):
candidates_to_add = []
delete_bgpd = False
area_stub_no_sum = "area (\S+) stub no-summary"
deleted_keychains = []
# Find contexts that are in newconf but not in running
# Find contexts that are in running but not in newconf
@ -1617,6 +1618,22 @@ def compare_context_objects(newconf, running):
):
continue
# Check if key chain is being deleted:
# - If it is being deleted then avoid deleting its contexts
# - Else delete its configuration without removing the root node
elif (
running_ctx_keys[0].startswith("key chain ")
and len(running_ctx_keys) == 1
):
deleted_keychains.append(running_ctx_keys[0])
lines_to_del.append((running_ctx_keys, None))
elif (
running_ctx_keys[0].startswith("key chain ")
and len(running_ctx_keys) > 1
and running_ctx_keys[0] in deleted_keychains
):
continue
# Delete an entire vni sub-context under "address-family l2vpn evpn"
elif (
"router bgp" in running_ctx_keys[0]