diff options
| author | Runar Borge <runar@borge.nu> | 2021-01-23 00:15:41 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2021-02-04 23:26:12 +0100 |
| commit | 7cfb307943287e556f4e0c5e85afaf9e350a8b5c (patch) | |
| tree | 215c67143ce2d1077342faa527a1d7cd044e293f /tools | |
| parent | Merge pull request #8010 from ton31337/fix/drop_aggregate_as_attribute_if_mal... (diff) | |
| download | frr-7cfb307943287e556f4e0c5e85afaf9e350a8b5c.tar.xz frr-7cfb307943287e556f4e0c5e85afaf9e350a8b5c.zip | |
frr-reload: rpki context exiting uses exit and not end
Issue:
The rpki subcontext uses exit instead of end to exit.
This makes issues with frr-reload in the way that frr-reload never exits
rpki context until it reaches the next end statement. this also happens when
parsing the configuration from vtysh.
Fixes: #7887
Signed-off-by: Runar Borge <runar@borge.nu>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/frr-reload.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/frr-reload.py b/tools/frr-reload.py index dca877dbf..b98c001e7 100755 --- a/tools/frr-reload.py +++ b/tools/frr-reload.py @@ -629,6 +629,16 @@ end ctx_keys = [] current_context_lines = [] + elif line == "exit" and ctx_keys[0].startswith("rpki"): + self.save_contexts(ctx_keys, current_context_lines) + log.debug("LINE %-50s: exiting old context, %-50s", line, ctx_keys) + + # Start a new context + new_ctx = True + main_ctx_key = [] + ctx_keys = [] + current_context_lines = [] + elif line == "exit-vrf": self.save_contexts(ctx_keys, current_context_lines) current_context_lines.append(line) |