From 1a1156ebf1058485b8108f8e745054b2c1eabf3d Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Wed, 18 Sep 2024 21:29:12 -0400 Subject: [PATCH] Remove unnecessary Lookup comparison classes --- netbox/ipam/fields.py | 4 ---- netbox/ipam/lookups.py | 30 ------------------------------ 2 files changed, 34 deletions(-) diff --git a/netbox/ipam/fields.py b/netbox/ipam/fields.py index 99dff081a..26fbc8fdc 100644 --- a/netbox/ipam/fields.py +++ b/netbox/ipam/fields.py @@ -105,10 +105,6 @@ IPAddressField.register_lookup(lookups.NetIn) IPAddressField.register_lookup(lookups.NetHostContained) IPAddressField.register_lookup(lookups.NetFamily) IPAddressField.register_lookup(lookups.NetMaskLength) -IPAddressField.register_lookup(lookups.NetHostLessThan) -IPAddressField.register_lookup(lookups.NetHostLessThanOrEqual) -IPAddressField.register_lookup(lookups.NetHostGreaterThan) -IPAddressField.register_lookup(lookups.NetHostGreaterThanOrEqual) IPAddressField.register_lookup(lookups.HostAsInet) diff --git a/netbox/ipam/lookups.py b/netbox/ipam/lookups.py index 4bb8e9b8d..1a5f7e0eb 100644 --- a/netbox/ipam/lookups.py +++ b/netbox/ipam/lookups.py @@ -154,36 +154,6 @@ class NetHostContained(Lookup): return 'CAST(HOST(%s) AS INET) <<= %s' % (lhs, rhs), params -class NetHostComparison(Lookup): - comparison_sql = None - - def as_sql(self, qn, connection): - lhs, lhs_params = self.process_lhs(qn, connection) - rhs, rhs_params = self.process_rhs(qn, connection) - params = lhs_params + rhs_params - return self.comparison_sql % (lhs, rhs), params - - -class NetHostGreaterThan(NetHostComparison): - lookup_name = 'net_host_gt' - comparison_sql = 'CAST(HOST(%s) AS INET) > INET %s' - - -class NetHostLessThan(NetHostComparison): - lookup_name = 'net_host_lt' - comparison_sql = 'CAST(HOST(%s) AS INET) < INET %s' - - -class NetHostGreaterThanOrEqual(NetHostComparison): - lookup_name = 'net_host_gte' - comparison_sql = 'CAST(HOST(%s) AS INET) >= INET %s' - - -class NetHostLessThanOrEqual(NetHostComparison): - lookup_name = 'net_host_lte' - comparison_sql = 'CAST(HOST(%s) AS INET) <= INET %s' - - class NetFamily(Transform): lookup_name = 'family' function = 'FAMILY'