NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-29 03:46:25 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Clean up bulk import & extend tests

Browse Source
This commit is contained in:
Jeremy Stretch 2025-01-03 13:18:31 -05:00
parent 750e325a36
commit 1d533c4e4a
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/circuits/forms/bulk_import.py
View File

@ -179,6 +179,15 @@ class CircuitGroupImportForm(NetBoxModelImportForm):
class CircuitGroupAssignmentImportForm(NetBoxModelImportForm): class CircuitGroupAssignmentImportForm(NetBoxModelImportForm):
member_type = CSVContentTypeField(
queryset=ContentType.objects.filter(CIRCUIT_GROUP_ASSIGNMENT_MEMBER_MODELS),
label=_('Circuit type (app & model)')
)
priority = CSVChoiceField(
label=_('Priority'),
choices=CircuitPriorityChoices,
required=False
)
class Meta: class Meta:
model = CircuitGroupAssignment model = CircuitGroupAssignment

4
netbox/circuits/models/circuits.py
View File

@ -191,7 +191,9 @@ class CircuitGroupAssignment(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin,
on_delete=models.PROTECT, on_delete=models.PROTECT,
related_name='+' related_name='+'
) )
member_id = models.PositiveBigIntegerField() member_id = models.PositiveBigIntegerField(
verbose_name=_('member ID')
)
member = GenericForeignKey( member = GenericForeignKey(
ct_field='member_type', ct_field='member_type',
fk_field='member_id' fk_field='member_id'

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

@ -468,6 +468,7 @@ class CircuitGroupAssignmentTestCase(
ViewTestCases.DeleteObjectViewTestCase, ViewTestCases.DeleteObjectViewTestCase,
ViewTestCases.ListObjectsViewTestCase, ViewTestCases.ListObjectsViewTestCase,
ViewTestCases.BulkEditObjectsViewTestCase, ViewTestCases.BulkEditObjectsViewTestCase,
ViewTestCases.BulkImportObjectsViewTestCase,
ViewTestCases.BulkDeleteObjectsViewTestCase ViewTestCases.BulkDeleteObjectsViewTestCase
): ):
model = CircuitGroupAssignment model = CircuitGroupAssignment
@ -523,6 +524,20 @@ class CircuitGroupAssignmentTestCase(
'tags': [t.pk for t in tags], 'tags': [t.pk for t in tags],
} }
cls.csv_data = (
"member_type,member_id,group,priority",
f"circuits.circuit,{circuits[0].pk},{circuit_groups[3].pk},primary",
f"circuits.circuit,{circuits[1].pk},{circuit_groups[3].pk},secondary",
f"circuits.circuit,{circuits[2].pk},{circuit_groups[3].pk},tertiary",
)
cls.csv_update_data = (
"id,priority",
f"{assignments[0].pk},inactive",
f"{assignments[1].pk},inactive",
f"{assignments[2].pk},inactive",
)
cls.bulk_edit_data = { cls.bulk_edit_data = {
'priority': CircuitPriorityChoices.PRIORITY_INACTIVE, 'priority': CircuitPriorityChoices.PRIORITY_INACTIVE,
} }