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

Fixed PEP8 issues with multipoint circuits

Browse Source
This commit is contained in:
Nathan Gotz 2016-09-14 16:06:23 -05:00
parent 5b78bb0738
commit 510bf5ca67
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/circuits/admin.py
View File

@ -21,13 +21,14 @@ class CircuitTypeAdmin(admin.ModelAdmin):
@admin.register(Circuit) @admin.register(Circuit)
class CircuitAdmin(admin.ModelAdmin): class CircuitAdmin(admin.ModelAdmin):
list_display = ['cid', 'provider', 'type', 'tenant','install_date'] list_display = ['cid', 'provider', 'type', 'tenant', 'install_date']
list_filter = ['provider', 'type', 'tenant'] list_filter = ['provider', 'type', 'tenant']
def get_queryset(self, request): def get_queryset(self, request):
qs = super(CircuitAdmin, self).get_queryset(request) qs = super(CircuitAdmin, self).get_queryset(request)
return qs.select_related('provider', 'type', 'tenant') return qs.select_related('provider', 'type', 'tenant')
@admin.register(Termination) @admin.register(Termination)
class TerminationAdmin(admin.ModelAdmin): class TerminationAdmin(admin.ModelAdmin):
list_display = ['tid', 'circuit', 'site', 'port_speed_human', list_display = ['tid', 'circuit', 'site', 'port_speed_human',

3
netbox/circuits/forms.py
View File

@ -150,6 +150,7 @@ class CircuitFilterForm(BootstrapMixin, CustomFieldFilterForm):
tenant = forms.MultipleChoiceField(required=False, choices=circuit_tenant_choices, tenant = forms.MultipleChoiceField(required=False, choices=circuit_tenant_choices,
widget=forms.SelectMultiple(attrs={'size': 8})) widget=forms.SelectMultiple(attrs={'size': 8}))
# #
# Terminations # Terminations
# #
@ -197,7 +198,7 @@ class TerminationForm(BootstrapMixin, CustomFieldForm):
model = Termination model = Termination
fields = [ fields = [
'tid', 'site', 'rack', 'device', 'livesearch', 'tid', 'site', 'rack', 'device', 'livesearch',
'interface','port_speed', 'upstream_speed', 'commit_rate', 'interface', 'port_speed', 'upstream_speed', 'commit_rate',
'xconnect_id', 'pp_info', 'comments' 'xconnect_id', 'pp_info', 'comments'
] ]
help_texts = { help_texts = {

1
netbox/circuits/models.py
View File

@ -90,6 +90,7 @@ class Circuit(CreatedUpdatedModel):
self.install_date.isoformat() if self.install_date else '', self.install_date.isoformat() if self.install_date else '',
]) ])
class Termination(CreatedUpdatedModel): class Termination(CreatedUpdatedModel):
""" """
A Termination is where a site A Termination is where a site

3
netbox/circuits/tables.py
View File

@ -57,8 +57,7 @@ class CircuitTable(BaseTable):
provider = tables.LinkColumn('circuits:provider', args=[Accessor('provider.slug')], verbose_name='Provider') provider = tables.LinkColumn('circuits:provider', args=[Accessor('provider.slug')], verbose_name='Provider')
tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')], verbose_name='Tenant') tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')], verbose_name='Tenant')
termination_count = tables.Column(accessor=Accessor('count_terminations'), termination_count = tables.Column(accessor=Accessor('count_terminations'),
verbose_name='Terminations') verbose_name='Terminations')
class Meta(BaseTable.Meta): class Meta(BaseTable.Meta):
model = Circuit model = Circuit

3
netbox/circuits/views.py
View File

@ -160,6 +160,7 @@ class CircuitBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
cls = Circuit cls = Circuit
default_redirect_url = 'circuits:circuit_list' default_redirect_url = 'circuits:circuit_list'
# #
# Terminations # Terminations
# #
@ -189,6 +190,7 @@ def termination_add(request, pk):
'cancel_url': reverse('circuits:circuit', kwargs={'pk': circuit.pk}), 'cancel_url': reverse('circuits:circuit', kwargs={'pk': circuit.pk}),
}) })
class TerminationEditView(PermissionRequiredMixin, ObjectEditView): class TerminationEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'circuits.change_circuit' permission_required = 'circuits.change_circuit'
model = Termination model = Termination
@ -197,6 +199,7 @@ class TerminationEditView(PermissionRequiredMixin, ObjectEditView):
template_name = 'circuits/termination_edit.html' template_name = 'circuits/termination_edit.html'
cancel_url = 'circuits:circuit_list' cancel_url = 'circuits:circuit_list'
@permission_required('circuits.delete_circuit') @permission_required('circuits.delete_circuit')
def termination_delete(request, pk): def termination_delete(request, pk):

1
netbox/netbox/urls.py
View File

@ -42,4 +42,3 @@ urlpatterns = [
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
] ]