Merge pull request #7552 from volta-networks/fix_reload_l2pvn

tools: fix frr-reload l2vpn delete
This commit is contained in:
Donald Sharp 2020-11-18 15:27:51 -05:00 committed by GitHub
commit 95bd143ec3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1301,6 +1301,12 @@ def compare_context_objects(newconf, running):
):
continue
# same thing for a pseudowire sub-context inside an l2vpn context
elif (len(running_ctx_keys) > 1 and running_ctx_keys[0].startswith('l2vpn') and
running_ctx_keys[1].startswith('member pseudowire') and
(running_ctx_keys[:1], None) in lines_to_del):
continue
# Non-global context
elif running_ctx_keys and not any(
"address-family" in key for key in running_ctx_keys