summaryrefslogtreecommitdiff
path: root/tools/frr-reload.py
diff options
context:
space:
mode:
authorDon Slice <dslice@cumulusnetworks.com>2018-12-14 13:11:05 +0000
committerDon Slice <dslice@cumulusnetworks.com>2018-12-14 13:11:05 +0000
commit2a2b64e487760529d2dd52140201b851ed6c6761 (patch)
treec1e9930b54cd51f8840152e539372008f7c32c71 /tools/frr-reload.py
parent9c3f61e5833b28076d1dd0f8437536d03ef0439a (diff)
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 <dslice@cumulusnetworks.com>
Diffstat (limited to 'tools/frr-reload.py')
-rwxr-xr-xtools/frr-reload.py4
1 files 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))