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

Fixes #9884: Prevent querying assigned VRF on prefix object init

Browse Source
This commit is contained in:
jeremystretch 2022-08-01 09:47:18 -04:00
parent 9fe5f09742
commit 8a075bcff9
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-3.2.md
View File

@ -11,6 +11,7 @@
### Bug Fixes ### Bug Fixes
* [#9884](https://github.com/netbox-community/netbox/issues/9884) - Prevent querying assigned VRF on prefix object init
* [#9891](https://github.com/netbox-community/netbox/issues/9891) - Ensure consistent ordering for tags during object serialization * [#9891](https://github.com/netbox-community/netbox/issues/9891) - Ensure consistent ordering for tags during object serialization
--- ---

2
netbox/ipam/models/ip.py
View File

@ -373,7 +373,7 @@ class Prefix(GetAvailablePrefixesMixin, NetBoxModel):
# Cache the original prefix and VRF so we can check if they have changed on post_save # Cache the original prefix and VRF so we can check if they have changed on post_save
self._prefix = self.prefix self._prefix = self.prefix
self._vrf = self.vrf self._vrf_id = self.vrf_id
def __str__(self): def __str__(self):
return str(self.prefix) return str(self.prefix)

4
netbox/ipam/signals.py
View File

@ -30,14 +30,14 @@ def update_children_depth(prefix):
def handle_prefix_saved(instance, created, **kwargs): def handle_prefix_saved(instance, created, **kwargs):
# Prefix has changed (or new instance has been created) # Prefix has changed (or new instance has been created)
if created or instance.vrf != instance._vrf or instance.prefix != instance._prefix: if created or instance.vrf_id != instance._vrf_id or instance.prefix != instance._prefix:
update_parents_children(instance) update_parents_children(instance)
update_children_depth(instance) update_children_depth(instance)
# If this is not a new prefix, clean up parent/children of previous prefix # If this is not a new prefix, clean up parent/children of previous prefix
if not created: if not created:
old_prefix = Prefix(vrf=instance._vrf, prefix=instance._prefix) old_prefix = Prefix(vrf_id=instance._vrf_id, prefix=instance._prefix)
update_parents_children(old_prefix) update_parents_children(old_prefix)
update_children_depth(old_prefix) update_children_depth(old_prefix)