diff options
author | Daniel Walton <dwalton@cumulusnetworks.com> | 2018-01-17 16:57:50 +0100 |
---|---|---|
committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2018-01-17 16:57:50 +0100 |
commit | 9d877afc13d71bbf1b6fa4ec83f2b1e0d6896fd9 (patch) | |
tree | a72c9e760c92a66f9f399572af88f211354d408f /tools/frr-reload.py | |
parent | Merge pull request #1634 from qlyoung/vtysh-output-file (diff) | |
download | frr-9d877afc13d71bbf1b6fa4ec83f2b1e0d6896fd9.tar.xz frr-9d877afc13d71bbf1b6fa4ec83f2b1e0d6896fd9.zip |
tools: frr-reload 'vni' keyword does not always create a sub-context
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Diffstat (limited to 'tools/frr-reload.py')
-rwxr-xr-x | tools/frr-reload.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/frr-reload.py b/tools/frr-reload.py index 2c651ffbd..0b7e80962 100755 --- a/tools/frr-reload.py +++ b/tools/frr-reload.py @@ -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 |