Mirrors/network
1
0
Fork 0
mirror of https://github.com/linux-system-roles/network.git synced 2026-07-25 20:03:49 +00:00
Code Issues Projects Releases Wiki Activity

library: fix failure reading interface info because not ignoring non-interface names

Browse source 
The library fetches interface info by reading sysfs. However, "/sys/class/net/"
may contain certain files that are not interface names, like "bonding_master"

Skip over these files. Otherwise, the code fails with

  File "/tmp/ansible_HkmKOM/ansible_module_network_connections.py", line 347,
   in link_infos  b = SysUtil._link_infos_fetch()
  File "/tmp/ansible_HkmKOM/ansible_module_network_connections.py", line 323,
   in _link_infos_fetch  ifindex = SysUtil._link_read_ifindex(ifname)
  File "/tmp/ansible_HkmKOM/ansible_module_network_connections.py", line 302,
   in _link_read_ifindex  c = SysUtil._sysctl_read('/sys/class/net/' + ifname + '/ifindex')
  File "/tmp/ansible_HkmKOM/ansible_module_network_connections.py", line 293,
   in _sysctl_read  with open(filename, 'r') as f: IOError: [Errno 20] Not a directory: '/sys/class/net/bonding_masters/ifindex'
This commit is contained in:
Thomas Haller 2017-05-03 15:36:55 +02:00
parent 03ff040df7
commit 9fbb2aa589
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
library/network_connections.py
View file

@ -321,9 +321,13 @@ class SysUtil:
def _link_infos_fetch():
links = {}
for ifname in os.listdir('/sys/class/net/'):
ifindex = SysUtil._link_read_ifindex(ifname)
if not os.path.islink('/sys/class/net/' + ifname):
# /sys/class/net may contain certain entries that are not
# interface names, like 'bonding_master'. Skip over files
# that are not links.
continue
links[ifname] = {
'ifindex': ifindex,
'ifindex': SysUtil._link_read_ifindex(ifname),
'ifname': ifname,
'address': SysUtil._link_read_address(ifname),
'perm-address': SysUtil._link_read_permaddress(ifname),
@ -359,7 +363,7 @@ class SysUtil:
return l
@classmethod
def link_info_find(cls, refresh=False, mac = None, ifname = None):
def link_info_find(cls, refresh = False, mac = None, ifname = None):
if mac is not None:
mac = Util.mac_norm(mac)
for li in cls.link_infos(refresh).values():
@ -1601,13 +1605,13 @@ class Cmd:
if connection['mac']:
li_mac = SysUtil.link_info_find(mac = connection['mac'])
if not li_mac:
AnsibleUtil.log_fatal(idx, 'profile specifies mac "%s" but not such interface exists' % (connection['mac']))
AnsibleUtil.log_fatal(idx, 'profile specifies mac "%s" but no such interface exists' % (connection['mac']))
if connection['interface_name'] and connection['type'] == 'ethernet':
li_ifname = SysUtil.link_info_find(ifname = connection['interface_name'])
if not li_ifname:
AnsibleUtil.log_fatal(idx, 'profile specifies interface_name "%s" but not such interface exists' % (connection['interface_name']))
AnsibleUtil.log_fatal(idx, 'profile specifies interface_name "%s" but no such interface exists' % (connection['interface_name']))
if li_mac and li_ifname and li_mac != li_ifname:
AnsibleUtil.log_fatal(idx, 'profile specifies interface_name "%s" and mac "%s" but not such interface exists' % (connection['interface_name'], connection['mac']))
AnsibleUtil.log_fatal(idx, 'profile specifies interface_name "%s" and mac "%s" but no such interface exists' % (connection['interface_name'], connection['mac']))
###############################################################################