NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-14 09:51:22 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Complete viewset tests for VLANTranslationRule

Browse Source
This commit is contained in:
Brian Tiemann 2024-10-21 22:41:21 -04:00
parent 0d5961bf6e
commit 25c8aca1fb
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/ipam/forms/bulk_edit.py
View File

@ -554,12 +554,19 @@ class VLANTranslationPolicyBulkEditForm(NetBoxModelBulkEditForm):
class VLANTranslationRuleBulkEditForm(NetBoxModelBulkEditForm): class VLANTranslationRuleBulkEditForm(NetBoxModelBulkEditForm):
policy = DynamicModelChoiceField(
label=_('Policy'),
queryset=VLANTranslationPolicy.objects.all(),
selector=True
)
local_vid = forms.IntegerField(required=False)
remote_vid = forms.IntegerField(required=False)
model = VLANTranslationRule model = VLANTranslationRule
fieldsets = ( fieldsets = (
FieldSet('policy', 'local_vid', 'remote_vid'), FieldSet('policy', 'local_vid', 'remote_vid'),
) )
nullable_fields = ('description',) fields = ('policy', 'local_vid', 'remote_vid')
class ServiceTemplateBulkEditForm(NetBoxModelBulkEditForm): class ServiceTemplateBulkEditForm(NetBoxModelBulkEditForm):

23
netbox/ipam/tests/test_views.py
View File

@ -953,8 +953,6 @@ class VLANTranslationRuleTestCase(ViewTestCases.PrimaryObjectViewTestCase):
) )
VLANTranslationRule.objects.bulk_create(vlan_translation_rules) VLANTranslationRule.objects.bulk_create(vlan_translation_rules)
tags = create_tags('Alpha', 'Bravo', 'Charlie')
cls.form_data = { cls.form_data = {
'policy': vlan_translation_policies[0].pk, 'policy': vlan_translation_policies[0].pk,
'local_vid': 300, 'local_vid': 300,
@ -962,38 +960,23 @@ class VLANTranslationRuleTestCase(ViewTestCases.PrimaryObjectViewTestCase):
} }
cls.csv_data = ( cls.csv_data = (
"policy_id,local_vid,remote_vid", "policy,local_vid,remote_vid",
f"{vlan_translation_policies[0].pk},103,203", f"{vlan_translation_policies[0].pk},103,203",
f"{vlan_translation_policies[0].pk},104,204", f"{vlan_translation_policies[0].pk},104,204",
f"{vlan_translation_policies[1].pk},105,205", f"{vlan_translation_policies[1].pk},105,205",
) )
cls.csv_update_data = ( cls.csv_update_data = (
"id,policy_id,local_vid,remote_vid", "id,policy,local_vid,remote_vid",
f"{vlan_translation_rules[0].pk},{vlan_translation_policies[1].pk},105,205", f"{vlan_translation_rules[0].pk},{vlan_translation_policies[1].pk},105,205",
f"{vlan_translation_rules[1].pk},{vlan_translation_policies[1].pk},106,206", f"{vlan_translation_rules[1].pk},{vlan_translation_policies[1].pk},106,206",
f"{vlan_translation_rules[2].pk},{vlan_translation_policies[0].pk},107,207", f"{vlan_translation_rules[2].pk},{vlan_translation_policies[0].pk},107,207",
) )
cls.bulk_edit_data = { cls.bulk_edit_data = {
'tags': [t.pk for t in tags], 'policy': vlan_translation_policies[2].pk,
} }
# def test_bulk_edit_objects_with_permission(self):
# pass
#
# def test_bulk_edit_objects_with_constrained_permission(self):
# pass
#
# def test_bulk_import_objects_with_permission(self):
# pass
#
# def test_bulk_import_objects_with_constrained_permission(self):
# pass
#
# def test_bulk_update_objects_with_permission(self):
# pass
class ServiceTemplateTestCase(ViewTestCases.PrimaryObjectViewTestCase): class ServiceTemplateTestCase(ViewTestCases.PrimaryObjectViewTestCase):
model = ServiceTemplate model = ServiceTemplate