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

Fixes : Fix exception when editing IP address with NAT inside IP assigned

Browse Source
This commit is contained in:
Jeremy Stretch
2020-08-20 14:38:58 -04:00
parent bc0e6cc8dd
commit 8d351178ac
2 changed files with 10 additions and 4 deletions
docs/release-notes
version-2.9.md
netbox/ipam
forms.py

1
docs/release-notes/version-2.9.md

@ -8,6 +8,7 @@
* [#5004](https://github.com/netbox-community/netbox/issues/5004) - Permit assignment of an interface to a LAG on any peer virtual chassis member * [#5004](https://github.com/netbox-community/netbox/issues/5004) - Permit assignment of an interface to a LAG on any peer virtual chassis member
* [#5012](https://github.com/netbox-community/netbox/issues/5012) - Return details of exceptions resulting from report/script execution * [#5012](https://github.com/netbox-community/netbox/issues/5012) - Return details of exceptions resulting from report/script execution
* [#5020](https://github.com/netbox-community/netbox/issues/5020) - Correct handling of dependent objects during bulk deletion * [#5020](https://github.com/netbox-community/netbox/issues/5020) - Correct handling of dependent objects during bulk deletion
* [#5022](https://github.com/netbox-community/netbox/issues/5022) - Fix exception when editing IP address with NAT inside IP assigned
--- ---

13
netbox/ipam/forms.py

@ -616,10 +616,15 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
elif type(instance.assigned_object) is VMInterface: elif type(instance.assigned_object) is VMInterface:
initial['virtual_machine'] = instance.assigned_object.virtual_machine initial['virtual_machine'] = instance.assigned_object.virtual_machine
initial['vminterface'] = instance.assigned_object initial['vminterface'] = instance.assigned_object
if instance.nat_inside and instance.nat_inside.device is not None: if instance.nat_inside:
initial['nat_site'] = instance.nat_inside.device.site nat_inside_parent = instance.nat_inside.assigned_object
initial['nat_rack'] = instance.nat_inside.device.rack if type(nat_inside_parent) is Interface:
initial['nat_device'] = instance.nat_inside.device initial['nat_site'] = nat_inside_parent.device.site.pk
initial['nat_rack'] = nat_inside_parent.device.rack.pk
initial['nat_device'] = nat_inside_parent.device.pk
elif type(nat_inside_parent) is VMInterface:
initial['nat_cluster'] = nat_inside_parent.virtual_machine.cluster.pk
initial['nat_virtual_machine'] = nat_inside_parent.virtual_machine.pk
kwargs['initial'] = initial kwargs['initial'] = initial
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)