ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-04 15:29:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Kc update ip filter (#26566)

Browse source 
* add first, last and next usable

* add usable ip filters

* add size usable, range usable and wildcard

* add ip prefix and netmask filter

* add network formatting and check if ip in subnet

* clean up order, add comments

* fix pep8

* update format by index

* clean up and updates from jmcgill298
This commit is contained in:
Ken Celenza 2017-07-12 12:17:58 -04:00 • committed by John R Barker
parent cf01068f53
commit 31b6ac896d
2 changed files with 709 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,18 +18,439 @@ from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
from ansible.compat.tests import unittest
from ansible.plugins.filter.ipaddr import ipaddr, _netmask_query
from ansible.plugins.filter.ipaddr import (ipaddr, _netmask_query, nthhost, next_nth_usable,
previous_nth_usable, network_in_usable, network_in_network)
class TestNetmask(unittest.TestCase):
def test_whole_octets(self):
class TestIpFilter(unittest.TestCase):
def test_netmask(self):
address = '1.1.1.1/24'
self.assertEqual(ipaddr(address, 'netmask'), '255.255.255.0')
def test_partial_octet(self):
address = '1.1.1.1/25'
self.assertEqual(ipaddr(address, 'netmask'), '255.255.255.128')
def test_32_cidr(self):
address = '1.12.1.34/32'
self.assertEqual(ipaddr(address, 'netmask'), '255.255.255.255')
def test_network(self):
# Unfixable in current state
# address = '1.12.1.34/32'
# self.assertEqual(ipaddr(address, 'network'), '1.12.1.34')
# address = '1.12.1.34/255.255.255.255'
# self.assertEqual(ipaddr(address, 'network'), '1.12.1.34')
# address = '1.12.1.34'
# self.assertEqual(ipaddr(address, 'network'), '1.12.1.34')
# address = '1.12.1.35/31'
# self.assertEqual(ipaddr(address, 'network'), '1.12.1.34')
address = '1.12.1.34/24'
self.assertEqual(ipaddr(address, 'network'), '1.12.1.0')
def test_broadcast(self):
address = '1.12.1.34/24'
self.assertEqual(ipaddr(address, 'broadcast'), '1.12.1.255')
address = '1.12.1.34/16'
self.assertEqual(ipaddr(address, 'broadcast'), '1.12.255.255')
address = '1.12.1.34/27'
self.assertEqual(ipaddr(address, 'broadcast'), '1.12.1.63')
address = '1.12.1.34/32'
self.assertEqual(ipaddr(address, 'broadcast'), None)
address = '1.12.1.35/31'
self.assertEqual(ipaddr(address, 'broadcast'), None)
def test_first_usable(self):
address = '1.12.1.0/24'
self.assertEqual(ipaddr(address, 'first_usable'), '1.12.1.1')
address = '1.12.1.36/24'
self.assertEqual(ipaddr(address, 'first_usable'), '1.12.1.1')
# address = '1.12.1.34'
# self.assertFalse(ipaddr(address, 'first_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(ipaddr(address, 'first_usable'), '1.12.1.33')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(ipaddr(address, 'first_usable'), '1.12.1.33')
address = '1.12.1.36/31'
self.assertEqual(ipaddr(address, 'first_usable'), '1.12.1.36')
address = '1.12.1.37/31'
self.assertEqual(ipaddr(address, 'first_usable'), '1.12.1.36')
address = '1.12.1.36/32'
self.assertEqual(ipaddr(address, 'first_usable'), None)
def test_last_usable(self):
address = '1.12.1.0/24'
self.assertEqual(ipaddr(address, 'last_usable'), '1.12.1.254')
address = '1.12.1.36/24'
self.assertEqual(ipaddr(address, 'last_usable'), '1.12.1.254')
# address = '1.12.1.34'
# self.assertFalse(ipaddr(address, 'last_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(ipaddr(address, 'last_usable'), '1.12.1.46')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(ipaddr(address, 'last_usable'), '1.12.1.46')
address = '1.12.1.36/31'
self.assertEqual(ipaddr(address, 'last_usable'), '1.12.1.37')
address = '1.12.1.37/31'
self.assertEqual(ipaddr(address, 'last_usable'), '1.12.1.37')
address = '1.12.1.36/32'
self.assertEqual(ipaddr(address, 'last_usable'), None)
def test_wildcard(self):
address = '1.12.1.0/24'
self.assertEqual(ipaddr(address, 'wildcard'), '0.0.0.255')
address = '1.12.1.0/25'
self.assertEqual(ipaddr(address, 'wildcard'), '0.0.0.127')
# address = '1.12.1.34'
# self.assertFalse(ipaddr(address, 'last_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(ipaddr(address, 'wildcard'), '0.0.0.15')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(ipaddr(address, 'wildcard'), '0.0.0.15')
address = '1.12.1.36/31'
self.assertEqual(ipaddr(address, 'wildcard'), '0.0.0.1')
address = '1.12.1.37/31'
self.assertEqual(ipaddr(address, 'wildcard'), '0.0.0.1')
address = '1.12.1.36/32'
self.assertEqual(ipaddr(address, 'wildcard'), '0.0.0.0')
address = '1.12.1.254/24'
self.assertEqual(ipaddr(address, 'wildcard'), '0.0.0.255')
def test_size_usable(self):
address = '1.12.1.0/24'
self.assertEqual(ipaddr(address, 'size_usable'), 254)
address = '1.12.1.0/25'
self.assertEqual(ipaddr(address, 'size_usable'), 126)
# address = '1.12.1.34'
# self.assertFalse(ipaddr(address, 'last_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(ipaddr(address, 'size_usable'), 14)
address = '1.12.1.36/255.255.255.240'
self.assertEqual(ipaddr(address, 'size_usable'), 14)
address = '1.12.1.36/31'
self.assertEqual(ipaddr(address, 'size_usable'), 2)
address = '1.12.1.37/31'
self.assertEqual(ipaddr(address, 'size_usable'), 2)
address = '1.12.1.36/32'
self.assertEqual(ipaddr(address, 'size_usable'), 0)
address = '1.12.1.254/24'
self.assertEqual(ipaddr(address, 'size_usable'), 254)
def test_range_usable(self):
address = '1.12.1.0/24'
self.assertEqual(ipaddr(address, 'range_usable'), '1.12.1.1-1.12.1.254')
address = '1.12.1.0/25'
self.assertEqual(ipaddr(address, 'range_usable'), '1.12.1.1-1.12.1.126')
# address = '1.12.1.34'
# self.assertFalse(ipaddr(address, 'last_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(ipaddr(address, 'range_usable'), '1.12.1.33-1.12.1.46')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(ipaddr(address, 'range_usable'), '1.12.1.33-1.12.1.46')
address = '1.12.1.36/31'
self.assertEqual(ipaddr(address, 'range_usable'), '1.12.1.36-1.12.1.37')
address = '1.12.1.37/31'
self.assertEqual(ipaddr(address, 'range_usable'), '1.12.1.36-1.12.1.37')
address = '1.12.1.36/32'
self.assertEqual(ipaddr(address, 'range_usable'), None)
address = '1.12.1.254/24'
self.assertEqual(ipaddr(address, 'range_usable'), '1.12.1.1-1.12.1.254')
def test_address_prefix(self):
address = '1.12.1.0/24'
self.assertEqual(ipaddr(address, 'address/prefix'), None)
address = '1.12.1.0/25'
self.assertEqual(ipaddr(address, 'address/prefix'), None)
# address = '1.12.1.34'
# self.assertFalse(ipaddr(address, 'last_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(ipaddr(address, 'address/prefix'), '1.12.1.36/28')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(ipaddr(address, 'address/prefix'), '1.12.1.36/28')
# address = '1.12.1.36/31'
# self.assertEqual(ipaddr(address, 'address/prefix'), '1.12.1.36/31') - unfixable?
# address = '1.12.1.37/31'
# self.assertEqual(ipaddr(address, 'address/prefix'), '1.12.1.37/31') - unfixable?
address = '1.12.1.36/32'
self.assertEqual(ipaddr(address, 'address/prefix'), None)
address = '1.12.1.254/24'
self.assertEqual(ipaddr(address, 'address/prefix'), '1.12.1.254/24')
def test_ip_prefix(self):
address = '1.12.1.0/24'
self.assertEqual(ipaddr(address, 'ip/prefix'), None)
address = '1.12.1.0/25'
self.assertEqual(ipaddr(address, 'ip/prefix'), None)
# address = '1.12.1.34'
# self.assertFalse(ipaddr(address, 'last_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(ipaddr(address, 'ip/prefix'), '1.12.1.36/28')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(ipaddr(address, 'ip/prefix'), '1.12.1.36/28')
address = '1.12.1.36/31'
self.assertEqual(ipaddr(address, 'ip/prefix'), '1.12.1.36/31')
address = '1.12.1.37/31'
self.assertEqual(ipaddr(address, 'ip/prefix'), '1.12.1.37/31')
address = '1.12.1.36/32'
self.assertEqual(ipaddr(address, 'ip/prefix'), None)
address = '1.12.1.254/24'
self.assertEqual(ipaddr(address, 'ip/prefix'), '1.12.1.254/24')
def test_ip_netmask(self):
address = '1.12.1.0/24'
self.assertEqual(ipaddr(address, 'ip_netmask'), None)
address = '1.12.1.0/25'
self.assertEqual(ipaddr(address, 'ip_netmask'), None)
address = '1.12.1.36/28'
self.assertEqual(ipaddr(address, 'ip_netmask'), '1.12.1.36 255.255.255.240')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(ipaddr(address, 'ip_netmask'), '1.12.1.36 255.255.255.240')
address = '1.12.1.36/31'
self.assertEqual(ipaddr(address, 'ip_netmask'), '1.12.1.36 255.255.255.254')
address = '1.12.1.37/31'
self.assertEqual(ipaddr(address, 'ip_netmask'), '1.12.1.37 255.255.255.254')
address = '1.12.1.36/32'
self.assertEqual(ipaddr(address, 'ip_netmask'), None)
address = '1.12.1.254/24'
self.assertEqual(ipaddr(address, 'ip_netmask'), '1.12.1.254 255.255.255.0')
'''
def test_ip_wildcard(self):
address = '1.12.1.0/24'
self.assertEqual(ipaddr(address, 'ip_wildcard'), None)
address = '1.12.1.0/25'
self.assertEqual(ipaddr(address, 'ip_wildcard'), None)
#address = '1.12.1.34'
#self.assertFalse(ipaddr(address, 'last_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(ipaddr(address, 'ip_wildcard'), '1.12.1.36 0.0.0.15')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(ipaddr(address, 'ip_wildcard'), '1.12.1.36 0.0.0.15')
address = '1.12.1.36/31'
self.assertEqual(ipaddr(address, 'ip_wildcard'), '1.12.1.36 0.0.0.1')
address = '1.12.1.37/31'
self.assertEqual(ipaddr(address, 'ip_wildcard'), '1.12.1.37 0.0.0.1')
address = '1.12.1.36/32'
self.assertEqual(ipaddr(address, 'ip_wildcard'), None)
address = '1.12.1.254/24'
self.assertEqual(ipaddr(address, 'ip_wildcard'), '1.12.1.254 0.0.0.255')
'''
def test_network_id(self):
address = '1.12.1.0/24'
self.assertEqual(ipaddr(address, 'network_id'), '1.12.1.0')
address = '1.12.1.0/25'
self.assertEqual(ipaddr(address, 'network_id'), '1.12.1.0')
# address = '1.12.1.34'
# self.assertFalse(ipaddr(address, 'last_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(ipaddr(address, 'network_id'), '1.12.1.32')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(ipaddr(address, 'network_id'), '1.12.1.32')
address = '1.12.1.36/31'
self.assertEqual(ipaddr(address, 'network_id'), '1.12.1.36')
address = '1.12.1.37/31'
self.assertEqual(ipaddr(address, 'network_id'), '1.12.1.36')
address = '1.12.1.36/32'
self.assertEqual(ipaddr(address, 'network_id'), '1.12.1.36')
address = '1.12.1.254/24'
self.assertEqual(ipaddr(address, 'network_id'), '1.12.1.0')
def test_network_prefix(self):
address = '1.12.1.0/24'
self.assertEqual(ipaddr(address, 'network/prefix'), '1.12.1.0/24')
address = '1.12.1.0/25'
self.assertEqual(ipaddr(address, 'network/prefix'), '1.12.1.0/25')
# address = '1.12.1.34'
# self.assertFalse(ipaddr(address, 'last_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(ipaddr(address, 'network/prefix'), '1.12.1.32/28')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(ipaddr(address, 'network/prefix'), '1.12.1.32/28')
address = '1.12.1.36/31'
self.assertEqual(ipaddr(address, 'network/prefix'), '1.12.1.36/31')
address = '1.12.1.37/31'
self.assertEqual(ipaddr(address, 'network/prefix'), '1.12.1.36/31')
address = '1.12.1.36/32'
self.assertEqual(ipaddr(address, 'network/prefix'), '1.12.1.36/32')
address = '1.12.1.254/24'
self.assertEqual(ipaddr(address, 'network/prefix'), '1.12.1.0/24')
def test_network_netmask(self):
address = '1.12.1.0/24'
self.assertEqual(ipaddr(address, 'network_netmask'), '1.12.1.0 255.255.255.0')
address = '1.12.1.0/25'
self.assertEqual(ipaddr(address, 'network_netmask'), '1.12.1.0 255.255.255.128')
# address = '1.12.1.34'
# self.assertFalse(ipaddr(address, 'last_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(ipaddr(address, 'network_netmask'), '1.12.1.32 255.255.255.240')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(ipaddr(address, 'network_netmask'), '1.12.1.32 255.255.255.240')
address = '1.12.1.36/31'
self.assertEqual(ipaddr(address, 'network_netmask'), '1.12.1.36 255.255.255.254')
address = '1.12.1.37/31'
self.assertEqual(ipaddr(address, 'network_netmask'), '1.12.1.36 255.255.255.254')
address = '1.12.1.36/32'
self.assertEqual(ipaddr(address, 'network_netmask'), '1.12.1.36 255.255.255.255')
address = '1.12.1.254/24'
self.assertEqual(ipaddr(address, 'network_netmask'), '1.12.1.0 255.255.255.0')
def test_network_wildcard(self):
address = '1.12.1.0/24'
self.assertEqual(ipaddr(address, 'network_wildcard'), '1.12.1.0 0.0.0.255')
address = '1.12.1.0/25'
self.assertEqual(ipaddr(address, 'network_wildcard'), '1.12.1.0 0.0.0.127')
# address = '1.12.1.34'
# self.assertFalse(ipaddr(address, 'last_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(ipaddr(address, 'network_wildcard'), '1.12.1.32 0.0.0.15')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(ipaddr(address, 'network_wildcard'), '1.12.1.32 0.0.0.15')
address = '1.12.1.36/31'
self.assertEqual(ipaddr(address, 'network_wildcard'), '1.12.1.36 0.0.0.1')
address = '1.12.1.37/31'
self.assertEqual(ipaddr(address, 'network_wildcard'), '1.12.1.36 0.0.0.1')
address = '1.12.1.36/32'
self.assertEqual(ipaddr(address, 'network_wildcard'), '1.12.1.36 0.0.0.0')
address = '1.12.1.254/24'
self.assertEqual(ipaddr(address, 'network_wildcard'), '1.12.1.0 0.0.0.255')
def test_next_usable(self):
address = '1.12.1.0/24'
self.assertEqual(ipaddr(address, 'next_usable'), '1.12.1.1')
address = '1.12.1.36/24'
self.assertEqual(ipaddr(address, 'next_usable'), '1.12.1.37')
# address = '1.12.1.34'
# self.assertFalse(ipaddr(address, 'last_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(ipaddr(address, 'next_usable'), '1.12.1.37')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(ipaddr(address, 'next_usable'), '1.12.1.37')
address = '1.12.1.36/31'
self.assertEqual(ipaddr(address, 'next_usable'), '1.12.1.37')
address = '1.12.1.37/31'
self.assertEqual(ipaddr(address, 'next_usable'), None)
address = '1.12.1.36/32'
self.assertEqual(ipaddr(address, 'next_usable'), None)
address = '1.12.1.254/24'
self.assertEqual(ipaddr(address, 'next_usable'), None)
def test_previous_usable(self):
address = '1.12.1.0/24'
self.assertEqual(ipaddr(address, 'previous_usable'), None)
address = '1.12.1.36/24'
self.assertEqual(ipaddr(address, 'previous_usable'), '1.12.1.35')
# address = '1.12.1.34'
# self.assertFalse(ipaddr(address, 'last_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(ipaddr(address, 'previous_usable'), '1.12.1.35')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(ipaddr(address, 'previous_usable'), '1.12.1.35')
address = '1.12.1.36/31'
self.assertEqual(ipaddr(address, 'previous_usable'), None)
address = '1.12.1.37/31'
self.assertEqual(ipaddr(address, 'previous_usable'), '1.12.1.36')
address = '1.12.1.36/32'
self.assertEqual(ipaddr(address, 'previous_usable'), None)
address = '1.12.1.254/24'
self.assertEqual(ipaddr(address, 'previous_usable'), '1.12.1.253')
def test_next_nth_usable(self):
address = '1.12.1.0/24'
self.assertEqual(next_nth_usable(address, 5), '1.12.1.5')
address = '1.12.1.36/24'
self.assertEqual(next_nth_usable(address, 10), '1.12.1.46')
# address = '1.12.1.34'
# self.assertFalse(ipaddr(address, 'last_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(next_nth_usable(address, 4), '1.12.1.40')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(next_nth_usable(address, 4), '1.12.1.40')
address = '1.12.1.36/31'
self.assertEqual(next_nth_usable(address, 1), '1.12.1.37')
address = '1.12.1.37/31'
self.assertEqual(next_nth_usable(address, 1), None)
address = '1.12.1.36/32'
self.assertEqual(next_nth_usable(address, 1), None)
address = '1.12.1.254/24'
self.assertEqual(next_nth_usable(address, 2), None)
def test_previous_nth_usable(self):
address = '1.12.1.0/24'
self.assertEqual(previous_nth_usable(address, 5), None)
address = '1.12.1.36/24'
self.assertEqual(previous_nth_usable(address, 10), '1.12.1.26')
# address = '1.12.1.34'
# self.assertFalse(ipaddr(address, 'last_usable'), 'Not a network address')
address = '1.12.1.36/28'
self.assertEqual(previous_nth_usable(address, 2), '1.12.1.34')
address = '1.12.1.36/255.255.255.240'
self.assertEqual(previous_nth_usable(address, 2), '1.12.1.34')
address = '1.12.1.36/31'
self.assertEqual(previous_nth_usable(address, 1), None)
address = '1.12.1.37/31'
self.assertEqual(previous_nth_usable(address, 1), '1.12.1.36')
address = '1.12.1.36/32'
self.assertEqual(previous_nth_usable(address, 1), None)
address = '1.12.1.254/24'
self.assertEqual(previous_nth_usable(address, 2), '1.12.1.252')
def test_network_in_usable(self):
subnet = '1.12.1.0/24'
address = '1.12.1.10'
self.assertEqual(network_in_usable(subnet, address), True)
subnet = '1.12.1.0/24'
address = '1.12.0.10'
self.assertEqual(network_in_usable(subnet, address), False)
subnet = '1.12.1.32/28'
address = '1.12.1.36'
self.assertEqual(network_in_usable(subnet, address), True)
subnet = '1.12.1.32/28'
address = '1.12.1.36/31'
self.assertEqual(network_in_usable(subnet, address), True)
subnet = '1.12.1.32/28'
address = '1.12.1.48/31'
self.assertEqual(network_in_usable(subnet, address), False)
subnet = '1.12.1.32/255.255.255.240'
address = '1.12.1.31'
self.assertEqual(network_in_usable(subnet, address), False)
subnet = '1.12.1.36/31'
address = '1.12.1.36'
self.assertEqual(network_in_usable(subnet, address), True)
subnet = '1.12.1.37/31'
address = '1.12.1.35'
self.assertEqual(network_in_usable(subnet, address), False)
subnet = '1.12.1.36/32'
address = '1.12.1.36'
self.assertEqual(network_in_usable(subnet, address), True)
subnet = '1.12.1.0/24'
address = '1.12.2.0'
self.assertEqual(network_in_usable(subnet, address), False)
def test_network_in_network(self):
subnet = '1.12.1.0/24'
address = '1.12.1.0'
self.assertEqual(network_in_network(subnet, address), True)
subnet = '1.12.1.0/24'
address = '1.12.0.10'
self.assertEqual(network_in_network(subnet, address), False)
subnet = '1.12.1.32/28'
address = '1.12.1.32/28'
self.assertEqual(network_in_network(subnet, address), True)
subnet = '1.12.1.32/28'
address = '1.12.1.47'
self.assertEqual(network_in_network(subnet, address), True)
subnet = '1.12.1.32/28'
address = '1.12.1.48/31'
self.assertEqual(network_in_network(subnet, address), False)
subnet = '1.12.1.32/255.255.255.240'
address = '1.12.1.31'
self.assertEqual(network_in_network(subnet, address), False)
subnet = '1.12.1.36/31'
address = '1.12.1.36'
self.assertEqual(network_in_network(subnet, address), True)
subnet = '1.12.1.37/31'
address = '1.12.1.35'
self.assertEqual(network_in_network(subnet, address), False)
subnet = '1.12.1.36/32'
address = '1.12.1.36'
self.assertEqual(network_in_network(subnet, address), True)
subnet = '1.12.1.0/24'
address = '1.12.2.0'
self.assertEqual(network_in_network(subnet, address), False)