valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simple regex fix for Linux aliases and VLAN tags

Browse Source
This commit is contained in:
Anthony Cornehl 2012-06-05 02:00:39 -07:00
parent 8de4dbc13d
commit daae29adf6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/network.py
View File

@ -84,7 +84,7 @@ def _interfaces_ip():
for line in group.split('\n'): for line in group.split('\n'):
if not ' ' in line: if not ' ' in line:
continue continue
m = re.match('^\d*:\s+(\w+)(?:@)?(\w+)?:\s+<(.+)>', line) m = re.match('^\d*:\s+([\w.]+)(?:@)?(\w+)?:\s+<(.+)>', line)
if m: if m:
iface,parent,attrs = m.groups() iface,parent,attrs = m.groups()
if 'UP' in attrs.split(','): if 'UP' in attrs.split(','):
@ -145,7 +145,7 @@ def _interfaces_ifconfig():
''' '''
ret = {} ret = {}
piface = re.compile('^(\w+)') piface = re.compile('^(\S+):?')
pmac = re.compile('.*?(?:HWaddr|ether) ([0-9a-fA-F:]+)') pmac = re.compile('.*?(?:HWaddr|ether) ([0-9a-fA-F:]+)')
pip = re.compile('.*?(?:inet addr:|inet )(.*?)\s') pip = re.compile('.*?(?:inet addr:|inet )(.*?)\s')
pip6 = re.compile('.*?(?:inet6 addr: (.*?)/|inet6 )([0-9a-fA-F:]+)') pip6 = re.compile('.*?(?:inet6 addr: (.*?)/|inet6 )([0-9a-fA-F:]+)')