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

Clean up component creation tests

Browse Source
This commit is contained in:
jeremystretch 2022-09-09 10:27:19 -04:00
parent 623a7e9a2c
commit 305701b387
5 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
netbox/dcim/forms/object_create.py
View File

@ -114,15 +114,17 @@ class InterfaceTemplateCreateForm(ComponentCreateForm, model_forms.InterfaceTemp
class FrontPortTemplateCreateForm(ComponentCreateForm, model_forms.FrontPortTemplateForm): class FrontPortTemplateCreateForm(ComponentCreateForm, model_forms.FrontPortTemplateForm):
rear_port_set = forms.MultipleChoiceField( rear_port = forms.MultipleChoiceField(
choices=[], choices=[],
label='Rear ports', label='Rear ports',
help_text='Select one rear port assignment for each front port being created.', help_text='Select one rear port assignment for each front port being created.',
) )
field_order = ('device_type', 'name', 'label') field_order = (
'device_type', 'module_type', 'name', 'label', 'type', 'color', 'rear_port', 'description',
)
class Meta(model_forms.FrontPortTemplateForm.Meta): class Meta(model_forms.FrontPortTemplateForm.Meta):
exclude = ('name', 'label') exclude = ('name', 'label', 'rear_port', 'rear_port_position')
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
@ -154,12 +156,12 @@ class FrontPortTemplateCreateForm(ComponentCreateForm, model_forms.FrontPortTemp
choices.append( choices.append(
('{}:{}'.format(rear_port.pk, i), '{}:{}'.format(rear_port.name, i)) ('{}:{}'.format(rear_port.pk, i), '{}:{}'.format(rear_port.name, i))
) )
self.fields['rear_port_set'].choices = choices self.fields['rear_port'].choices = choices
def get_iterative_data(self, iteration): def get_iterative_data(self, iteration):
# Assign rear port and position from selected set # Assign rear port and position from selected set
rear_port, position = self.cleaned_data['rear_port_set'][iteration].split(':') rear_port, position = self.cleaned_data['rear_port'][iteration].split(':')
return { return {
'rear_port': int(rear_port), 'rear_port': int(rear_port),
@ -240,15 +242,15 @@ class InterfaceCreateForm(ComponentCreateForm, model_forms.InterfaceForm):
class FrontPortCreateForm(ComponentCreateForm, model_forms.FrontPortForm): class FrontPortCreateForm(ComponentCreateForm, model_forms.FrontPortForm):
rear_port_set = forms.MultipleChoiceField( rear_port = forms.MultipleChoiceField(
choices=[], choices=[],
label='Rear ports', label='Rear ports',
help_text='Select one rear port assignment for each front port being created.', help_text='Select one rear port assignment for each front port being created.',
) )
field_order = ('device', 'name', 'label') field_order = ('device', 'module', 'name', 'label', 'type', 'color', 'rear_port')
class Meta(model_forms.FrontPortForm.Meta): class Meta(model_forms.FrontPortForm.Meta):
exclude = ('name', 'label') exclude = ('name', 'label', 'rear_port', 'rear_port_position')
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
@ -273,12 +275,12 @@ class FrontPortCreateForm(ComponentCreateForm, model_forms.FrontPortForm):
choices.append( choices.append(
('{}:{}'.format(rear_port.pk, i), '{}:{}'.format(rear_port.name, i)) ('{}:{}'.format(rear_port.pk, i), '{}:{}'.format(rear_port.name, i))
) )
self.fields['rear_port_set'].choices = choices self.fields['rear_port'].choices = choices
def get_iterative_data(self, iteration): def get_iterative_data(self, iteration):
# Assign rear port and position from selected set # Assign rear port and position from selected set
rear_port, position = self.cleaned_data['rear_port_set'][iteration].split(':') rear_port, position = self.cleaned_data['rear_port'][iteration].split(':')
return { return {
'rear_port': int(rear_port), 'rear_port': int(rear_port),

2
netbox/dcim/models/device_components.py
View File

@ -908,6 +908,8 @@ class FrontPort(ModularComponentModel, CabledObjectModel):
def clean(self): def clean(self):
super().clean() super().clean()
if hasattr(self, 'rear_port'):
# Validate rear port assignment # Validate rear port assignment
if self.rear_port.device != self.device: if self.rear_port.device != self.device:
raise ValidationError({ raise ValidationError({

4
netbox/dcim/tests/test_forms.py
View File

@ -1,6 +1,6 @@
from django.test import TestCase from django.test import TestCase
from dcim.choices import DeviceFaceChoices, DeviceStatusChoices from dcim.choices import DeviceFaceChoices, DeviceStatusChoices, InterfaceTypeChoices
from dcim.forms import * from dcim.forms import *
from dcim.models import * from dcim.models import *
from utilities.testing import create_test_device from utilities.testing import create_test_device
@ -131,6 +131,7 @@ class LabelTestCase(TestCase):
'device': self.device.pk, 'device': self.device.pk,
'name': 'eth[0-9]', 'name': 'eth[0-9]',
'label': 'Interface[0-9]', 'label': 'Interface[0-9]',
'type': InterfaceTypeChoices.TYPE_1GE_GBIC,
} }
form = InterfaceCreateForm(interface_data) form = InterfaceCreateForm(interface_data)
@ -144,6 +145,7 @@ class LabelTestCase(TestCase):
'device': self.device.pk, 'device': self.device.pk,
'name': 'eth[0-9]', 'name': 'eth[0-9]',
'label': 'Interface[0-1]', 'label': 'Interface[0-1]',
'type': InterfaceTypeChoices.TYPE_1GE_GBIC,
} }
form = InterfaceCreateForm(bad_interface_data) form = InterfaceCreateForm(bad_interface_data)

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

@ -1279,7 +1279,7 @@ class InterfaceTemplateTestCase(ViewTestCases.DeviceComponentTemplateViewTestCas
class FrontPortTemplateTestCase(ViewTestCases.DeviceComponentTemplateViewTestCase): class FrontPortTemplateTestCase(ViewTestCases.DeviceComponentTemplateViewTestCase):
model = FrontPortTemplate model = FrontPortTemplate
validation_excluded_fields = ('name', 'label') validation_excluded_fields = ('name', 'label', 'rear_port')
@classmethod @classmethod
def setUpTestData(cls): def setUpTestData(cls):
@ -1314,9 +1314,7 @@ class FrontPortTemplateTestCase(ViewTestCases.DeviceComponentTemplateViewTestCas
'device_type': devicetype.pk, 'device_type': devicetype.pk,
'name': 'Front Port [4-6]', 'name': 'Front Port [4-6]',
'type': PortTypeChoices.TYPE_8P8C, 'type': PortTypeChoices.TYPE_8P8C,
'rear_port_set': [ 'rear_port': [f'{rp.pk}:1' for rp in rearports[3:6]],
'{}:1'.format(rp.pk) for rp in rearports[3:6]
],
} }
cls.bulk_edit_data = { cls.bulk_edit_data = {
@ -2292,7 +2290,7 @@ class InterfaceTestCase(ViewTestCases.DeviceComponentViewTestCase):
class FrontPortTestCase(ViewTestCases.DeviceComponentViewTestCase): class FrontPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
model = FrontPort model = FrontPort
validation_excluded_fields = ('name', 'label') validation_excluded_fields = ('name', 'label', 'rear_port')
@classmethod @classmethod
def setUpTestData(cls): def setUpTestData(cls):
@ -2330,9 +2328,7 @@ class FrontPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
'device': device.pk, 'device': device.pk,
'name': 'Front Port [4-6]', 'name': 'Front Port [4-6]',
'type': PortTypeChoices.TYPE_8P8C, 'type': PortTypeChoices.TYPE_8P8C,
'rear_port_set': [ 'rear_port': [f'{rp.pk}:1' for rp in rearports[3:6]],
'{}:1'.format(rp.pk) for rp in rearports[3:6]
],
'description': 'New description', 'description': 'New description',
'tags': [t.pk for t in tags], 'tags': [t.pk for t in tags],
} }

8
netbox/virtualization/tests/test_views.py
View File

@ -251,7 +251,7 @@ class VirtualMachineTestCase(ViewTestCases.PrimaryObjectViewTestCase):
class VMInterfaceTestCase(ViewTestCases.DeviceComponentViewTestCase): class VMInterfaceTestCase(ViewTestCases.DeviceComponentViewTestCase):
model = VMInterface model = VMInterface
validation_excluded_fields = ('name', 'label') validation_excluded_fields = ('name',)
@classmethod @classmethod
def setUpTestData(cls): def setUpTestData(cls):
@ -291,10 +291,10 @@ class VMInterfaceTestCase(ViewTestCases.DeviceComponentViewTestCase):
tags = create_tags('Alpha', 'Bravo', 'Charlie') tags = create_tags('Alpha', 'Bravo', 'Charlie')
cls.form_data = { cls.form_data = {
'virtual_machine': virtualmachines[1].pk, 'virtual_machine': virtualmachines[0].pk,
'name': 'Interface X', 'name': 'Interface X',
'enabled': False, 'enabled': False,
'bridge': interfaces[3].pk, 'bridge': interfaces[1].pk,
'mac_address': EUI('01-02-03-04-05-06'), 'mac_address': EUI('01-02-03-04-05-06'),
'mtu': 65000, 'mtu': 65000,
'description': 'New description', 'description': 'New description',
@ -307,7 +307,7 @@ class VMInterfaceTestCase(ViewTestCases.DeviceComponentViewTestCase):
cls.bulk_create_data = { cls.bulk_create_data = {
'virtual_machine': virtualmachines[1].pk, 'virtual_machine': virtualmachines[1].pk,
'name_pattern': 'Interface [4-6]', 'name': 'Interface [4-6]',
'enabled': False, 'enabled': False,
'bridge': interfaces[3].pk, 'bridge': interfaces[3].pk,
'mac_address': EUI('01-02-03-04-05-06'), 'mac_address': EUI('01-02-03-04-05-06'),