From 7cfb307943287e556f4e0c5e85afaf9e350a8b5c Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Sat, 23 Jan 2021 00:15:41 +0100 Subject: [PATCH] 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 --- tools/frr-reload.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/frr-reload.py b/tools/frr-reload.py index dca877dbfe..b98c001e7d 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)