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 fixes

Browse Source
This commit is contained in:
Arthur Hanson 2024-10-23 14:59:13 -07:00
parent be59775d56
commit 76e438dea9
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/virtualization/models/virtualmachines.py
View File

@ -238,7 +238,7 @@ class VirtualMachine(ContactsMixin, ImageAttachmentsMixin, RenderConfigMixin, Co
# Assign site from cluster if not set # Assign site from cluster if not set
if self.cluster and not self.site: if self.cluster and not self.site:
self.site = self.cluster.site self.site = self.cluster._site
super().save(*args, **kwargs) super().save(*args, **kwargs)

3
netbox/virtualization/tests/test_api.py
View File

@ -112,7 +112,8 @@ class ClusterTest(APIViewTestCases.APIViewTestCase):
Cluster(name='Cluster 2', type=cluster_types[0], group=cluster_groups[0], status=ClusterStatusChoices.STATUS_PLANNED), Cluster(name='Cluster 2', type=cluster_types[0], group=cluster_groups[0], status=ClusterStatusChoices.STATUS_PLANNED),
Cluster(name='Cluster 3', type=cluster_types[0], group=cluster_groups[0], status=ClusterStatusChoices.STATUS_PLANNED), Cluster(name='Cluster 3', type=cluster_types[0], group=cluster_groups[0], status=ClusterStatusChoices.STATUS_PLANNED),
) )
Cluster.objects.bulk_create(clusters) for cluster in clusters:
cluster.save()
cls.create_data = [ cls.create_data = [
{ {

18
netbox/virtualization/tests/test_filtersets.py
View File

@ -136,7 +136,7 @@ class ClusterTestCase(TestCase, ChangeLoggedFilterSetTests):
type=cluster_types[0], type=cluster_types[0],
group=cluster_groups[0], group=cluster_groups[0],
status=ClusterStatusChoices.STATUS_PLANNED, status=ClusterStatusChoices.STATUS_PLANNED,
site=sites[0], scope=sites[0],
tenant=tenants[0], tenant=tenants[0],
description='foobar1' description='foobar1'
), ),
@ -145,7 +145,7 @@ class ClusterTestCase(TestCase, ChangeLoggedFilterSetTests):
type=cluster_types[1], type=cluster_types[1],
group=cluster_groups[1], group=cluster_groups[1],
status=ClusterStatusChoices.STATUS_STAGING, status=ClusterStatusChoices.STATUS_STAGING,
site=sites[1], scope=sites[1],
tenant=tenants[1], tenant=tenants[1],
description='foobar2' description='foobar2'
), ),
@ -154,12 +154,13 @@ class ClusterTestCase(TestCase, ChangeLoggedFilterSetTests):
type=cluster_types[2], type=cluster_types[2],
group=cluster_groups[2], group=cluster_groups[2],
status=ClusterStatusChoices.STATUS_ACTIVE, status=ClusterStatusChoices.STATUS_ACTIVE,
site=sites[2], scope=sites[2],
tenant=tenants[2], tenant=tenants[2],
description='foobar3' description='foobar3'
), ),
) )
Cluster.objects.bulk_create(clusters) for cluster in clusters:
cluster.save()
def test_q(self): def test_q(self):
params = {'q': 'foobar1'} params = {'q': 'foobar1'}
@ -272,11 +273,12 @@ class VirtualMachineTestCase(TestCase, ChangeLoggedFilterSetTests):
Site.objects.bulk_create(sites) Site.objects.bulk_create(sites)
clusters = ( clusters = (
Cluster(name='Cluster 1', type=cluster_types[0], group=cluster_groups[0], site=sites[0]), Cluster(name='Cluster 1', type=cluster_types[0], group=cluster_groups[0], scope=sites[0]),
Cluster(name='Cluster 2', type=cluster_types[1], group=cluster_groups[1], site=sites[1]), Cluster(name='Cluster 2', type=cluster_types[1], group=cluster_groups[1], scope=sites[1]),
Cluster(name='Cluster 3', type=cluster_types[2], group=cluster_groups[2], site=sites[2]), Cluster(name='Cluster 3', type=cluster_types[2], group=cluster_groups[2], scope=sites[2]),
) )
Cluster.objects.bulk_create(clusters) for cluster in clusters:
cluster.save()
platforms = ( platforms = (
Platform(name='Platform 1', slug='platform-1'), Platform(name='Platform 1', slug='platform-1'),

13
netbox/virtualization/tests/test_views.py
View File

@ -117,11 +117,12 @@ class ClusterTestCase(ViewTestCases.PrimaryObjectViewTestCase):
ClusterType.objects.bulk_create(clustertypes) ClusterType.objects.bulk_create(clustertypes)
clusters = ( clusters = (
Cluster(name='Cluster 1', group=clustergroups[0], type=clustertypes[0], status=ClusterStatusChoices.STATUS_ACTIVE, site=sites[0]), Cluster(name='Cluster 1', group=clustergroups[0], type=clustertypes[0], status=ClusterStatusChoices.STATUS_ACTIVE, scope=sites[0]),
Cluster(name='Cluster 2', group=clustergroups[0], type=clustertypes[0], status=ClusterStatusChoices.STATUS_ACTIVE, site=sites[0]), Cluster(name='Cluster 2', group=clustergroups[0], type=clustertypes[0], status=ClusterStatusChoices.STATUS_ACTIVE, scope=sites[0]),
Cluster(name='Cluster 3', group=clustergroups[0], type=clustertypes[0], status=ClusterStatusChoices.STATUS_ACTIVE, site=sites[0]), Cluster(name='Cluster 3', group=clustergroups[0], type=clustertypes[0], status=ClusterStatusChoices.STATUS_ACTIVE, scope=sites[0]),
) )
Cluster.objects.bulk_create(clusters) for cluster in clusters:
cluster.save()
tags = create_tags('Alpha', 'Bravo', 'Charlie') tags = create_tags('Alpha', 'Bravo', 'Charlie')
@ -131,7 +132,8 @@ class ClusterTestCase(ViewTestCases.PrimaryObjectViewTestCase):
'type': clustertypes[1].pk, 'type': clustertypes[1].pk,
'status': ClusterStatusChoices.STATUS_OFFLINE, 'status': ClusterStatusChoices.STATUS_OFFLINE,
'tenant': None, 'tenant': None,
'site': sites[1].pk, 'scope_type': ContentType.objects.get_for_model(Site).pk,
'scope': sites[1].pk,
'comments': 'Some comments', 'comments': 'Some comments',
'tags': [t.pk for t in tags], 'tags': [t.pk for t in tags],
} }
@ -155,7 +157,6 @@ class ClusterTestCase(ViewTestCases.PrimaryObjectViewTestCase):
'type': clustertypes[1].pk, 'type': clustertypes[1].pk,
'status': ClusterStatusChoices.STATUS_OFFLINE, 'status': ClusterStatusChoices.STATUS_OFFLINE,
'tenant': None, 'tenant': None,
'site': sites[1].pk,
'comments': 'New comments', 'comments': 'New comments',
} }