NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-07 08:08:15 -06:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Fix PEP8 whitespace errors

Browse Source
This commit is contained in:
Joseph Kennedy 2017-09-01 02:44:57 -04:00
parent 1ccbf746b9
commit 60fd2c4296
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/dcim/filters.py
View File

@ -579,8 +579,8 @@ class InterfaceFilter(django_filters.FilterSet):
class InterfaceListFilter(django_filters.FilterSet):
q = django_filters.CharFilter(
method='search',
label='Search',
method='search',
label='Search',
)
device = django_filters.CharFilter(
method='filter_device',
@ -630,7 +630,7 @@ class InterfaceListFilter(django_filters.FilterSet):
if not value.strip():
return queryset
return queryset.filter(device__site__slug=value)
def filter_role(self, queryset, name, value):
if not value.strip():
return queryset

9
netbox/dcim/forms.py
View File

@ -1584,21 +1584,18 @@ class InterfaceCSVForm(forms.ModelForm):
required=False,
help_text='Is Lag?'
)
class Meta:
model = Interface
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']
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):
interface_name = self.cleaned_data.get('interface_name')
if not interface:
return None
return interface
def clean_lag(self):
device_id = self.cleaned_data.get('device')
lag_name = self.cleaned_data.get('lag')

9
netbox/dcim/models.py
View File

@ -1146,10 +1146,11 @@ class Interface(models.Model):
help_text="This interface is used only for out-of-band management"
)
description = models.CharField(max_length=100, blank=True)
objects = InterfaceQuerySet.as_manager()
csv_headers = ['device','lag','name','mac_address','form_factor','enabled','description','mtu','mgmt_only','is_virtual','is_wireless','is_connected','is_lag']
csv_headers = ['device', 'lag', 'name', 'mac_address', 'form_factor', 'enabled', 'description', 'mtu', 'mgmt_only', 'is_virtual', 'is_wireless', 'is_connected', 'is_lag']
class Meta:
ordering = ['device', 'name']
unique_together = ['device', 'name']
@ -1170,7 +1171,7 @@ class Interface(models.Model):
if self.lag and self.lag.device != self.device:
raise ValidationError({
'lag': "The selected LAG interface ({}) belongs to a different device ({}).".format(
self.lag.name, self.lag.device.name
self.lag.name, self.lag.device.name
)
})

11
netbox/dcim/tables.py
View File

@ -537,9 +537,9 @@ class InterfaceConnectionTable(BaseTable):
class InterfaceImportTable(BaseTable):
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.LinkColumn('dcim:interface', accessor=Accessor('self.name'),
args=[Accessor('self.pk')], verbose_name='Lag ID')
args=[Accessor('self.pk')], verbose_name='Lag ID')
name = tables.Column(verbose_name='Interface')
mac_address = tables.Column(verbose_name='MAC Address')
form_factor = tables.Column(verbose_name='Form Factor')
@ -550,14 +550,15 @@ class InterfaceImportTable(BaseTable):
is_virtual = tables.Column(verbose_name='Is Virtual?')
is_wireless = tables.Column(verbose_name='Is Wireless?')
is_lag = tables.Column(verbose_name='Is Lag?')
class Meta(BaseTable.Meta):
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')
class InterfaceListTable(BaseTable):
device = tables.LinkColumn('dcim:device', accessor=Accessor('device'),
args=[Accessor('device.pk')], verbose_name='Device')
args=[Accessor('device.pk')], verbose_name='Device')
name = tables.TemplateColumn(template_code=INTERFACE_LINK, verbose_name='Interface')
enabled = tables.TemplateColumn(template_code=INTERFACE_ENABLED, verbose_name='Enabled')
form_factor = tables.Column(verbose_name='Form Factor')
@ -566,4 +567,4 @@ class InterfaceListTable(BaseTable):
class Meta(BaseTable.Meta):
model = Interface
fields = ('device','name','enabled','form_factor','mac_address','description')
fields = ('device', 'name', 'enabled', 'form_factor', 'mac_address', 'description')