NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-08 00:28:16 -06:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Jeremy Stretch 2024-08-05 10:09:58 -04:00
parent 6372d065be
commit febb5da4ab
5 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netbox/dcim/filtersets.py
View File

@ -1322,11 +1322,11 @@ class ModuleFilterSet(NetBoxModelFilterSet):
to_field_name='model', to_field_name='model',
label=_('Module type (model)'), label=_('Module type (model)'),
) )
module_bay_id = django_filters.ModelMultipleChoiceFilter( module_bay_id = TreeNodeMultipleChoiceFilter(
field_name='module_bay',
queryset=ModuleBay.objects.all(), queryset=ModuleBay.objects.all(),
to_field_name='id', field_name='module_bay',
label=_('Module Bay (ID)') lookup_expr='in',
label=_('Module bay (ID)'),
) )
device_id = django_filters.ModelMultipleChoiceFilter( device_id = django_filters.ModelMultipleChoiceFilter(
queryset=Device.objects.all(), queryset=Device.objects.all(),
@ -1794,6 +1794,10 @@ class RearPortFilterSet(
class ModuleBayFilterSet(ModularDeviceComponentFilterSet, NetBoxModelFilterSet): class ModuleBayFilterSet(ModularDeviceComponentFilterSet, NetBoxModelFilterSet):
parent_id = django_filters.ModelMultipleChoiceFilter(
queryset=ModuleBay.objects.all(),
label=_('Parent module bay (ID)'),
)
installed_module_id = django_filters.ModelMultipleChoiceFilter( installed_module_id = django_filters.ModelMultipleChoiceFilter(
field_name='installed_module', field_name='installed_module',
queryset=ModuleBay.objects.all(), queryset=ModuleBay.objects.all(),

8
netbox/dcim/tests/test_api.py
View File

@ -1352,7 +1352,8 @@ class ModuleTest(APIViewTestCases.APIViewTestCase):
ModuleBay(device=device, name='Module Bay 5'), ModuleBay(device=device, name='Module Bay 5'),
ModuleBay(device=device, name='Module Bay 6'), ModuleBay(device=device, name='Module Bay 6'),
) )
ModuleBay.objects.bulk_create(module_bays) for module_bay in module_bays:
module_bay.save()
modules = ( modules = (
Module(device=device, module_bay=module_bays[0], module_type=module_types[0]), 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_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 = 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 1'),
ModuleBay(device=device, name='Device Bay 2'), ModuleBay(device=device, name='Device Bay 2'),
ModuleBay(device=device, name='Device Bay 3'), 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 = [ cls.create_data = [
{ {

33
netbox/dcim/tests/test_filtersets.py
View File

@ -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[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]), FrontPort(device=devices[1], name='Front Port 2', type=PortTypeChoices.TYPE_8P8C, rear_port=rear_ports[1]),
)) ))
ModuleBay.objects.bulk_create(( ModuleBay.objects.create(device=devices[0], name='Module Bay 1')
ModuleBay(device=devices[0], name='Module Bay 1'), ModuleBay.objects.create(device=devices[1], name='Module Bay 2')
ModuleBay(device=devices[1], name='Module Bay 2'),
))
DeviceBay.objects.bulk_create(( DeviceBay.objects.bulk_create((
DeviceBay(device=devices[0], name='Device Bay 1'), DeviceBay(device=devices[0], name='Device Bay 1'),
DeviceBay(device=devices[1], name='Device Bay 2'), 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 2'),
ModuleBay(device=devices[2], name='Module Bay 3'), ModuleBay(device=devices[2], name='Module Bay 3'),
) )
ModuleBay.objects.bulk_create(module_bays) for module_bay in module_bays:
module_bay.save()
modules = ( modules = (
Module( Module(
@ -2838,7 +2837,8 @@ class ConsolePortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedF
ModuleBay(device=devices[1], name='Module Bay 2'), ModuleBay(device=devices[1], name='Module Bay 2'),
ModuleBay(device=devices[2], name='Module Bay 3'), ModuleBay(device=devices[2], name='Module Bay 3'),
) )
ModuleBay.objects.bulk_create(module_bays) for module_bay in module_bays:
module_bay.save()
modules = ( modules = (
Module(device=devices[0], module_bay=module_bays[0], module_type=module_type), 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[1], name='Module Bay 2'),
ModuleBay(device=devices[2], name='Module Bay 3'), ModuleBay(device=devices[2], name='Module Bay 3'),
) )
ModuleBay.objects.bulk_create(module_bays) for module_bay in module_bays:
module_bay.save()
modules = ( modules = (
Module(device=devices[0], module_bay=module_bays[0], module_type=module_type), 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[1], name='Module Bay 2'),
ModuleBay(device=devices[2], name='Module Bay 3'), ModuleBay(device=devices[2], name='Module Bay 3'),
) )
ModuleBay.objects.bulk_create(module_bays) for module_bay in module_bays:
module_bay.save()
modules = ( modules = (
Module(device=devices[0], module_bay=module_bays[0], module_type=module_type), 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[1], name='Module Bay 2'),
ModuleBay(device=devices[2], name='Module Bay 3'), ModuleBay(device=devices[2], name='Module Bay 3'),
) )
ModuleBay.objects.bulk_create(module_bays) for module_bay in module_bays:
module_bay.save()
modules = ( modules = (
Module(device=devices[0], module_bay=module_bays[0], module_type=module_type), 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[2], name='Module Bay 3'),
ModuleBay(device=devices[3], name='Module Bay 4'), ModuleBay(device=devices[3], name='Module Bay 4'),
) )
ModuleBay.objects.bulk_create(module_bays) for module_bay in module_bays:
module_bay.save()
modules = ( modules = (
Module(device=devices[0], module_bay=module_bays[0], module_type=module_type), 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[1], name='Module Bay 2'),
ModuleBay(device=devices[2], name='Module Bay 3'), ModuleBay(device=devices[2], name='Module Bay 3'),
) )
ModuleBay.objects.bulk_create(module_bays) for module_bay in module_bays:
module_bay.save()
modules = ( modules = (
Module(device=devices[0], module_bay=module_bays[0], module_type=module_type), 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[1], name='Module Bay 2'),
ModuleBay(device=devices[2], name='Module Bay 3'), ModuleBay(device=devices[2], name='Module Bay 3'),
) )
ModuleBay.objects.bulk_create(module_bays) for module_bay in module_bays:
module_bay.save()
modules = ( modules = (
Module(device=devices[0], module_bay=module_bays[0], module_type=module_type), 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 4', label='D', description='Fourth'),
ModuleBay(device=devices[2], name='Module Bay 5', label='E', description='Fifth'), 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') module_type = ModuleType.objects.create(manufacturer=manufacturer, model='Module Type 1')
modules = ( modules = (

3
netbox/dcim/tests/test_models.py
View File

@ -641,7 +641,8 @@ class ModuleBayTestCase(TestCase):
ModuleBay(device=device, name='Module Bay 2', label='B', description='Second'), ModuleBay(device=device, name='Module Bay 2', label='B', description='Second'),
ModuleBay(device=device, name='Module Bay 3', label='C', description='Third'), 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') manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
module_type = ModuleType.objects.create(manufacturer=manufacturer, model='Module Type 1') module_type = ModuleType.objects.create(manufacturer=manufacturer, model='Module Type 1')

15
netbox/dcim/tests/test_views.py
View File

@ -1899,12 +1899,9 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
def test_device_modulebays(self): def test_device_modulebays(self):
device = Device.objects.first() device = Device.objects.first()
device_bays = ( ModuleBay.objects.create(device=device, name='Module Bay 1')
ModuleBay(device=device, name='Module Bay 1'), ModuleBay.objects.create(device=device, name='Module Bay 2')
ModuleBay(device=device, name='Module Bay 2'), ModuleBay.objects.create(device=device, name='Module Bay 3')
ModuleBay(device=device, name='Module Bay 3'),
)
ModuleBay.objects.bulk_create(device_bays)
url = reverse('dcim:device_modulebays', kwargs={'pk': device.pk}) url = reverse('dcim:device_modulebays', kwargs={'pk': device.pk})
self.assertHttpStatus(self.client.get(url), 200) 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 4'),
ModuleBay(device=devices[1], name='Module Bay 5'), ModuleBay(device=devices[1], name='Module Bay 5'),
) )
ModuleBay.objects.bulk_create(module_bays) for module_bay in module_bays:
module_bay.save()
modules = ( modules = (
Module(device=devices[0], module_bay=module_bays[0], module_type=module_types[0]), 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 2'),
ModuleBay(device=device, name='Module Bay 3'), 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') tags = create_tags('Alpha', 'Bravo', 'Charlie')