From 2038eb3ff633dc70b4220fa1874334177482e8f9 Mon Sep 17 00:00:00 2001 From: Luke Anderson Date: Thu, 25 May 2023 12:14:35 +0930 Subject: [PATCH] Fix #12690 - Add Cluster/ClusterGroup Filtering to VLANGroup QuerySet --- netbox/ipam/querysets.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/netbox/ipam/querysets.py b/netbox/ipam/querysets.py index 9f4463f61..90652de18 100644 --- a/netbox/ipam/querysets.py +++ b/netbox/ipam/querysets.py @@ -64,6 +64,16 @@ class VLANQuerySet(RestrictedQuerySet): scope_type=ContentType.objects.get_by_natural_key('dcim', 'rack'), scope_id=device.rack_id ) + if device.cluster: + q |= Q( + scope_type=ContentType.objects.get_by_natural_key('virtualization', 'cluster'), + scope_id=device.cluster.id + ) + if device.cluster.group: + q |= Q( + scope_type=ContentType.objects.get_by_natural_key('virtualization', 'clustergroup'), + scope_id=device.cluster.group.id + ) # Return all applicable VLANs return self.filter(