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

7699 fix ipam tests

Browse Source
This commit is contained in:
Arthur Hanson 2024-10-24 09:23:18 -07:00
parent 65295f6d79
commit 9108915604
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/ipam/querysets.py
View File

@ -148,7 +148,7 @@ class VLANQuerySet(RestrictedQuerySet):
# Find all relevant VLANGroups # Find all relevant VLANGroups
q = Q() q = Q()
site = vm.site or vm.cluster.site site = vm.site or vm.cluster._site
if vm.cluster: if vm.cluster:
# Add VLANGroups scoped to the assigned cluster (or its group) # Add VLANGroups scoped to the assigned cluster (or its group)
q |= Q( q |= Q(

9
netbox/ipam/tests/test_filtersets.py
View File

@ -1674,11 +1674,12 @@ class VLANTestCase(TestCase, ChangeLoggedFilterSetTests):
cluster_type = ClusterType.objects.create(name='Cluster Type 1', slug='cluster-type-1') cluster_type = ClusterType.objects.create(name='Cluster Type 1', slug='cluster-type-1')
clusters = ( clusters = (
Cluster(name='Cluster 1', type=cluster_type, group=cluster_groups[0], site=sites[0]), Cluster(name='Cluster 1', type=cluster_type, group=cluster_groups[0], scope=sites[0]),
Cluster(name='Cluster 2', type=cluster_type, group=cluster_groups[1], site=sites[1]), Cluster(name='Cluster 2', type=cluster_type, group=cluster_groups[1], scope=sites[1]),
Cluster(name='Cluster 3', type=cluster_type, group=cluster_groups[2], site=sites[2]), Cluster(name='Cluster 3', type=cluster_type, group=cluster_groups[2], scope=sites[2]),
) )
Cluster.objects.bulk_create(clusters) for cluster in clusters:
cluster.save()
virtual_machines = ( virtual_machines = (
VirtualMachine(name='Virtual Machine 1', cluster=clusters[0]), VirtualMachine(name='Virtual Machine 1', cluster=clusters[0]),