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

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

View File

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