NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-07 08:08:15 -06:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Fix device location check

Browse Source 
Instead of an exact match between device and rack location, it is now
sufficient if the device location or one of its children contains the
selected rack.
This commit is contained in:
Alexander Haase 2024-09-18 20:16:13 +02:00
parent 98ca4b2eef
commit add8640514
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/dcim/models/devices.py
View File

@ -840,7 +840,7 @@ class Device(
"Location {location} does not belong to site {site}."
).format(location=self.location, site=self.site)
})
if self.rack and self.location and self.rack.location != self.location:
if self.rack and self.location and not self.location.get_descendants(True).contains(self.rack.location):
raise ValidationError({
'rack': _(
"Rack {rack} does not belong to location {location}."

19
netbox/dcim/tests/test_models.py
View File

@ -613,6 +613,25 @@ class DeviceTestCase(TestCase):
with self.assertRaises(ValidationError):
Device(name='device2', site=sites[0], location=locations[1], device_type=device_type, role=device_role).full_clean()
def test_device_mismatched_rack_location(self):
site = Site.objects.first()
locations = (
Location(name='Location 1', slug='location-1', site=site),
Location(name='Location 2', slug='location-2', site=site),
)
for location in locations:
location.save()
rack = Rack.objects.create(name='Rack 1', site=site, location=locations[0])
device_type = DeviceType.objects.first()
device_role = DeviceRole.objects.first()
# Device should use location from rack
with self.assertRaises(ValidationError):
Device(name='device1', site=site, location=locations[1], rack=rack, device_type=device_type, role=device_role).full_clean()
def test_device_rack_clone_fields(self):
site = Site.objects.first()
location = Location(name='Location 1', slug='location-1', site=site)