proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 08:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: avoid python2 regex syntax

Browse Source 
Update a few regexs to avoid python2-specific syntax

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2020-09-26 13:11:39 -04:00
parent 45c3045aef
commit 1e5b2db644
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/topotests/lib/common_config.py
View File

@ -636,7 +636,7 @@ def get_frr_ipv6_linklocal(tgen, router, intf=None, vrf=None):
ll_per_if_count = 0 ll_per_if_count = 0
# Interface ip # Interface ip
m1 = re_search("inet6 (fe80[:a-fA-F0-9]+[\/0-9]+)", line) m1 = re_search("inet6 (fe80[:a-fA-F0-9]+[/0-9]+)", line)
if m1: if m1:
local = m1.group(1) local = m1.group(1)
ll_per_if_count += 1 ll_per_if_count += 1
@ -698,7 +698,7 @@ def start_topology(tgen, daemon=None):
router_list = tgen.routers() router_list = tgen.routers()
ROUTER_LIST = sorted( ROUTER_LIST = sorted(
router_list.keys(), key=lambda x: int(re_search("\d+", x).group(0)) router_list.keys(), key=lambda x: int(re_search("[0-9]+", x).group(0))
) )
TMPDIR = os.path.join(LOGDIR, tgen.modname) TMPDIR = os.path.join(LOGDIR, tgen.modname)
@ -827,7 +827,7 @@ def topo_daemons(tgen, topo):
router_list = tgen.routers() router_list = tgen.routers()
ROUTER_LIST = sorted( ROUTER_LIST = sorted(
router_list.keys(), key=lambda x: int(re_search("\d+", x).group(0)) router_list.keys(), key=lambda x: int(re_search("[0-9]+", x).group(0))
) )
for rtr in ROUTER_LIST: for rtr in ROUTER_LIST: