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

Merge pull request #24857 from gtmanfred/develop

Browse Source 
add interfaces to subnets
This commit is contained in:
Thomas S Hatch 2015-06-22 16:37:33 -04:00
commit bc08ee3e32
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/network.py
View File

@ -671,7 +671,7 @@ def interface_ip(iface):
return salt.utils.network.interface_ip(iface) return salt.utils.network.interface_ip(iface)
def subnets(): def subnets(interfaces=None):
''' '''
Returns a list of IPv4 subnets to which the host belongs Returns a list of IPv4 subnets to which the host belongs
@ -680,8 +680,9 @@ def subnets():
.. code-block:: bash .. code-block:: bash
salt '*' network.subnets salt '*' network.subnets
salt '*' network.subnets interfaces=eth1
''' '''
return salt.utils.network.subnets() return salt.utils.network.subnets(interfaces)
def subnets6(): def subnets6():

17
salt/utils/network.py
View File

@ -848,11 +848,20 @@ def interface_ip(iface):
return error return error
def _subnets(proto='inet'): def _subnets(proto='inet', interfaces_=None):
''' '''
Returns a list of subnets to which the host belongs Returns a list of subnets to which the host belongs
''' '''
ifaces = interfaces() if interfaces_ is None:
ifaces = interfaces()
elif isinstance(interfaces_, list):
ifaces = {}
for key, value in six.iteritems(interfaces()):
if key in interfaces_:
ifaces[key] = value
else:
ifaces = {interfaces_: interfaces().get(interfaces_, {})}
ret = set() ret = set()
if proto == 'inet': if proto == 'inet':
@ -874,11 +883,11 @@ def _subnets(proto='inet'):
return [str(net) for net in sorted(ret)] return [str(net) for net in sorted(ret)]
def subnets(): def subnets(interfaces=None):
''' '''
Returns a list of IPv4 subnets to which the host belongs Returns a list of IPv4 subnets to which the host belongs
''' '''
return _subnets('inet') return _subnets('inet', interfaces_=interfaces)
def subnets6(): def subnets6():