diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py index ede1e2a09..d7f775e26 100644 --- a/netbox/dcim/tests/test_filtersets.py +++ b/netbox/dcim/tests/test_filtersets.py @@ -2617,15 +2617,23 @@ class DeviceTestCase(TestCase, ChangeLoggedFilterSetTests): addresses = IPAddress.objects.filter(address__family=4) params = {'primary_ip4_id': [addresses[0].pk, addresses[1].pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'primary_ip4': [str(addresses[0].address), str(addresses[1].address)]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) params = {'primary_ip4_id': [addresses[2].pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 0) + params = {'primary_ip4': [str(addresses[2].address)]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 0) def test_primary_ip6(self): addresses = IPAddress.objects.filter(address__family=6) params = {'primary_ip6_id': [addresses[0].pk, addresses[1].pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'primary_ip6': [str(addresses[0].address), str(addresses[1].address)]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) params = {'primary_ip6_id': [addresses[2].pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 0) + params = {'primary_ip6': [str(addresses[2].address)]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 0) def test_virtual_chassis_id(self): params = {'virtual_chassis_id': [VirtualChassis.objects.first().pk]} @@ -6450,15 +6458,23 @@ class VirtualDeviceContextTestCase(TestCase, ChangeLoggedFilterSetTests): addresses = IPAddress.objects.filter(address__family=4) params = {'primary_ip4_id': [addresses[0].pk, addresses[1].pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'primary_ip4': [str(addresses[0].address), str(addresses[1].address)]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) params = {'primary_ip4_id': [addresses[2].pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 0) + params = {'primary_ip4': [str(addresses[2].address)]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 0) def test_primary_ip6(self): addresses = IPAddress.objects.filter(address__family=6) params = {'primary_ip6_id': [addresses[0].pk, addresses[1].pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'primary_ip6': [str(addresses[0].address), str(addresses[1].address)]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) params = {'primary_ip6_id': [addresses[2].pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 0) + params = {'primary_ip6': [str(addresses[2].address)]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 0) class MACAddressTestCase(TestCase, ChangeLoggedFilterSetTests):