matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #16733 from gtataranni/fix/regex-string

Browse source 
tools: fix invalid escape on regex string
This commit is contained in:
Donatas Abraitis 2024-09-04 08:13:19 +03:00 committed by GitHub
parent 40a47a92f4 fe9e148aaa
commit 3dbef7a119
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/frr-reload.py
View file

@ -203,7 +203,7 @@ def get_normalized_es_id(line):
""" """
sub_strs = ["evpn mh es-id", "evpn mh es-sys-mac"] sub_strs = ["evpn mh es-id", "evpn mh es-sys-mac"]
for sub_str in sub_strs: for sub_str in sub_strs:
obj = re.match(sub_str + " (?P<esi>\S*)", line) obj = re.match(sub_str + r" (?P<esi>\S*)", line)
if obj: if obj:
line = "%s %s" % (sub_str, obj.group("esi").lower()) line = "%s %s" % (sub_str, obj.group("esi").lower())
break break
@ -871,7 +871,7 @@ def bgp_delete_nbr_remote_as_line(lines_to_add):
if ctx_keys[0] not in pg_dict: if ctx_keys[0] not in pg_dict:
pg_dict[ctx_keys[0]] = dict() pg_dict[ctx_keys[0]] = dict()
# find 'neighbor <pg_name> peer-group' # find 'neighbor <pg_name> peer-group'
re_pg = re.match("neighbor (\S+) peer-group$", line) re_pg = re.match(r"neighbor (\S+) peer-group$", line)
if re_pg and re_pg.group(1) not in pg_dict[ctx_keys[0]]: if re_pg and re_pg.group(1) not in pg_dict[ctx_keys[0]]:
pg_dict[ctx_keys[0]][re_pg.group(1)] = { pg_dict[ctx_keys[0]][re_pg.group(1)] = {
"nbr": list(), "nbr": list(),
@ -1066,7 +1066,7 @@ def bgp_delete_move_lines(lines_to_add, lines_to_del):
if ctx_keys[0] not in del_dict: if ctx_keys[0] not in del_dict:
del_dict[ctx_keys[0]] = dict() del_dict[ctx_keys[0]] = dict()
# find 'no neighbor <pg_name> peer-group' # find 'no neighbor <pg_name> peer-group'
re_pg = re.match("neighbor (\S+) peer-group$", line) re_pg = re.match(r"neighbor (\S+) peer-group$", line)
if re_pg and re_pg.group(1) not in del_dict[ctx_keys[0]]: if re_pg and re_pg.group(1) not in del_dict[ctx_keys[0]]:
del_dict[ctx_keys[0]][re_pg.group(1)] = list() del_dict[ctx_keys[0]][re_pg.group(1)] = list()
found_pg_del_cmd = True found_pg_del_cmd = True