Initial work on a front end for managing DeviceTypes

netbox/dcim/filters.py

@@ -65,12 +65,12 @@ class RackFilter(django_filters.FilterSet):
 
 
 class DeviceTypeFilter(django_filters.FilterSet):
-    manufacturer_id = django_filters.ModelChoiceFilter(
+    manufacturer_id = django_filters.ModelMultipleChoiceFilter(
         name='manufacturer',
         queryset=Manufacturer.objects.all(),
         label='Manufacturer (ID)',
     )
-    manufacturer = django_filters.ModelChoiceFilter(
+    manufacturer = django_filters.ModelMultipleChoiceFilter(
         name='manufacturer',
         queryset=Manufacturer.objects.all(),
         to_field_name='slug',

netbox/dcim/forms.py

@@ -159,6 +159,38 @@ class RackFilterForm(forms.Form, BootstrapMixin):
                                       widget=forms.SelectMultiple(attrs={'size': 8}))
 
 
+#
+# Device types
+#
+
+class DeviceTypeForm(forms.ModelForm, BootstrapMixin):
+
+    class Meta:
+        model = DeviceType
+        fields = ['manufacturer', 'model', 'slug', 'u_height', 'is_full_depth', 'is_console_server', 'is_pdu',
+                  'is_network_device']
+
+
+class DeviceTypeBulkEditForm(forms.Form, BootstrapMixin):
+    pk = forms.ModelMultipleChoiceField(queryset=DeviceType.objects.all(), widget=forms.MultipleHiddenInput)
+    manufacturer = forms.ModelChoiceField(queryset=Manufacturer.objects.all(), required=False)
+    u_height = forms.IntegerField(min_value=1, required=False)
+
+
+class DeviceTypeBulkDeleteForm(ConfirmationForm):
+    pk = forms.ModelMultipleChoiceField(queryset=DeviceType.objects.all(), widget=forms.MultipleHiddenInput)
+
+
+def devicetype_manufacturer_choices():
+    manufacturer_choices = Manufacturer.objects.annotate(devicetype_count=Count('device_types'))
+    return [(m.slug, '{} ({})'.format(m.name, m.devicetype_count)) for m in manufacturer_choices]
+
+
+class DeviceTypeFilterForm(forms.Form, BootstrapMixin):
+    manufacturer = forms.MultipleChoiceField(required=False, choices=devicetype_manufacturer_choices,
+                                             widget=forms.SelectMultiple(attrs={'size': 8}))
+
+
 #
 # Devices
 #

netbox/dcim/tables.py

@@ -1,7 +1,7 @@
 import django_tables2 as tables
 from django_tables2.utils import Accessor
 
-from .models import Site, Rack, Device, ConsolePort, PowerPort
+from .models import Site, Rack, DeviceType, Device, ConsolePort, PowerPort
 
 
 PREFIXES_PER_VLAN = """
@@ -74,6 +74,30 @@ class RackBulkEditTable(RackTable):
         fields = ('pk', 'name', 'site', 'group', 'facility_id', 'u_height')
 
 
+#
+# Device types
+#
+
+class DeviceTypeTable(tables.Table):
+    model = tables.LinkColumn('dcim:devicetype', args=[Accessor('pk')], verbose_name='Device Type')
+
+    class Meta:
+        model = DeviceType
+        fields = ('model', 'manufacturer', 'u_height')
+        empty_text = "No device types were found."
+        attrs = {
+            'class': 'table table-hover',
+        }
+
+
+class DeviceTypeBulkEditTable(DeviceTypeTable):
+    pk = tables.CheckBoxColumn()
+
+    class Meta(DeviceTypeTable.Meta):
+        model = None  # django_tables2 bugfix
+        fields = ('pk', 'model', 'manufacturer', 'u_height')
+
+
 #
 # Devices
 #

netbox/dcim/urls.py

@@ -24,6 +24,15 @@ urlpatterns = [
     url(r'^racks/(?P<pk>\d+)/edit/$', views.rack_edit, name='rack_edit'),
     url(r'^racks/(?P<pk>\d+)/delete/$', views.rack_delete, name='rack_delete'),
 
+    # Device types
+    url(r'^device-types/$', views.DeviceTypeListView.as_view(), name='devicetype_list'),
+    url(r'^device-types/add/$', views.device_add, name='devicetype_add'),
+    url(r'^device-types/edit/$', views.DeviceTypeBulkEditView.as_view(), name='devicetype_bulk_edit'),
+    url(r'^device-types/delete/$', views.DeviceTypeBulkDeleteView.as_view(), name='devicetype_bulk_delete'),
+    url(r'^device-types/(?P<pk>\d+)/$', views.devicetype, name='devicetype'),
+    url(r'^device-types/(?P<pk>\d+)/edit/$', views.devicetype_edit, name='devicetype_edit'),
+    url(r'^device-types/(?P<pk>\d+)/delete/$', views.devicetype_delete, name='devicetype_delete'),
+
     # Devices
     url(r'^devices/$', views.DeviceListView.as_view(), name='device_list'),
     url(r'^devices/add/$', views.device_add, name='device_add'),

netbox/dcim/views.py

@@ -15,19 +15,21 @@ from utilities.error_handlers import handle_protectederror
 from utilities.forms import ConfirmationForm
 from utilities.views import ObjectListView, BulkImportView, BulkEditView, BulkDeleteView
 
-from .filters import RackFilter, DeviceFilter, ConsoleConnectionFilter, PowerConnectionFilter, InterfaceConnectionFilter
+from .filters import RackFilter, DeviceTypeFilter, DeviceFilter, ConsoleConnectionFilter, PowerConnectionFilter, \
+    InterfaceConnectionFilter
 from .forms import SiteForm, SiteImportForm, RackForm, RackImportForm, RackBulkEditForm, RackBulkDeleteForm, \
-    RackFilterForm, DeviceForm, DeviceImportForm, DeviceBulkEditForm, DeviceBulkDeleteForm, DeviceFilterForm, \
+    RackFilterForm, DeviceTypeForm, DeviceTypeBulkEditForm, DeviceTypeBulkDeleteForm, DeviceTypeFilterForm, \
+    DeviceForm, DeviceImportForm, DeviceBulkEditForm, DeviceBulkDeleteForm, DeviceFilterForm, \
     ConsolePortForm, ConsolePortCreateForm, ConsolePortConnectionForm, ConsoleConnectionImportForm, \
     ConsoleServerPortForm, ConsoleServerPortCreateForm, ConsoleServerPortConnectionForm, PowerPortForm, \
     PowerPortCreateForm, PowerPortConnectionForm, PowerConnectionImportForm, PowerOutletForm, PowerOutletCreateForm, \
     PowerOutletConnectionForm, InterfaceForm, InterfaceCreateForm, InterfaceBulkCreateForm, InterfaceConnectionForm, \
     InterfaceConnectionDeletionForm, InterfaceConnectionImportForm, ConsoleConnectionFilterForm, \
     PowerConnectionFilterForm, InterfaceConnectionFilterForm, IPAddressForm
-from .models import Site, Rack, Device, ConsolePort, ConsoleServerPort, PowerPort, \
-    PowerOutlet, Interface, InterfaceConnection, Module, CONNECTION_STATUS_CONNECTED
-from .tables import SiteTable, RackTable, RackBulkEditTable, DeviceTable, DeviceBulkEditTable, DeviceImportTable, \
-    ConsoleConnectionTable, PowerConnectionTable, InterfaceConnectionTable
+from .models import Site, Rack, DeviceType, Device, ConsolePort, ConsoleServerPort, PowerPort, PowerOutlet, Interface, \
+    InterfaceConnection, Module, CONNECTION_STATUS_CONNECTED
+from .tables import SiteTable, RackTable, RackBulkEditTable, DeviceTypeTable, DeviceTypeBulkEditTable, DeviceTable, \
+    DeviceBulkEditTable, DeviceImportTable, ConsoleConnectionTable, PowerConnectionTable, InterfaceConnectionTable
 
 
 EXPANSION_PATTERN = '\[(\d+-\d+)\]'
@@ -307,6 +309,125 @@ class RackBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
     redirect_url = 'dcim:rack_list'
 
 
+#
+# Device types
+#
+
+class DeviceTypeListView(ObjectListView):
+    queryset = DeviceType.objects.select_related('manufacturer')
+    filter = DeviceTypeFilter
+    filter_form = DeviceTypeFilterForm
+    table = DeviceTypeTable
+    edit_table = DeviceTypeBulkEditTable
+    edit_table_permissions = ['dcim.change_devicetype', 'dcim.delete_devicetype']
+    template_name = 'dcim/devicetype_list.html'
+
+
+def devicetype(request, pk):
+
+    devicetype = get_object_or_404(DeviceType, pk=pk)
+
+    return render(request, 'dcim/devicetype.html', {
+        'devicetype': devicetype,
+    })
+
+
+@permission_required('dcim.add_devicetype')
+def devicetype_add(request):
+
+    if request.method == 'POST':
+        form = DeviceTypeForm(request.POST)
+        if form.is_valid():
+            devicetype = form.save()
+            messages.success(request, "Added new device type: {}".format(devicetype))
+            if '_addanother' in request.POST:
+                return redirect('dcim:devicetype_add')
+            else:
+                return redirect('dcim:devicetype', pk=devicetype.pk)
+
+    else:
+        form = DeviceTypeForm()
+
+    return render(request, 'dcim/devicetype_edit.html', {
+        'form': form,
+        'cancel_url': reverse('dcim:devicetype_list'),
+    })
+
+
+@permission_required('dcim.change_devicetype')
+def devicetype_edit(request, pk):
+
+    devicetype = get_object_or_404(DeviceType, pk=pk)
+
+    if request.method == 'POST':
+        form = DeviceTypeForm(request.POST, instance=devicetype)
+        if form.is_valid():
+            devicetype = form.save()
+            messages.success(request, "Modified device type {}".format(devicetype))
+            return redirect('dcim:devicetype', pk=devicetype.pk)
+
+    else:
+        form = DeviceTypeForm(instance=devicetype)
+
+    return render(request, 'dcim/devicetype_edit.html', {
+        'devicetype': devicetype,
+        'form': form,
+        'cancel_url': reverse('dcim:devicetype', kwargs={'pk': devicetype.pk}),
+    })
+
+
+@permission_required('dcim.delete_devicetype')
+def devicetype_delete(request, pk):
+
+    devicetype = get_object_or_404(DeviceType, pk=pk)
+
+    if request.method == 'POST':
+        form = ConfirmationForm(request.POST)
+        if form.is_valid():
+            try:
+                devicetype.delete()
+                messages.success(request, "Device type {} has been deleted".format(devicetype))
+                return redirect('dcim:devicetype_list')
+            except ProtectedError, e:
+                handle_protectederror(devicetype, request, e)
+                return redirect('dcim:devicetype', pk=devicetype.pk)
+
+    else:
+        form = ConfirmationForm()
+
+    return render(request, 'dcim/devicetype_delete.html', {
+        'devicetype': device,
+        'form': form,
+        'cancel_url': reverse('dcim:devicetype', kwargs={'pk': devicetype.pk}),
+    })
+
+
+class DeviceTypeBulkEditView(PermissionRequiredMixin, BulkEditView):
+    permission_required = 'dcim.change_devicetype'
+    cls = DeviceType
+    form = DeviceTypeBulkEditForm
+    template_name = 'dcim/devicetype_bulk_edit.html'
+    redirect_url = 'dcim:devicetype_list'
+
+    def update_objects(self, pk_list, form):
+
+        fields_to_update = {}
+        for field in ['manufacturer', 'u_height']:
+            if form.cleaned_data[field]:
+                fields_to_update[field] = form.cleaned_data[field]
+
+        updated_count = self.cls.objects.filter(pk__in=pk_list).update(**fields_to_update)
+        messages.success(self.request, "Updated {} device types".format(updated_count))
+
+
+class DeviceTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
+    permission_required = 'dcim.delete_devicetype'
+    cls = DeviceType
+    form = DeviceTypeBulkDeleteForm
+    template_name = 'dcim/devicetype_bulk_delete.html'
+    redirect_url = 'dcim:devicetype_list'
+
+
 #
 # Devices
 #