diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index 2fb1e9949..a4d75654e 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -698,9 +698,6 @@ class DeviceTypeComponentFilterSet(django_filters.FilterSet): label=_('Device type (ID)'), ) - # TODO: Remove in v4.1 - devicetype_id = device_type_id - def search(self, queryset, name, value): if not value.strip(): return queryset @@ -717,9 +714,6 @@ class ModularDeviceTypeComponentFilterSet(DeviceTypeComponentFilterSet): label=_('Module type (ID)'), ) - # TODO: Remove in v4.1 - moduletype_id = module_type_id - class ConsolePortTemplateFilterSet(ChangeLoggedModelFilterSet, ModularDeviceTypeComponentFilterSet): diff --git a/netbox/extras/filtersets.py b/netbox/extras/filtersets.py index 274834d31..c3ac3e6ab 100644 --- a/netbox/extras/filtersets.py +++ b/netbox/extras/filtersets.py @@ -589,10 +589,6 @@ class ConfigContextFilterSet(ChangeLoggedModelFilterSet): label=_('Data file (ID)'), ) - # TODO: Remove in v4.1 - role = device_role - role_id = device_role_id - class Meta: model = ConfigContext fields = ('id', 'name', 'is_active', 'description', 'weight', 'auto_sync_enabled', 'data_synced') diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index d58f5bfc9..5cdfac34e 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -912,10 +912,6 @@ class VLANGroupFilterSet(OrganizationalModelFilterSet): method='filter_scope' ) - # TODO: Remove in v4.1 - sitegroup = site_group - clustergroup = cluster_group - class Meta: model = VLANGroup fields = ('id', 'name', 'slug', 'min_vid', 'max_vid', 'description', 'scope_id') @@ -1106,10 +1102,6 @@ class ServiceFilterSet(NetBoxModelFilterSet): lookup_expr='contains' ) - # TODO: Remove in v4.1 - ipaddress = ip_address - ipaddress_id = ip_address_id - class Meta: model = Service fields = ('id', 'name', 'protocol', 'description') diff --git a/netbox/vpn/filtersets.py b/netbox/vpn/filtersets.py index 3f8b2ee78..92aa702c6 100644 --- a/netbox/vpn/filtersets.py +++ b/netbox/vpn/filtersets.py @@ -190,10 +190,6 @@ class IKEPolicyFilterSet(NetBoxModelFilterSet): to_field_name='name' ) - # TODO: Remove in v4.1 - proposal = ike_proposal - proposal_id = ike_proposal_id - class Meta: model = IKEPolicy fields = ('id', 'name', 'preshared_key', 'description') @@ -255,10 +251,6 @@ class IPSecPolicyFilterSet(NetBoxModelFilterSet): to_field_name='name' ) - # TODO: Remove in v4.1 - proposal = ipsec_proposal - proposal_id = ipsec_proposal_id - class Meta: model = IPSecPolicy fields = ('id', 'name', 'description')