Skip to content

Commit 6b21c84

Browse files
committed
#7424: Add virtual_chassis field to device component filter form
1 parent fa8a8ab commit 6b21c84

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

netbox/dcim/api/nested_serializers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ class NestedVirtualChassisSerializer(WritableNestedSerializer):
340340

341341
class Meta:
342342
model = models.VirtualChassis
343-
fields = ['id', 'name', 'url', 'master', 'member_count']
343+
fields = ['id', 'url', 'display', 'name', 'master', 'member_count']
344344

345345

346346
#

netbox/dcim/forms/filtersets.py

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@ class DeviceComponentFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
9292
label=_('Location'),
9393
fetch_trigger='open'
9494
)
95+
virtual_chassis_id = DynamicModelMultipleChoiceField(
96+
queryset=VirtualChassis.objects.all(),
97+
required=False,
98+
label=_('Virtual Chassis'),
99+
fetch_trigger='open'
100+
)
95101
device_id = DynamicModelMultipleChoiceField(
96102
queryset=Device.objects.all(),
97103
required=False,
@@ -888,7 +894,7 @@ class ConsolePortFilterForm(DeviceComponentFilterForm):
888894
field_groups = [
889895
['q', 'tag'],
890896
['name', 'label', 'type', 'speed'],
891-
['region_id', 'site_group_id', 'site_id', 'location_id', 'device_id'],
897+
['region_id', 'site_group_id', 'site_id', 'location_id', 'virtual_chassis_id', 'device_id'],
892898
]
893899
type = forms.MultipleChoiceField(
894900
choices=ConsolePortTypeChoices,
@@ -908,7 +914,7 @@ class ConsoleServerPortFilterForm(DeviceComponentFilterForm):
908914
field_groups = [
909915
['q', 'tag'],
910916
['name', 'label', 'type', 'speed'],
911-
['region_id', 'site_group_id', 'site_id', 'location_id', 'device_id'],
917+
['region_id', 'site_group_id', 'site_id', 'location_id', 'virtual_chassis_id', 'device_id'],
912918
]
913919
type = forms.MultipleChoiceField(
914920
choices=ConsolePortTypeChoices,
@@ -928,7 +934,7 @@ class PowerPortFilterForm(DeviceComponentFilterForm):
928934
field_groups = [
929935
['q', 'tag'],
930936
['name', 'label', 'type'],
931-
['region_id', 'site_group_id', 'site_id', 'location_id', 'device_id'],
937+
['region_id', 'site_group_id', 'site_id', 'location_id', 'virtual_chassis_id', 'device_id'],
932938
]
933939
type = forms.MultipleChoiceField(
934940
choices=PowerPortTypeChoices,
@@ -943,7 +949,7 @@ class PowerOutletFilterForm(DeviceComponentFilterForm):
943949
field_groups = [
944950
['q', 'tag'],
945951
['name', 'label', 'type'],
946-
['region_id', 'site_group_id', 'site_id', 'location_id', 'device_id'],
952+
['region_id', 'site_group_id', 'site_id', 'location_id', 'virtual_chassis_id', 'device_id'],
947953
]
948954
type = forms.MultipleChoiceField(
949955
choices=PowerOutletTypeChoices,
@@ -958,7 +964,7 @@ class InterfaceFilterForm(DeviceComponentFilterForm):
958964
field_groups = [
959965
['q', 'tag'],
960966
['name', 'label', 'kind', 'type', 'enabled', 'mgmt_only', 'mac_address'],
961-
['region_id', 'site_group_id', 'site_id', 'location_id', 'device_id'],
967+
['region_id', 'site_group_id', 'site_id', 'location_id', 'virtual_chassis_id', 'device_id'],
962968
]
963969
kind = forms.MultipleChoiceField(
964970
choices=InterfaceKindChoices,
@@ -993,7 +999,7 @@ class FrontPortFilterForm(DeviceComponentFilterForm):
993999
field_groups = [
9941000
['q', 'tag'],
9951001
['name', 'label', 'type', 'color'],
996-
['region_id', 'site_group_id', 'site_id', 'location_id', 'device_id'],
1002+
['region_id', 'site_group_id', 'site_id', 'location_id', 'virtual_chassis_id', 'device_id'],
9971003
]
9981004
model = FrontPort
9991005
type = forms.MultipleChoiceField(
@@ -1012,7 +1018,7 @@ class RearPortFilterForm(DeviceComponentFilterForm):
10121018
field_groups = [
10131019
['q', 'tag'],
10141020
['name', 'label', 'type', 'color'],
1015-
['region_id', 'site_group_id', 'site_id', 'location_id', 'device_id'],
1021+
['region_id', 'site_group_id', 'site_id', 'location_id', 'virtual_chassis_id', 'device_id'],
10161022
]
10171023
type = forms.MultipleChoiceField(
10181024
choices=PortTypeChoices,
@@ -1030,7 +1036,7 @@ class DeviceBayFilterForm(DeviceComponentFilterForm):
10301036
field_groups = [
10311037
['q', 'tag'],
10321038
['name', 'label'],
1033-
['region_id', 'site_group_id', 'site_id', 'location_id', 'device_id'],
1039+
['region_id', 'site_group_id', 'site_id', 'location_id', 'virtual_chassis_id', 'device_id'],
10341040
]
10351041
tag = TagFilterField(model)
10361042

@@ -1040,7 +1046,7 @@ class InventoryItemFilterForm(DeviceComponentFilterForm):
10401046
field_groups = [
10411047
['q', 'tag'],
10421048
['name', 'label', 'manufacturer_id', 'serial', 'asset_tag', 'discovered'],
1043-
['region_id', 'site_group_id', 'site_id', 'location_id', 'device_id'],
1049+
['region_id', 'site_group_id', 'site_id', 'location_id', 'virtual_chassis_id', 'device_id'],
10441050
]
10451051
manufacturer_id = DynamicModelMultipleChoiceField(
10461052
queryset=Manufacturer.objects.all(),

0 commit comments

Comments
 (0)