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

Merge pull request #3872 from dslicenc/frr-reload-vrf-context

Browse Source 
tools: keep exit-vrf to change context correctly between vrfs
This commit is contained in:
Russ White 2019-02-27 11:16:38 -05:00 committed by GitHub
commit 3f77bcdbe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/frr-reload.py
View File

@ -433,7 +433,7 @@ end
self.save_contexts(ctx_keys, current_context_lines) self.save_contexts(ctx_keys, current_context_lines)
new_ctx = True new_ctx = True
elif line in ["end", "exit-vrf"]: elif line == "end":
self.save_contexts(ctx_keys, current_context_lines) self.save_contexts(ctx_keys, current_context_lines)
log.debug('LINE %-50s: exiting old context, %-50s', line, ctx_keys) log.debug('LINE %-50s: exiting old context, %-50s', line, ctx_keys)
@ -443,6 +443,17 @@ end
ctx_keys = [] ctx_keys = []
current_context_lines = [] current_context_lines = []
elif line == "exit-vrf":
self.save_contexts(ctx_keys, current_context_lines)
current_context_lines.append(line)
log.debug('LINE %-50s: append to current_context_lines, %-50s', line, ctx_keys)
#Start a new context
new_ctx = True
main_ctx_key = []
ctx_keys = []
current_context_lines = []
elif line in ["exit-address-family", "exit", "exit-vnc"]: elif line in ["exit-address-family", "exit", "exit-vnc"]:
# if this exit is for address-family ipv4 unicast, ignore the pop # if this exit is for address-family ipv4 unicast, ignore the pop
if main_ctx_key: if main_ctx_key: