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

LinkColumn for lag and try to do a proper get

Browse Source
This commit is contained in:
Joseph Kennedy 2017-08-26 23:58:46 -04:00
parent 98308b2eef
commit f855733f46
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/dcim/forms.py
View File

@ -1605,7 +1605,7 @@ class InterfaceCSVForm(forms.ModelForm):
if device_id is not None and lag_name is not None: if device_id is not None and lag_name is not None:
lag = Interface.objects.filter( lag = Interface.objects.filter(
device=device_id, form_factor=IFACE_FF_LAG).get( device=device_id, form_factor=IFACE_FF_LAG).get(
lag=lag_name name=lag_name
) )
if not lag_name: if not lag_name:
return None return None

4
netbox/dcim/tables.py
View File

@ -538,7 +538,9 @@ class InterfaceConnectionTable(BaseTable):
class InterfaceImportTable(BaseTable): class InterfaceImportTable(BaseTable):
device = tables.LinkColumn('dcim:device', accessor=Accessor('interface.device'), device = tables.LinkColumn('dcim:device', accessor=Accessor('interface.device'),
args=[Accessor('interface.device.pk')], verbose_name='Device') args=[Accessor('interface.device.pk')], verbose_name='Device')
lag = tables.Column(verbose_name='Lag ID') lag = tables.LinkColumn('dcim:interface', accessor=Accessor('self.name'),
args=[Accessor('self.pk')], verbose_name='Lag ID')
#lag = tables.Column(verbose_name='Lag ID')
name = tables.Column(verbose_name='Interface') name = tables.Column(verbose_name='Interface')
mac_address = tables.Column(verbose_name='MAC Address') mac_address = tables.Column(verbose_name='MAC Address')
form_factor = tables.Column(verbose_name='Form Factor') form_factor = tables.Column(verbose_name='Form Factor')