proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-15 13:30:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15709 from chiragshah6/fdev2

Browse Source 
tools: frr-reload strip interface vrf ctx line
This commit is contained in:
Mark Stapp 2024-04-16 11:32:18 -04:00 committed by GitHub
commit 84d1fb19e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/frr-reload.py
View File

@ -220,6 +220,23 @@ def get_normalized_mac_ip_line(line):
return line return line
def get_normalized_interface_vrf(line):
"""
If 'interface <int_name> vrf <vrf_name>' is present in file,
we need to remove the explicit "vrf <vrf_name>"
so that the context information is created
correctly and configurations are matched appropriately.
"""
intf_vrf = re.search("interface (\S+) vrf (\S+)", line)
if intf_vrf:
old_line = "vrf %s" % intf_vrf.group(2)
new_line = line.replace(old_line, "").strip()
return new_line
return line
# This dictionary contains a tree of all commands that we know start a # This dictionary contains a tree of all commands that we know start a
# new multi-line context. All other commands are treated either as # new multi-line context. All other commands are treated either as
# commands inside a multi-line context or as single-line contexts. This # commands inside a multi-line context or as single-line contexts. This
@ -295,6 +312,10 @@ class Config(object):
# Compress duplicate whitespaces # Compress duplicate whitespaces
line = " ".join(line.split()) line = " ".join(line.split())
# Remove 'vrf <vrf_name>' from 'interface <x> vrf <vrf_name>'
if line.startswith("interface ") and "vrf" in line:
line = get_normalized_interface_vrf(line)
if ":" in line: if ":" in line:
line = get_normalized_mac_ip_line(line) line = get_normalized_mac_ip_line(line)