NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-20 02:06:42 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Remove dependency on RawSQL from IPAddress manager

Browse Source
This commit is contained in:
Jeremy Stretch 2020-02-19 17:17:41 -05:00
parent 7a53e24f97
commit 1130f6b9f0
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/ipam/lookups.py
View File

@ -154,10 +154,24 @@ class NetHostContained(Lookup):
return 'CAST(HOST(%s) AS INET) << %s' % (lhs, rhs), params return 'CAST(HOST(%s) AS INET) << %s' % (lhs, rhs), params
#
# Transforms
#
class NetMaskLength(Transform): class NetMaskLength(Transform):
lookup_name = 'net_mask_length'
function = 'MASKLEN' function = 'MASKLEN'
lookup_name = 'net_mask_length'
@property @property
def output_field(self): def output_field(self):
return IntegerField() return IntegerField()
class Host(Transform):
function = 'HOST'
lookup_name = 'host'
class Inet(Transform):
function = 'INET'
lookup_name = 'inet'

5
netbox/ipam/managers.py
View File

@ -1,5 +1,6 @@
from django.db import models from django.db import models
from django.db.models.expressions import RawSQL
from ipam.lookups import Host, Inet
class IPAddressManager(models.Manager): class IPAddressManager(models.Manager):
@ -13,4 +14,4 @@ class IPAddressManager(models.Manager):
IP address as a /32 or /128. IP address as a /32 or /128.
""" """
qs = super().get_queryset() qs = super().get_queryset()
return qs.annotate(host=RawSQL('INET(HOST(ipam_ipaddress.address))', [])).order_by('family', 'host') return qs.order_by('family', Inet(Host('address')))