mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
jeremystretch
2022-10-05 10:28:48 -04:00
parent 568e0c7ff6 ae90ad1fb7
commit c481a1b6a2
30 changed files with 286 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
netbox/virtualization/models.py
View File

@@ -350,14 +350,12 @@ class VirtualMachine(NetBoxModel, ConfigContextModel):
})
# Validate site for cluster & device
if self.cluster and self.cluster.site != self.site:
if self.cluster and self.site and self.cluster.site != self.site:
raise ValidationError({
'cluster': f'The selected cluster ({self.cluster} is not assigned to this site ({self.site}).'
})
if self.device and self.device.site != self.site:
raise ValidationError({
'device': f'The selected device ({self.device} is not assigned to this site ({self.site}).'
'cluster': f'The selected cluster ({self.cluster}) is not assigned to this site ({self.site}).'
})
elif self.cluster:
self.site = self.cluster.site
# Validate assigned cluster device
if self.device and not self.cluster:
@@ -366,7 +364,7 @@ class VirtualMachine(NetBoxModel, ConfigContextModel):
})
if self.device and self.device not in self.cluster.devices.all():
raise ValidationError({
'device': f'The selected device ({self.device} is not assigned to this cluster ({self.cluster}).'
'device': f'The selected device ({self.device}) is not assigned to this cluster ({self.cluster}).'
})
# Validate primary IP addresses

7
netbox/virtualization/tests/test_models.py
View File

@@ -70,9 +70,10 @@ class VirtualMachineTestCase(TestCase):
with self.assertRaises(ValidationError):
VirtualMachine(name='vm1', site=sites[0], cluster=clusters[1]).full_clean()
# VM with cluster site but no direct site should fail
with self.assertRaises(ValidationError):
VirtualMachine(name='vm1', site=None, cluster=clusters[0]).full_clean()
# VM with cluster site but no direct site should have its site set automatically
vm = VirtualMachine(name='vm1', site=None, cluster=clusters[0])
vm.full_clean()
self.assertEqual(vm.site, sites[0])
def test_vm_name_case_sensitivity(self):
vm1 = VirtualMachine(