NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-10 01:28:16 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Change lag interface...add clean_lag function. Switch to NullBooleanField for other fields in InterfaceCSVForm

Browse Source
This commit is contained in:
Joseph Kennedy 2017-08-25 22:55:27 -04:00
parent 5dd5608e5b
commit 6f7bb50475
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
netbox/dcim/forms.py
View File

@ -1541,11 +1541,9 @@ class InterfaceCSVForm(forms.ModelForm):
name = forms.CharField( name = forms.CharField(
help_text='Name of interface' help_text='Name of interface'
) )
lag = FlexibleModelChoiceField( lag = forms.CharField(
required=False, required=False,
queryset = Interface.objects.order_naturally().filter(form_factor=IFACE_FF_LAG), help_text='Lag Name'
help_text='Lag Name',
error_messages={'invalid_choice': 'Lag not found.'}
) )
mac_address = forms.CharField( mac_address = forms.CharField(
required=False, required=False,
@ -1559,7 +1557,7 @@ class InterfaceCSVForm(forms.ModelForm):
required=False, required=False,
help_text='Description for interface' help_text='Description for interface'
) )
enabled = forms.BooleanField( enabled = forms.NullBooleanField(
required=False, required=False,
help_text='Enabled/Disabled' help_text='Enabled/Disabled'
) )
@ -1571,15 +1569,15 @@ class InterfaceCSVForm(forms.ModelForm):
required=False, required=False,
help_text='Management Only' help_text='Management Only'
) )
is_virtual = forms.BooleanField( is_virtual = forms.NullBooleanField(
required=False, required=False,
help_text='Is Virtual?' help_text='Is Virtual?'
) )
is_wireless = forms.BooleanField( is_wireless = forms.NullBooleanField(
required=False, required=False,
help_text='Is Wireless?' help_text='Is Wireless?'
) )
is_lag = forms.BooleanField( is_lag = forms.NullBooleanField(
required=False, required=False,
help_text='Is Lag?' help_text='Is Lag?'
) )
@ -1587,10 +1585,10 @@ class InterfaceCSVForm(forms.ModelForm):
class Meta: class Meta:
model = Interface model = Interface
fields = ('device', 'lag','name','mac_address','form_factor','enabled','description','mtu','mgmt_only','is_virtual','is_wireless','is_lag') fields = ('device', 'lag','name','mac_address','form_factor','enabled','description','mtu','mgmt_only','is_virtual','is_wireless','is_lag')
nullable_fields = ['lag','is_virtual','is_wireless','is_lag']
def clean_interface(self): def clean_interface(self):
interface_name = self.cleaned_data.get('interface_name') interface_name = self.cleaned_data.get('interface_name')
if not interface: if not interface:
return None return None
@ -1598,6 +1596,25 @@ class InterfaceCSVForm(forms.ModelForm):
return interface return interface
def clean_lag(self):
try:
if device is not None:
interface_ordering = device.device_type.interface_ordering
lag = Interface.objects.order_naturally(method=interface_ordering).filter(
device=device, form_factor=IFACE_FF_LAG).get(
lag=self.cleaned_data['lag'], name=lag
)
self.fields['lag'].queryset = Interface.objects.order_naturally(method=interface_ordering).filter(
device=device, form_factor=IFACE_FF_LAG
)
except:
return None
if not lag:
return None
return lag
class InterfaceFilterForm(BootstrapMixin, forms.Form): class InterfaceFilterForm(BootstrapMixin, forms.Form):
site = forms.ModelChoiceField(required=False, queryset=Site.objects.all(), to_field_name='slug') site = forms.ModelChoiceField(required=False, queryset=Site.objects.all(), to_field_name='slug')
device = forms.CharField(required=False, label='Device name') device = forms.CharField(required=False, label='Device name')