NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fixes #460: Corrected ordering of IP addresses with differing prefix lengths

Browse Source
This commit is contained in:
Jeremy Stretch 2016-08-13 01:02:03 -04:00
parent bf1b8ab9b8
commit 4f774f8ba6
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
netbox/ipam/models.py
View File

@ -5,6 +5,7 @@ from django.core.exceptions import ValidationError
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.core.validators import MaxValueValidator, MinValueValidator from django.core.validators import MaxValueValidator, MinValueValidator
from django.db import models from django.db import models
from django.db.models.expressions import RawSQL
from dcim.models import Interface from dcim.models import Interface
from tenancy.models import Tenant from tenancy.models import Tenant
@ -295,6 +296,18 @@ class Prefix(CreatedUpdatedModel):
return STATUS_CHOICE_CLASSES[self.status] return STATUS_CHOICE_CLASSES[self.status]
class IPAddressManager(models.Manager):
def get_queryset(self):
"""
By default, PostgreSQL will order INETs with shorter (larger) prefix lengths ahead of those with longer
(smaller) masks. This makes no sense when ordering IPs, which should be ordered solely by family and host
address. Here, we alter the default ordering to use HOST(address) instead of the raw address value.
"""
qs = super(IPAddressManager, self).get_queryset()
return qs.annotate(host=RawSQL('HOST(ipam_ipaddress.address)', [])).order_by('family', 'host')
class IPAddress(CreatedUpdatedModel): class IPAddress(CreatedUpdatedModel):
""" """
An IPAddress represents an individual IPv4 or IPv6 address and its mask. The mask length should match what is An IPAddress represents an individual IPv4 or IPv6 address and its mask. The mask length should match what is
@ -317,6 +330,8 @@ class IPAddress(CreatedUpdatedModel):
null=True, verbose_name='NAT IP (inside)') null=True, verbose_name='NAT IP (inside)')
description = models.CharField(max_length=100, blank=True) description = models.CharField(max_length=100, blank=True)
objects = IPAddressManager()
class Meta: class Meta:
ordering = ['family', 'address'] ordering = ['family', 'address']
verbose_name = 'IP address' verbose_name = 'IP address'