From 7bce246ff47b9d9fc749e17ee8ebd6d900af9b53 Mon Sep 17 00:00:00 2001 From: dansheps Date: Wed, 20 Nov 2019 12:17:30 -0600 Subject: [PATCH] Initial Work on #3564 --- netbox/dcim/filters.py | 20 +++++ netbox/dcim/forms.py | 64 ++++++++++++++++ netbox/dcim/tables.py | 73 +++++++++++++++++++ netbox/dcim/urls.py | 8 ++ netbox/dcim/views.py | 68 +++++++++++++++++ .../templates/dcim/device_component_list.html | 19 +++++ netbox/templates/inc/nav_menu.html | 17 +++++ 7 files changed, 269 insertions(+) create mode 100644 netbox/templates/dcim/device_component_list.html diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index dc98282fb..4d5cf2e62 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -621,6 +621,26 @@ class DeviceComponentFilterSet(django_filters.FilterSet): method='search', label='Search', ) + region_id = django_filters.ModelMultipleChoiceFilter( + field_name='device__site__region', + queryset=Region.objects.all(), + label='Region (ID)', + ) + region = django_filters.ModelMultipleChoiceFilter( + field_name='device__site__region__in', + queryset=Region.objects.all(), + label='Region name (slug)', + ) + site_id = django_filters.ModelMultipleChoiceFilter( + field_name='device__site', + queryset=Site.objects.all(), + label='Site (ID)', + ) + site = django_filters.ModelMultipleChoiceFilter( + field_name='device__site__slug', + queryset=Site.objects.all(), + label='Site name (slug)', + ) device_id = django_filters.ModelMultipleChoiceFilter( queryset=Device.objects.all(), label='Device (ID)', diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index abf9b7b1b..2f36c9e47 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -56,6 +56,33 @@ def get_device_by_name_or_pk(name): return device +class DeviceComponentFilterForm(BootstrapMixin, forms.Form): + + field_order = [ + 'q', 'region', 'site' + ] + q = forms.CharField( + required=False, + label='Search' + ) + region_id = TreeNodeChoiceField( + queryset=Region.objects.all(), + required=False, + widget=APISelect( + api_url="/api/dcim/regions/" + ) + ) + site_id = forms.ModelChoiceField( + queryset=Site.objects.all(), + to_field_name='slug', + required=False, + help_text='Name of parent site', + error_messages={ + 'invalid_choice': 'Site not found.', + } + ) + + class InterfaceCommonForm: def clean(self): @@ -2063,6 +2090,11 @@ class DeviceBulkAddInterfaceForm(DeviceBulkAddComponentForm): # Console ports # + +class ConsolePortFilterForm(DeviceComponentFilterForm): + model = ConsolePort + + class ConsolePortForm(BootstrapMixin, forms.ModelForm): tags = TagField( required=False @@ -2100,6 +2132,11 @@ class ConsolePortCreateForm(ComponentForm): # Console server ports # + +class ConsoleServerPortFilterForm(DeviceComponentFilterForm): + model = ConsoleServerPort + + class ConsoleServerPortForm(BootstrapMixin, forms.ModelForm): tags = TagField( required=False @@ -2172,6 +2209,11 @@ class ConsoleServerPortBulkDisconnectForm(ConfirmationForm): # Power ports # + +class PowerPortFilterForm(DeviceComponentFilterForm): + model = PowerPort + + class PowerPortForm(BootstrapMixin, forms.ModelForm): tags = TagField( required=False @@ -2219,6 +2261,11 @@ class PowerPortCreateForm(ComponentForm): # Power outlets # + +class PowerOutletFilterForm(DeviceComponentFilterForm): + model = PowerOutlet + + class PowerOutletForm(BootstrapMixin, forms.ModelForm): power_port = forms.ModelChoiceField( queryset=PowerPort.objects.all(), @@ -2332,6 +2379,11 @@ class PowerOutletBulkDisconnectForm(ConfirmationForm): # Interfaces # + +class InterfaceFilterForm(DeviceComponentFilterForm): + model = Interface + + class InterfaceForm(InterfaceCommonForm, BootstrapMixin, forms.ModelForm): untagged_vlan = forms.ModelChoiceField( queryset=VLAN.objects.all(), @@ -2661,6 +2713,10 @@ class InterfaceBulkDisconnectForm(ConfirmationForm): # Front pass-through ports # +class FrontPortFilterForm(DeviceComponentFilterForm): + model = FrontPort + + class FrontPortForm(BootstrapMixin, forms.ModelForm): tags = TagField( required=False @@ -2786,6 +2842,10 @@ class FrontPortBulkDisconnectForm(ConfirmationForm): # Rear pass-through ports # +class RearPortFilterForm(DeviceComponentFilterForm): + model = RearPort + + class RearPortForm(BootstrapMixin, forms.ModelForm): tags = TagField( required=False @@ -3344,6 +3404,10 @@ class CableFilterForm(BootstrapMixin, forms.Form): # Device bays # +class DeviceBayFilterForm(DeviceComponentFilterForm): + model = DeviceBay + + class DeviceBayForm(BootstrapMixin, forms.ModelForm): tags = TagField( required=False diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index a8a4fc227..bd626f823 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -643,6 +643,15 @@ class DeviceImportTable(BaseTable): # Device components # +class DeviceComponentDetailTable(BaseTable): + component_type = '' + + pk = ToggleColumn() + device = tables.LinkColumn() + cable = tables.LinkColumn() + + + class ConsolePortTable(BaseTable): class Meta(BaseTable.Meta): @@ -650,6 +659,14 @@ class ConsolePortTable(BaseTable): fields = ('name', 'type') +class ConsolePortDetailTable(DeviceComponentDetailTable): + component_type = 'Console Ports' + + class Meta(ConsolePortTable.Meta): + model = ConsolePort + fields = ('pk', 'name', 'type', 'connection_status', 'device', 'cable') + + class ConsoleServerPortTable(BaseTable): class Meta(BaseTable.Meta): @@ -657,6 +674,14 @@ class ConsoleServerPortTable(BaseTable): fields = ('name', 'description') +class ConsoleServerPortDetailTable(DeviceComponentDetailTable): + component_type = 'Console Server Ports' + + class Meta(ConsoleServerPortTable.Meta): + model = ConsoleServerPort + fields = ('pk', 'name', 'type', 'connection_status', 'device', 'cable') + + class PowerPortTable(BaseTable): class Meta(BaseTable.Meta): @@ -664,6 +689,14 @@ class PowerPortTable(BaseTable): fields = ('name', 'type') +class PowerPortDetailTable(DeviceComponentDetailTable): + component_type = 'Power Ports' + + class Meta(PowerPortTable.Meta): + model = PowerPort + fields = ('pk', 'name', 'type', 'connection_status', 'device', 'cable') + + class PowerOutletTable(BaseTable): class Meta(BaseTable.Meta): @@ -671,6 +704,14 @@ class PowerOutletTable(BaseTable): fields = ('name', 'type', 'description') +class PowerOutletDetailTable(DeviceComponentDetailTable): + component_type = 'Power Outlets' + + class Meta(PowerOutletTable.Meta): + model = PowerOutlet + fields = ('pk', 'name', 'type', 'connection_status', 'device', 'cable') + + class InterfaceTable(BaseTable): class Meta(BaseTable.Meta): @@ -678,6 +719,14 @@ class InterfaceTable(BaseTable): fields = ('name', 'type', 'lag', 'enabled', 'mgmt_only', 'description') +class InterfaceDetailTable(DeviceComponentDetailTable): + component_type = 'Interfaces' + + class Meta(InterfaceTable.Meta): + model = Interface + fields = ('pk', 'name', 'type', 'connection_status', 'device', 'cable') + + class FrontPortTable(BaseTable): class Meta(BaseTable.Meta): @@ -686,6 +735,14 @@ class FrontPortTable(BaseTable): empty_text = "None" +class FrontPortDetailTable(DeviceComponentDetailTable): + component_type = 'Front Ports' + + class Meta(FrontPortTable.Meta): + model = FrontPort + fields = ('pk', 'name', 'type', 'connection_status', 'device', 'cable') + + class RearPortTable(BaseTable): class Meta(BaseTable.Meta): @@ -694,6 +751,14 @@ class RearPortTable(BaseTable): empty_text = "None" +class RearPortDetailTable(DeviceComponentDetailTable): + component_type = 'Rear Ports' + + class Meta(RearPortTable.Meta): + model = RearPort + fields = ('pk', 'name', 'type', 'connection_status', 'device', 'cable') + + class DeviceBayTable(BaseTable): class Meta(BaseTable.Meta): @@ -701,6 +766,14 @@ class DeviceBayTable(BaseTable): fields = ('name',) +class DeviceBayDetailTable(DeviceComponentDetailTable): + component_type = 'Device Bays' + + class Meta(DeviceBayTable.Meta): + model = FrontPort + fields = ('pk', 'name', 'device', 'installed_device') + + # # Cables # diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index aeafbc697..c0dbd937d 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -171,6 +171,7 @@ urlpatterns = [ path(r'devices/console-ports/add/', views.DeviceBulkAddConsolePortView.as_view(), name='device_bulk_add_consoleport'), path(r'devices//console-ports/add/', views.ConsolePortCreateView.as_view(), name='consoleport_add'), path(r'devices//console-ports/delete/', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'), + path(r'console-ports/', views.ConsolePortListView.as_view(),name='consoleport_list'), path(r'console-ports//connect//', views.CableCreateView.as_view(), name='consoleport_connect', kwargs={'termination_a_type': ConsolePort}), path(r'console-ports//edit/', views.ConsolePortEditView.as_view(), name='consoleport_edit'), path(r'console-ports//delete/', views.ConsolePortDeleteView.as_view(), name='consoleport_delete'), @@ -181,6 +182,7 @@ urlpatterns = [ path(r'devices//console-server-ports/add/', views.ConsoleServerPortCreateView.as_view(), name='consoleserverport_add'), path(r'devices//console-server-ports/edit/', views.ConsoleServerPortBulkEditView.as_view(), name='consoleserverport_bulk_edit'), path(r'devices//console-server-ports/delete/', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'), + path(r'console-server-ports/', views.ConsoleServerPortListView.as_view(),name='consoleserverport_list'), path(r'console-server-ports//connect//', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'termination_a_type': ConsoleServerPort}), path(r'console-server-ports//edit/', views.ConsoleServerPortEditView.as_view(), name='consoleserverport_edit'), path(r'console-server-ports//delete/', views.ConsoleServerPortDeleteView.as_view(), name='consoleserverport_delete'), @@ -192,6 +194,7 @@ urlpatterns = [ path(r'devices/power-ports/add/', views.DeviceBulkAddPowerPortView.as_view(), name='device_bulk_add_powerport'), path(r'devices//power-ports/add/', views.PowerPortCreateView.as_view(), name='powerport_add'), path(r'devices//power-ports/delete/', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'), + path(r'power-ports/', views.PowerPortListView.as_view(),name='powerport_list'), path(r'power-ports//connect//', views.CableCreateView.as_view(), name='powerport_connect', kwargs={'termination_a_type': PowerPort}), path(r'power-ports//edit/', views.PowerPortEditView.as_view(), name='powerport_edit'), path(r'power-ports//delete/', views.PowerPortDeleteView.as_view(), name='powerport_delete'), @@ -202,6 +205,7 @@ urlpatterns = [ path(r'devices//power-outlets/add/', views.PowerOutletCreateView.as_view(), name='poweroutlet_add'), path(r'devices//power-outlets/edit/', views.PowerOutletBulkEditView.as_view(), name='poweroutlet_bulk_edit'), path(r'devices//power-outlets/delete/', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'), + path(r'power-outlets/', views.PowerOutletListView.as_view(), name='poweroutlet_list'), path(r'power-outlets//connect//', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'termination_a_type': PowerOutlet}), path(r'power-outlets//edit/', views.PowerOutletEditView.as_view(), name='poweroutlet_edit'), path(r'power-outlets//delete/', views.PowerOutletDeleteView.as_view(), name='poweroutlet_delete'), @@ -214,6 +218,7 @@ urlpatterns = [ path(r'devices//interfaces/add/', views.InterfaceCreateView.as_view(), name='interface_add'), path(r'devices//interfaces/edit/', views.InterfaceBulkEditView.as_view(), name='interface_bulk_edit'), path(r'devices//interfaces/delete/', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'), + path(r'interfaces/', views.InterfaceListView.as_view(), name='interface_list'), path(r'interfaces//connect//', views.CableCreateView.as_view(), name='interface_connect', kwargs={'termination_a_type': Interface}), path(r'interfaces//', views.InterfaceView.as_view(), name='interface'), path(r'interfaces//edit/', views.InterfaceEditView.as_view(), name='interface_edit'), @@ -228,6 +233,7 @@ urlpatterns = [ path(r'devices//front-ports/add/', views.FrontPortCreateView.as_view(), name='frontport_add'), path(r'devices//front-ports/edit/', views.FrontPortBulkEditView.as_view(), name='frontport_bulk_edit'), path(r'devices//front-ports/delete/', views.FrontPortBulkDeleteView.as_view(), name='frontport_bulk_delete'), + path(r'front-ports/', views.FrontPortListView.as_view(), name='frontport_list'), path(r'front-ports//connect//', views.CableCreateView.as_view(), name='frontport_connect', kwargs={'termination_a_type': FrontPort}), path(r'front-ports//edit/', views.FrontPortEditView.as_view(), name='frontport_edit'), path(r'front-ports//delete/', views.FrontPortDeleteView.as_view(), name='frontport_delete'), @@ -240,6 +246,7 @@ urlpatterns = [ path(r'devices//rear-ports/add/', views.RearPortCreateView.as_view(), name='rearport_add'), path(r'devices//rear-ports/edit/', views.RearPortBulkEditView.as_view(), name='rearport_bulk_edit'), path(r'devices//rear-ports/delete/', views.RearPortBulkDeleteView.as_view(), name='rearport_bulk_delete'), + path(r'rear-ports/', views.RearPortListView.as_view(), name='rearport_list'), path(r'rear-ports//connect//', views.CableCreateView.as_view(), name='rearport_connect', kwargs={'termination_a_type': RearPort}), path(r'rear-ports//edit/', views.RearPortEditView.as_view(), name='rearport_edit'), path(r'rear-ports//delete/', views.RearPortDeleteView.as_view(), name='rearport_delete'), @@ -251,6 +258,7 @@ urlpatterns = [ path(r'devices/device-bays/add/', views.DeviceBulkAddDeviceBayView.as_view(), name='device_bulk_add_devicebay'), path(r'devices//bays/add/', views.DeviceBayCreateView.as_view(), name='devicebay_add'), path(r'devices//bays/delete/', views.DeviceBayBulkDeleteView.as_view(), name='devicebay_bulk_delete'), + path(r'device-bays/', views.DeviceBayListView.as_view(), name='devicebay_list'), path(r'device-bays//edit/', views.DeviceBayEditView.as_view(), name='devicebay_edit'), path(r'device-bays//delete/', views.DeviceBayDeleteView.as_view(), name='devicebay_delete'), path(r'device-bays//populate/', views.DeviceBayPopulateView.as_view(), name='devicebay_populate'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index c61d6c3ff..1946f1447 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1197,6 +1197,14 @@ class DeviceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Console ports # +class ConsolePortListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_consoleport' + queryset = ConsolePort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable') + filter = filters.ConsolePortFilter + filter_form = forms.ConsolePortFilterForm + table = tables.ConsolePortDetailTable + template_name = 'dcim/device_component_list.html' + class ConsolePortCreateView(PermissionRequiredMixin, ComponentCreateView): permission_required = 'dcim.add_consoleport' parent_model = Device @@ -1229,6 +1237,14 @@ class ConsolePortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Console server ports # +class ConsoleServerPortListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_consoleserverport' + queryset = ConsoleServerPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable') + filter = filters.ConsoleServerPortFilter + filter_form = forms.ConsoleServerPortFilterForm + table = tables.ConsoleServerPortDetailTable + template_name = 'dcim/device_component_list.html' + class ConsoleServerPortCreateView(PermissionRequiredMixin, ComponentCreateView): permission_required = 'dcim.add_consoleserverport' parent_model = Device @@ -1281,6 +1297,14 @@ class ConsoleServerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Power ports # +class PowerPortListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_powerport' + queryset = PowerPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable') + filter = filters.PowerPortFilter + filter_form = forms.PowerPortFilterForm + table = tables.PowerPortDetailTable + template_name = 'dcim/device_component_list.html' + class PowerPortCreateView(PermissionRequiredMixin, ComponentCreateView): permission_required = 'dcim.add_powerport' parent_model = Device @@ -1313,6 +1337,14 @@ class PowerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Power outlets # +class PowerOutletListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_poweroutlet' + queryset = PowerOutlet.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable') + filter = filters.PowerOutletFilter + filter_form = forms.PowerOutletFilterForm + table = tables.PowerOutletDetailTable + template_name = 'dcim/device_component_list.html' + class PowerOutletCreateView(PermissionRequiredMixin, ComponentCreateView): permission_required = 'dcim.add_poweroutlet' parent_model = Device @@ -1365,6 +1397,16 @@ class PowerOutletBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Interfaces # +class InterfaceListView(PermissionRequiredMixin, ObjectListView): + type = 'Interface' + permission_required = 'dcim.view_interface' + queryset = Interface.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable') + filter = filters.InterfaceFilter + filter_form = forms.InterfaceFilterForm + table = tables.InterfaceDetailTable + template_name = 'dcim/device_component_list.html' + + class InterfaceView(PermissionRequiredMixin, View): permission_required = 'dcim.view_interface' @@ -1454,6 +1496,14 @@ class InterfaceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Front ports # +class FrontPortListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_frontport' + queryset = FrontPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable') + filter = filters.FrontPortFilter + filter_form = forms.FrontPortFilterForm + table = tables.FrontPortDetailTable + template_name = 'dcim/device_component_list.html' + class FrontPortCreateView(PermissionRequiredMixin, ComponentCreateView): permission_required = 'dcim.add_frontport' parent_model = Device @@ -1506,6 +1556,14 @@ class FrontPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Rear ports # +class RearPortListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_rearport' + queryset = RearPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable') + filter = filters.RearPortFilter + filter_form = forms.RearPortFilterForm + table = tables.RearPortDetailTable + template_name = 'dcim/device_component_list.html' + class RearPortCreateView(PermissionRequiredMixin, ComponentCreateView): permission_required = 'dcim.add_rearport' parent_model = Device @@ -1558,6 +1616,16 @@ class RearPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Device bays # +class DeviceBayListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_devicebay' + queryset = DeviceBay.objects.prefetch_related( + 'device', 'device__site', 'installed_device', 'installed_device__site' + ) + filter = filters.DeviceBayFilter + filter_form = forms.DeviceBayFilterForm + table = tables.DeviceBayDetailTable + template_name = 'dcim/device_component_list.html' + class DeviceBayCreateView(PermissionRequiredMixin, ComponentCreateView): permission_required = 'dcim.add_devicebay' parent_model = Device diff --git a/netbox/templates/dcim/device_component_list.html b/netbox/templates/dcim/device_component_list.html new file mode 100644 index 000000000..8c2e57c4f --- /dev/null +++ b/netbox/templates/dcim/device_component_list.html @@ -0,0 +1,19 @@ +{% extends '_base.html' %} +{% load buttons %} + +{% block content %} +
+ {% export_button content_type %} +
+

{% block title %}{{ table.component_type }}{% endblock %}

+
+
+ {% include 'responsive_table.html' %} + {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %} +
+
+ {% include 'inc/search_panel.html' %} + {% include 'inc/tags_panel.html' %} +
+
+{% endblock %} diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html index 41a88ef44..852a3600a 100644 --- a/netbox/templates/inc/nav_menu.html +++ b/netbox/templates/inc/nav_menu.html @@ -183,6 +183,23 @@ Interface Connections +
  • +
  • Device Components
    • + + Interfaces + + + Front Ports + + + Rear Ports + + + Power Ports + + + Power Outlet +