proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 06:50:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1143 from dwalton76/frr-reload-vni

Browse Source 
tools: frr-reload.py support for vni under 'address-family l2vpn evpn'
This commit is contained in:
David Lamparter 2017-09-08 17:35:23 +02:00 committed by GitHub
commit 5cf0c43de6
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/frr-reload.py
View File

@ -319,6 +319,17 @@ end
neighbor 2001:10::3 peer-group IBGPv6 neighbor 2001:10::3 peer-group IBGPv6
exit-address-family exit-address-family
! !
end
address-family evpn
neighbor LEAF activate
advertise-all-vni
vni 10100
rd 65000:10100
route-target import 10.1.1.1:10100
route-target export 10.1.1.1:10100
exit-vni
exit-address-family
!
end end
router ospf router ospf
ospf router-id 10.0.0.1 ospf router-id 10.0.0.1
@ -398,7 +409,7 @@ end
ctx_keys = [] ctx_keys = []
current_context_lines = [] current_context_lines = []
elif line == "exit-address-family" or line == "exit": elif line == "exit-address-family" or line == "exit" or line == "exit-vni":
# if this exit is for address-family ipv4 unicast, ignore the pop # if this exit is for address-family ipv4 unicast, ignore the pop
if main_ctx_key: if main_ctx_key:
self.save_contexts(ctx_keys, current_context_lines) self.save_contexts(ctx_keys, current_context_lines)
@ -419,6 +430,17 @@ end
new_ctx = False new_ctx = False
log.debug('LINE %-50s: entering new context, %-50s', line, ctx_keys) log.debug('LINE %-50s: entering new context, %-50s', line, ctx_keys)
elif "vni " in line:
main_ctx_key = []
# Save old context first
self.save_contexts(ctx_keys, current_context_lines)
current_context_lines = []
main_ctx_key = copy.deepcopy(ctx_keys)
log.debug('LINE %-50s: entering sub-context, append to ctx_keys', line)
ctx_keys.append(line)
elif "address-family " in line: elif "address-family " in line:
main_ctx_key = [] main_ctx_key = []
@ -874,6 +896,9 @@ def compare_context_objects(newconf, running):
elif running_ctx_keys and not any("address-family" in key for key in running_ctx_keys): elif running_ctx_keys and not any("address-family" in key for key in running_ctx_keys):
lines_to_del.append((running_ctx_keys, None)) lines_to_del.append((running_ctx_keys, None))
elif running_ctx_keys and not any("vni" in key for key in running_ctx_keys):
lines_to_del.append((running_ctx_keys, None))
# Global context # Global context
else: else:
for line in running_ctx.lines: for line in running_ctx.lines: