NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 18:08:38 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Remove complex ordering for IP addresses

Browse Source 
After review complex ordering does not appear to be required
This commit is contained in:
Dan Sheppard 2020-01-29 12:54:55 -06:00
parent 22228b58f1
commit 23155551d1
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
netbox/ipam/tests/test_ordering.py
View File

@ -194,15 +194,6 @@ class IPAddressOrderingTestCase(TestCase):
status, vrf, address = addresses[i] status, vrf, address = addresses[i]
self.assertEqual((obj.vrf, obj.address), (vrf, address)) self.assertEqual((obj.vrf, obj.address), (vrf, address))
def _compare_complex(self, queryset, addresses):
qsaddress, regaddress = [], []
for i, obj in enumerate(queryset):
qsaddress.append(obj.address)
for addr in addresses:
regaddress.append(addr[2])
return (qsaddress, regaddress)
def test_address_ordering(self): def test_address_ordering(self):
# Setup Addresses # Setup Addresses
@ -290,22 +281,3 @@ class IPAddressOrderingTestCase(TestCase):
# Test # Test
self._compare_address(IPAddress.objects.all(), addresses) self._compare_address(IPAddress.objects.all(), addresses)
def test_address_complex_ordering(self):
# Setup VRFs
vrfa, vrfb, vrfc = self.vrfs
# Setup addresses
addresses = [
(IPAddressStatusChoices.STATUS_ACTIVE, vrfa, netaddr.IPNetwork('10.0.0.1/24')),
(IPAddressStatusChoices.STATUS_ACTIVE, vrfa, netaddr.IPNetwork('10.0.1.1/24')),
(IPAddressStatusChoices.STATUS_ACTIVE, vrfa, netaddr.IPNetwork('10.0.1.1/25')),
(IPAddressStatusChoices.STATUS_ACTIVE, vrfa, netaddr.IPNetwork('10.1.0.1/24')),
(IPAddressStatusChoices.STATUS_ACTIVE, vrfa, netaddr.IPNetwork('10.1.1.1/24')),
(IPAddressStatusChoices.STATUS_ACTIVE, None, netaddr.IPNetwork('192.168.0.1/24')),
]
IPAddress.objects.bulk_create(self._create_address(addresses))
# Test
qsaddresses, compaddresses = self._compare_complex(IPAddress.objects.all(), addresses)
self.assertEquals(qsaddresses, compaddresses)