Mirrors/network
1
0
Fork 0
mirror of https://github.com/linux-system-roles/network.git synced 2026-01-23 02:15:17 +00:00
Code Issues Projects Releases Wiki Activity

library: check that 'mac'/'interface_name' refers to an existing interface

Browse source 
When configuring a profile that specifies a MAC address or an
interface-name, make sure that such an interface actually exists.
This commit is contained in:
Thomas Haller 2017-02-12 15:38:26 +01:00
parent faf3b699ba
commit 37664fda92
2 changed files with 36 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

37
library/network_connections.py
View file

@ -357,6 +357,18 @@ class SysUtil:
cls._link_infos = l
return l
@classmethod
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():
if mac is not None and mac not in [li.get('perm-address', None), li.get('address', None)]:
continue
if ifname is not None and ifname != li.get('ifname', None):
continue
return li
return None
###############################################################################
class ArgUtil:
@ -606,6 +618,7 @@ class ArgValidator_DictConnection(ArgValidatorDict):
ArgValidatorStr ('master'),
ArgValidatorStr ('interface_name'),
ArgValidatorMac ('mac'),
ArgValidatorBool('check_iface_exists', default_value = True),
ArgValidatorStr ('parent'),
ArgValidatorInt ('vlan_id', val_min = 0, val_max = 4095, default_value = None),
ArgValidatorBool('ignore_errors', default_value = None),
@ -1521,7 +1534,26 @@ class Cmd:
raise
def run_prepare(self):
pass
for idx, connection in enumerate(AnsibleUtil.connections):
if 'type' in connection and connection['check_iface_exists']:
# when the profile is tied to a certain interface via 'interface_name' or 'mac',
# check that such an interface exists.
#
# This check has many flaws, as we don't check whether the existing
# interface has the right device type. Also, there is some ambiguity
# between the current MAC address and the permanent MAC address.
li_mac = None
li_ifname = None
if connection['mac']:
li_mac = SysUtil.link_info_find(mac = connection['mac'])
if not li_mac:
AnsibleUtil.log_error(idx, 'profile specifies mac "%s" but not 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_error(idx, 'profile specifies interface_name "%s" but not such interface exists' % (connection['interface_name']))
if li_mac and li_ifname and li_mac != li_ifname:
AnsibleUtil.log_error(idx, 'profile specifies interface_name "%s" and mac "%s" but not such interface exists' % (connection['interface_name'], connection['mac']))
###############################################################################
@ -1693,9 +1725,6 @@ class Cmd_initscripts(Cmd):
return None
return f
def run_prepare(self):
pass
def run_state_absent(self, idx):
if not self.check_name(idx):
return

3
library/test_network_connections.py
View file

@ -132,6 +132,7 @@ class TestValidator(unittest.TestCase):
'vlan_id': None,
'ignore_errors': None,
'interface_name': None,
'check_iface_exists': True,
'slave_type': None,
},
{
@ -172,6 +173,7 @@ class TestValidator(unittest.TestCase):
'vlan_id': None,
'ignore_errors': None,
'interface_name': None,
'check_iface_exists': True,
'slave_type': None,
'wait': 90,
},
@ -226,6 +228,7 @@ class TestValidator(unittest.TestCase):
},
'mac': 'aa:bb:cc',
'master': None,
'check_iface_exists': True,
'name': '5',
'parent': None,
'ignore_errors': None,