From 67bf11ab82a47bde40a2e25910bb651026a0ad78 Mon Sep 17 00:00:00 2001 From: Joseph Kennedy Date: Tue, 22 Aug 2017 18:44:55 -0400 Subject: [PATCH] Add more fields to InterfaceCSVForm and InterfaceImportTable --- netbox/dcim/forms.py | 32 +++++++++++++++++++++++++++++--- netbox/dcim/tables.py | 11 ++++++++--- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index aa691ff45..7c6830b81 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1541,20 +1541,46 @@ class InterfaceCSVForm(forms.ModelForm): name = forms.CharField( help_text='Name of interface' ) + lag = forms.CharField( + required=False, + help_text='Lag Name' + ) mac_address = forms.CharField( required=False, help_text='MAC address of interface' ) + form_factor = forms.CharField( + required=False, + help_text='Interface Form Factor' + ) description = forms.CharField( required=False, help_text='Description for interface' ) + enabled = forms.CharField( + required=False, + help_text='Enabled/Disabled' + ) + mtu = forms.CharField( + required=False, + help_text='MTU' + ) + mgmt_only = forms.CharField( + required=False, + help_text='Management Only' + ) + is_virtual = forms.CharField( + required=False, + help_text='Is Virtual?' + ) + is_wireless = forms.CharField( + required=False, + help_text='Is Wireless?' + ) class Meta: model = Interface - fields = [ - 'device', 'name', 'mac_address', 'description' - ] + fields = ('device', 'lag','name','mac_address','form_factor','enabled','description','mtu','mgmt_only','is_virtual','is_wireless') def clean_interface(self): diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 971c69e40..e3cacf5ad 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -538,14 +538,19 @@ class InterfaceConnectionTable(BaseTable): class InterfaceImportTable(BaseTable): device = tables.LinkColumn('dcim:device', accessor=Accessor('interface.device'), args=[Accessor('interface.device.pk')], verbose_name='Device') + lag = tables.Column(verbose_name='Lag') name = tables.Column(verbose_name='Interface') - form_factor = tables.Column(verbose_name='Form Factor') mac_address = tables.Column(verbose_name='MAC Address') + form_factor = tables.Column(verbose_name='Form Factor') + enabled = tables.Column(verbose_name='Enabled') description = tables.Column(verbose_name='Description') - + mtu = tables.Column(verbose_name='MTU') + mgmt_only = tables.Column(verbose_name='MGMT Only') + is_virtual = tables.Column(verbose_name='Virtual') + is_wireless = tables.Column(verbose_name='Wireless') class Meta(BaseTable.Meta): model = Interface - fields = ('device', 'name', 'form_factor','mac_address', 'description') + fields = ('device', 'lag','name','mac_address','form_factor','enabled','description','mtu','mgmt_only','is_virtual','is_wireless') class InterfaceListTable(BaseTable):