From 2a2b64e487760529d2dd52140201b851ed6c6761 Mon Sep 17 00:00:00 2001 From: Don Slice Date: Fri, 14 Dec 2018 13:11:05 +0000 Subject: [PATCH] tools: stop frr-reload.py from trying to delete the vrf context Problem seen when removing last config item under the vrf context, where frr-reload.py tries instead to delete the vrf context itself. Since that is not permitted on an active vrf, the command errors out and nothing is deleted. Signed-off-by: Don Slice --- tools/frr-reload.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/frr-reload.py b/tools/frr-reload.py index 3b41b57d68..c48c8b97ad 100755 --- a/tools/frr-reload.py +++ b/tools/frr-reload.py @@ -974,8 +974,8 @@ def compare_context_objects(newconf, running): delete_bgpd = True lines_to_del.append((running_ctx_keys, None)) - # We cannot do 'no interface' in FRR, and so deal with it - elif running_ctx_keys[0].startswith('interface'): + # We cannot do 'no interface' or 'no vrf' in FRR, and so deal with it + elif running_ctx_keys[0].startswith('interface') or running_ctx_keys[0].startswith('vrf'): for line in running_ctx.lines: lines_to_del.append((running_ctx_keys, line))