diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 1f6f32232..9e2cf5322 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1953,6 +1953,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 # @@ -2015,6 +2030,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 # diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index fedd7e7e0..285b864a2 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( diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 52ca46758..77bd522bc 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'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 3b4f13844..e640ca07f 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1199,6 +1199,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() @@ -1231,6 +1239,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()