From febb5da4abc397cc437fb58569105816bad84527 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 5 Aug 2024 10:09:58 -0400 Subject: [PATCH] Fix tests --- netbox/dcim/filtersets.py | 12 ++++++---- netbox/dcim/tests/test_api.py | 8 ++++--- netbox/dcim/tests/test_filtersets.py | 33 +++++++++++++++++----------- netbox/dcim/tests/test_models.py | 3 ++- netbox/dcim/tests/test_views.py | 15 ++++++------- 5 files changed, 42 insertions(+), 29 deletions(-) diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index 1ae198165..3607eda2c 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -1322,11 +1322,11 @@ class ModuleFilterSet(NetBoxModelFilterSet): to_field_name='model', label=_('Module type (model)'), ) - module_bay_id = django_filters.ModelMultipleChoiceFilter( - field_name='module_bay', + module_bay_id = TreeNodeMultipleChoiceFilter( queryset=ModuleBay.objects.all(), - to_field_name='id', - label=_('Module Bay (ID)') + field_name='module_bay', + lookup_expr='in', + label=_('Module bay (ID)'), ) device_id = django_filters.ModelMultipleChoiceFilter( queryset=Device.objects.all(), @@ -1794,6 +1794,10 @@ class RearPortFilterSet( class ModuleBayFilterSet(ModularDeviceComponentFilterSet, NetBoxModelFilterSet): + parent_id = django_filters.ModelMultipleChoiceFilter( + queryset=ModuleBay.objects.all(), + label=_('Parent module bay (ID)'), + ) installed_module_id = django_filters.ModelMultipleChoiceFilter( field_name='installed_module', queryset=ModuleBay.objects.all(), diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index b690007be..7a9d124bb 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -1352,7 +1352,8 @@ class ModuleTest(APIViewTestCases.APIViewTestCase): ModuleBay(device=device, name='Module Bay 5'), ModuleBay(device=device, name='Module Bay 6'), ) - ModuleBay.objects.bulk_create(module_bays) + for module_bay in module_bays: + module_bay.save() modules = ( Module(device=device, module_bay=module_bays[0], module_type=module_types[0]), @@ -1810,12 +1811,13 @@ class ModuleBayTest(APIViewTestCases.APIViewTestCase): device_type = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1') device = Device.objects.create(device_type=device_type, role=role, name='Device 1', site=site) - device_bays = ( + module_bays = ( ModuleBay(device=device, name='Device Bay 1'), ModuleBay(device=device, name='Device Bay 2'), ModuleBay(device=device, name='Device Bay 3'), ) - ModuleBay.objects.bulk_create(device_bays) + for module_bay in module_bays: + module_bay.save() cls.create_data = [ { diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py index 07b93dbaf..942523a0f 100644 --- a/netbox/dcim/tests/test_filtersets.py +++ b/netbox/dcim/tests/test_filtersets.py @@ -2320,10 +2320,8 @@ class DeviceTestCase(TestCase, ChangeLoggedFilterSetTests): FrontPort(device=devices[0], name='Front Port 1', type=PortTypeChoices.TYPE_8P8C, rear_port=rear_ports[0]), FrontPort(device=devices[1], name='Front Port 2', type=PortTypeChoices.TYPE_8P8C, rear_port=rear_ports[1]), )) - ModuleBay.objects.bulk_create(( - ModuleBay(device=devices[0], name='Module Bay 1'), - ModuleBay(device=devices[1], name='Module Bay 2'), - )) + ModuleBay.objects.create(device=devices[0], name='Module Bay 1') + ModuleBay.objects.create(device=devices[1], name='Module Bay 2') DeviceBay.objects.bulk_create(( DeviceBay(device=devices[0], name='Device Bay 1'), DeviceBay(device=devices[1], name='Device Bay 2'), @@ -2635,7 +2633,8 @@ class ModuleTestCase(TestCase, ChangeLoggedFilterSetTests): ModuleBay(device=devices[2], name='Module Bay 2'), ModuleBay(device=devices[2], name='Module Bay 3'), ) - ModuleBay.objects.bulk_create(module_bays) + for module_bay in module_bays: + module_bay.save() modules = ( Module( @@ -2838,7 +2837,8 @@ class ConsolePortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedF ModuleBay(device=devices[1], name='Module Bay 2'), ModuleBay(device=devices[2], name='Module Bay 3'), ) - ModuleBay.objects.bulk_create(module_bays) + for module_bay in module_bays: + module_bay.save() modules = ( Module(device=devices[0], module_bay=module_bays[0], module_type=module_type), @@ -3018,7 +3018,8 @@ class ConsoleServerPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeL ModuleBay(device=devices[1], name='Module Bay 2'), ModuleBay(device=devices[2], name='Module Bay 3'), ) - ModuleBay.objects.bulk_create(module_bays) + for module_bay in module_bays: + module_bay.save() modules = ( Module(device=devices[0], module_bay=module_bays[0], module_type=module_type), @@ -3198,7 +3199,8 @@ class PowerPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil ModuleBay(device=devices[1], name='Module Bay 2'), ModuleBay(device=devices[2], name='Module Bay 3'), ) - ModuleBay.objects.bulk_create(module_bays) + for module_bay in module_bays: + module_bay.save() modules = ( Module(device=devices[0], module_bay=module_bays[0], module_type=module_type), @@ -3386,7 +3388,8 @@ class PowerOutletTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedF ModuleBay(device=devices[1], name='Module Bay 2'), ModuleBay(device=devices[2], name='Module Bay 3'), ) - ModuleBay.objects.bulk_create(module_bays) + for module_bay in module_bays: + module_bay.save() modules = ( Module(device=devices[0], module_bay=module_bays[0], module_type=module_type), @@ -3617,7 +3620,8 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil ModuleBay(device=devices[2], name='Module Bay 3'), ModuleBay(device=devices[3], name='Module Bay 4'), ) - ModuleBay.objects.bulk_create(module_bays) + for module_bay in module_bays: + module_bay.save() modules = ( Module(device=devices[0], module_bay=module_bays[0], module_type=module_type), @@ -4064,7 +4068,8 @@ class FrontPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil ModuleBay(device=devices[1], name='Module Bay 2'), ModuleBay(device=devices[2], name='Module Bay 3'), ) - ModuleBay.objects.bulk_create(module_bays) + for module_bay in module_bays: + module_bay.save() modules = ( Module(device=devices[0], module_bay=module_bays[0], module_type=module_type), @@ -4253,7 +4258,8 @@ class RearPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFilt ModuleBay(device=devices[1], name='Module Bay 2'), ModuleBay(device=devices[2], name='Module Bay 3'), ) - ModuleBay.objects.bulk_create(module_bays) + for module_bay in module_bays: + module_bay.save() modules = ( Module(device=devices[0], module_bay=module_bays[0], module_type=module_type), @@ -4435,7 +4441,8 @@ class ModuleBayTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil ModuleBay(device=devices[2], name='Module Bay 4', label='D', description='Fourth'), ModuleBay(device=devices[2], name='Module Bay 5', label='E', description='Fifth'), ) - ModuleBay.objects.bulk_create(module_bays) + for module_bay in module_bays: + module_bay.save() module_type = ModuleType.objects.create(manufacturer=manufacturer, model='Module Type 1') modules = ( diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py index 5cfa2817d..1c3dbb90b 100644 --- a/netbox/dcim/tests/test_models.py +++ b/netbox/dcim/tests/test_models.py @@ -641,7 +641,8 @@ class ModuleBayTestCase(TestCase): ModuleBay(device=device, name='Module Bay 2', label='B', description='Second'), ModuleBay(device=device, name='Module Bay 3', label='C', description='Third'), ) - ModuleBay.objects.bulk_create(module_bays) + for module_bay in module_bays: + module_bay.save() manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1') module_type = ModuleType.objects.create(manufacturer=manufacturer, model='Module Type 1') diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py index c8763e5b9..bb59a5752 100644 --- a/netbox/dcim/tests/test_views.py +++ b/netbox/dcim/tests/test_views.py @@ -1899,12 +1899,9 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase): @override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) def test_device_modulebays(self): device = Device.objects.first() - device_bays = ( - ModuleBay(device=device, name='Module Bay 1'), - ModuleBay(device=device, name='Module Bay 2'), - ModuleBay(device=device, name='Module Bay 3'), - ) - ModuleBay.objects.bulk_create(device_bays) + ModuleBay.objects.create(device=device, name='Module Bay 1') + ModuleBay.objects.create(device=device, name='Module Bay 2') + ModuleBay.objects.create(device=device, name='Module Bay 3') url = reverse('dcim:device_modulebays', kwargs={'pk': device.pk}) self.assertHttpStatus(self.client.get(url), 200) @@ -1980,7 +1977,8 @@ class ModuleTestCase( ModuleBay(device=devices[1], name='Module Bay 4'), ModuleBay(device=devices[1], name='Module Bay 5'), ) - ModuleBay.objects.bulk_create(module_bays) + for module_bay in module_bays: + module_bay.save() modules = ( Module(device=devices[0], module_bay=module_bays[0], module_type=module_types[0]), @@ -2782,7 +2780,8 @@ class ModuleBayTestCase(ViewTestCases.DeviceComponentViewTestCase): ModuleBay(device=device, name='Module Bay 2'), ModuleBay(device=device, name='Module Bay 3'), ) - ModuleBay.objects.bulk_create(module_bays) + for module_bay in module_bays: + module_bay.save() tags = create_tags('Alpha', 'Bravo', 'Charlie')