Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ifupdown2/addons/bridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -3991,7 +3991,7 @@ def _query_check_l2protocol_tunnel(self, brport_name, user_config_l2protocol_tun
cached_ifla_brport_group_maskhi = self.cache.get_link_info_slave_data_attribute(brport_name, Link.IFLA_BRPORT_GROUP_FWD_MASKHI)
cached_ifla_brport_group_mask = self.cache.get_link_info_slave_data_attribute(brport_name, Link.IFLA_BRPORT_GROUP_FWD_MASK)

for protocol in re.split(',|\s*', user_config_l2protocol_tunnel):
for protocol in re.split(r',|\s*', user_config_l2protocol_tunnel):
callback = self.query_check_l2protocol_tunnel_callback.get(protocol)

if callable(callback):
Expand Down
2 changes: 1 addition & 1 deletion ifupdown2/ifupdown/ifupdownmain.py
Original file line number Diff line number Diff line change
Expand Up @@ -1575,7 +1575,7 @@ def _sched_ifaces(self, ifacenames, ops, skipupperifaces=False,

def _render_ifacename(self, ifacename):
new_ifacenames = []
vlan_match = re.match("^([\d]+)-([\d]+)", ifacename)
vlan_match = re.match(r"^([\d]+)-([\d]+)", ifacename)
if vlan_match:
vlan_groups = vlan_match.groups()
if vlan_groups[0] and vlan_groups[1]:
Expand Down
4 changes: 2 additions & 2 deletions ifupdown2/ifupdown/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def parse_iface_range(cls, name):
# eg: swp1.[2-100]
# return (prefix, range-start, range-end)
# eg return ("swp1.", 1, 20, ".100")
range_match = re.match("^([\w]+)\[([\d]+)-([\d]+)\]([\.\w]+)", name)
range_match = re.match(r"^([\w]+)\[([\d]+)-([\d]+)\]([\.\w]+)", name)
if range_match:
range_groups = range_match.groups()
if range_groups[1] and range_groups[2]:
Expand All @@ -246,7 +246,7 @@ def parse_iface_range(cls, name):
# eg: swp[1-20].100
# return (prefix, range-start, range-end, suffix)
# eg return ("swp", 1, 20, ".100")
range_match = re.match("^([\w\.]+)\[([\d]+)-([\d]+)\]", name)
range_match = re.match(r"^([\w\.]+)\[([\d]+)-([\d]+)\]", name)
if range_match:
range_groups = range_match.groups()
if range_groups[1] and range_groups[2]:
Expand Down
2 changes: 1 addition & 1 deletion ifupdown2/lib/iproute2.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
class IPRoute2(Cache, Requirements):

VXLAN_UDP_PORT = 4789
VXLAN_PEER_REGEX_PATTERN = re.compile("\s+dst\s+(\d+.\d+.\d+.\d+)\s+")
VXLAN_PEER_REGEX_PATTERN = re.compile(r"\s+dst\s+(\d+.\d+.\d+.\d+)\s+")

def __init__(self):
Cache.__init__(self)
Expand Down