Fix #11478 - Add vc_interfaces flag to control selection of VC interfaces

netbox/dcim/filtersets.py

@@ -1462,17 +1462,16 @@ class InterfaceFilterSet(
     PathEndpointFilterSet,
     CommonInterfaceFilterSet
 ):
-    # Override device and device_id filters from DeviceComponentFilterSet to match against any peer virtual chassis
-    # members
-    device = MultiValueCharFilter(
-        method='filter_device',
-        field_name='name',
-        label=_('Device'),
+    virtual_chassis_for_device = django_filters.ModelMultipleChoiceFilter(
+        field_name='device__virtual_chassis__members',
+        queryset=Device.objects.all(),
+        to_field_name='name',
+        label=_('Virtual Chassis Interfaces for Device (ID)')
     )
-    device_id = MultiValueNumberFilter(
-        method='filter_device_id',
-        field_name='pk',
-        label=_('Device (ID)'),
+    virtual_chassis_for_device_id = django_filters.ModelMultipleChoiceFilter(
+        field_name='device__virtual_chassis__members',
+        queryset=Device.objects.all(),
+        label=_('Virtual Chassis Interfaces for Device (ID)')
     )
     kind = django_filters.CharFilter(
         method='filter_kind',
@@ -1540,27 +1539,6 @@ class Meta:
             'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'description', 'cable_end',
         ]
 
-    def filter_device(self, queryset, name, value):
-        try:
-            devices = Device.objects.filter(**{'{}__in'.format(name): value})
-            vc_interface_ids = []
-            for device in devices:
-                vc_interface_ids.extend(device.vc_interfaces().values_list('id', flat=True))
-            return queryset.filter(pk__in=vc_interface_ids)
-        except Device.DoesNotExist:
-            return queryset.none()
-
-    def filter_device_id(self, queryset, name, id_list):
-        # Include interfaces belonging to peer virtual chassis members
-        vc_interface_ids = []
-        try:
-            devices = Device.objects.filter(pk__in=id_list)
-            for device in devices:
-                vc_interface_ids += device.vc_interfaces(if_master=False).values_list('id', flat=True)
-            return queryset.filter(pk__in=vc_interface_ids)
-        except Device.DoesNotExist:
-            return queryset.none()
-
     def filter_kind(self, queryset, name, value):
         value = value.strip().lower()
         return {

netbox/dcim/forms/model_forms.py

@@ -1107,23 +1107,23 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm):
         required=False,
         label=_('Parent interface'),
         query_params={
-            'device_id': '$device',
+            'virtual_chassis_for_device_id': '$device',
         }
     )
     bridge = DynamicModelChoiceField(
         queryset=Interface.objects.all(),
         required=False,
         label=_('Bridged interface'),
         query_params={
-            'device_id': '$device',
+            'virtual_chassis_for_device_id': '$device',
         }
     )
     lag = DynamicModelChoiceField(
         queryset=Interface.objects.all(),
         required=False,
         label=_('LAG interface'),
         query_params={
-            'device_id': '$device',
+            'virtual_chassis_for_device_id': '$device',
             'type': 'lag',
         }
     )

netbox/dcim/tests/test_filtersets.py

@@ -3116,6 +3116,13 @@ def test_device(self):
         params = {'device': [devices[0].name, devices[1].name]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
+    def test_virtual_chassis_for_device(self):
+        devices = Device.objects.filter(name__in=['Device 1', 'Device 3'])
+        params = {'device_id': [devices[0].pk, devices[1].pk]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+        params = {'device': [devices[0].name, devices[1].name]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
     def test_module(self):
         modules = Module.objects.all()[:2]
         params = {'module_id': [modules[0].pk, modules[1].pk]}