Merge pull request #1648 from dwalton76/frr-reload

tools: frr-reload 'vni' keyword does not always create a sub-context
This commit is contained in:
Jafar Al-Gharaibeh 2018-01-18 09:32:41 -06:00 committed by GitHub
commit 81dadaca1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -434,7 +434,14 @@ end
new_ctx = False
log.debug('LINE %-50s: entering new context, %-50s', line, ctx_keys)
elif "vni " in line:
# The 'vni' keyword under 'router bgp X/address-family l2vpn evpn' creates
# a sub-context but the 'vni' keyword in other places (such as 'vrf BLUE')
# does not.
elif ("vni " in line and
len(ctx_keys) == 2 and
ctx_keys[0].startswith('router bgp') and
ctx_keys[1] == 'address-family l2vpn evpn'):
main_ctx_key = []
# Save old context first