ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

ipaddr: Handle network address in ipmath (#57149)

Browse source 
* Updated testcase, documentation

Fixes: #54457

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde 2019-06-04 14:01:19 +05:30 committed by Nilashish Chakraborty
parent e620e27609
commit ee8a607cca
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
docs/docsite/rst/user_guide/playbooks_filters_ipaddr.rst
View file

@ -448,6 +448,15 @@ Here are a few simple examples::
# {{ '192.168.0.5' | ipmath(-10) }}
192.167.255.251
# {{ '192.168.1.1/24' | ipmath(5) }}
192.168.1.6
# {{ '192.168.1.6/24' | ipmath(-5) }}
192.168.1.1
# {{ '192.168.2.6/24' | ipmath(-10) }}
192.168.1.252
# {{ '2001::1' | ipmath(10) }}
2001::b

7
lib/ansible/plugins/filter/ipaddr.py
View file

@ -673,8 +673,11 @@ def ipaddr(value, query='', version=False, alias='ipaddr'):
def ipmath(value, amount):
try:
ip = netaddr.IPAddress(value)
except netaddr.AddrFormatError:
if '/' in value:
ip = netaddr.IPNetwork(value).ip
else:
ip = netaddr.IPAddress(value)
except (netaddr.AddrFormatError, ValueError):
msg = 'You must pass a valid IP address; {0} is invalid'.format(value)
raise errors.AnsibleFilterError(msg)

4
test/units/plugins/filter/test_ipaddr.py
View file

@ -481,6 +481,10 @@ class TestIpFilter(unittest.TestCase):
self.assertEqual(ipmath('192.168.1.5', -5), '192.168.1.0')
self.assertEqual(ipmath('192.168.0.5', -10), '192.167.255.251')
self.assertEqual(ipmath('192.168.1.1/24', 5), '192.168.1.6')
self.assertEqual(ipmath('192.168.1.6/24', -5), '192.168.1.1')
self.assertEqual(ipmath('192.168.2.6/24', -10), '192.168.1.252')
self.assertEqual(ipmath('2001::1', 8), '2001::9')
self.assertEqual(ipmath('2001::1', 9), '2001::a')
self.assertEqual(ipmath('2001::1', 10), '2001::b')