15410 removed deprecated filters (#16410)

* 15410 removed legacy filters

* 15410 fix tests

* 15410 fix tests

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):
 

netbox/dcim/tests/test_filtersets.py

@@ -50,9 +50,9 @@ class DeviceComponentTemplateFilterSetTests:
         params = {'description': ['foobar1', 'foobar2']}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
-    def test_devicetype_id(self):
+    def test_device_type_id(self):
         device_types = DeviceType.objects.all()[:2]
-        params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
+        params = {'device_type_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
 
@@ -1753,9 +1753,9 @@ class InventoryItemTemplateTestCase(TestCase, DeviceComponentTemplateFilterSetTe
         params = {'name': ['Inventory Item 1', 'Inventory Item 2']}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
-    def test_devicetype_id(self):
+    def test_device_type_id(self):
         device_types = DeviceType.objects.all()[:2]
-        params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
+        params = {'device_type_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_label(self):

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')

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')

netbox/ipam/tests/test_filtersets.py

@@ -1525,8 +1525,8 @@ class VLANGroupTestCase(TestCase, ChangeLoggedFilterSetTests):
         params = {'region': Region.objects.first().pk}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
-    def test_sitegroup(self):
-        params = {'sitegroup': SiteGroup.objects.first().pk}
+    def test_site_group(self):
+        params = {'site_group': SiteGroup.objects.first().pk}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
     def test_site(self):
@@ -1541,8 +1541,8 @@ class VLANGroupTestCase(TestCase, ChangeLoggedFilterSetTests):
         params = {'rack': Rack.objects.first().pk}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
-    def test_clustergroup(self):
-        params = {'clustergroup': ClusterGroup.objects.first().pk}
+    def test_cluster_group(self):
+        params = {'cluster_group': ClusterGroup.objects.first().pk}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
     def test_cluster(self):

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')