From f3a41df395a91c4a48eee9eaa15c7de803031e1b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 18 Nov 2019 22:12:29 -0500 Subject: [PATCH 1/4] #3455: Correct related_name on Cluster.tenant --- netbox/virtualization/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py index c47f516cf..630a1468c 100644 --- a/netbox/virtualization/models.py +++ b/netbox/virtualization/models.py @@ -106,7 +106,7 @@ class Cluster(ChangeLoggedModel, CustomFieldModel): tenant = models.ForeignKey( to='tenancy.Tenant', on_delete=models.PROTECT, - related_name='tenants', + related_name='clusters', blank=True, null=True ) From adb25fd7d798398c7dffec2afec3f1445cbebf40 Mon Sep 17 00:00:00 2001 From: Sander Steffann Date: Thu, 5 Dec 2019 21:36:11 +0100 Subject: [PATCH 2/4] 822 bulk import of device components (#3711) Closes #822: CSV import for device components * Implement CSV import for netbox-community#822 * Comment out default_return_url until there is a proper target * Fix the default value of `enabled` when not included in the import * rear_port is definitely required here * Power Ports don't have a type (yet) * Add import for console-ports and console-server-ports * Add import for device-bays --- README.md | 7 - docs/additional-features/custom-scripts.md | 2 +- docs/installation/3-http-daemon.md | 1 - docs/release-notes/version-2.6.md | 15 ++ netbox/circuits/filters.py | 6 +- netbox/dcim/filters.py | 12 +- netbox/dcim/forms.py | 280 ++++++++++++++++++++- netbox/dcim/tables.py | 74 ++++++ netbox/dcim/urls.py | 8 + netbox/dcim/views.py | 64 +++++ netbox/extras/api/urls.py | 2 +- netbox/extras/filters.py | 21 ++ netbox/ipam/filters.py | 14 +- netbox/ipam/forms.py | 2 +- netbox/ipam/tables.py | 4 +- netbox/project-static/css/base.css | 8 + netbox/secrets/filters.py | 4 +- netbox/templates/dcim/inc/interface.html | 3 + netbox/templates/dcim/powerfeed.html | 12 + netbox/templates/users/_user.html | 8 +- netbox/tenancy/filters.py | 4 +- netbox/users/views.py | 5 + netbox/virtualization/filters.py | 8 +- 23 files changed, 523 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 996f26332..38961c286 100644 --- a/README.md +++ b/README.md @@ -36,13 +36,6 @@ Please see [the documentation](http://netbox.readthedocs.io/en/stable/) for instructions on installing NetBox. To upgrade NetBox, please download the [latest release](https://github.com/netbox-community/netbox/releases) and run `upgrade.sh`. -## Alternative Installations - -* [Docker container](https://github.com/netbox-community/netbox-docker) (via [@cimnine](https://github.com/cimnine)) -* [Vagrant deployment](https://github.com/ryanmerolle/netbox-vagrant) (via [@ryanmerolle](https://github.com/ryanmerolle)) -* [Ansible deployment](https://github.com/lae/ansible-role-netbox) (via [@lae](https://github.com/lae)) -* [Kubernetes deployment](https://github.com/CENGN/netbox-kubernetes) (via [@CENGN](https://github.com/CENGN)) - # Providing Feedback Feature requests and bug reports must be submitted as GiHub issues. (Please be diff --git a/docs/additional-features/custom-scripts.md b/docs/additional-features/custom-scripts.md index 8d453f668..cdb49c82a 100644 --- a/docs/additional-features/custom-scripts.md +++ b/docs/additional-features/custom-scripts.md @@ -182,7 +182,7 @@ class NewBranchScript(Script): class Meta: name = "New Branch" description = "Provision a new branch site" - fields = ['site_name', 'switch_count', 'switch_model'] + field_order = ['site_name', 'switch_count', 'switch_model'] site_name = StringVar( description="Name of the new site" diff --git a/docs/installation/3-http-daemon.md b/docs/installation/3-http-daemon.md index be8f70586..a3a186aeb 100644 --- a/docs/installation/3-http-daemon.md +++ b/docs/installation/3-http-daemon.md @@ -32,7 +32,6 @@ server { proxy_set_header X-Forwarded-Host $server_name; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; - add_header P3P 'CP="ALL DSP COR PSAa PSDa OUR NOR ONL UNI COM NAV"'; } } ``` diff --git a/docs/release-notes/version-2.6.md b/docs/release-notes/version-2.6.md index 181d448ff..575d23822 100644 --- a/docs/release-notes/version-2.6.md +++ b/docs/release-notes/version-2.6.md @@ -1,3 +1,18 @@ +# v2.6.8 (FUTURE) + +## Enhancements + +* [#3139](https://github.com/netbox-community/netbox/issues/3139) - Disable password change form for LDAP-authenticated users +* [#3457](https://github.com/netbox-community/netbox/issues/3457) - Display cable colors on device view +* [#3329](https://github.com/netbox-community/netbox/issues/3329) - Remove obsolete P3P policy header +* [#3663](https://github.com/netbox-community/netbox/issues/3663) - Add query filters for `created` and `last_updated` fields + +## Bug Fixes + +* [#3669](https://github.com/netbox-community/netbox/issues/3669) - Include `weight` field in prefix/VLAN role form +* [#3674](https://github.com/netbox-community/netbox/issues/3674) - Include comments on PowerFeed view +* [#3679](https://github.com/netbox-community/netbox/issues/3679) - Fix link for assigned ipaddress in interface page + # v2.6.7 (2019-11-01) ## Enhancements diff --git a/netbox/circuits/filters.py b/netbox/circuits/filters.py index 088ec144a..502d2d103 100644 --- a/netbox/circuits/filters.py +++ b/netbox/circuits/filters.py @@ -2,14 +2,14 @@ import django_filters from django.db.models import Q from dcim.models import Region, Site -from extras.filters import CustomFieldFilterSet +from extras.filters import CustomFieldFilterSet, CreatedUpdatedFilterSet from tenancy.filtersets import TenancyFilterSet from utilities.filters import NameSlugSearchFilterSet, NumericInFilter, TagFilter, TreeNodeMultipleChoiceFilter from .constants import * from .models import Circuit, CircuitTermination, CircuitType, Provider -class ProviderFilter(CustomFieldFilterSet): +class ProviderFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -54,7 +54,7 @@ class CircuitTypeFilter(NameSlugSearchFilterSet): fields = ['id', 'name', 'slug'] -class CircuitFilter(CustomFieldFilterSet, TenancyFilterSet): +class CircuitFilter(CustomFieldFilterSet, TenancyFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index dc98282fb..6204e0b1a 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -2,7 +2,7 @@ import django_filters from django.contrib.auth.models import User from django.db.models import Q -from extras.filters import CustomFieldFilterSet, LocalConfigContextFilter +from extras.filters import CustomFieldFilterSet, LocalConfigContextFilter, CreatedUpdatedFilterSet from tenancy.filtersets import TenancyFilterSet from tenancy.models import Tenant from utilities.constants import COLOR_CHOICES @@ -39,7 +39,7 @@ class RegionFilter(NameSlugSearchFilterSet): fields = ['id', 'name', 'slug'] -class SiteFilter(TenancyFilterSet, CustomFieldFilterSet): +class SiteFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -117,7 +117,7 @@ class RackRoleFilter(NameSlugSearchFilterSet): fields = ['id', 'name', 'slug', 'color'] -class RackFilter(TenancyFilterSet, CustomFieldFilterSet): +class RackFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -252,7 +252,7 @@ class ManufacturerFilter(NameSlugSearchFilterSet): fields = ['id', 'name', 'slug'] -class DeviceTypeFilter(CustomFieldFilterSet): +class DeviceTypeFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -424,7 +424,7 @@ class PlatformFilter(NameSlugSearchFilterSet): fields = ['id', 'name', 'slug', 'napalm_driver'] -class DeviceFilter(LocalConfigContextFilter, TenancyFilterSet, CustomFieldFilterSet): +class DeviceFilter(LocalConfigContextFilter, TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -1113,7 +1113,7 @@ class PowerPanelFilter(django_filters.FilterSet): return queryset.filter(qs_filter) -class PowerFeedFilter(CustomFieldFilterSet): +class PowerFeedFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index abf9b7b1b..156b0627a 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -25,7 +25,7 @@ from utilities.forms import ( ConfirmationForm, CSVChoiceField, ExpandableNameField, FilterChoiceField, FlexibleModelChoiceField, JSONField, SelectWithPK, SmallTextarea, SlugField, StaticSelect2, StaticSelect2Multiple, BOOLEAN_WITH_BLANK_CHOICES, ) -from virtualization.models import Cluster, ClusterGroup +from virtualization.models import Cluster, ClusterGroup, VirtualMachine from .choices import * from .constants import * from .models import ( @@ -2096,6 +2096,21 @@ class ConsolePortCreateForm(ComponentForm): ) +class ConsolePortCSVForm(forms.ModelForm): + device = FlexibleModelChoiceField( + queryset=Device.objects.all(), + to_field_name='name', + help_text='Name or ID of device', + error_messages={ + 'invalid_choice': 'Device not found.', + } + ) + + class Meta: + model = ConsolePort + fields = ConsolePort.csv_headers + + # # Console server ports # @@ -2168,6 +2183,21 @@ class ConsoleServerPortBulkDisconnectForm(ConfirmationForm): ) +class ConsoleServerPortCSVForm(forms.ModelForm): + device = FlexibleModelChoiceField( + queryset=Device.objects.all(), + to_field_name='name', + help_text='Name or ID of device', + error_messages={ + 'invalid_choice': 'Device not found.', + } + ) + + class Meta: + model = ConsoleServerPort + fields = ConsoleServerPort.csv_headers + + # # Power ports # @@ -2215,6 +2245,21 @@ class PowerPortCreateForm(ComponentForm): ) +class PowerPortCSVForm(forms.ModelForm): + device = FlexibleModelChoiceField( + queryset=Device.objects.all(), + to_field_name='name', + help_text='Name or ID of device', + error_messages={ + 'invalid_choice': 'Device not found.', + } + ) + + class Meta: + model = PowerPort + fields = PowerPort.csv_headers + + # # Power outlets # @@ -2280,6 +2325,56 @@ class PowerOutletCreateForm(ComponentForm): self.fields['power_port'].queryset = PowerPort.objects.filter(device=self.parent) +class PowerOutletCSVForm(forms.ModelForm): + device = FlexibleModelChoiceField( + queryset=Device.objects.all(), + to_field_name='name', + help_text='Name or ID of device', + error_messages={ + 'invalid_choice': 'Device not found.', + } + ) + power_port = FlexibleModelChoiceField( + queryset=PowerPort.objects.all(), + required=False, + to_field_name='name', + help_text='Name or ID of Power Port', + error_messages={ + 'invalid_choice': 'Power Port not found.', + } + ) + feed_leg = CSVChoiceField( + choices=POWERFEED_LEG_CHOICES, + required=False, + ) + + class Meta: + model = PowerOutlet + fields = PowerOutlet.csv_headers + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + # Limit PowerPort choices to those belonging to this device (or VC master) + if self.is_bound: + try: + device = self.fields['device'].to_python(self.data['device']) + except forms.ValidationError: + device = None + else: + try: + device = self.instance.device + except Device.DoesNotExist: + device = None + + if device: + self.fields['power_port'].queryset = PowerPort.objects.filter( + device__in=[device, device.get_vc_master()] + ) + else: + self.fields['power_port'].queryset = PowerPort.objects.none() + + class PowerOutletBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): pk = forms.ModelMultipleChoiceField( queryset=PowerOutlet.objects.all(), @@ -2531,6 +2626,73 @@ class InterfaceCreateForm(InterfaceCommonForm, ComponentForm, forms.Form): self.fields['tagged_vlans'].choices = vlan_choices +class InterfaceCSVForm(forms.ModelForm): + device = FlexibleModelChoiceField( + queryset=Device.objects.all(), + required=False, + to_field_name='name', + help_text='Name or ID of device', + error_messages={ + 'invalid_choice': 'Device not found.', + } + ) + virtual_machine = FlexibleModelChoiceField( + queryset=VirtualMachine.objects.all(), + required=False, + to_field_name='name', + help_text='Name or ID of virtual machine', + error_messages={ + 'invalid_choice': 'Virtual machine not found.', + } + ) + lag = FlexibleModelChoiceField( + queryset=Interface.objects.all(), + required=False, + to_field_name='name', + help_text='Name or ID of LAG interface', + error_messages={ + 'invalid_choice': 'LAG interface not found.', + } + ) + type = CSVChoiceField( + choices=IFACE_TYPE_CHOICES, + ) + mode = CSVChoiceField( + choices=IFACE_MODE_CHOICES, + required=False, + ) + + class Meta: + model = Interface + fields = Interface.csv_headers + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + # Limit LAG choices to interfaces belonging to this device (or VC master) + if self.is_bound: + try: + device = self.fields['device'].to_python(self.data['device']) + except forms.ValidationError: + device = None + else: + device = self.instance.device + + if device: + self.fields['lag'].queryset = Interface.objects.filter( + device__in=[device, device.get_vc_master()], type=IFACE_TYPE_LAG + ) + else: + self.fields['lag'].queryset = Interface.objects.none() + + def clean_enabled(self): + # Make sure enabled is True when it's not included in the uploaded data + if 'enabled' not in self.data: + return True + else: + return self.cleaned_data['enabled'] + + class InterfaceBulkEditForm(InterfaceCommonForm, BootstrapMixin, AddRemoveTagsForm, BulkEditForm): pk = forms.ModelMultipleChoiceField( queryset=Interface.objects.all(), @@ -2747,6 +2909,54 @@ class FrontPortCreateForm(ComponentForm): } +class FrontPortCSVForm(forms.ModelForm): + device = FlexibleModelChoiceField( + queryset=Device.objects.all(), + to_field_name='name', + help_text='Name or ID of device', + error_messages={ + 'invalid_choice': 'Device not found.', + } + ) + rear_port = FlexibleModelChoiceField( + queryset=RearPort.objects.all(), + to_field_name='name', + help_text='Name or ID of Rear Port', + error_messages={ + 'invalid_choice': 'Rear Port not found.', + } + ) + type = CSVChoiceField( + choices=PORT_TYPE_CHOICES, + ) + + class Meta: + model = FrontPort + fields = FrontPort.csv_headers + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + # Limit RearPort choices to those belonging to this device (or VC master) + if self.is_bound: + try: + device = self.fields['device'].to_python(self.data['device']) + except forms.ValidationError: + device = None + else: + try: + device = self.instance.device + except Device.DoesNotExist: + device = None + + if device: + self.fields['rear_port'].queryset = RearPort.objects.filter( + device__in=[device, device.get_vc_master()] + ) + else: + self.fields['rear_port'].queryset = RearPort.objects.none() + + class FrontPortBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): pk = forms.ModelMultipleChoiceField( queryset=FrontPort.objects.all(), @@ -2821,6 +3031,24 @@ class RearPortCreateForm(ComponentForm): ) +class RearPortCSVForm(forms.ModelForm): + device = FlexibleModelChoiceField( + queryset=Device.objects.all(), + to_field_name='name', + help_text='Name or ID of device', + error_messages={ + 'invalid_choice': 'Device not found.', + } + ) + type = CSVChoiceField( + choices=PORT_TYPE_CHOICES, + ) + + class Meta: + model = RearPort + fields = RearPort.csv_headers + + class RearPortBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): pk = forms.ModelMultipleChoiceField( queryset=RearPort.objects.all(), @@ -3389,6 +3617,56 @@ class PopulateDeviceBayForm(BootstrapMixin, forms.Form): ).exclude(pk=device_bay.device.pk) +class DeviceBayCSVForm(forms.ModelForm): + device = FlexibleModelChoiceField( + queryset=Device.objects.all(), + to_field_name='name', + help_text='Name or ID of device', + error_messages={ + 'invalid_choice': 'Device not found.', + } + ) + installed_device = FlexibleModelChoiceField( + queryset=Device.objects.all(), + required=False, + to_field_name='name', + help_text='Name or ID of device', + error_messages={ + 'invalid_choice': 'Child device not found.', + } + ) + + class Meta: + model = DeviceBay + fields = DeviceBay.csv_headers + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + # Limit installed device choices to devices of the correct type and location + if self.is_bound: + try: + device = self.fields['device'].to_python(self.data['device']) + except forms.ValidationError: + device = None + else: + try: + device = self.instance.device + except Device.DoesNotExist: + device = None + + if device: + self.fields['installed_device'].queryset = Device.objects.filter( + site=device.site, + rack=device.rack, + parent_bay__isnull=True, + device_type__u_height=0, + device_type__subdevice_role=SUBDEVICE_ROLE_CHILD + ).exclude(pk=device.pk) + else: + self.fields['installed_device'].queryset = Interface.objects.none() + + class DeviceBayBulkRenameForm(BulkRenameForm): pk = forms.ModelMultipleChoiceField( queryset=DeviceBay.objects.all(), diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index a8a4fc227..4851ada5c 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -426,6 +426,15 @@ class ConsolePortTemplateTable(BaseTable): empty_text = "None" +class ConsolePortImportTable(BaseTable): + device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device') + + class Meta(BaseTable.Meta): + model = ConsolePort + fields = ('device', 'name', 'description') + empty_text = False + + class ConsoleServerPortTemplateTable(BaseTable): pk = ToggleColumn() actions = tables.TemplateColumn( @@ -440,6 +449,15 @@ class ConsoleServerPortTemplateTable(BaseTable): empty_text = "None" +class ConsoleServerPortImportTable(BaseTable): + device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device') + + class Meta(BaseTable.Meta): + model = ConsoleServerPort + fields = ('device', 'name', 'description') + empty_text = False + + class PowerPortTemplateTable(BaseTable): pk = ToggleColumn() actions = tables.TemplateColumn( @@ -454,6 +472,15 @@ class PowerPortTemplateTable(BaseTable): empty_text = "None" +class PowerPortImportTable(BaseTable): + device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device') + + class Meta(BaseTable.Meta): + model = PowerPort + fields = ('device', 'name', 'description', 'maximum_draw', 'allocated_draw') + empty_text = False + + class PowerOutletTemplateTable(BaseTable): pk = ToggleColumn() actions = tables.TemplateColumn( @@ -468,6 +495,15 @@ class PowerOutletTemplateTable(BaseTable): empty_text = "None" +class PowerOutletImportTable(BaseTable): + device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device') + + class Meta(BaseTable.Meta): + model = PowerOutlet + fields = ('device', 'name', 'description', 'power_port', 'feed_leg') + empty_text = False + + class InterfaceTemplateTable(BaseTable): pk = ToggleColumn() mgmt_only = tables.TemplateColumn("{% if value %}OOB Management{% endif %}") @@ -483,6 +519,16 @@ class InterfaceTemplateTable(BaseTable): empty_text = "None" +class InterfaceImportTable(BaseTable): + device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device') + virtual_machine = tables.LinkColumn('virtualization:virtualmachine', args=[Accessor('virtual_machine.pk')], verbose_name='Virtual Machine') + + class Meta(BaseTable.Meta): + model = Interface + fields = ('device', 'virtual_machine', 'name', 'description', 'lag', 'type', 'enabled', 'mac_address', 'mtu', 'mgmt_only', 'mode') + empty_text = False + + class FrontPortTemplateTable(BaseTable): pk = ToggleColumn() rear_port_position = tables.Column( @@ -500,6 +546,15 @@ class FrontPortTemplateTable(BaseTable): empty_text = "None" +class FrontPortImportTable(BaseTable): + device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device') + + class Meta(BaseTable.Meta): + model = FrontPort + fields = ('device', 'name', 'description', 'type', 'rear_port', 'rear_port_position') + empty_text = False + + class RearPortTemplateTable(BaseTable): pk = ToggleColumn() actions = tables.TemplateColumn( @@ -514,6 +569,15 @@ class RearPortTemplateTable(BaseTable): empty_text = "None" +class RearPortImportTable(BaseTable): + device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device') + + class Meta(BaseTable.Meta): + model = RearPort + fields = ('device', 'name', 'description', 'type', 'position') + empty_text = False + + class DeviceBayTemplateTable(BaseTable): pk = ToggleColumn() actions = tables.TemplateColumn( @@ -701,6 +765,16 @@ class DeviceBayTable(BaseTable): fields = ('name',) +class DeviceBayImportTable(BaseTable): + device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device') + installed_device = tables.LinkColumn('dcim:device', args=[Accessor('installed_device.pk')], verbose_name='Installed Device') + + class Meta(BaseTable.Meta): + model = DeviceBay + fields = ('device', 'name', 'installed_device', 'description') + empty_text = False + + # # Cables # diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index aeafbc697..33bdc6318 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -175,6 +175,7 @@ urlpatterns = [ path(r'console-ports//edit/', views.ConsolePortEditView.as_view(), name='consoleport_edit'), path(r'console-ports//delete/', views.ConsolePortDeleteView.as_view(), name='consoleport_delete'), path(r'console-ports//trace/', views.CableTraceView.as_view(), name='consoleport_trace', kwargs={'model': ConsolePort}), + path(r'console-ports/import/', views.ConsolePortBulkImportView.as_view(), name='consoleport_import'), # Console server ports path(r'devices/console-server-ports/add/', views.DeviceBulkAddConsoleServerPortView.as_view(), name='device_bulk_add_consoleserverport'), @@ -187,6 +188,7 @@ urlpatterns = [ path(r'console-server-ports//trace/', views.CableTraceView.as_view(), name='consoleserverport_trace', kwargs={'model': ConsoleServerPort}), path(r'console-server-ports/rename/', views.ConsoleServerPortBulkRenameView.as_view(), name='consoleserverport_bulk_rename'), path(r'console-server-ports/disconnect/', views.ConsoleServerPortBulkDisconnectView.as_view(), name='consoleserverport_bulk_disconnect'), + path(r'console-server-ports/import/', views.ConsoleServerPortBulkImportView.as_view(), name='consoleserverport_import'), # Power ports path(r'devices/power-ports/add/', views.DeviceBulkAddPowerPortView.as_view(), name='device_bulk_add_powerport'), @@ -196,6 +198,7 @@ urlpatterns = [ path(r'power-ports//edit/', views.PowerPortEditView.as_view(), name='powerport_edit'), path(r'power-ports//delete/', views.PowerPortDeleteView.as_view(), name='powerport_delete'), path(r'power-ports//trace/', views.CableTraceView.as_view(), name='powerport_trace', kwargs={'model': PowerPort}), + path(r'power-ports/import/', views.PowerPortBulkImportView.as_view(), name='powerport_import'), # Power outlets path(r'devices/power-outlets/add/', views.DeviceBulkAddPowerOutletView.as_view(), name='device_bulk_add_poweroutlet'), @@ -208,6 +211,7 @@ urlpatterns = [ path(r'power-outlets//trace/', views.CableTraceView.as_view(), name='poweroutlet_trace', kwargs={'model': PowerOutlet}), path(r'power-outlets/rename/', views.PowerOutletBulkRenameView.as_view(), name='poweroutlet_bulk_rename'), path(r'power-outlets/disconnect/', views.PowerOutletBulkDisconnectView.as_view(), name='poweroutlet_bulk_disconnect'), + path(r'power-outlets/import/', views.PowerOutletBulkImportView.as_view(), name='poweroutlet_import'), # Interfaces path(r'devices/interfaces/add/', views.DeviceBulkAddInterfaceView.as_view(), name='device_bulk_add_interface'), @@ -222,6 +226,7 @@ urlpatterns = [ path(r'interfaces//trace/', views.CableTraceView.as_view(), name='interface_trace', kwargs={'model': Interface}), path(r'interfaces/rename/', views.InterfaceBulkRenameView.as_view(), name='interface_bulk_rename'), path(r'interfaces/disconnect/', views.InterfaceBulkDisconnectView.as_view(), name='interface_bulk_disconnect'), + path(r'interfaces/import/', views.InterfaceBulkImportView.as_view(), name='interface_import'), # Front ports # path(r'devices/front-ports/add/', views.DeviceBulkAddFrontPortView.as_view(), name='device_bulk_add_frontport'), @@ -234,6 +239,7 @@ urlpatterns = [ path(r'front-ports//trace/', views.CableTraceView.as_view(), name='frontport_trace', kwargs={'model': FrontPort}), path(r'front-ports/rename/', views.FrontPortBulkRenameView.as_view(), name='frontport_bulk_rename'), path(r'front-ports/disconnect/', views.FrontPortBulkDisconnectView.as_view(), name='frontport_bulk_disconnect'), + path(r'front-ports/import/', views.FrontPortBulkImportView.as_view(), name='frontport_import'), # Rear ports # path(r'devices/rear-ports/add/', views.DeviceBulkAddRearPortView.as_view(), name='device_bulk_add_rearport'), @@ -246,6 +252,7 @@ urlpatterns = [ path(r'rear-ports//trace/', views.CableTraceView.as_view(), name='rearport_trace', kwargs={'model': RearPort}), path(r'rear-ports/rename/', views.RearPortBulkRenameView.as_view(), name='rearport_bulk_rename'), path(r'rear-ports/disconnect/', views.RearPortBulkDisconnectView.as_view(), name='rearport_bulk_disconnect'), + path(r'rear-ports/import/', views.RearPortBulkImportView.as_view(), name='rearport_import'), # Device bays path(r'devices/device-bays/add/', views.DeviceBulkAddDeviceBayView.as_view(), name='device_bulk_add_devicebay'), @@ -256,6 +263,7 @@ urlpatterns = [ path(r'device-bays//populate/', views.DeviceBayPopulateView.as_view(), name='devicebay_populate'), path(r'device-bays//depopulate/', views.DeviceBayDepopulateView.as_view(), name='devicebay_depopulate'), path(r'device-bays/rename/', views.DeviceBayBulkRenameView.as_view(), name='devicebay_bulk_rename'), + path(r'device-bays/import/', views.DeviceBayBulkImportView.as_view(), name='devicebay_import'), # Inventory items path(r'inventory-items/', views.InventoryItemListView.as_view(), name='inventoryitem_list'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index c61d6c3ff..d0d20a911 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1218,6 +1218,14 @@ class ConsolePortDeleteView(PermissionRequiredMixin, ObjectDeleteView): model = ConsolePort +class ConsolePortBulkImportView(PermissionRequiredMixin, BulkImportView): + permission_required = 'dcim.add_consoleport' + model_form = forms.ConsolePortCSVForm + table = tables.ConsolePortImportTable + # TODO: change after netbox-community#3564 has been implemented + # default_return_url = 'dcim:consoleport_list' + + class ConsolePortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_consoleport' queryset = ConsolePort.objects.all() @@ -1250,6 +1258,14 @@ class ConsoleServerPortDeleteView(PermissionRequiredMixin, ObjectDeleteView): model = ConsoleServerPort +class ConsoleServerPortBulkImportView(PermissionRequiredMixin, BulkImportView): + permission_required = 'dcim.add_consoleserverport' + model_form = forms.ConsoleServerPortCSVForm + table = tables.ConsoleServerPortImportTable + # TODO: change after netbox-community#3564 has been implemented + # default_return_url = 'dcim:consoleserverport_list' + + class ConsoleServerPortBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_consoleserverport' queryset = ConsoleServerPort.objects.all() @@ -1302,6 +1318,14 @@ class PowerPortDeleteView(PermissionRequiredMixin, ObjectDeleteView): model = PowerPort +class PowerPortBulkImportView(PermissionRequiredMixin, BulkImportView): + permission_required = 'dcim.add_powerport' + model_form = forms.PowerPortCSVForm + table = tables.PowerPortImportTable + # TODO: change after netbox-community#3564 has been implemented + # default_return_url = 'dcim:powerport_list' + + class PowerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_powerport' queryset = PowerPort.objects.all() @@ -1334,6 +1358,14 @@ class PowerOutletDeleteView(PermissionRequiredMixin, ObjectDeleteView): model = PowerOutlet +class PowerOutletBulkImportView(PermissionRequiredMixin, BulkImportView): + permission_required = 'dcim.add_poweroutlet' + model_form = forms.PowerOutletCSVForm + table = tables.PowerOutletImportTable + # TODO: change after netbox-community#3564 has been implemented + # default_return_url = 'dcim:poweroutlet_list' + + class PowerOutletBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_poweroutlet' queryset = PowerOutlet.objects.all() @@ -1423,6 +1455,14 @@ class InterfaceDeleteView(PermissionRequiredMixin, ObjectDeleteView): model = Interface +class InterfaceBulkImportView(PermissionRequiredMixin, BulkImportView): + permission_required = 'dcim.add_interface' + model_form = forms.InterfaceCSVForm + table = tables.InterfaceImportTable + # TODO: change after netbox-community#3564 has been implemented + # default_return_url = 'dcim:interface_list' + + class InterfaceBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_interface' queryset = Interface.objects.all() @@ -1475,6 +1515,14 @@ class FrontPortDeleteView(PermissionRequiredMixin, ObjectDeleteView): model = FrontPort +class FrontPortBulkImportView(PermissionRequiredMixin, BulkImportView): + permission_required = 'dcim.add_frontport' + model_form = forms.FrontPortCSVForm + table = tables.FrontPortImportTable + # TODO: change after netbox-community#3564 has been implemented + # default_return_url = 'dcim:frontport_list' + + class FrontPortBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_frontport' queryset = FrontPort.objects.all() @@ -1527,6 +1575,14 @@ class RearPortDeleteView(PermissionRequiredMixin, ObjectDeleteView): model = RearPort +class RearPortBulkImportView(PermissionRequiredMixin, BulkImportView): + permission_required = 'dcim.add_rearport' + model_form = forms.RearPortCSVForm + table = tables.RearPortImportTable + # TODO: change after netbox-community#3564 has been implemented + # default_return_url = 'dcim:rearport_list' + + class RearPortBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_rearport' queryset = RearPort.objects.all() @@ -1648,6 +1704,14 @@ class DeviceBayDepopulateView(PermissionRequiredMixin, View): }) +class DeviceBayBulkImportView(PermissionRequiredMixin, BulkImportView): + permission_required = 'dcim.add_devicebay' + model_form = forms.DeviceBayCSVForm + table = tables.DeviceBayImportTable + # TODO: change after netbox-community#3564 has been implemented + # default_return_url = 'dcim:devicebay_list' + + class DeviceBayBulkRenameView(PermissionRequiredMixin, BulkRenameView): permission_required = 'dcim.change_devicebay' queryset = DeviceBay.objects.all() diff --git a/netbox/extras/api/urls.py b/netbox/extras/api/urls.py index 3215439c2..50a54d3fe 100644 --- a/netbox/extras/api/urls.py +++ b/netbox/extras/api/urls.py @@ -18,7 +18,7 @@ router.APIRootView = ExtrasRootView router.register(r'_choices', views.ExtrasFieldChoicesViewSet, basename='field-choice') # Custom field choices -router.register(r'_custom_field_choices', views.CustomFieldChoicesViewSet, base_name='custom-field-choice') +router.register(r'_custom_field_choices', views.CustomFieldChoicesViewSet, basename='custom-field-choice') # Graphs router.register(r'graphs', views.GraphViewSet) diff --git a/netbox/extras/filters.py b/netbox/extras/filters.py index b307aa308..7a9862760 100644 --- a/netbox/extras/filters.py +++ b/netbox/extras/filters.py @@ -223,3 +223,24 @@ class ObjectChangeFilter(django_filters.FilterSet): Q(user_name__icontains=value) | Q(object_repr__icontains=value) ) + + +class CreatedUpdatedFilterSet(django_filters.FilterSet): + created = django_filters.DateFilter() + created__gte = django_filters.DateFilter( + field_name='created', + lookup_expr='gte' + ) + created__lte = django_filters.DateFilter( + field_name='created', + lookup_expr='lte' + ) + last_updated = django_filters.DateTimeFilter() + last_updated__gte = django_filters.DateTimeFilter( + field_name='last_updated', + lookup_expr='gte' + ) + last_updated__lte = django_filters.DateTimeFilter( + field_name='last_updated', + lookup_expr='lte' + ) diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py index c57006b27..c54ba2f62 100644 --- a/netbox/ipam/filters.py +++ b/netbox/ipam/filters.py @@ -5,7 +5,7 @@ from django.db.models import Q from netaddr.core import AddrFormatError from dcim.models import Site, Device, Interface -from extras.filters import CustomFieldFilterSet +from extras.filters import CustomFieldFilterSet, CreatedUpdatedFilterSet from tenancy.filtersets import TenancyFilterSet from utilities.filters import NameSlugSearchFilterSet, NumericInFilter, TagFilter from virtualization.models import VirtualMachine @@ -13,7 +13,7 @@ from .constants import * from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF -class VRFFilter(TenancyFilterSet, CustomFieldFilterSet): +class VRFFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -49,7 +49,7 @@ class RIRFilter(NameSlugSearchFilterSet): fields = ['name', 'slug', 'is_private'] -class AggregateFilter(CustomFieldFilterSet): +class AggregateFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -110,7 +110,7 @@ class RoleFilter(NameSlugSearchFilterSet): fields = ['id', 'name', 'slug'] -class PrefixFilter(TenancyFilterSet, CustomFieldFilterSet): +class PrefixFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -247,7 +247,7 @@ class PrefixFilter(TenancyFilterSet, CustomFieldFilterSet): return queryset.filter(prefix__net_mask_length=value) -class IPAddressFilter(TenancyFilterSet, CustomFieldFilterSet): +class IPAddressFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -384,7 +384,7 @@ class VLANGroupFilter(NameSlugSearchFilterSet): fields = ['id', 'name', 'slug'] -class VLANFilter(TenancyFilterSet, CustomFieldFilterSet): +class VLANFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -444,7 +444,7 @@ class VLANFilter(TenancyFilterSet, CustomFieldFilterSet): return queryset.filter(qs_filter) -class ServiceFilter(django_filters.FilterSet): +class ServiceFilter(CreatedUpdatedFilterSet): q = django_filters.CharFilter( method='search', label='Search', diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index 002d2a72a..bedbe3463 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -240,7 +240,7 @@ class RoleForm(BootstrapMixin, forms.ModelForm): class Meta: model = Role fields = [ - 'name', 'slug', + 'name', 'slug', 'weight', ] diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index 3906f080f..91f195ba0 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -85,7 +85,7 @@ IPADDRESS_LINK = """ """ IPADDRESS_ASSIGN_LINK = """ -{{ record }} +{{ record }} """ IPADDRESS_PARENT = """ @@ -292,7 +292,7 @@ class RoleTable(BaseTable): class Meta(BaseTable.Meta): model = Role - fields = ('pk', 'name', 'prefix_count', 'vlan_count', 'slug', 'actions') + fields = ('pk', 'name', 'prefix_count', 'vlan_count', 'slug', 'weight', 'actions') # diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css index 6ae37bdf1..9d4c099f4 100644 --- a/netbox/project-static/css/base.css +++ b/netbox/project-static/css/base.css @@ -457,6 +457,14 @@ table.report th a { width: 80px; border: 1px solid grey; } +.inline-color-block { + display: inline-block; + width: 1.5em; + height: 1.5em; + border: 1px solid grey; + border-radius: .25em; + vertical-align: middle; +} .text-nowrap { white-space: nowrap; } diff --git a/netbox/secrets/filters.py b/netbox/secrets/filters.py index 628d716db..bdc643e71 100644 --- a/netbox/secrets/filters.py +++ b/netbox/secrets/filters.py @@ -2,7 +2,7 @@ import django_filters from django.db.models import Q from dcim.models import Device -from extras.filters import CustomFieldFilterSet +from extras.filters import CustomFieldFilterSet, CreatedUpdatedFilterSet from utilities.filters import NameSlugSearchFilterSet, NumericInFilter, TagFilter from .models import Secret, SecretRole @@ -14,7 +14,7 @@ class SecretRoleFilter(NameSlugSearchFilterSet): fields = ['id', 'name', 'slug'] -class SecretFilter(CustomFieldFilterSet): +class SecretFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 424f487a8..6ec46824b 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -48,6 +48,9 @@ {% if iface.cable %} {{ iface.cable }} + {% if iface.cable.color %} +   + {% endif %} diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index 8589524c9..a8ab302eb 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -121,6 +121,18 @@ +
+
+ Comments +
+
+ {% if powerfeed.comments %} + {{ powerfeed.comments|gfm }} + {% else %} + None + {% endif %} +
+
diff --git a/netbox/templates/users/_user.html b/netbox/templates/users/_user.html index 9f71b9633..b8cc0471f 100644 --- a/netbox/templates/users/_user.html +++ b/netbox/templates/users/_user.html @@ -12,9 +12,11 @@ Profile - - Change Password - + {% if not request.user.ldap_username %} + + Change Password + + {% endif %} API Tokens diff --git a/netbox/tenancy/filters.py b/netbox/tenancy/filters.py index acb0fa0cc..ac7e6fabb 100644 --- a/netbox/tenancy/filters.py +++ b/netbox/tenancy/filters.py @@ -1,7 +1,7 @@ import django_filters from django.db.models import Q -from extras.filters import CustomFieldFilterSet +from extras.filters import CustomFieldFilterSet, CreatedUpdatedFilterSet from utilities.filters import NameSlugSearchFilterSet, NumericInFilter, TagFilter from .models import Tenant, TenantGroup @@ -13,7 +13,7 @@ class TenantGroupFilter(NameSlugSearchFilterSet): fields = ['id', 'name', 'slug'] -class TenantFilter(CustomFieldFilterSet): +class TenantFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' diff --git a/netbox/users/views.py b/netbox/users/views.py index 6abdd817d..47d3503d7 100644 --- a/netbox/users/views.py +++ b/netbox/users/views.py @@ -95,6 +95,11 @@ class ChangePasswordView(LoginRequiredMixin, View): template_name = 'users/change_password.html' def get(self, request): + # LDAP users cannot change their password here + if getattr(request.user, 'ldap_username'): + messages.warning(request, "LDAP-authenticated user credentials cannot be changed within NetBox.") + return redirect('user:profile') + form = PasswordChangeForm(user=request.user) return render(request, self.template_name, { diff --git a/netbox/virtualization/filters.py b/netbox/virtualization/filters.py index a438d8598..a2179bf05 100644 --- a/netbox/virtualization/filters.py +++ b/netbox/virtualization/filters.py @@ -4,9 +4,9 @@ from netaddr import EUI from netaddr.core import AddrFormatError from dcim.models import DeviceRole, Interface, Platform, Region, Site -from tenancy.models import Tenant -from extras.filters import CustomFieldFilterSet +from extras.filters import CustomFieldFilterSet, CreatedUpdatedFilterSet from tenancy.filtersets import TenancyFilterSet +from tenancy.models import Tenant from utilities.filters import ( MultiValueMACAddressFilter, NameSlugSearchFilterSet, NumericInFilter, TagFilter, TreeNodeMultipleChoiceFilter, ) @@ -28,7 +28,7 @@ class ClusterGroupFilter(NameSlugSearchFilterSet): fields = ['id', 'name', 'slug'] -class ClusterFilter(CustomFieldFilterSet): +class ClusterFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -86,7 +86,7 @@ class ClusterFilter(CustomFieldFilterSet): ) -class VirtualMachineFilter(TenancyFilterSet, CustomFieldFilterSet): +class VirtualMachineFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' From fe2c682dc3847b943bc99082df958755ff499c50 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 5 Dec 2019 15:54:29 -0500 Subject: [PATCH 3/4] Changelog updates --- docs/release-notes/version-2.7.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-2.7.md b/docs/release-notes/version-2.7.md index e51cdb644..ae5bff7ae 100644 --- a/docs/release-notes/version-2.7.md +++ b/docs/release-notes/version-2.7.md @@ -31,6 +31,11 @@ console-ports: This new functionality replaces the existing CSV-based import form, which did not allow for component template import. +### Bulk Import of Device Components ([#822](https://github.com/netbox-community/netbox/issues/822)) + +NetBox now supports the bulk import of device components such as console ports, power ports, and interfaces. Device +components can be imported in CSV-format. + ## Changes ### Topology Maps Removed ([#2745](https://github.com/netbox-community/netbox/issues/2745)) @@ -88,7 +93,7 @@ Full connection details are required in both sections, even if they are the same * [#1865](https://github.com/digitalocean/netbox/issues/1865) - Add console port and console server port types * [#2902](https://github.com/digitalocean/netbox/issues/2902) - Replace supervisord with systemd * [#3455](https://github.com/digitalocean/netbox/issues/3455) - Add tenant assignment to cluster -* [#3538](https://github.com/digitalocean/netbox/issues/3538) - +* [#3538](https://github.com/digitalocean/netbox/issues/3538) - Introduce a REST API endpoint for executing custom scripts ## API Changes From 8cbd2f5c2dc844e3e1e38db830021c74e2612384 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Thu, 5 Dec 2019 16:10:49 -0600 Subject: [PATCH 4/4] Add list view for device components (#3719) * Initial Work on #3564 * #3564 - Fixup issue with filter on interface * #3564 - Fix PEP8 errors * #3564 - Finalize fields, readjust order, reduce repetition * #3564 - Update Changelog * #3564 - Fix extra space * #3564 - Change interface table ordering * #3564 - Minor cleanup * #3564 - Add Import Links * Fix PEP8 --- docs/release-notes/version-2.7.md | 1 + netbox/dcim/filters.py | 41 ++++++++++ netbox/dcim/forms.py | 64 ++++++++++++++++ netbox/dcim/tables.py | 71 ++++++++++++++++++ netbox/dcim/urls.py | 8 ++ netbox/dcim/views.py | 74 +++++++++++++++++++ .../templates/dcim/device_component_list.html | 20 +++++ netbox/templates/inc/nav_menu.html | 66 +++++++++++++++++ 8 files changed, 345 insertions(+) create mode 100644 netbox/templates/dcim/device_component_list.html diff --git a/docs/release-notes/version-2.7.md b/docs/release-notes/version-2.7.md index ae5bff7ae..71896fd17 100644 --- a/docs/release-notes/version-2.7.md +++ b/docs/release-notes/version-2.7.md @@ -93,6 +93,7 @@ Full connection details are required in both sections, even if they are the same * [#1865](https://github.com/digitalocean/netbox/issues/1865) - Add console port and console server port types * [#2902](https://github.com/digitalocean/netbox/issues/2902) - Replace supervisord with systemd * [#3455](https://github.com/digitalocean/netbox/issues/3455) - Add tenant assignment to cluster +* [#3564](https://github.com/digitalocean/netbox/issues/3564) - Add interface, ports & bays list view * [#3538](https://github.com/digitalocean/netbox/issues/3538) - Introduce a REST API endpoint for executing custom scripts ## API Changes diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 6204e0b1a..8971f6ac7 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)', @@ -713,6 +733,27 @@ class InterfaceFilter(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', + to_field_name='slug', + queryset=Site.objects.all(), + label='Site name (slug)', + ) device = django_filters.CharFilter( method='filter_device', field_name='name', diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 156b0627a..58c88ec63 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 = TreeNodeChoiceField( + queryset=Region.objects.all(), + required=False, + widget=APISelect( + api_url="/api/dcim/regions/" + ) + ) + site = 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 @@ -2115,6 +2147,11 @@ class ConsolePortCSVForm(forms.ModelForm): # Console server ports # + +class ConsoleServerPortFilterForm(DeviceComponentFilterForm): + model = ConsoleServerPort + + class ConsoleServerPortForm(BootstrapMixin, forms.ModelForm): tags = TagField( required=False @@ -2202,6 +2239,11 @@ class ConsoleServerPortCSVForm(forms.ModelForm): # Power ports # + +class PowerPortFilterForm(DeviceComponentFilterForm): + model = PowerPort + + class PowerPortForm(BootstrapMixin, forms.ModelForm): tags = TagField( required=False @@ -2264,6 +2306,11 @@ class PowerPortCSVForm(forms.ModelForm): # Power outlets # + +class PowerOutletFilterForm(DeviceComponentFilterForm): + model = PowerOutlet + + class PowerOutletForm(BootstrapMixin, forms.ModelForm): power_port = forms.ModelChoiceField( queryset=PowerPort.objects.all(), @@ -2427,6 +2474,11 @@ class PowerOutletBulkDisconnectForm(ConfirmationForm): # Interfaces # + +class InterfaceFilterForm(DeviceComponentFilterForm): + model = Interface + + class InterfaceForm(InterfaceCommonForm, BootstrapMixin, forms.ModelForm): untagged_vlan = forms.ModelChoiceField( queryset=VLAN.objects.all(), @@ -2823,6 +2875,10 @@ class InterfaceBulkDisconnectForm(ConfirmationForm): # Front pass-through ports # +class FrontPortFilterForm(DeviceComponentFilterForm): + model = FrontPort + + class FrontPortForm(BootstrapMixin, forms.ModelForm): tags = TagField( required=False @@ -2996,6 +3052,10 @@ class FrontPortBulkDisconnectForm(ConfirmationForm): # Rear pass-through ports # +class RearPortFilterForm(DeviceComponentFilterForm): + model = RearPort + + class RearPortForm(BootstrapMixin, forms.ModelForm): tags = TagField( required=False @@ -3572,6 +3632,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 4851ada5c..1b5a32700 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -707,6 +707,16 @@ class DeviceImportTable(BaseTable): # Device components # +class DeviceComponentDetailTable(BaseTable): + pk = ToggleColumn() + cable = tables.LinkColumn() + + class Meta(BaseTable.Meta): + order_by = ('device', 'name') + fields = ('pk', 'device', 'name', 'type', 'description', 'cable') + sequence = ('pk', 'device', 'name', 'type', 'description', 'cable') + + class ConsolePortTable(BaseTable): class Meta(BaseTable.Meta): @@ -714,6 +724,13 @@ class ConsolePortTable(BaseTable): fields = ('name', 'type') +class ConsolePortDetailTable(DeviceComponentDetailTable): + device = tables.LinkColumn() + + class Meta(DeviceComponentDetailTable.Meta, ConsolePortTable.Meta): + pass + + class ConsoleServerPortTable(BaseTable): class Meta(BaseTable.Meta): @@ -721,6 +738,13 @@ class ConsoleServerPortTable(BaseTable): fields = ('name', 'description') +class ConsoleServerPortDetailTable(DeviceComponentDetailTable): + device = tables.LinkColumn() + + class Meta(DeviceComponentDetailTable.Meta, ConsoleServerPortTable.Meta): + pass + + class PowerPortTable(BaseTable): class Meta(BaseTable.Meta): @@ -728,6 +752,13 @@ class PowerPortTable(BaseTable): fields = ('name', 'type') +class PowerPortDetailTable(DeviceComponentDetailTable): + device = tables.LinkColumn() + + class Meta(DeviceComponentDetailTable.Meta, PowerPortTable.Meta): + pass + + class PowerOutletTable(BaseTable): class Meta(BaseTable.Meta): @@ -735,6 +766,13 @@ class PowerOutletTable(BaseTable): fields = ('name', 'type', 'description') +class PowerOutletDetailTable(DeviceComponentDetailTable): + device = tables.LinkColumn() + + class Meta(DeviceComponentDetailTable.Meta, PowerOutletTable.Meta): + pass + + class InterfaceTable(BaseTable): class Meta(BaseTable.Meta): @@ -742,6 +780,15 @@ class InterfaceTable(BaseTable): fields = ('name', 'type', 'lag', 'enabled', 'mgmt_only', 'description') +class InterfaceDetailTable(DeviceComponentDetailTable): + parent = tables.LinkColumn(order_by=('device', 'virtual_machine')) + + class Meta(InterfaceTable.Meta): + order_by = ('parent', 'name') + fields = ('pk', 'parent', 'name', 'type', 'description', 'cable') + sequence = ('pk', 'parent', 'name', 'type', 'description', 'cable') + + class FrontPortTable(BaseTable): class Meta(BaseTable.Meta): @@ -750,6 +797,13 @@ class FrontPortTable(BaseTable): empty_text = "None" +class FrontPortDetailTable(DeviceComponentDetailTable): + device = tables.LinkColumn() + + class Meta(DeviceComponentDetailTable.Meta, FrontPortTable.Meta): + pass + + class RearPortTable(BaseTable): class Meta(BaseTable.Meta): @@ -758,6 +812,13 @@ class RearPortTable(BaseTable): empty_text = "None" +class RearPortDetailTable(DeviceComponentDetailTable): + device = tables.LinkColumn() + + class Meta(DeviceComponentDetailTable.Meta, RearPortTable.Meta): + pass + + class DeviceBayTable(BaseTable): class Meta(BaseTable.Meta): @@ -765,6 +826,16 @@ class DeviceBayTable(BaseTable): fields = ('name',) +class DeviceBayDetailTable(DeviceComponentDetailTable): + device = tables.LinkColumn() + installed_device = tables.LinkColumn() + + class Meta(DeviceBayTable.Meta): + fields = ('pk', 'name', 'device', 'installed_device') + sequence = ('pk', 'name', 'device', 'installed_device') + exclude = ('cable',) + + class DeviceBayImportTable(BaseTable): device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device') installed_device = tables.LinkColumn('dcim:device', args=[Accessor('installed_device.pk')], verbose_name='Installed Device') diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 33bdc6318..956b49bc4 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'), @@ -182,6 +183,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'), @@ -194,6 +196,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'), @@ -205,6 +208,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'), @@ -218,6 +222,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'), @@ -233,6 +238,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'), @@ -246,6 +252,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'), @@ -258,6 +265,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 d0d20a911..f3a00de0d 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1197,6 +1197,15 @@ 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 @@ -1237,6 +1246,15 @@ 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 @@ -1297,6 +1315,15 @@ 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 @@ -1337,6 +1364,15 @@ 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 @@ -1397,6 +1433,15 @@ class PowerOutletBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Interfaces # +class InterfaceListView(PermissionRequiredMixin, ObjectListView): + 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' @@ -1494,6 +1539,15 @@ 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 @@ -1554,6 +1608,15 @@ 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 @@ -1614,6 +1677,17 @@ 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..3936a1c19 --- /dev/null +++ b/netbox/templates/dcim/device_component_list.html @@ -0,0 +1,20 @@ +{% extends '_base.html' %} +{% load buttons %} +{% load helpers %} + +{% block content %} +
+ {% export_button content_type %} +
+

{% block title %}{{ table.Meta.model|model_name|capfirst }}s{% 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..7fcf076a1 100644 --- a/netbox/templates/inc/nav_menu.html +++ b/netbox/templates/inc/nav_menu.html @@ -183,6 +183,72 @@ Interface Connections +
  • +
  • Device Components
    • + + {% if perms.dcim.add_interface %} +
    + +
    + {% endif %} + Interfaces + + + {% if perms.dcim.add_frontport %} +
    + +
    + {% endif %} + Front Ports + + + {% if perms.dcim.add_rearport %} +
    + +
    + {% endif %} + Rear Ports + + + {% if perms.dcim.add_consoleport %} +
    + +
    + {% endif %} + Console Ports + + + {% if perms.dcim.add_consoleserverport %} +
    + +
    + {% endif %} + Console Server Ports + + + {% if perms.dcim.add_powerport %} +
    + +
    + {% endif %} + Power Ports + + + {% if perms.dcim.add_poweroutlet %} +
    + +
    + {% endif %} + Power Outlet + + + {% if perms.dcim.add_devicebay %} +
    + +
    + {% endif %} + Device Bays +