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

Fixes #674: Correct status assignment on IP address import

Browse Source
This commit is contained in:
Jeremy Stretch
2016-11-10 15:01:05 -05:00
parent 1f3f9781d9
commit 9c7f55d8d0
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/ipam/forms.py
View File

@ -220,12 +220,11 @@ class PrefixFromCSVForm(forms.ModelForm):
self.add_error('vlan_vid', "Must specify site and/or VLAN group when assigning a VLAN.") self.add_error('vlan_vid', "Must specify site and/or VLAN group when assigning a VLAN.")
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
m = super(PrefixFromCSVForm, self).save(commit=False)
# Assign Prefix status by name # Assign Prefix status by name
m.status = dict(self.fields['status_name'].choices)[self.cleaned_data['status_name']] self.instance.status = dict(self.fields['status_name'].choices)[self.cleaned_data['status_name']]
if kwargs.get('commit'):
m.save() return super(PrefixFromCSVForm, self).save(*args, **kwargs)
return m
class PrefixImportForm(BulkImportForm, BootstrapMixin): class PrefixImportForm(BulkImportForm, BootstrapMixin):
@ -391,7 +390,10 @@ class IPAddressFromCSVForm(forms.ModelForm):
if is_primary and not device: if is_primary and not device:
self.add_error('is_primary', "No device specified; cannot set as primary IP") self.add_error('is_primary', "No device specified; cannot set as primary IP")
def save(self, commit=True): def save(self, *args, **kwargs):
# Assign status by name
self.instance.status = dict(self.fields['status_name'].choices)[self.cleaned_data['status_name']]
# Set interface # Set interface
if self.cleaned_data['device'] and self.cleaned_data['interface_name']: if self.cleaned_data['device'] and self.cleaned_data['interface_name']:
@ -404,7 +406,7 @@ class IPAddressFromCSVForm(forms.ModelForm):
elif self.instance.address.version == 6: elif self.instance.address.version == 6:
self.instance.primary_ip6_for = self.cleaned_data['device'] self.instance.primary_ip6_for = self.cleaned_data['device']
return super(IPAddressFromCSVForm, self).save(commit=commit) return super(IPAddressFromCSVForm, self).save(*args, **kwargs)
class IPAddressImportForm(BulkImportForm, BootstrapMixin): class IPAddressImportForm(BulkImportForm, BootstrapMixin):