From bd573fd5cf3273456d1ac5faabbde85509cb8387 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Mon, 18 Feb 2019 21:37:00 -0500 Subject: [PATCH 001/140] implemented #2350 - config context included by default in API --- CHANGELOG.md | 14 ++++++++++++++ netbox/dcim/api/views.py | 15 +++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a36f7c21b..5c97e0d21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +v2.6.0 (FUTURE) + +## Changes + +### API Device/VM Config Context Included by Default ([#2350](https://github.com/digitalocean/netbox/issues/2350)) + +The rendered Config Context for Devices and VMs is now included by default in all API results (list and detail views). +Previously the rendered Config Context was only available in the detail view for objects. Users with large amounts of +context data may observe a performance drop when returning multiple objects. To combat this, in cases where the rendered +Config Context is not needed, the query parameter `?exclude=config_context` may be added to the request as to remove +the Config Context from being included in any results. + +--- + v2.5.7 (FUTURE) ## Enhancements diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 4e14d8163..477fffe07 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -291,16 +291,23 @@ class DeviceViewSet(CustomFieldModelViewSet): def get_serializer_class(self): """ - Include rendered config context when retrieving a single Device. + Select the specific serializer based on the request context. + + If the `brief` query param equates to True, return the NestedDeviceSerializer + + If the `exclude` query param includes `config_context` as a value, return the DeviceSerializer + + Else, return the DeviceWithConfigContextSerializer """ - if self.action == 'retrieve': - return serializers.DeviceWithConfigContextSerializer request = self.get_serializer_context()['request'] if request.query_params.get('brief', False): return serializers.NestedDeviceSerializer - return serializers.DeviceSerializer + elif 'config_context' in request.query_params.get('exclude', []): + return serializers.DeviceSerializer + + return serializers.DeviceWithConfigContextSerializer @action(detail=True, url_path='napalm') def napalm(self, request, pk): From e521508de99bbcab21c5f952838cef8ccc929a38 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Mon, 18 Feb 2019 22:10:05 -0500 Subject: [PATCH 002/140] #2350 - added virtual machines and test cases --- netbox/dcim/tests/test_api.py | 34 ++++++++++++++++++++---- netbox/virtualization/api/views.py | 15 ++++++++--- netbox/virtualization/tests/test_api.py | 35 ++++++++++++++++++++----- 3 files changed, 69 insertions(+), 15 deletions(-) diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index aa57d4790..3f9021bc6 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -1791,6 +1791,16 @@ class DeviceTest(APITestCase): site=self.site1, cluster=self.cluster1 ) + self.device_with_context_data = Device.objects.create( + device_type=self.devicetype1, + device_role=self.devicerole1, + name='Device with context data', + site=self.site1, + local_context_data={ + 'A': 1, + 'B': 2 + } + ) def test_get_device(self): @@ -1806,7 +1816,7 @@ class DeviceTest(APITestCase): url = reverse('dcim-api:device-list') response = self.client.get(url, **self.header) - self.assertEqual(response.data['count'], 3) + self.assertEqual(response.data['count'], 4) def test_list_devices_brief(self): @@ -1832,7 +1842,7 @@ class DeviceTest(APITestCase): response = self.client.post(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_201_CREATED) - self.assertEqual(Device.objects.count(), 4) + self.assertEqual(Device.objects.count(), 5) device4 = Device.objects.get(pk=response.data['id']) self.assertEqual(device4.device_type_id, data['device_type']) self.assertEqual(device4.device_role_id, data['device_role']) @@ -1867,7 +1877,7 @@ class DeviceTest(APITestCase): response = self.client.post(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_201_CREATED) - self.assertEqual(Device.objects.count(), 6) + self.assertEqual(Device.objects.count(), 7) self.assertEqual(response.data[0]['name'], data[0]['name']) self.assertEqual(response.data[1]['name'], data[1]['name']) self.assertEqual(response.data[2]['name'], data[2]['name']) @@ -1891,7 +1901,7 @@ class DeviceTest(APITestCase): response = self.client.put(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_200_OK) - self.assertEqual(Device.objects.count(), 3) + self.assertEqual(Device.objects.count(), 4) device1 = Device.objects.get(pk=response.data['id']) self.assertEqual(device1.device_type_id, data['device_type']) self.assertEqual(device1.device_role_id, data['device_role']) @@ -1906,7 +1916,21 @@ class DeviceTest(APITestCase): response = self.client.delete(url, **self.header) self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT) - self.assertEqual(Device.objects.count(), 2) + self.assertEqual(Device.objects.count(), 3) + + def test_config_context_included_by_default_in_list_view(self): + + url = reverse('dcim-api:device-list') + '?slug=device-with-context-data' + response = self.client.get(url, **self.header) + + self.assertEqual(response.data['results'][0].get('config_context', {}).get('A'), 1) + + def test_config_context_excluded(self): + + url = reverse('dcim-api:device-list') + '?exclude=config_context' + response = self.client.get(url, **self.header) + + self.assertFalse('config_context' in response.data['results'][0]) class ConsolePortTest(APITestCase): diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py index 3b0c02b22..ce7ee4934 100644 --- a/netbox/virtualization/api/views.py +++ b/netbox/virtualization/api/views.py @@ -50,16 +50,23 @@ class VirtualMachineViewSet(CustomFieldModelViewSet): def get_serializer_class(self): """ - Include rendered config context when retrieving a single VirtualMachine. + Select the specific serializer based on the request context. + + If the `brief` query param equates to True, return the NestedVirtualMachineSerializer + + If the `exclude` query param includes `config_context` as a value, return the VirtualMachineSerializer + + Else, return the VirtualMachineWithConfigContextSerializer """ - if self.action == 'retrieve': - return serializers.VirtualMachineWithConfigContextSerializer request = self.get_serializer_context()['request'] if request.query_params.get('brief', False): return serializers.NestedVirtualMachineSerializer - return serializers.VirtualMachineSerializer + elif 'config_context' in request.query_params.get('exclude', []): + return serializers.VirtualMachineSerializer + + return serializers.VirtualMachineWithConfigContextSerializer class InterfaceViewSet(ModelViewSet): diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py index 91792f8fb..d618ebe30 100644 --- a/netbox/virtualization/tests/test_api.py +++ b/netbox/virtualization/tests/test_api.py @@ -337,6 +337,14 @@ class VirtualMachineTest(APITestCase): self.virtualmachine1 = VirtualMachine.objects.create(name='Test Virtual Machine 1', cluster=self.cluster1) self.virtualmachine2 = VirtualMachine.objects.create(name='Test Virtual Machine 2', cluster=self.cluster1) self.virtualmachine3 = VirtualMachine.objects.create(name='Test Virtual Machine 3', cluster=self.cluster1) + self.virtualmachine_with_context_data = VirtualMachine.objects.create( + name='VM with context data', + cluster=self.cluster1, + local_context_data={ + 'A': 1, + 'B': 2 + } + ) def test_get_virtualmachine(self): @@ -350,7 +358,7 @@ class VirtualMachineTest(APITestCase): url = reverse('virtualization-api:virtualmachine-list') response = self.client.get(url, **self.header) - self.assertEqual(response.data['count'], 3) + self.assertEqual(response.data['count'], 4) def test_list_virtualmachines_brief(self): @@ -373,7 +381,7 @@ class VirtualMachineTest(APITestCase): response = self.client.post(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_201_CREATED) - self.assertEqual(VirtualMachine.objects.count(), 4) + self.assertEqual(VirtualMachine.objects.count(), 5) virtualmachine4 = VirtualMachine.objects.get(pk=response.data['id']) self.assertEqual(virtualmachine4.name, data['name']) self.assertEqual(virtualmachine4.cluster.pk, data['cluster']) @@ -388,7 +396,7 @@ class VirtualMachineTest(APITestCase): response = self.client.post(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST) - self.assertEqual(VirtualMachine.objects.count(), 3) + self.assertEqual(VirtualMachine.objects.count(), 4) def test_create_virtualmachine_bulk(self): @@ -411,7 +419,7 @@ class VirtualMachineTest(APITestCase): response = self.client.post(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_201_CREATED) - self.assertEqual(VirtualMachine.objects.count(), 6) + self.assertEqual(VirtualMachine.objects.count(), 7) self.assertEqual(response.data[0]['name'], data[0]['name']) self.assertEqual(response.data[1]['name'], data[1]['name']) self.assertEqual(response.data[2]['name'], data[2]['name']) @@ -438,7 +446,7 @@ class VirtualMachineTest(APITestCase): response = self.client.put(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_200_OK) - self.assertEqual(VirtualMachine.objects.count(), 3) + self.assertEqual(VirtualMachine.objects.count(), 4) virtualmachine1 = VirtualMachine.objects.get(pk=response.data['id']) self.assertEqual(virtualmachine1.name, data['name']) self.assertEqual(virtualmachine1.cluster.pk, data['cluster']) @@ -451,7 +459,22 @@ class VirtualMachineTest(APITestCase): response = self.client.delete(url, **self.header) self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT) - self.assertEqual(VirtualMachine.objects.count(), 2) + self.assertEqual(VirtualMachine.objects.count(), 3) + + def test_config_context_included_by_default_in_list_view(self): + + url = reverse('virtualization-api:virtualmachine-list') + url = '{}?id__in={}'.format(url, self.virtualmachine_with_context_data.pk) + response = self.client.get(url, **self.header) + + self.assertEqual(response.data['results'][0].get('config_context', {}).get('A'), 1) + + def test_config_context_excluded(self): + + url = reverse('virtualization-api:virtualmachine-list') + '?exclude=config_context' + response = self.client.get(url, **self.header) + + self.assertFalse('config_context' in response.data['results'][0]) class InterfaceTest(APITestCase): From fc2bb724fa91e5d9de83269ad3999e71753c99af Mon Sep 17 00:00:00 2001 From: John Anderson Date: Wed, 20 Feb 2019 03:52:47 -0500 Subject: [PATCH 003/140] initial pass on migrating to custom tag model with color and comments fields --- CHANGELOG.md | 5 ++ .../migrations/0015_custom_tag_models.py | 25 ++++++ netbox/circuits/models.py | 6 +- .../dcim/migrations/0070_custom_tag_models.py | 85 +++++++++++++++++++ netbox/dcim/models.py | 30 +++---- netbox/extras/api/serializers.py | 4 +- netbox/extras/api/views.py | 4 +- netbox/extras/filters.py | 3 +- netbox/extras/forms.py | 8 +- .../extras/migrations/0017_tag_taggeditem.py | 46 ++++++++++ .../migrations/0018_rename_tag_tables.py | 46 ++++++++++ .../migrations/0019_delete_taggit_models.py | 52 ++++++++++++ .../0020_add_color_comments_to_tag.py | 24 ++++++ netbox/extras/models.py | 22 +++++ netbox/extras/tables.py | 8 +- netbox/extras/tests/test_api.py | 3 +- netbox/extras/tests/test_views.py | 3 +- netbox/extras/views.py | 14 +-- .../ipam/migrations/0025_custom_tag_models.py | 45 ++++++++++ netbox/ipam/models.py | 14 +-- netbox/netbox/admin.py | 15 +++- .../migrations/0006_custom_tag_models.py | 20 +++++ netbox/secrets/models.py | 4 +- netbox/templates/extras/tag.html | 18 ++++ netbox/templates/extras/tag_edit.html | 19 +++++ .../templates/utilities/templatetags/tag.html | 4 +- .../migrations/0006_custom_tag_models.py | 20 +++++ netbox/tenancy/models.py | 4 +- netbox/utilities/filters.py | 3 +- netbox/utilities/views.py | 2 +- .../migrations/0009_custom_tag_models.py | 25 ++++++ netbox/virtualization/models.py | 6 +- 32 files changed, 524 insertions(+), 63 deletions(-) create mode 100644 netbox/circuits/migrations/0015_custom_tag_models.py create mode 100644 netbox/dcim/migrations/0070_custom_tag_models.py create mode 100644 netbox/extras/migrations/0017_tag_taggeditem.py create mode 100644 netbox/extras/migrations/0018_rename_tag_tables.py create mode 100644 netbox/extras/migrations/0019_delete_taggit_models.py create mode 100644 netbox/extras/migrations/0020_add_color_comments_to_tag.py create mode 100644 netbox/ipam/migrations/0025_custom_tag_models.py create mode 100644 netbox/secrets/migrations/0006_custom_tag_models.py create mode 100644 netbox/templates/extras/tag_edit.html create mode 100644 netbox/tenancy/migrations/0006_custom_tag_models.py create mode 100644 netbox/virtualization/migrations/0009_custom_tag_models.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c97e0d21..30fcca532 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,11 @@ context data may observe a performance drop when returning multiple objects. To Config Context is not needed, the query parameter `?exclude=config_context` may be added to the request as to remove the Config Context from being included in any results. +## Enhancements + +* [#2324](https://github.com/digitalocean/netbox/issues/2324) - Add color option for tags +* [#2791](https://github.com/digitalocean/netbox/issues/2791) - Add a comment field for tags + --- v2.5.7 (FUTURE) diff --git a/netbox/circuits/migrations/0015_custom_tag_models.py b/netbox/circuits/migrations/0015_custom_tag_models.py new file mode 100644 index 000000000..657b20071 --- /dev/null +++ b/netbox/circuits/migrations/0015_custom_tag_models.py @@ -0,0 +1,25 @@ +# Generated by Django 2.1.4 on 2019-02-20 06:56 + +from django.db import migrations +import taggit.managers + + +class Migration(migrations.Migration): + + dependencies = [ + ('circuits', '0014_circuittermination_description'), + ('extras', '0018_rename_tag_tables'), + ] + + operations = [ + migrations.AlterField( + model_name='circuit', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='provider', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + ] diff --git a/netbox/circuits/models.py b/netbox/circuits/models.py index b558d5007..5824ad65f 100644 --- a/netbox/circuits/models.py +++ b/netbox/circuits/models.py @@ -6,7 +6,7 @@ from taggit.managers import TaggableManager from dcim.constants import CONNECTION_STATUS_CHOICES, STATUS_CLASSES from dcim.fields import ASNField from dcim.models import CableTermination -from extras.models import CustomFieldModel, ObjectChange +from extras.models import CustomFieldModel, ObjectChange, TaggedItem from utilities.models import ChangeLoggedModel from utilities.utils import serialize_object from .constants import CIRCUIT_STATUS_ACTIVE, CIRCUIT_STATUS_CHOICES, TERM_SIDE_CHOICES @@ -55,7 +55,7 @@ class Provider(ChangeLoggedModel, CustomFieldModel): object_id_field='obj_id' ) - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = ['name', 'slug', 'asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', 'comments'] @@ -165,7 +165,7 @@ class Circuit(ChangeLoggedModel, CustomFieldModel): object_id_field='obj_id' ) - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = [ 'cid', 'provider', 'type', 'status', 'tenant', 'install_date', 'commit_rate', 'description', 'comments', diff --git a/netbox/dcim/migrations/0070_custom_tag_models.py b/netbox/dcim/migrations/0070_custom_tag_models.py new file mode 100644 index 000000000..6b82a0dfd --- /dev/null +++ b/netbox/dcim/migrations/0070_custom_tag_models.py @@ -0,0 +1,85 @@ +# Generated by Django 2.1.4 on 2019-02-20 06:56 + +from django.db import migrations +import taggit.managers + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0069_deprecate_nullablecharfield'), + ('extras', '0018_rename_tag_tables'), + ] + + operations = [ + migrations.AlterField( + model_name='consoleport', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='consoleserverport', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='device', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='devicebay', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='devicetype', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='frontport', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='interface', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='inventoryitem', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='poweroutlet', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='powerport', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='rack', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='rearport', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='site', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='virtualchassis', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index f7892b2af..3715e3033 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -15,7 +15,7 @@ from mptt.models import MPTTModel, TreeForeignKey from taggit.managers import TaggableManager from timezone_field import TimeZoneField -from extras.models import ConfigContextModel, CustomFieldModel, ObjectChange +from extras.models import ConfigContextModel, CustomFieldModel, ObjectChange, TaggedItem from utilities.fields import ColorField from utilities.managers import NaturalOrderingManager from utilities.models import ChangeLoggedModel @@ -319,7 +319,7 @@ class Site(ChangeLoggedModel, CustomFieldModel): ) objects = NaturalOrderingManager() - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = [ 'name', 'slug', 'status', 'region', 'tenant', 'facility', 'asn', 'time_zone', 'description', 'physical_address', @@ -566,7 +566,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel): ) objects = NaturalOrderingManager() - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = [ 'site', 'group_name', 'name', 'facility_id', 'tenant', 'status', 'role', 'type', 'serial', 'asset_tag', 'width', @@ -914,7 +914,7 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): object_id_field='obj_id' ) - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = [ 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'subdevice_role', 'comments', @@ -1455,7 +1455,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): ) objects = NaturalOrderingManager() - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = [ 'name', 'device_role', 'tenant', 'manufacturer', 'model_name', 'platform', 'serial', 'asset_tag', 'status', @@ -1743,7 +1743,7 @@ class ConsolePort(CableTermination, ComponentModel): ) objects = DeviceComponentManager() - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = ['device', 'name'] @@ -1786,7 +1786,7 @@ class ConsoleServerPort(CableTermination, ComponentModel): ) objects = DeviceComponentManager() - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = ['device', 'name'] @@ -1835,7 +1835,7 @@ class PowerPort(CableTermination, ComponentModel): ) objects = DeviceComponentManager() - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = ['device', 'name'] @@ -1878,7 +1878,7 @@ class PowerOutlet(CableTermination, ComponentModel): ) objects = DeviceComponentManager() - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = ['device', 'name'] @@ -1998,7 +1998,7 @@ class Interface(CableTermination, ComponentModel): ) objects = InterfaceManager() - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = [ 'device', 'virtual_machine', 'name', 'lag', 'form_factor', 'enabled', 'mac_address', 'mtu', 'mgmt_only', @@ -2199,7 +2199,7 @@ class FrontPort(CableTermination, ComponentModel): ) objects = DeviceComponentManager() - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = ['device', 'name', 'type', 'rear_port', 'rear_port_position', 'description'] @@ -2265,7 +2265,7 @@ class RearPort(CableTermination, ComponentModel): ) objects = DeviceComponentManager() - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = ['device', 'name', 'type', 'positions', 'description'] @@ -2312,7 +2312,7 @@ class DeviceBay(ComponentModel): ) objects = DeviceComponentManager() - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = ['device', 'name', 'installed_device'] @@ -2405,7 +2405,7 @@ class InventoryItem(ComponentModel): blank=True ) - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = [ 'device', 'name', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered', 'description', @@ -2452,7 +2452,7 @@ class VirtualChassis(ChangeLoggedModel): blank=True ) - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = ['master', 'domain'] diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py index 7643562bb..9d24589b0 100644 --- a/netbox/extras/api/serializers.py +++ b/netbox/extras/api/serializers.py @@ -1,6 +1,5 @@ from django.core.exceptions import ObjectDoesNotExist from rest_framework import serializers -from taggit.models import Tag from dcim.api.nested_serializers import ( NestedDeviceSerializer, NestedDeviceRoleSerializer, NestedPlatformSerializer, NestedRackSerializer, @@ -10,6 +9,7 @@ from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site from extras.constants import * from extras.models import ( ConfigContext, ExportTemplate, Graph, ImageAttachment, ObjectChange, ReportResult, TopologyMap, + Tag ) from tenancy.api.nested_serializers import NestedTenantSerializer, NestedTenantGroupSerializer from tenancy.models import Tenant, TenantGroup @@ -80,7 +80,7 @@ class TagSerializer(ValidatedModelSerializer): class Meta: model = Tag - fields = ['id', 'name', 'slug', 'tagged_items'] + fields = ['id', 'name', 'slug', 'color', 'comments', 'tagged_items'] # diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py index 0453b1f1c..17070c7b4 100644 --- a/netbox/extras/api/views.py +++ b/netbox/extras/api/views.py @@ -6,11 +6,11 @@ from rest_framework.decorators import action from rest_framework.exceptions import PermissionDenied from rest_framework.response import Response from rest_framework.viewsets import ReadOnlyModelViewSet, ViewSet -from taggit.models import Tag from extras import filters from extras.models import ( ConfigContext, CustomField, ExportTemplate, Graph, ImageAttachment, ObjectChange, ReportResult, TopologyMap, + Tag ) from extras.reports import get_report, get_reports from utilities.api import FieldChoicesViewSet, IsAuthenticatedOrLoginNotRequired, ModelViewSet @@ -115,7 +115,7 @@ class TopologyMapViewSet(ModelViewSet): # class TagViewSet(ModelViewSet): - queryset = Tag.objects.annotate(tagged_items=Count('taggit_taggeditem_items')) + queryset = Tag.objects.annotate(tagged_items=Count('extras_taggeditem_items')) serializer_class = serializers.TagSerializer filterset_class = filters.TagFilter diff --git a/netbox/extras/filters.py b/netbox/extras/filters.py index d0a801b48..eadbbae42 100644 --- a/netbox/extras/filters.py +++ b/netbox/extras/filters.py @@ -1,12 +1,11 @@ import django_filters from django.contrib.contenttypes.models import ContentType from django.db.models import Q -from taggit.models import Tag from dcim.models import DeviceRole, Platform, Region, Site from tenancy.models import Tenant, TenantGroup from .constants import CF_FILTER_DISABLED, CF_FILTER_EXACT, CF_TYPE_BOOLEAN, CF_TYPE_SELECT -from .models import ConfigContext, CustomField, Graph, ExportTemplate, ObjectChange, TopologyMap +from .models import ConfigContext, CustomField, Graph, ExportTemplate, ObjectChange, Tag, TopologyMap class CustomFieldFilter(django_filters.Filter): diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py index b48482c93..b92955b1b 100644 --- a/netbox/extras/forms.py +++ b/netbox/extras/forms.py @@ -6,19 +6,18 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist from mptt.forms import TreeNodeMultipleChoiceField from taggit.forms import TagField -from taggit.models import Tag from dcim.models import DeviceRole, Platform, Region, Site from tenancy.models import Tenant, TenantGroup from utilities.forms import ( add_blank_choice, APISelectMultiple, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect, ContentTypeSelect, - FilterChoiceField, FilterTreeNodeMultipleChoiceField, LaxURLField, JSONField, SlugField, + FilterChoiceField, FilterTreeNodeMultipleChoiceField, LaxURLField, JSONField, SlugField, CommentField ) from .constants import ( CF_FILTER_DISABLED, CF_TYPE_BOOLEAN, CF_TYPE_DATE, CF_TYPE_INTEGER, CF_TYPE_SELECT, CF_TYPE_URL, OBJECTCHANGE_ACTION_CHOICES, ) -from .models import ConfigContext, CustomField, CustomFieldValue, ImageAttachment, ObjectChange +from .models import ConfigContext, CustomField, CustomFieldValue, ImageAttachment, ObjectChange, Tag # @@ -190,11 +189,12 @@ class CustomFieldFilterForm(forms.Form): class TagForm(BootstrapMixin, forms.ModelForm): slug = SlugField() + comments = CommentField() class Meta: model = Tag fields = [ - 'name', 'slug', + 'name', 'slug', 'color', 'comments' ] diff --git a/netbox/extras/migrations/0017_tag_taggeditem.py b/netbox/extras/migrations/0017_tag_taggeditem.py new file mode 100644 index 000000000..d76abf2f1 --- /dev/null +++ b/netbox/extras/migrations/0017_tag_taggeditem.py @@ -0,0 +1,46 @@ +# Generated by Django 2.1.4 on 2019-02-20 06:56 + +from django.db import migrations, models +import django.db.models.deletion +import utilities.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('extras', '0016_exporttemplate_add_cable'), + ] + + state_operations = [ + migrations.CreateModel( + name='Tag', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), + ('name', models.CharField(max_length=100, unique=True)), + ('slug', models.SlugField(max_length=100, unique=True)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='TaggedItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), + ('object_id', models.IntegerField(db_index=True)), + ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='extras_taggeditem_tagged_items', to='contenttypes.ContentType')), + ('tag', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='extras_taggeditem_items', to='extras.Tag')), + ], + options={ + 'abstract': False, + }, + ), + ] + + operations = [ + migrations.SeparateDatabaseAndState( + database_operations=None, + state_operations=state_operations + ) + ] diff --git a/netbox/extras/migrations/0018_rename_tag_tables.py b/netbox/extras/migrations/0018_rename_tag_tables.py new file mode 100644 index 000000000..521db2cb2 --- /dev/null +++ b/netbox/extras/migrations/0018_rename_tag_tables.py @@ -0,0 +1,46 @@ +# Generated by Django 2.1.4 on 2019-02-20 06:59 + +from django.db import migrations + + +class AppTaggitAlterModelTable(migrations.AlterModelTable): + """ + A special subclass of AlterModelTable which hardcodes the app_label to 'taggit' + + This is needed because the migration deals with models which belong to the taggit + app, however because taggit is a 3rd party app, we cannot create our own migrations + there. + """ + + def state_forwards(self, app_label, state): + super().state_forwards('taggit', state) + + def database_forwards(self, app_label, schema_editor, from_state, to_state): + super().database_forwards('taggit', schema_editor, from_state, to_state) + + def database_backwards(self, app_label, schema_editor, from_state, to_state): + super().database_backwards('taggit', schema_editor, from_state, to_state) + + def reduce(self, operation, app_label=None): + if app_label: + app_label = 'taggit' + super().reduce(operation, app_label=app_label) + + +class Migration(migrations.Migration): + + dependencies = [ + ('taggit', '0001_initial'), + ('extras', '0017_tag_taggeditem'), + ] + + operations = [ + AppTaggitAlterModelTable( + name='Tag', + table='extras_tag' + ), + AppTaggitAlterModelTable( + name='TaggedItem', + table='extras_taggeditem' + ), + ] diff --git a/netbox/extras/migrations/0019_delete_taggit_models.py b/netbox/extras/migrations/0019_delete_taggit_models.py new file mode 100644 index 000000000..fadb658e7 --- /dev/null +++ b/netbox/extras/migrations/0019_delete_taggit_models.py @@ -0,0 +1,52 @@ +# Generated by Django 2.1.4 on 2019-02-20 07:05 + +from django.db import migrations + + +class AppTaggitDeleteModel(migrations.DeleteModel): + """ + A special subclass of DeleteModel which hardcodes the app_label to 'taggit' + + This is needed because the migration deals with models which belong to the taggit + app, however because taggit is a 3rd party app, we cannot create our own migrations + there. + """ + + def state_forwards(self, app_label, state): + super().state_forwards('taggit', state) + + def database_forwards(self, app_label, schema_editor, from_state, to_state): + super().database_forwards('taggit', schema_editor, from_state, to_state) + + def database_backwards(self, app_label, schema_editor, from_state, to_state): + super().database_backwards('taggit', schema_editor, from_state, to_state) + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0018_rename_tag_tables'), + ('circuits', '0015_custom_tag_models'), + ('dcim', '0070_custom_tag_models'), + ('ipam', '0025_custom_tag_models'), + ('secrets', '0006_custom_tag_models'), + ('tenancy', '0006_custom_tag_models'), + ('virtualization', '0009_custom_tag_models'), + ] + + state_operations = [ + AppTaggitDeleteModel( + name='Tag', + ), + AppTaggitDeleteModel( + name='TaggedItem', + ), + ] + + database_operations = [] + operations = [ + migrations.SeparateDatabaseAndState( + database_operations=None, + state_operations=state_operations + ) + ] diff --git a/netbox/extras/migrations/0020_add_color_comments_to_tag.py b/netbox/extras/migrations/0020_add_color_comments_to_tag.py new file mode 100644 index 000000000..44800eaf4 --- /dev/null +++ b/netbox/extras/migrations/0020_add_color_comments_to_tag.py @@ -0,0 +1,24 @@ +# Generated by Django 2.1.4 on 2019-02-20 07:38 + +from django.db import migrations, models +import utilities.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0019_delete_taggit_models'), + ] + + operations = [ + migrations.AddField( + model_name='tag', + name='color', + field=utilities.fields.ColorField(max_length=6), + ), + migrations.AddField( + model_name='tag', + name='comments', + field=models.TextField(blank=True), + ), + ] diff --git a/netbox/extras/models.py b/netbox/extras/models.py index d3b9f4eff..55365048a 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -12,8 +12,10 @@ from django.db.models import F, Q from django.http import HttpResponse from django.template import Template, Context from django.urls import reverse +from taggit.models import TagBase, GenericTaggedItemBase from dcim.constants import CONNECTION_STATUS_CONNECTED +from utilities.fields import ColorField from utilities.utils import deepmerge, foreground_color from .constants import * from .querysets import ConfigContextQuerySet @@ -860,3 +862,23 @@ class ObjectChange(models.Model): self.object_repr, self.object_data, ) + + +# +# Tags +# + + +class Tag(TagBase): + color = ColorField() + comments = models.TextField( + blank=True + ) + + +class TaggedItem(GenericTaggedItemBase): + tag = models.ForeignKey( + to=Tag, + related_name="%(app_label)s_%(class)s_items", + on_delete=models.CASCADE + ) diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py index 5fab8910f..e646ad821 100644 --- a/netbox/extras/tables.py +++ b/netbox/extras/tables.py @@ -1,9 +1,8 @@ import django_tables2 as tables from django_tables2.utils import Accessor -from taggit.models import Tag, TaggedItem -from utilities.tables import BaseTable, BooleanColumn, ToggleColumn -from .models import ConfigContext, ObjectChange +from utilities.tables import BaseTable, BooleanColumn, ColorColumn, ToggleColumn +from .models import ConfigContext, ObjectChange, Tag, TaggedItem TAG_ACTIONS = """ {% if perms.taggit.change_tag %} @@ -71,10 +70,11 @@ class TagTable(BaseTable): attrs={'td': {'class': 'text-right'}}, verbose_name='' ) + color = ColorColumn() class Meta(BaseTable.Meta): model = Tag - fields = ('pk', 'name', 'items', 'slug', 'actions') + fields = ('pk', 'name', 'items', 'slug', 'color', 'actions') class TaggedItemTable(BaseTable): diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py index cccb00a8a..3fe36c9ef 100644 --- a/netbox/extras/tests/test_api.py +++ b/netbox/extras/tests/test_api.py @@ -1,11 +1,10 @@ from django.contrib.contenttypes.models import ContentType from django.urls import reverse from rest_framework import status -from taggit.models import Tag from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Platform, Region, Site from extras.constants import GRAPH_TYPE_SITE -from extras.models import ConfigContext, Graph, ExportTemplate +from extras.models import ConfigContext, Graph, ExportTemplate, Tag from tenancy.models import Tenant, TenantGroup from utilities.testing import APITestCase diff --git a/netbox/extras/tests/test_views.py b/netbox/extras/tests/test_views.py index d478f069c..4c91fbb50 100644 --- a/netbox/extras/tests/test_views.py +++ b/netbox/extras/tests/test_views.py @@ -4,10 +4,9 @@ import uuid from django.contrib.auth.models import User from django.test import Client, TestCase from django.urls import reverse -from taggit.models import Tag from dcim.models import Site -from extras.models import ConfigContext, ObjectChange +from extras.models import ConfigContext, ObjectChange, Tag class TagTestCase(TestCase): diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 713143af8..517c3e5b4 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -9,7 +9,6 @@ from django.shortcuts import get_object_or_404, redirect, render from django.utils.safestring import mark_safe from django.views.generic import View from django_tables2 import RequestConfig -from taggit.models import Tag, TaggedItem from utilities.forms import ConfirmationForm from utilities.paginator import EnhancedPaginator @@ -19,7 +18,7 @@ from .forms import ( ConfigContextForm, ConfigContextBulkEditForm, ConfigContextFilterForm, ImageAttachmentForm, ObjectChangeFilterForm, TagFilterForm, TagForm, ) -from .models import ConfigContext, ImageAttachment, ObjectChange, ReportResult +from .models import ConfigContext, ImageAttachment, ObjectChange, ReportResult, Tag, TaggedItem from .reports import get_report, get_reports from .tables import ConfigContextTable, ObjectChangeTable, TagTable, TaggedItemTable @@ -30,7 +29,7 @@ from .tables import ConfigContextTable, ObjectChangeTable, TagTable, TaggedItemT class TagListView(ObjectListView): queryset = Tag.objects.annotate( - items=Count('taggit_taggeditem_items') + items=Count('extras_taggeditem_items') ).order_by( 'name' ) @@ -69,22 +68,23 @@ class TagView(View): class TagEditView(PermissionRequiredMixin, ObjectEditView): - permission_required = 'taggit.change_tag' + permission_required = 'extras.change_tag' model = Tag model_form = TagForm default_return_url = 'extras:tag_list' + template_name = 'extras/tag_edit.html' class TagDeleteView(PermissionRequiredMixin, ObjectDeleteView): - permission_required = 'taggit.delete_tag' + permission_required = 'extras.delete_tag' model = Tag default_return_url = 'extras:tag_list' class TagBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): - permission_required = 'taggit.delete_tag' + permission_required = 'extras.delete_tag' queryset = Tag.objects.annotate( - items=Count('taggit_taggeditem_items') + items=Count('extras_taggeditem_items') ).order_by( 'name' ) diff --git a/netbox/ipam/migrations/0025_custom_tag_models.py b/netbox/ipam/migrations/0025_custom_tag_models.py new file mode 100644 index 000000000..05895219c --- /dev/null +++ b/netbox/ipam/migrations/0025_custom_tag_models.py @@ -0,0 +1,45 @@ +# Generated by Django 2.1.4 on 2019-02-20 06:56 + +from django.db import migrations +import taggit.managers + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0024_vrf_allow_null_rd'), + ('extras', '0018_rename_tag_tables'), + ] + + operations = [ + migrations.AlterField( + model_name='aggregate', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='ipaddress', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='prefix', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='service', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='vlan', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='vrf', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + ] diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 181852ad3..a8a6185fb 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -10,7 +10,7 @@ from django.urls import reverse from taggit.managers import TaggableManager from dcim.models import Interface -from extras.models import CustomFieldModel +from extras.models import CustomFieldModel, TaggedItem from utilities.models import ChangeLoggedModel from .constants import * from .fields import IPNetworkField, IPAddressField @@ -55,7 +55,7 @@ class VRF(ChangeLoggedModel, CustomFieldModel): object_id_field='obj_id' ) - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = ['name', 'rd', 'tenant', 'enforce_unique', 'description'] @@ -154,7 +154,7 @@ class Aggregate(ChangeLoggedModel, CustomFieldModel): object_id_field='obj_id' ) - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = ['prefix', 'rir', 'date_added', 'description'] @@ -324,7 +324,7 @@ class Prefix(ChangeLoggedModel, CustomFieldModel): ) objects = PrefixQuerySet.as_manager() - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = [ 'prefix', 'vrf', 'tenant', 'site', 'vlan_group', 'vlan_vid', 'status', 'role', 'is_pool', 'description', @@ -583,7 +583,7 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel): ) objects = IPAddressManager() - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = [ 'address', 'vrf', 'tenant', 'status', 'role', 'device', 'virtual_machine', 'interface_name', 'is_primary', @@ -790,7 +790,7 @@ class VLAN(ChangeLoggedModel, CustomFieldModel): object_id_field='obj_id' ) - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = ['site', 'group_name', 'vid', 'name', 'tenant', 'status', 'role', 'description'] @@ -892,7 +892,7 @@ class Service(ChangeLoggedModel, CustomFieldModel): object_id_field='obj_id' ) - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = ['device', 'virtual_machine', 'name', 'protocol', 'description'] diff --git a/netbox/netbox/admin.py b/netbox/netbox/admin.py index 61796aabd..a0dca834a 100644 --- a/netbox/netbox/admin.py +++ b/netbox/netbox/admin.py @@ -2,8 +2,17 @@ from django.conf import settings from django.contrib.admin import AdminSite from django.contrib.auth.admin import GroupAdmin, UserAdmin from django.contrib.auth.models import Group, User -from taggit.admin import TagAdmin -from taggit.models import Tag +from taggit.admin import TagAdmin, TaggedItemInline + +from extras.models import Tag, TaggedItem + + +class NetBoxTaggedItemInline(TaggedItemInline): + model = TaggedItem + + +class NetBoxTagAdmin(TagAdmin): + inlines = [NetBoxTaggedItemInline] class NetBoxAdminSite(AdminSite): @@ -20,7 +29,7 @@ admin_site = NetBoxAdminSite(name='admin') # Register external models admin_site.register(Group, GroupAdmin) admin_site.register(User, UserAdmin) -admin_site.register(Tag, TagAdmin) +admin_site.register(Tag, NetBoxTagAdmin) # Modify the template to include an RQ link if django_rq is installed (see RQ_SHOW_ADMIN_LINK) if settings.WEBHOOKS_ENABLED: diff --git a/netbox/secrets/migrations/0006_custom_tag_models.py b/netbox/secrets/migrations/0006_custom_tag_models.py new file mode 100644 index 000000000..19699ad05 --- /dev/null +++ b/netbox/secrets/migrations/0006_custom_tag_models.py @@ -0,0 +1,20 @@ +# Generated by Django 2.1.4 on 2019-02-20 06:56 + +from django.db import migrations +import taggit.managers + + +class Migration(migrations.Migration): + + dependencies = [ + ('secrets', '0005_change_logging'), + ('extras', '0018_rename_tag_tables'), + ] + + operations = [ + migrations.AlterField( + model_name='secret', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + ] diff --git a/netbox/secrets/models.py b/netbox/secrets/models.py index 8190cd1dd..6dcb5abee 100644 --- a/netbox/secrets/models.py +++ b/netbox/secrets/models.py @@ -14,7 +14,7 @@ from django.urls import reverse from django.utils.encoding import force_bytes from taggit.managers import TaggableManager -from extras.models import CustomFieldModel +from extras.models import CustomFieldModel, TaggedItem from utilities.models import ChangeLoggedModel from .exceptions import InvalidKey from .hashers import SecretValidationHasher @@ -345,7 +345,7 @@ class Secret(ChangeLoggedModel, CustomFieldModel): object_id_field='obj_id' ) - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) plaintext = None csv_headers = ['device', 'role', 'name', 'plaintext'] diff --git a/netbox/templates/extras/tag.html b/netbox/templates/extras/tag.html index 748cad0bf..49e67c395 100644 --- a/netbox/templates/extras/tag.html +++ b/netbox/templates/extras/tag.html @@ -59,8 +59,26 @@ {{ items_count }} + + Color + +   + + +
+
+ Comments +
+
+ {% if tag.comments %} + {{ tag.comments|gfm }} + {% else %} + None + {% endif %} +
+
{% include 'panel_table.html' with table=items_table heading='Tagged Objects' %} diff --git a/netbox/templates/extras/tag_edit.html b/netbox/templates/extras/tag_edit.html new file mode 100644 index 000000000..800db1d26 --- /dev/null +++ b/netbox/templates/extras/tag_edit.html @@ -0,0 +1,19 @@ +{% extends 'utilities/obj_edit.html' %} +{% load form_helpers %} + +{% block form %} +
+
Tag
+
+ {% render_field form.name %} + {% render_field form.slug %} + {% render_field form.color %} +
+
+
+
Comments
+
+ {% render_field form.comments %} +
+
+{% endblock %} diff --git a/netbox/templates/utilities/templatetags/tag.html b/netbox/templates/utilities/templatetags/tag.html index 09b885d42..0be4e7ca5 100644 --- a/netbox/templates/utilities/templatetags/tag.html +++ b/netbox/templates/utilities/templatetags/tag.html @@ -1,5 +1,7 @@ +{% load helpers %} + {% if url_name %} - {{ tag }} + {{ tag }} {% else %} {{ tag }} {% endif %} diff --git a/netbox/tenancy/migrations/0006_custom_tag_models.py b/netbox/tenancy/migrations/0006_custom_tag_models.py new file mode 100644 index 000000000..ceeee437f --- /dev/null +++ b/netbox/tenancy/migrations/0006_custom_tag_models.py @@ -0,0 +1,20 @@ +# Generated by Django 2.1.4 on 2019-02-20 06:56 + +from django.db import migrations +import taggit.managers + + +class Migration(migrations.Migration): + + dependencies = [ + ('tenancy', '0005_change_logging'), + ('extras', '0018_rename_tag_tables'), + ] + + operations = [ + migrations.AlterField( + model_name='tenant', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + ] diff --git a/netbox/tenancy/models.py b/netbox/tenancy/models.py index 045679b90..bc67804d6 100644 --- a/netbox/tenancy/models.py +++ b/netbox/tenancy/models.py @@ -3,7 +3,7 @@ from django.db import models from django.urls import reverse from taggit.managers import TaggableManager -from extras.models import CustomFieldModel +from extras.models import CustomFieldModel, TaggedItem from utilities.models import ChangeLoggedModel @@ -70,7 +70,7 @@ class Tenant(ChangeLoggedModel, CustomFieldModel): object_id_field='obj_id' ) - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = ['name', 'slug', 'group', 'description', 'comments'] diff --git a/netbox/utilities/filters.py b/netbox/utilities/filters.py index 40e687077..674aee639 100644 --- a/netbox/utilities/filters.py +++ b/netbox/utilities/filters.py @@ -1,7 +1,8 @@ import django_filters from django.conf import settings from django.db.models import Q -from taggit.models import Tag + +from extras.models import Tag class NumericInFilter(django_filters.BaseInFilter, django_filters.NumberFilter): diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index f52f4ea9e..02441549f 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -157,7 +157,7 @@ class ObjectListView(View): # Construct queryset for tags list if hasattr(model, 'tags'): - tags = model.tags.annotate(count=Count('taggit_taggeditem_items')).order_by('name') + tags = model.tags.annotate(count=Count('extras_taggeditem_items')).order_by('name') else: tags = None diff --git a/netbox/virtualization/migrations/0009_custom_tag_models.py b/netbox/virtualization/migrations/0009_custom_tag_models.py new file mode 100644 index 000000000..02569bee2 --- /dev/null +++ b/netbox/virtualization/migrations/0009_custom_tag_models.py @@ -0,0 +1,25 @@ +# Generated by Django 2.1.4 on 2019-02-20 06:56 + +from django.db import migrations +import taggit.managers + + +class Migration(migrations.Migration): + + dependencies = [ + ('virtualization', '0008_virtualmachine_local_context_data'), + ('extras', '0018_rename_tag_tables'), + ] + + operations = [ + migrations.AlterField( + model_name='cluster', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterField( + model_name='virtualmachine', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + ] diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py index ff9f39ee9..2ef782dfd 100644 --- a/netbox/virtualization/models.py +++ b/netbox/virtualization/models.py @@ -6,7 +6,7 @@ from django.urls import reverse from taggit.managers import TaggableManager from dcim.models import Device -from extras.models import ConfigContextModel, CustomFieldModel +from extras.models import ConfigContextModel, CustomFieldModel, TaggedItem from utilities.models import ChangeLoggedModel from .constants import DEVICE_STATUS_ACTIVE, VM_STATUS_CHOICES, VM_STATUS_CLASSES @@ -119,7 +119,7 @@ class Cluster(ChangeLoggedModel, CustomFieldModel): object_id_field='obj_id' ) - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = ['name', 'type', 'group', 'site', 'comments'] @@ -238,7 +238,7 @@ class VirtualMachine(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): object_id_field='obj_id' ) - tags = TaggableManager() + tags = TaggableManager(through=TaggedItem) csv_headers = [ 'name', 'status', 'role', 'cluster', 'tenant', 'platform', 'vcpus', 'memory', 'disk', 'comments', From 0a06d92c2ec334fd379712cf37c893b750e4345d Mon Sep 17 00:00:00 2001 From: John Anderson Date: Wed, 20 Feb 2019 03:56:32 -0500 Subject: [PATCH 004/140] added default values for comments and color fields on tag --- netbox/extras/migrations/0020_add_color_comments_to_tag.py | 4 ++-- netbox/extras/models.py | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/netbox/extras/migrations/0020_add_color_comments_to_tag.py b/netbox/extras/migrations/0020_add_color_comments_to_tag.py index 44800eaf4..0eebd4fbc 100644 --- a/netbox/extras/migrations/0020_add_color_comments_to_tag.py +++ b/netbox/extras/migrations/0020_add_color_comments_to_tag.py @@ -14,11 +14,11 @@ class Migration(migrations.Migration): migrations.AddField( model_name='tag', name='color', - field=utilities.fields.ColorField(max_length=6), + field=utilities.fields.ColorField(max_length=6, default='9e9e9e'), ), migrations.AddField( model_name='tag', name='comments', - field=models.TextField(blank=True), + field=models.TextField(blank=True, default=''), ), ] diff --git a/netbox/extras/models.py b/netbox/extras/models.py index 55365048a..da8e4744c 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -870,9 +870,12 @@ class ObjectChange(models.Model): class Tag(TagBase): - color = ColorField() + color = ColorField( + default='9e9e9e' + ) comments = models.TextField( - blank=True + blank=True, + default='' ) From bb6fb81fc0e5dfd5512f5928b4038a8ae4b7e19b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 20 Feb 2019 14:34:05 -0500 Subject: [PATCH 005/140] Closes #2643: Add description field to console/power components and device bays --- CHANGELOG.md | 1 + netbox/dcim/api/serializers.py | 18 +++--- netbox/dcim/filters.py | 22 +++---- netbox/dcim/forms.py | 58 +++++++++++++++++-- .../0071_device_components_add_description.py | 38 ++++++++++++ netbox/dcim/models.py | 35 +++++------ netbox/templates/dcim/device.html | 3 + netbox/templates/dcim/inc/consoleport.html | 5 ++ .../templates/dcim/inc/consoleserverport.html | 9 ++- netbox/templates/dcim/inc/devicebay.html | 32 +++++++--- netbox/templates/dcim/inc/poweroutlet.html | 9 ++- netbox/templates/dcim/inc/powerport.html | 5 ++ 12 files changed, 181 insertions(+), 54 deletions(-) create mode 100644 netbox/dcim/migrations/0071_device_components_add_description.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 30fcca532..13bb12931 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ the Config Context from being included in any results. ## Enhancements * [#2324](https://github.com/digitalocean/netbox/issues/2324) - Add color option for tags +* [#2643](https://github.com/digitalocean/netbox/issues/2643) - Add `description` field to console/power components and device bays * [#2791](https://github.com/digitalocean/netbox/issues/2791) - Add a comment field for tags --- diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index c17400a35..82bd9b6be 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -346,8 +346,8 @@ class ConsoleServerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer) class Meta: model = ConsoleServerPort fields = [ - 'id', 'device', 'name', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', - 'tags', + 'id', 'device', 'name', 'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', + 'cable', 'tags', ] @@ -359,8 +359,8 @@ class ConsolePortSerializer(TaggitSerializer, ConnectedEndpointSerializer): class Meta: model = ConsolePort fields = [ - 'id', 'device', 'name', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', - 'tags', + 'id', 'device', 'name', 'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', + 'cable', 'tags', ] @@ -372,8 +372,8 @@ class PowerOutletSerializer(TaggitSerializer, ConnectedEndpointSerializer): class Meta: model = PowerOutlet fields = [ - 'id', 'device', 'name', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', - 'tags', + 'id', 'device', 'name', 'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', + 'cable', 'tags', ] @@ -385,8 +385,8 @@ class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer): class Meta: model = PowerPort fields = [ - 'id', 'device', 'name', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', - 'tags', + 'id', 'device', 'name', 'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', + 'cable', 'tags', ] @@ -475,7 +475,7 @@ class DeviceBaySerializer(TaggitSerializer, ValidatedModelSerializer): class Meta: model = DeviceBay - fields = ['id', 'device', 'name', 'installed_device', 'tags'] + fields = ['id', 'device', 'name', 'description', 'installed_device', 'tags'] # diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 4974c3b4d..4b22b2002 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -689,7 +689,8 @@ class DeviceComponentFilterSet(django_filters.FilterSet): if not value.strip(): return queryset return queryset.filter( - Q(name__icontains=value) + Q(name__icontains=value) | + Q(description__icontains=value) ) @@ -702,7 +703,7 @@ class ConsolePortFilter(DeviceComponentFilterSet): class Meta: model = ConsolePort - fields = ['name', 'connection_status'] + fields = ['name', 'description', 'connection_status'] class ConsoleServerPortFilter(DeviceComponentFilterSet): @@ -714,7 +715,7 @@ class ConsoleServerPortFilter(DeviceComponentFilterSet): class Meta: model = ConsoleServerPort - fields = ['name', 'connection_status'] + fields = ['name', 'description', 'connection_status'] class PowerPortFilter(DeviceComponentFilterSet): @@ -726,7 +727,7 @@ class PowerPortFilter(DeviceComponentFilterSet): class Meta: model = PowerPort - fields = ['name', 'connection_status'] + fields = ['name', 'description', 'connection_status'] class PowerOutletFilter(DeviceComponentFilterSet): @@ -738,7 +739,7 @@ class PowerOutletFilter(DeviceComponentFilterSet): class Meta: model = PowerOutlet - fields = ['name', 'connection_status'] + fields = ['name', 'description', 'connection_status'] class InterfaceFilter(django_filters.FilterSet): @@ -793,13 +794,14 @@ class InterfaceFilter(django_filters.FilterSet): class Meta: model = Interface - fields = ['name', 'connection_status', 'form_factor', 'enabled', 'mtu', 'mgmt_only'] + fields = ['name', 'connection_status', 'form_factor', 'enabled', 'mtu', 'mgmt_only', 'description'] def search(self, queryset, name, value): if not value.strip(): return queryset return queryset.filter( - Q(name__icontains=value) + Q(name__icontains=value) | + Q(description__icontains=value) ).distinct() def filter_device(self, queryset, name, value): @@ -857,7 +859,7 @@ class FrontPortFilter(DeviceComponentFilterSet): class Meta: model = FrontPort - fields = ['name', 'type'] + fields = ['name', 'type', 'description'] class RearPortFilter(DeviceComponentFilterSet): @@ -869,14 +871,14 @@ class RearPortFilter(DeviceComponentFilterSet): class Meta: model = RearPort - fields = ['name', 'type'] + fields = ['name', 'type', 'description'] class DeviceBayFilter(DeviceComponentFilterSet): class Meta: model = DeviceBay - fields = ['name'] + fields = ['name', 'description'] class InventoryItemFilter(DeviceComponentFilterSet): diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index bf774dfcb..18627c2f5 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1854,7 +1854,7 @@ class ConsolePortForm(BootstrapMixin, forms.ModelForm): class Meta: model = ConsolePort fields = [ - 'device', 'name', 'tags', + 'device', 'name', 'description', 'tags', ] widgets = { 'device': forms.HiddenInput(), @@ -1865,6 +1865,10 @@ class ConsolePortCreateForm(ComponentForm): name_pattern = ExpandableNameField( label='Name' ) + description = forms.CharField( + max_length=100, + required=False + ) tags = TagField( required=False ) @@ -1882,7 +1886,7 @@ class ConsoleServerPortForm(BootstrapMixin, forms.ModelForm): class Meta: model = ConsoleServerPort fields = [ - 'device', 'name', 'tags', + 'device', 'name', 'description', 'tags', ] widgets = { 'device': forms.HiddenInput(), @@ -1893,11 +1897,31 @@ class ConsoleServerPortCreateForm(ComponentForm): name_pattern = ExpandableNameField( label='Name' ) + description = forms.CharField( + max_length=100, + required=False + ) tags = TagField( required=False ) +class ConsoleServerPortBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): + pk = forms.ModelMultipleChoiceField( + queryset=ConsoleServerPort.objects.all(), + widget=forms.MultipleHiddenInput() + ) + description = forms.CharField( + max_length=100, + required=False + ) + + class Meta: + nullable_fields = [ + 'description', + ] + + class ConsoleServerPortBulkRenameForm(BulkRenameForm): pk = forms.ModelMultipleChoiceField( queryset=ConsoleServerPort.objects.all(), @@ -1924,7 +1948,7 @@ class PowerPortForm(BootstrapMixin, forms.ModelForm): class Meta: model = PowerPort fields = [ - 'device', 'name', 'tags', + 'device', 'name', 'description', 'tags', ] widgets = { 'device': forms.HiddenInput(), @@ -1935,6 +1959,10 @@ class PowerPortCreateForm(ComponentForm): name_pattern = ExpandableNameField( label='Name' ) + description = forms.CharField( + max_length=100, + required=False + ) tags = TagField( required=False ) @@ -1952,7 +1980,7 @@ class PowerOutletForm(BootstrapMixin, forms.ModelForm): class Meta: model = PowerOutlet fields = [ - 'device', 'name', 'tags', + 'device', 'name', 'description', 'tags', ] widgets = { 'device': forms.HiddenInput(), @@ -1963,11 +1991,31 @@ class PowerOutletCreateForm(ComponentForm): name_pattern = ExpandableNameField( label='Name' ) + description = forms.CharField( + max_length=100, + required=False + ) tags = TagField( required=False ) +class PowerOutletBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): + pk = forms.ModelMultipleChoiceField( + queryset=PowerOutlet.objects.all(), + widget=forms.MultipleHiddenInput() + ) + description = forms.CharField( + max_length=100, + required=False + ) + + class Meta: + nullable_fields = [ + 'description', + ] + + class PowerOutletBulkRenameForm(BulkRenameForm): pk = forms.ModelMultipleChoiceField( queryset=PowerOutlet.objects.all(), @@ -2776,7 +2824,7 @@ class DeviceBayForm(BootstrapMixin, forms.ModelForm): class Meta: model = DeviceBay fields = [ - 'device', 'name', 'tags', + 'device', 'name', 'description', 'tags', ] widgets = { 'device': forms.HiddenInput(), diff --git a/netbox/dcim/migrations/0071_device_components_add_description.py b/netbox/dcim/migrations/0071_device_components_add_description.py new file mode 100644 index 000000000..d38f8a88b --- /dev/null +++ b/netbox/dcim/migrations/0071_device_components_add_description.py @@ -0,0 +1,38 @@ +# Generated by Django 2.1.7 on 2019-02-20 18:50 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0070_custom_tag_models'), + ] + + operations = [ + migrations.AddField( + model_name='consoleport', + name='description', + field=models.CharField(blank=True, max_length=100), + ), + migrations.AddField( + model_name='consoleserverport', + name='description', + field=models.CharField(blank=True, max_length=100), + ), + migrations.AddField( + model_name='devicebay', + name='description', + field=models.CharField(blank=True, max_length=100), + ), + migrations.AddField( + model_name='poweroutlet', + name='description', + field=models.CharField(blank=True, max_length=100), + ), + migrations.AddField( + model_name='powerport', + name='description', + field=models.CharField(blank=True, max_length=100), + ), + ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 3715e3033..b7675b34e 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -46,6 +46,10 @@ class ComponentTemplateModel(models.Model): class ComponentModel(models.Model): + description = models.CharField( + max_length=100, + blank=True + ) class Meta: abstract = True @@ -1745,7 +1749,7 @@ class ConsolePort(CableTermination, ComponentModel): objects = DeviceComponentManager() tags = TaggableManager(through=TaggedItem) - csv_headers = ['device', 'name'] + csv_headers = ['device', 'name', 'description'] class Meta: ordering = ['device', 'name'] @@ -1761,6 +1765,7 @@ class ConsolePort(CableTermination, ComponentModel): return ( self.device.identifier, self.name, + self.description, ) @@ -1788,7 +1793,7 @@ class ConsoleServerPort(CableTermination, ComponentModel): objects = DeviceComponentManager() tags = TaggableManager(through=TaggedItem) - csv_headers = ['device', 'name'] + csv_headers = ['device', 'name', 'description'] class Meta: unique_together = ['device', 'name'] @@ -1803,6 +1808,7 @@ class ConsoleServerPort(CableTermination, ComponentModel): return ( self.device.identifier, self.name, + self.description, ) @@ -1841,7 +1847,7 @@ class PowerPort(CableTermination, ComponentModel): class Meta: ordering = ['device', 'name'] - unique_together = ['device', 'name'] + unique_together = ['device', 'name', 'description'] def __str__(self): return self.name @@ -1853,6 +1859,7 @@ class PowerPort(CableTermination, ComponentModel): return ( self.device.identifier, self.name, + self.description, ) @@ -1883,7 +1890,7 @@ class PowerOutlet(CableTermination, ComponentModel): csv_headers = ['device', 'name'] class Meta: - unique_together = ['device', 'name'] + unique_together = ['device', 'name', 'description'] def __str__(self): return self.name @@ -1895,6 +1902,7 @@ class PowerOutlet(CableTermination, ComponentModel): return ( self.device.identifier, self.name, + self.description, ) @@ -1973,10 +1981,6 @@ class Interface(CableTermination, ComponentModel): verbose_name='OOB Management', help_text='This interface is used only for out-of-band management' ) - description = models.CharField( - max_length=100, - blank=True - ) mode = models.PositiveSmallIntegerField( choices=IFACE_MODE_CHOICES, blank=True, @@ -2193,10 +2197,6 @@ class FrontPort(CableTermination, ComponentModel): default=1, validators=[MinValueValidator(1), MaxValueValidator(64)] ) - description = models.CharField( - max_length=100, - blank=True - ) objects = DeviceComponentManager() tags = TaggableManager(through=TaggedItem) @@ -2259,10 +2259,6 @@ class RearPort(CableTermination, ComponentModel): default=1, validators=[MinValueValidator(1), MaxValueValidator(64)] ) - description = models.CharField( - max_length=100, - blank=True - ) objects = DeviceComponentManager() tags = TaggableManager(through=TaggedItem) @@ -2314,7 +2310,7 @@ class DeviceBay(ComponentModel): objects = DeviceComponentManager() tags = TaggableManager(through=TaggedItem) - csv_headers = ['device', 'name', 'installed_device'] + csv_headers = ['device', 'name', 'installed_device', 'description'] class Meta: ordering = ['device', 'name'] @@ -2331,6 +2327,7 @@ class DeviceBay(ComponentModel): self.device.identifier, self.name, self.installed_device.identifier if self.installed_device else None, + self.description, ) def clean(self): @@ -2400,10 +2397,6 @@ class InventoryItem(ComponentModel): default=False, verbose_name='Discovered' ) - description = models.CharField( - max_length=100, - blank=True - ) tags = TaggableManager(through=TaggedItem) diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 716752c57..895f5eb59 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -445,6 +445,7 @@ {% endif %} Name Status + Description Installed Device @@ -570,6 +571,7 @@ {% endif %} Name + Description Cable Connection @@ -625,6 +627,7 @@ {% endif %} Name + Description Cable Connection diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html index e78ab7ea7..74b13fdbc 100644 --- a/netbox/templates/dcim/inc/consoleport.html +++ b/netbox/templates/dcim/inc/consoleport.html @@ -5,6 +5,11 @@ {{ cp }} + {# Description #} + + {{ cp.description }} + + {# Cable #} {% if cp.cable %} diff --git a/netbox/templates/dcim/inc/consoleserverport.html b/netbox/templates/dcim/inc/consoleserverport.html index 212846b00..93f89a1e0 100644 --- a/netbox/templates/dcim/inc/consoleserverport.html +++ b/netbox/templates/dcim/inc/consoleserverport.html @@ -1,3 +1,5 @@ +{% load helpers %} + {# Checkbox #} @@ -12,12 +14,17 @@ {{ csp }} + {# Description #} + + {{ csp.description|placeholder }} + + {# Cable #} {% if csp.cable %} {{ csp.cable }} {% else %} - — + — {% endif %} diff --git a/netbox/templates/dcim/inc/devicebay.html b/netbox/templates/dcim/inc/devicebay.html index dc2977855..9ae8958ec 100644 --- a/netbox/templates/dcim/inc/devicebay.html +++ b/netbox/templates/dcim/inc/devicebay.html @@ -1,16 +1,35 @@ +{% load helpers %} + {% if perms.dcim.change_devicebay or perms.dcim.delete_devicebay %} {% endif %} + + {# Name #} {{ devicebay.name }} + + {# Status #} + + {% if devicebay.installed_device %} + + {{ devicebay.installed_device.get_status_display }} + + {% else %} + Vacant + {% endif %} + + + {# Description #} + + {{ devicebay.description|placeholder }} + + + {# Installed device #} {% if devicebay.installed_device %} - - {{ devicebay.installed_device.get_status_display }} - {{ devicebay.installed_device }} @@ -18,11 +37,10 @@ {{ devicebay.installed_device.device_type.display_name }} {% else %} - - - Vacant - + {% endif %} + + {# Actions #} {% if perms.dcim.change_devicebay %} {% if devicebay.installed_device %} diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index 54ce414ad..7b359d36d 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -1,3 +1,5 @@ +{% load helpers %} + {# Checkbox #} @@ -12,12 +14,17 @@ {{ po }} + {# Description #} + + {{ po.description|placeholder }} + + {# Cable #} {% if po.cable %} {{ po.cable }} {% else %} - — + — {% endif %} diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index 4bfbdadcf..55838399e 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -5,6 +5,11 @@ {{ pp }} + {# Description #} + + {{ pp.description }} + + {# Cable #} {% if pp.cable %} From fba6d286036d0fdaf8dcae16f8ef11787c05f6be Mon Sep 17 00:00:00 2001 From: John Anderson Date: Thu, 21 Feb 2019 00:15:15 -0500 Subject: [PATCH 006/140] removed migration to delete taggit models --- .../extras/migrations/0017_tag_taggeditem.py | 4 ++ .../migrations/0018_rename_tag_tables.py | 7 +++ ...g.py => 0019_add_color_comments_to_tag.py} | 8 ++- .../migrations/0019_delete_taggit_models.py | 52 ------------------- 4 files changed, 18 insertions(+), 53 deletions(-) rename netbox/extras/migrations/{0020_add_color_comments_to_tag.py => 0019_add_color_comments_to_tag.py} (62%) delete mode 100644 netbox/extras/migrations/0019_delete_taggit_models.py diff --git a/netbox/extras/migrations/0017_tag_taggeditem.py b/netbox/extras/migrations/0017_tag_taggeditem.py index d76abf2f1..8dbf32a75 100644 --- a/netbox/extras/migrations/0017_tag_taggeditem.py +++ b/netbox/extras/migrations/0017_tag_taggeditem.py @@ -36,6 +36,10 @@ class Migration(migrations.Migration): 'abstract': False, }, ), + migrations.AlterIndexTogether( + name='taggeditem', + index_together={('content_type', 'object_id')}, + ), ] operations = [ diff --git a/netbox/extras/migrations/0018_rename_tag_tables.py b/netbox/extras/migrations/0018_rename_tag_tables.py index 521db2cb2..9cdb41d06 100644 --- a/netbox/extras/migrations/0018_rename_tag_tables.py +++ b/netbox/extras/migrations/0018_rename_tag_tables.py @@ -28,6 +28,13 @@ class AppTaggitAlterModelTable(migrations.AlterModelTable): class Migration(migrations.Migration): + """ + Rename the tables from taggit_* to extras_* + + Note that while we change the database state, we are not deleting the django + model state for the taggit models. Doing so would result in makemigrations + recreating them. + """ dependencies = [ ('taggit', '0001_initial'), diff --git a/netbox/extras/migrations/0020_add_color_comments_to_tag.py b/netbox/extras/migrations/0019_add_color_comments_to_tag.py similarity index 62% rename from netbox/extras/migrations/0020_add_color_comments_to_tag.py rename to netbox/extras/migrations/0019_add_color_comments_to_tag.py index 0eebd4fbc..5c4b5807c 100644 --- a/netbox/extras/migrations/0020_add_color_comments_to_tag.py +++ b/netbox/extras/migrations/0019_add_color_comments_to_tag.py @@ -7,7 +7,13 @@ import utilities.fields class Migration(migrations.Migration): dependencies = [ - ('extras', '0019_delete_taggit_models'), + ('extras', '0018_rename_tag_tables'), + ('circuits', '0015_custom_tag_models'), + ('dcim', '0070_custom_tag_models'), + ('ipam', '0025_custom_tag_models'), + ('secrets', '0006_custom_tag_models'), + ('tenancy', '0006_custom_tag_models'), + ('virtualization', '0009_custom_tag_models'), ] operations = [ diff --git a/netbox/extras/migrations/0019_delete_taggit_models.py b/netbox/extras/migrations/0019_delete_taggit_models.py deleted file mode 100644 index fadb658e7..000000000 --- a/netbox/extras/migrations/0019_delete_taggit_models.py +++ /dev/null @@ -1,52 +0,0 @@ -# Generated by Django 2.1.4 on 2019-02-20 07:05 - -from django.db import migrations - - -class AppTaggitDeleteModel(migrations.DeleteModel): - """ - A special subclass of DeleteModel which hardcodes the app_label to 'taggit' - - This is needed because the migration deals with models which belong to the taggit - app, however because taggit is a 3rd party app, we cannot create our own migrations - there. - """ - - def state_forwards(self, app_label, state): - super().state_forwards('taggit', state) - - def database_forwards(self, app_label, schema_editor, from_state, to_state): - super().database_forwards('taggit', schema_editor, from_state, to_state) - - def database_backwards(self, app_label, schema_editor, from_state, to_state): - super().database_backwards('taggit', schema_editor, from_state, to_state) - - -class Migration(migrations.Migration): - - dependencies = [ - ('extras', '0018_rename_tag_tables'), - ('circuits', '0015_custom_tag_models'), - ('dcim', '0070_custom_tag_models'), - ('ipam', '0025_custom_tag_models'), - ('secrets', '0006_custom_tag_models'), - ('tenancy', '0006_custom_tag_models'), - ('virtualization', '0009_custom_tag_models'), - ] - - state_operations = [ - AppTaggitDeleteModel( - name='Tag', - ), - AppTaggitDeleteModel( - name='TaggedItem', - ), - ] - - database_operations = [] - operations = [ - migrations.SeparateDatabaseAndState( - database_operations=None, - state_operations=state_operations - ) - ] From b9d11aa4ca32796b17a3da72edc1f250a4950590 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Fri, 22 Feb 2019 01:32:31 -0500 Subject: [PATCH 007/140] refactor tag migrations and add changelog fields to tag --- .../migrations/0015_custom_tag_models.py | 2 +- .../dcim/migrations/0070_custom_tag_models.py | 2 +- .../extras/migrations/0017_tag_taggeditem.py | 9 +-- .../migrations/0018_rename_tag_tables.py | 53 --------------- netbox/extras/migrations/0018_tag_data.py | 65 +++++++++++++++++++ ...19_add_color_comments_changelog_to_tag.py} | 18 +++-- netbox/extras/models.py | 9 ++- .../ipam/migrations/0025_custom_tag_models.py | 2 +- .../migrations/0006_custom_tag_models.py | 2 +- .../migrations/0006_custom_tag_models.py | 2 +- .../migrations/0009_custom_tag_models.py | 2 +- 11 files changed, 90 insertions(+), 76 deletions(-) delete mode 100644 netbox/extras/migrations/0018_rename_tag_tables.py create mode 100644 netbox/extras/migrations/0018_tag_data.py rename netbox/extras/migrations/{0019_add_color_comments_to_tag.py => 0019_add_color_comments_changelog_to_tag.py} (59%) diff --git a/netbox/circuits/migrations/0015_custom_tag_models.py b/netbox/circuits/migrations/0015_custom_tag_models.py index 657b20071..e4926b923 100644 --- a/netbox/circuits/migrations/0015_custom_tag_models.py +++ b/netbox/circuits/migrations/0015_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('circuits', '0014_circuittermination_description'), - ('extras', '0018_rename_tag_tables'), + ('extras', '0017_tag_taggeditem'), ] operations = [ diff --git a/netbox/dcim/migrations/0070_custom_tag_models.py b/netbox/dcim/migrations/0070_custom_tag_models.py index 6b82a0dfd..255b9c3ff 100644 --- a/netbox/dcim/migrations/0070_custom_tag_models.py +++ b/netbox/dcim/migrations/0070_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('dcim', '0069_deprecate_nullablecharfield'), - ('extras', '0018_rename_tag_tables'), + ('extras', '0017_tag_taggeditem'), ] operations = [ diff --git a/netbox/extras/migrations/0017_tag_taggeditem.py b/netbox/extras/migrations/0017_tag_taggeditem.py index 8dbf32a75..91f47240b 100644 --- a/netbox/extras/migrations/0017_tag_taggeditem.py +++ b/netbox/extras/migrations/0017_tag_taggeditem.py @@ -12,7 +12,7 @@ class Migration(migrations.Migration): ('extras', '0016_exporttemplate_add_cable'), ] - state_operations = [ + operations = [ migrations.CreateModel( name='Tag', fields=[ @@ -41,10 +41,3 @@ class Migration(migrations.Migration): index_together={('content_type', 'object_id')}, ), ] - - operations = [ - migrations.SeparateDatabaseAndState( - database_operations=None, - state_operations=state_operations - ) - ] diff --git a/netbox/extras/migrations/0018_rename_tag_tables.py b/netbox/extras/migrations/0018_rename_tag_tables.py deleted file mode 100644 index 9cdb41d06..000000000 --- a/netbox/extras/migrations/0018_rename_tag_tables.py +++ /dev/null @@ -1,53 +0,0 @@ -# Generated by Django 2.1.4 on 2019-02-20 06:59 - -from django.db import migrations - - -class AppTaggitAlterModelTable(migrations.AlterModelTable): - """ - A special subclass of AlterModelTable which hardcodes the app_label to 'taggit' - - This is needed because the migration deals with models which belong to the taggit - app, however because taggit is a 3rd party app, we cannot create our own migrations - there. - """ - - def state_forwards(self, app_label, state): - super().state_forwards('taggit', state) - - def database_forwards(self, app_label, schema_editor, from_state, to_state): - super().database_forwards('taggit', schema_editor, from_state, to_state) - - def database_backwards(self, app_label, schema_editor, from_state, to_state): - super().database_backwards('taggit', schema_editor, from_state, to_state) - - def reduce(self, operation, app_label=None): - if app_label: - app_label = 'taggit' - super().reduce(operation, app_label=app_label) - - -class Migration(migrations.Migration): - """ - Rename the tables from taggit_* to extras_* - - Note that while we change the database state, we are not deleting the django - model state for the taggit models. Doing so would result in makemigrations - recreating them. - """ - - dependencies = [ - ('taggit', '0001_initial'), - ('extras', '0017_tag_taggeditem'), - ] - - operations = [ - AppTaggitAlterModelTable( - name='Tag', - table='extras_tag' - ), - AppTaggitAlterModelTable( - name='TaggedItem', - table='extras_taggeditem' - ), - ] diff --git a/netbox/extras/migrations/0018_tag_data.py b/netbox/extras/migrations/0018_tag_data.py new file mode 100644 index 000000000..86d024a66 --- /dev/null +++ b/netbox/extras/migrations/0018_tag_data.py @@ -0,0 +1,65 @@ +# Generated by Django 2.1.4 on 2019-02-20 06:56 + +from django.db import migrations, models +import django.db.models.deletion +import utilities.fields + + +def copy_tags(apps, schema_editor): + """ + Copy data from taggit_tag to extras_tag + """ + TaggitTag = apps.get_model('taggit', 'Tag') + ExtrasTag = apps.get_model('extras', 'Tag') + + tags_values = TaggitTag.objects.all().values('id', 'name', 'slug') + tags = [ExtrasTag(**tag) for tag in tags_values] + ExtrasTag.objects.bulk_create(tags) + + +def copy_taggeditems(apps, schema_editor): + """ + Copy data from taggit_taggeditem to extras_taggeditem + """ + TaggitTaggedItem = apps.get_model('taggit', 'TaggedItem') + ExtrasTaggedItem = apps.get_model('extras', 'TaggedItem') + + tagged_items_values = TaggitTaggedItem.objects.all().values('id', 'object_id', 'content_type_id', 'tag_id') + tagged_items = [ExtrasTaggedItem(**tagged_item) for tagged_item in tagged_items_values] + ExtrasTaggedItem.objects.bulk_create(tagged_items) + + +def delete_taggit_taggeditems(apps, schema_editor): + """ + Delete all TaggedItem instances from taggit_taggeditem + """ + TaggitTaggedItem = apps.get_model('taggit', 'TaggedItem') + TaggitTaggedItem.objects.all().delete() + + +def delete_taggit_tags(apps, schema_editor): + """ + Delete all Tag instances from taggit_tag + """ + TaggitTag = apps.get_model('taggit', 'Tag') + TaggitTag.objects.all().delete() + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0017_tag_taggeditem'), + ('circuits', '0015_custom_tag_models'), + ('dcim', '0070_custom_tag_models'), + ('ipam', '0025_custom_tag_models'), + ('secrets', '0006_custom_tag_models'), + ('tenancy', '0006_custom_tag_models'), + ('virtualization', '0009_custom_tag_models'), + ] + + operations = [ + migrations.RunPython(copy_tags), + migrations.RunPython(copy_taggeditems), + migrations.RunPython(delete_taggit_taggeditems), + migrations.RunPython(delete_taggit_tags), + ] diff --git a/netbox/extras/migrations/0019_add_color_comments_to_tag.py b/netbox/extras/migrations/0019_add_color_comments_changelog_to_tag.py similarity index 59% rename from netbox/extras/migrations/0019_add_color_comments_to_tag.py rename to netbox/extras/migrations/0019_add_color_comments_changelog_to_tag.py index 5c4b5807c..8a81d85ed 100644 --- a/netbox/extras/migrations/0019_add_color_comments_to_tag.py +++ b/netbox/extras/migrations/0019_add_color_comments_changelog_to_tag.py @@ -7,13 +7,7 @@ import utilities.fields class Migration(migrations.Migration): dependencies = [ - ('extras', '0018_rename_tag_tables'), - ('circuits', '0015_custom_tag_models'), - ('dcim', '0070_custom_tag_models'), - ('ipam', '0025_custom_tag_models'), - ('secrets', '0006_custom_tag_models'), - ('tenancy', '0006_custom_tag_models'), - ('virtualization', '0009_custom_tag_models'), + ('extras', '0018_tag_data'), ] operations = [ @@ -27,4 +21,14 @@ class Migration(migrations.Migration): name='comments', field=models.TextField(blank=True, default=''), ), + migrations.AddField( + model_name='tag', + name='created', + field=models.DateField(auto_now_add=True, null=True), + ), + migrations.AddField( + model_name='tag', + name='last_updated', + field=models.DateTimeField(auto_now=True, null=True), + ), ] diff --git a/netbox/extras/models.py b/netbox/extras/models.py index da8e4744c..b24844089 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -868,8 +868,8 @@ class ObjectChange(models.Model): # Tags # - -class Tag(TagBase): +from utilities.models import ChangeLoggedModel +class Tag(TagBase, ChangeLoggedModel): color = ColorField( default='9e9e9e' ) @@ -885,3 +885,8 @@ class TaggedItem(GenericTaggedItemBase): related_name="%(app_label)s_%(class)s_items", on_delete=models.CASCADE ) + + class Meta: + index_together = ( + ("content_type", "object_id") + ) diff --git a/netbox/ipam/migrations/0025_custom_tag_models.py b/netbox/ipam/migrations/0025_custom_tag_models.py index 05895219c..89075f3ab 100644 --- a/netbox/ipam/migrations/0025_custom_tag_models.py +++ b/netbox/ipam/migrations/0025_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('ipam', '0024_vrf_allow_null_rd'), - ('extras', '0018_rename_tag_tables'), + ('extras', '0017_tag_taggeditem'), ] operations = [ diff --git a/netbox/secrets/migrations/0006_custom_tag_models.py b/netbox/secrets/migrations/0006_custom_tag_models.py index 19699ad05..2f196ad72 100644 --- a/netbox/secrets/migrations/0006_custom_tag_models.py +++ b/netbox/secrets/migrations/0006_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('secrets', '0005_change_logging'), - ('extras', '0018_rename_tag_tables'), + ('extras', '0017_tag_taggeditem'), ] operations = [ diff --git a/netbox/tenancy/migrations/0006_custom_tag_models.py b/netbox/tenancy/migrations/0006_custom_tag_models.py index ceeee437f..9104398ad 100644 --- a/netbox/tenancy/migrations/0006_custom_tag_models.py +++ b/netbox/tenancy/migrations/0006_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('tenancy', '0005_change_logging'), - ('extras', '0018_rename_tag_tables'), + ('extras', '0017_tag_taggeditem'), ] operations = [ diff --git a/netbox/virtualization/migrations/0009_custom_tag_models.py b/netbox/virtualization/migrations/0009_custom_tag_models.py index 02569bee2..883d844f7 100644 --- a/netbox/virtualization/migrations/0009_custom_tag_models.py +++ b/netbox/virtualization/migrations/0009_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('virtualization', '0008_virtualmachine_local_context_data'), - ('extras', '0018_rename_tag_tables'), + ('extras', '0017_tag_taggeditem'), ] operations = [ From de52f219053651314bf759cbe7dfcc2050e43726 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Fri, 22 Feb 2019 01:42:17 -0500 Subject: [PATCH 008/140] fix circular import for ObjectChange, for now... --- netbox/extras/models.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netbox/extras/models.py b/netbox/extras/models.py index b24844089..285be6c44 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -868,7 +868,10 @@ class ObjectChange(models.Model): # Tags # -from utilities.models import ChangeLoggedModel +# TODO: figure out a way around this circular import for ObjectChange +from utilities.models import ChangeLoggedModel # noqa: E402 + + class Tag(TagBase, ChangeLoggedModel): color = ColorField( default='9e9e9e' From 8e548605c8a2c7d5157d7b60d286dbe0fad4e1b5 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Fri, 22 Feb 2019 02:29:00 -0500 Subject: [PATCH 009/140] added changelog views for Tag --- CHANGELOG.md | 5 +++++ netbox/extras/models.py | 3 +++ netbox/extras/tables.py | 3 +++ netbox/extras/urls.py | 3 +++ netbox/templates/extras/tag.html | 9 +++++++++ 5 files changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30fcca532..074de88d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,10 +10,15 @@ context data may observe a performance drop when returning multiple objects. To Config Context is not needed, the query parameter `?exclude=config_context` may be added to the request as to remove the Config Context from being included in any results. +### Tag Permissions Changed + +NetBox now makes use of its own `Tag` model instead of the vanilla model which ships with django-taggit. This new model lives in the `extras` app and thus any permissions that you may have configured using "Taggit | Tag" should be changed to now use "Extras | Tag." + ## Enhancements * [#2324](https://github.com/digitalocean/netbox/issues/2324) - Add color option for tags * [#2791](https://github.com/digitalocean/netbox/issues/2791) - Add a comment field for tags +* [#2926](https://github.com/digitalocean/netbox/issues/2926) - Add changelog to the Tag model --- diff --git a/netbox/extras/models.py b/netbox/extras/models.py index 285be6c44..9d907c84e 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -881,6 +881,9 @@ class Tag(TagBase, ChangeLoggedModel): default='' ) + def get_absolute_url(self): + return reverse('extras:tag', args=[self.slug]) + class TaggedItem(GenericTaggedItemBase): tag = models.ForeignKey( diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py index e646ad821..d1454db4f 100644 --- a/netbox/extras/tables.py +++ b/netbox/extras/tables.py @@ -5,6 +5,9 @@ from utilities.tables import BaseTable, BooleanColumn, ColorColumn, ToggleColumn from .models import ConfigContext, ObjectChange, Tag, TaggedItem TAG_ACTIONS = """ + + + {% if perms.taggit.change_tag %} {% endif %} diff --git a/netbox/extras/urls.py b/netbox/extras/urls.py index 35a6fb110..d475ab5a3 100644 --- a/netbox/extras/urls.py +++ b/netbox/extras/urls.py @@ -1,6 +1,8 @@ from django.conf.urls import url from extras import views +from extras.models import Tag + app_name = 'extras' urlpatterns = [ @@ -11,6 +13,7 @@ urlpatterns = [ url(r'^tags/(?P[\w-]+)/$', views.TagView.as_view(), name='tag'), url(r'^tags/(?P[\w-]+)/edit/$', views.TagEditView.as_view(), name='tag_edit'), url(r'^tags/(?P[\w-]+)/delete/$', views.TagDeleteView.as_view(), name='tag_delete'), + url(r'^tags/(?P[\w-]+)/changelog/$', views.ObjectChangeLogView.as_view(), name='tag_changelog', kwargs={'model': Tag}), # Config contexts url(r'^config-contexts/$', views.ConfigContextListView.as_view(), name='configcontext_list'), diff --git a/netbox/templates/extras/tag.html b/netbox/templates/extras/tag.html index 49e67c395..c8bd8442a 100644 --- a/netbox/templates/extras/tag.html +++ b/netbox/templates/extras/tag.html @@ -31,6 +31,15 @@ {% endif %}

{% block title %}Tag: {{ tag }}{% endblock %}

+ {% include 'inc/created_updated.html' with obj=tag %} + {% endblock %} {% block content %} From 231a5aa9fd9211c9dcf57accb2349f86e719791a Mon Sep 17 00:00:00 2001 From: John Anderson Date: Fri, 1 Mar 2019 23:16:08 -0500 Subject: [PATCH 010/140] v2.6.0-dev version update --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index a85a5d78e..2cf1e1f0a 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -22,7 +22,7 @@ except ImportError: ) -VERSION = '2.5.8-dev' +VERSION = '2.6.0-dev' BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) From 80b3a5ffc46b9262e709d622c7d6a9268c9cac4c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 4 Mar 2019 15:57:21 -0500 Subject: [PATCH 011/140] Fixed erroneous addition of 'description' field to unique_together --- netbox/dcim/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 7fb789235..541fd646e 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1843,11 +1843,11 @@ class PowerPort(CableTermination, ComponentModel): objects = DeviceComponentManager() tags = TaggableManager(through=TaggedItem) - csv_headers = ['device', 'name'] + csv_headers = ['device', 'name', 'description'] class Meta: ordering = ['device', 'name'] - unique_together = ['device', 'name', 'description'] + unique_together = ['device', 'name'] def __str__(self): return self.name @@ -1887,10 +1887,10 @@ class PowerOutlet(CableTermination, ComponentModel): objects = DeviceComponentManager() tags = TaggableManager(through=TaggedItem) - csv_headers = ['device', 'name'] + csv_headers = ['device', 'name', 'description'] class Meta: - unique_together = ['device', 'name', 'description'] + unique_together = ['device', 'name'] def __str__(self): return self.name From b9f4a9e57bc8c6fb83ccf5253fa35df895127c0c Mon Sep 17 00:00:00 2001 From: Grokzen Date: Mon, 4 Mar 2019 21:58:40 +0100 Subject: [PATCH 012/140] Closes #1792 - Add CustomFieldChoices API endpoint (#2941) * Add new api endpoint for CustomFieldChoices * Add changelog item for #1792 * Add tests for CustomFieldchoiceAPI endpoint --- CHANGELOG.md | 1 + netbox/extras/api/urls.py | 3 ++ netbox/extras/api/views.py | 36 ++++++++++++++++++++++-- netbox/extras/tests/test_customfields.py | 33 +++++++++++++++++++++- 4 files changed, 70 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00615d515..3a803df20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ to now use "Extras | Tag." * [#2643](https://github.com/digitalocean/netbox/issues/2643) - Add `description` field to console/power components and device bays * [#2791](https://github.com/digitalocean/netbox/issues/2791) - Add a comment field for tags * [#2926](https://github.com/digitalocean/netbox/issues/2926) - Add changelog to the Tag model +* [#1792](https://github.com/digitalocean/netbox/issues/1792) - Add CustomFieldChoices API endpoint --- diff --git a/netbox/extras/api/urls.py b/netbox/extras/api/urls.py index 1bdcf181b..c135280ea 100644 --- a/netbox/extras/api/urls.py +++ b/netbox/extras/api/urls.py @@ -17,6 +17,9 @@ router.APIRootView = ExtrasRootView # Field choices 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') + # Graphs router.register(r'graphs', views.GraphViewSet) diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py index 17070c7b4..b964b22da 100644 --- a/netbox/extras/api/views.py +++ b/netbox/extras/api/views.py @@ -1,3 +1,5 @@ +from collections import OrderedDict + from django.contrib.contenttypes.models import ContentType from django.db.models import Count from django.http import Http404, HttpResponse @@ -9,8 +11,8 @@ from rest_framework.viewsets import ReadOnlyModelViewSet, ViewSet from extras import filters from extras.models import ( - ConfigContext, CustomField, ExportTemplate, Graph, ImageAttachment, ObjectChange, ReportResult, TopologyMap, - Tag + ConfigContext, CustomField, CustomFieldChoice, ExportTemplate, Graph, ImageAttachment, ObjectChange, ReportResult, TopologyMap, + Tag, ) from extras.reports import get_report, get_reports from utilities.api import FieldChoicesViewSet, IsAuthenticatedOrLoginNotRequired, ModelViewSet @@ -28,6 +30,36 @@ class ExtrasFieldChoicesViewSet(FieldChoicesViewSet): ) +# +# Custom field choices +# + +class CustomFieldChoicesViewSet(ViewSet): + """ + """ + permission_classes = [IsAuthenticatedOrLoginNotRequired] + + def __init__(self, *args, **kwargs): + super(CustomFieldChoicesViewSet, self).__init__(*args, **kwargs) + + self._fields = OrderedDict() + + for cfc in CustomFieldChoice.objects.all(): + self._fields.setdefault(cfc.field.name, {}) + self._fields[cfc.field.name][cfc.value] = cfc.pk + + def list(self, request): + return Response(self._fields) + + def retrieve(self, request, pk): + if pk not in self._fields: + raise Http404 + return Response(self._fields[pk]) + + def get_view_name(self): + return "Custom Field choices" + + # # Custom fields # diff --git a/netbox/extras/tests/test_customfields.py b/netbox/extras/tests/test_customfields.py index b02e787c1..96f3483bc 100644 --- a/netbox/extras/tests/test_customfields.py +++ b/netbox/extras/tests/test_customfields.py @@ -6,9 +6,10 @@ from django.urls import reverse from rest_framework import status from dcim.models import Site -from extras.constants import CF_TYPE_TEXT, CF_TYPE_INTEGER, CF_TYPE_BOOLEAN, CF_TYPE_DATE, CF_TYPE_SELECT, CF_TYPE_URL +from extras.constants import CF_TYPE_TEXT, CF_TYPE_INTEGER, CF_TYPE_BOOLEAN, CF_TYPE_DATE, CF_TYPE_SELECT, CF_TYPE_URL, CF_TYPE_SELECT from extras.models import CustomField, CustomFieldValue, CustomFieldChoice from utilities.testing import APITestCase +from virtualization.models import VirtualMachine class CustomFieldTest(TestCase): @@ -299,3 +300,33 @@ class CustomFieldAPITest(APITestCase): self.assertEqual(response.data['custom_fields'].get('magic_choice'), data['custom_fields']['magic_choice']) cfv = self.site.custom_field_values.get(field=self.cf_select) self.assertEqual(cfv.value.pk, data['custom_fields']['magic_choice']) + + +class CustomFieldChoiceAPITest(APITestCase): + def setUp(self): + super().setUp() + + vm_content_type = ContentType.objects.get_for_model(VirtualMachine) + + self.cf_1 = CustomField.objects.create(name="cf_1", type=CF_TYPE_SELECT) + self.cf_2 = CustomField.objects.create(name="cf_2", type=CF_TYPE_SELECT) + + self.cf_choice_1 = CustomFieldChoice.objects.create(field=self.cf_1, value="cf_field_1", weight=100) + self.cf_choice_2 = CustomFieldChoice.objects.create(field=self.cf_1, value="cf_field_2", weight=50) + self.cf_choice_3 = CustomFieldChoice.objects.create(field=self.cf_2, value="cf_field_3", weight=10) + + def test_list_cfc(self): + url = reverse('extras-api:custom-field-choice-list') + response = self.client.get(url, **self.header) + + self.assertEqual(len(response.data), 2) + self.assertEqual(len(response.data[self.cf_1.name]), 2) + self.assertEqual(len(response.data[self.cf_2.name]), 1) + + self.assertTrue(self.cf_choice_1.value in response.data[self.cf_1.name]) + self.assertTrue(self.cf_choice_2.value in response.data[self.cf_1.name]) + self.assertTrue(self.cf_choice_3.value in response.data[self.cf_2.name]) + + self.assertEqual(self.cf_choice_1.pk, response.data[self.cf_1.name][self.cf_choice_1.value]) + self.assertEqual(self.cf_choice_2.pk, response.data[self.cf_1.name][self.cf_choice_2.value]) + self.assertEqual(self.cf_choice_3.pk, response.data[self.cf_2.name][self.cf_choice_3.value]) From 66d9d9d9cbbceaa7b1e7efcaecd9e9c988f7f8fb Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 4 Mar 2019 16:01:43 -0500 Subject: [PATCH 013/140] Rearranged changelog items --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a803df20..52230def4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,11 +18,11 @@ to now use "Extras | Tag." ## Enhancements -* [#2324](https://github.com/digitalocean/netbox/issues/2324) - Add color option for tags -* [#2643](https://github.com/digitalocean/netbox/issues/2643) - Add `description` field to console/power components and device bays -* [#2791](https://github.com/digitalocean/netbox/issues/2791) - Add a comment field for tags -* [#2926](https://github.com/digitalocean/netbox/issues/2926) - Add changelog to the Tag model * [#1792](https://github.com/digitalocean/netbox/issues/1792) - Add CustomFieldChoices API endpoint +* [#2324](https://github.com/digitalocean/netbox/issues/2324) - Add `color` option for tags +* [#2643](https://github.com/digitalocean/netbox/issues/2643) - Add `description` field to console/power components and device bays +* [#2791](https://github.com/digitalocean/netbox/issues/2791) - Add a `comment` field for tags +* [#2926](https://github.com/digitalocean/netbox/issues/2926) - Add changelog to the Tag model --- From 8a1d7fdb371ae3a51309150ff6a07224db15ab18 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 5 Mar 2019 13:46:37 -0500 Subject: [PATCH 014/140] Updated migrations to account for extras/0017_exporttemplate_mime_type_length --- netbox/circuits/migrations/0015_custom_tag_models.py | 2 +- netbox/dcim/migrations/0070_custom_tag_models.py | 2 +- .../{0017_tag_taggeditem.py => 0018_tag_taggeditem.py} | 2 +- netbox/extras/migrations/{0018_tag_data.py => 0019_tag_data.py} | 2 +- ...og_to_tag.py => 0020_add_color_comments_changelog_to_tag.py} | 2 +- netbox/ipam/migrations/0025_custom_tag_models.py | 2 +- netbox/secrets/migrations/0006_custom_tag_models.py | 2 +- netbox/tenancy/migrations/0006_custom_tag_models.py | 2 +- netbox/virtualization/migrations/0009_custom_tag_models.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename netbox/extras/migrations/{0017_tag_taggeditem.py => 0018_tag_taggeditem.py} (96%) rename netbox/extras/migrations/{0018_tag_data.py => 0019_tag_data.py} (97%) rename netbox/extras/migrations/{0019_add_color_comments_changelog_to_tag.py => 0020_add_color_comments_changelog_to_tag.py} (95%) diff --git a/netbox/circuits/migrations/0015_custom_tag_models.py b/netbox/circuits/migrations/0015_custom_tag_models.py index e4926b923..d00eb36d7 100644 --- a/netbox/circuits/migrations/0015_custom_tag_models.py +++ b/netbox/circuits/migrations/0015_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('circuits', '0014_circuittermination_description'), - ('extras', '0017_tag_taggeditem'), + ('extras', '0018_tag_taggeditem'), ] operations = [ diff --git a/netbox/dcim/migrations/0070_custom_tag_models.py b/netbox/dcim/migrations/0070_custom_tag_models.py index 255b9c3ff..e3b54b9cc 100644 --- a/netbox/dcim/migrations/0070_custom_tag_models.py +++ b/netbox/dcim/migrations/0070_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('dcim', '0069_deprecate_nullablecharfield'), - ('extras', '0017_tag_taggeditem'), + ('extras', '0018_tag_taggeditem'), ] operations = [ diff --git a/netbox/extras/migrations/0017_tag_taggeditem.py b/netbox/extras/migrations/0018_tag_taggeditem.py similarity index 96% rename from netbox/extras/migrations/0017_tag_taggeditem.py rename to netbox/extras/migrations/0018_tag_taggeditem.py index 91f47240b..11a3a50a5 100644 --- a/netbox/extras/migrations/0017_tag_taggeditem.py +++ b/netbox/extras/migrations/0018_tag_taggeditem.py @@ -9,7 +9,7 @@ class Migration(migrations.Migration): dependencies = [ ('contenttypes', '0002_remove_content_type_name'), - ('extras', '0016_exporttemplate_add_cable'), + ('extras', '0017_exporttemplate_mime_type_length'), ] operations = [ diff --git a/netbox/extras/migrations/0018_tag_data.py b/netbox/extras/migrations/0019_tag_data.py similarity index 97% rename from netbox/extras/migrations/0018_tag_data.py rename to netbox/extras/migrations/0019_tag_data.py index 86d024a66..af4641daa 100644 --- a/netbox/extras/migrations/0018_tag_data.py +++ b/netbox/extras/migrations/0019_tag_data.py @@ -48,7 +48,7 @@ def delete_taggit_tags(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('extras', '0017_tag_taggeditem'), + ('extras', '0018_tag_taggeditem'), ('circuits', '0015_custom_tag_models'), ('dcim', '0070_custom_tag_models'), ('ipam', '0025_custom_tag_models'), diff --git a/netbox/extras/migrations/0019_add_color_comments_changelog_to_tag.py b/netbox/extras/migrations/0020_add_color_comments_changelog_to_tag.py similarity index 95% rename from netbox/extras/migrations/0019_add_color_comments_changelog_to_tag.py rename to netbox/extras/migrations/0020_add_color_comments_changelog_to_tag.py index 8a81d85ed..33171db98 100644 --- a/netbox/extras/migrations/0019_add_color_comments_changelog_to_tag.py +++ b/netbox/extras/migrations/0020_add_color_comments_changelog_to_tag.py @@ -7,7 +7,7 @@ import utilities.fields class Migration(migrations.Migration): dependencies = [ - ('extras', '0018_tag_data'), + ('extras', '0019_tag_data'), ] operations = [ diff --git a/netbox/ipam/migrations/0025_custom_tag_models.py b/netbox/ipam/migrations/0025_custom_tag_models.py index 89075f3ab..a47335b58 100644 --- a/netbox/ipam/migrations/0025_custom_tag_models.py +++ b/netbox/ipam/migrations/0025_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('ipam', '0024_vrf_allow_null_rd'), - ('extras', '0017_tag_taggeditem'), + ('extras', '0018_tag_taggeditem'), ] operations = [ diff --git a/netbox/secrets/migrations/0006_custom_tag_models.py b/netbox/secrets/migrations/0006_custom_tag_models.py index 2f196ad72..8e5fc1b80 100644 --- a/netbox/secrets/migrations/0006_custom_tag_models.py +++ b/netbox/secrets/migrations/0006_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('secrets', '0005_change_logging'), - ('extras', '0017_tag_taggeditem'), + ('extras', '0018_tag_taggeditem'), ] operations = [ diff --git a/netbox/tenancy/migrations/0006_custom_tag_models.py b/netbox/tenancy/migrations/0006_custom_tag_models.py index 9104398ad..92e333520 100644 --- a/netbox/tenancy/migrations/0006_custom_tag_models.py +++ b/netbox/tenancy/migrations/0006_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('tenancy', '0005_change_logging'), - ('extras', '0017_tag_taggeditem'), + ('extras', '0018_tag_taggeditem'), ] operations = [ diff --git a/netbox/virtualization/migrations/0009_custom_tag_models.py b/netbox/virtualization/migrations/0009_custom_tag_models.py index 883d844f7..3f70d5469 100644 --- a/netbox/virtualization/migrations/0009_custom_tag_models.py +++ b/netbox/virtualization/migrations/0009_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('virtualization', '0008_virtualmachine_local_context_data'), - ('extras', '0017_tag_taggeditem'), + ('extras', '0018_tag_taggeditem'), ] operations = [ From d9c8c0cbc10a92e3a1b104e959cf20a8b9eb3bb7 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 8 Mar 2019 10:25:09 -0500 Subject: [PATCH 015/140] Fixes #2968: Correct API documentation for SerializerMethodFields --- CHANGELOG.md | 4 ++++ netbox/dcim/api/serializers.py | 7 +++++++ netbox/extras/api/serializers.py | 3 +++ netbox/netbox/settings.py | 1 + netbox/virtualization/api/serializers.py | 2 ++ 5 files changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e6c3d361..fbbba1907 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,10 @@ to now use "Extras | Tag." * [#2791](https://github.com/digitalocean/netbox/issues/2791) - Add a `comment` field for tags * [#2926](https://github.com/digitalocean/netbox/issues/2926) - Add changelog to the Tag model +## Bug Fixes + +* [#2968](https://github.com/digitalocean/netbox/issues/2968) - Correct API documentation for SerializerMethodFields + --- v2.5.8 (FUTURE) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 969308ba1..d18c59be5 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -1,3 +1,4 @@ +from drf_yasg.utils import swagger_serializer_method from rest_framework import serializers from rest_framework.validators import UniqueTogetherValidator from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField @@ -35,6 +36,7 @@ class ConnectedEndpointSerializer(ValidatedModelSerializer): ) return None + @swagger_serializer_method(serializer_or_field=serializers.DictField) def get_connected_endpoint(self, obj): """ Return the appropriate serializer for the type of connected object. @@ -312,6 +314,7 @@ class DeviceSerializer(TaggitSerializer, CustomFieldModelSerializer): return data + @swagger_serializer_method(serializer_or_field=NestedDeviceSerializer) def get_parent_device(self, obj): try: device_bay = obj.parent_bay @@ -334,6 +337,7 @@ class DeviceWithConfigContextSerializer(DeviceSerializer): 'custom_fields', 'config_context', 'created', 'last_updated', ] + @swagger_serializer_method(serializer_or_field=serializers.DictField) def get_config_context(self, obj): return obj.get_config_context() @@ -531,9 +535,11 @@ class CableSerializer(ValidatedModelSerializer): return data + @swagger_serializer_method(serializer_or_field=serializers.DictField) def get_termination_a(self, obj): return self._get_termination(obj, 'a') + @swagger_serializer_method(serializer_or_field=serializers.DictField) def get_termination_b(self, obj): return self._get_termination(obj, 'b') @@ -564,6 +570,7 @@ class InterfaceConnectionSerializer(ValidatedModelSerializer): model = Interface fields = ['interface_a', 'interface_b', 'connection_status'] + @swagger_serializer_method(serializer_or_field=NestedInterfaceSerializer) def get_interface_a(self, obj): context = {'request': self.context['request']} return NestedInterfaceSerializer(instance=obj, context=context).data diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py index 9d24589b0..6533b71ff 100644 --- a/netbox/extras/api/serializers.py +++ b/netbox/extras/api/serializers.py @@ -1,4 +1,5 @@ from django.core.exceptions import ObjectDoesNotExist +from drf_yasg.utils import swagger_serializer_method from rest_framework import serializers from dcim.api.nested_serializers import ( @@ -112,6 +113,7 @@ class ImageAttachmentSerializer(ValidatedModelSerializer): return data + @swagger_serializer_method(serializer_or_field=serializers.DictField) def get_parent(self, obj): # Static mapping of models to their nested serializers @@ -215,6 +217,7 @@ class ObjectChangeSerializer(serializers.ModelSerializer): 'id', 'time', 'user', 'user_name', 'request_id', 'action', 'content_type', 'changed_object', 'object_data', ] + @swagger_serializer_method(serializer_or_field=serializers.DictField) def get_changed_object(self, obj): """ Serialize a nested representation of the changed object. diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 08ded2b63..08bd63588 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -308,6 +308,7 @@ SWAGGER_SETTINGS = { 'drf_yasg.inspectors.ChoiceFieldInspector', 'drf_yasg.inspectors.FileFieldInspector', 'drf_yasg.inspectors.DictFieldInspector', + 'drf_yasg.inspectors.SerializerMethodFieldInspector', 'drf_yasg.inspectors.SimpleFieldInspector', 'drf_yasg.inspectors.StringDefaultFieldInspector', ], diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py index 1b06dab3b..86953cadc 100644 --- a/netbox/virtualization/api/serializers.py +++ b/netbox/virtualization/api/serializers.py @@ -1,3 +1,4 @@ +from drf_yasg.utils import swagger_serializer_method from rest_framework import serializers from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField @@ -80,6 +81,7 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer): 'config_context', 'created', 'last_updated', ] + @swagger_serializer_method(serializer_or_field=serializers.DictField) def get_config_context(self, obj): return obj.get_config_context() From 5b753923b61748c947877bd0db5569c906a3e895 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 11 Mar 2019 22:40:52 -0400 Subject: [PATCH 016/140] Initial work on power modeling (WIP) --- netbox/dcim/constants.py | 30 ++++ netbox/dcim/forms.py | 170 ++++++++++++++++++++- netbox/dcim/migrations/0072_powerfeeds.py | 74 +++++++++ netbox/dcim/models.py | 131 ++++++++++++++++ netbox/dcim/tables.py | 50 +++++- netbox/dcim/urls.py | 22 ++- netbox/dcim/views.py | 115 +++++++++++++- netbox/templates/dcim/powerfeed.html | 111 ++++++++++++++ netbox/templates/dcim/powerfeed_edit.html | 45 ++++++ netbox/templates/dcim/powerfeed_list.html | 22 +++ netbox/templates/dcim/powerpanel_list.html | 18 +++ netbox/templates/inc/nav_menu.html | 23 +++ 12 files changed, 804 insertions(+), 7 deletions(-) create mode 100644 netbox/dcim/migrations/0072_powerfeeds.py create mode 100644 netbox/templates/dcim/powerfeed.html create mode 100644 netbox/templates/dcim/powerfeed_edit.html create mode 100644 netbox/templates/dcim/powerfeed_list.html create mode 100644 netbox/templates/dcim/powerpanel_list.html diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index 0b81e68bf..e68493af6 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -443,3 +443,33 @@ RACK_DIMENSION_UNIT_CHOICES = ( (LENGTH_UNIT_MILLIMETER, 'Millimeters'), (LENGTH_UNIT_INCH, 'Inches'), ) + +# Power feeds +POWERFEED_TYPE_PRIMARY = 1 +POWERFEED_TYPE_REDUNDANT = 2 +POWERFEED_TYPE_CHOICES = ( + (POWERFEED_TYPE_PRIMARY, 'AC'), + (POWERFEED_TYPE_REDUNDANT, 'DC'), +) +POWERFEED_SUPPLY_AC = 1 +POWERFEED_SUPPLY_DC = 2 +POWERFEED_SUPPLY_CHOICES = ( + (POWERFEED_SUPPLY_AC, 'AC'), + (POWERFEED_SUPPLY_DC, 'DC'), +) +POWERFEED_PHASE_SINGLE = 1 +POWERFEED_PHASE_3PHASE = 3 +POWERFEED_PHASE_CHOICES = ( + (POWERFEED_PHASE_SINGLE, 'Single phase'), + (POWERFEED_PHASE_3PHASE, 'Three-phase'), +) +POWERFEED_STATUS_OFFLINE = 0 +POWERFEED_STATUS_ACTIVE = 1 +POWERFEED_STATUS_PLANNED = 2 +POWERFEED_STATUS_FAILED = 4 +POWERFEED_STATUS_CHOICES = ( + (POWERFEED_STATUS_ACTIVE, 'Active'), + (POWERFEED_STATUS_OFFLINE, 'Offline'), + (POWERFEED_STATUS_PLANNED, 'Planned'), + (POWERFEED_STATUS_FAILED, 'Failed'), +) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index ab3da181f..8e429137a 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -26,8 +26,8 @@ from .constants import * from .models import ( Cable, DeviceBay, DeviceBayTemplate, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, Manufacturer, - InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, - RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis + InventoryItem, Platform, PowerFeed, PowerOutlet, PowerOutletTemplate, PowerPanel, PowerPort, PowerPortTemplate, + Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, ) DEVICE_BY_PK_RE = r'{\d+\}' @@ -3156,3 +3156,169 @@ class VirtualChassisFilterForm(BootstrapMixin, CustomFieldFilterForm): to_field_name='slug', null_label='-- None --', ) + + +# +# Power panels +# + +class PowerPanelForm(BootstrapMixin, forms.ModelForm): + rackgroup = ChainedModelChoiceField( + queryset=RackGroup.objects.all(), + chains=( + ('site', 'site'), + ), + required=False, + widget=APISelect( + api_url='/api/dcim/rack-groups/', + ) + ) + + class Meta: + model = PowerPanel + fields = [ + 'site', 'rackgroup', 'name', + ] + widgets = { + 'site': APISelect( + api_url="/api/dcim/sites/", + filter_for={ + 'rackgroup': 'site_id', + } + ), + } + + +class PowerPanelCSVForm(forms.ModelForm): + site = forms.ModelChoiceField( + queryset=Site.objects.all(), + to_field_name='name', + help_text='Name of parent site', + error_messages={ + 'invalid_choice': 'Site not found.', + } + ) + group_name = forms.CharField( + help_text='Name of rack group', + required=False + ) + + class Meta: + model = PowerPanel + fields = PowerPanel.csv_headers + + +# +# Power feeds +# + +class PowerFeedForm(BootstrapMixin, CustomFieldForm): + tags = TagField( + required=False + ) + + class Meta: + model = PowerFeed + fields = [ + 'powerpanel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', 'max_utilization', + 'comments', 'tags', + ] + widgets = { + 'site': APISelect( + api_url="/api/dcim/sites/", + filter_for={ + 'rackgroup': 'site_id', + } + ), + 'type': StaticSelect2(), + 'status': StaticSelect2(), + 'supply': StaticSelect2(), + 'phase': StaticSelect2(), + } + + +class PowerFeedCSVForm(forms.ModelForm): + type = CSVChoiceField( + choices=POWERFEED_TYPE_CHOICES, + required=False, + help_text='Primary or redundant' + ) + status = CSVChoiceField( + choices=POWERFEED_STATUS_CHOICES, + required=False, + help_text='Operational status' + ) + supply = CSVChoiceField( + choices=POWERFEED_SUPPLY_CHOICES, + required=False, + help_text='AC/DC' + ) + + class Meta: + model = PowerFeed + fields = PowerFeed.csv_headers + + +class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm): + pk = forms.ModelMultipleChoiceField( + queryset=PowerFeed.objects.all(), + widget=forms.MultipleHiddenInput + ) + powerpanel = forms.ModelChoiceField( + queryset=PowerPanel.objects.all(), + required=False, + widget=APISelect( + api_url="/api/dcim/sites", + filter_for={ + 'rackgroup': 'site_id', + } + ) + ) + rackgroup = forms.ModelChoiceField( + queryset=RackGroup.objects.all(), + required=False, + widget=APISelect( + api_url="/api/dcim/rack-groups", + ) + ) + type = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_TYPE_CHOICES), + required=False, + initial='', + widget=StaticSelect2() + ) + status = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_STATUS_CHOICES), + required=False, + initial='', + widget=StaticSelect2() + ) + supply = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_SUPPLY_CHOICES), + required=False, + initial='', + widget=StaticSelect2() + ) + voltage = forms.IntegerField( + required=False + ) + amperage = forms.IntegerField( + required=False + ) + phase = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_PHASE_CHOICES), + required=False, + initial='', + widget=StaticSelect2() + ) + max_utilization = forms.IntegerField( + required=False + ) + comments = forms.CharField( + required=False + ) + + class Meta: + nullable_fields = [ + 'rackgroup', 'comments', + ] diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py new file mode 100644 index 000000000..ddfbb8ec1 --- /dev/null +++ b/netbox/dcim/migrations/0072_powerfeeds.py @@ -0,0 +1,74 @@ +# Generated by Django 2.1.7 on 2019-03-12 02:29 + +import django.core.validators +from django.db import migrations, models +import django.db.models.deletion +import taggit.managers + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0020_add_color_comments_changelog_to_tag'), + ('dcim', '0071_device_components_add_description'), + ] + + operations = [ + migrations.CreateModel( + name='PowerFeed', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), + ('created', models.DateField(auto_now_add=True, null=True)), + ('last_updated', models.DateTimeField(auto_now=True, null=True)), + ('name', models.CharField(max_length=50)), + ('type', models.PositiveSmallIntegerField(default=1)), + ('status', models.PositiveSmallIntegerField(default=1)), + ('supply', models.PositiveSmallIntegerField(default=1)), + ('voltage', models.PositiveSmallIntegerField(default=120, validators=[django.core.validators.MinValueValidator(1)])), + ('amperage', models.PositiveSmallIntegerField(default=20, validators=[django.core.validators.MinValueValidator(1)])), + ('phase', models.PositiveSmallIntegerField(default=1)), + ('max_utilization', models.PositiveSmallIntegerField(default=80, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])), + ('comments', models.TextField(blank=True)), + ], + options={ + 'ordering': ['powerpanel', 'name'], + }, + ), + migrations.CreateModel( + name='PowerPanel', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), + ('created', models.DateField(auto_now_add=True, null=True)), + ('last_updated', models.DateTimeField(auto_now=True, null=True)), + ('name', models.CharField(max_length=50)), + ('rackgroup', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='dcim.RackGroup')), + ('site', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='dcim.Site')), + ], + options={ + 'ordering': ['site', 'name'], + }, + ), + migrations.AddField( + model_name='powerfeed', + name='powerpanel', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='powerfeeds', to='dcim.PowerPanel'), + ), + migrations.AddField( + model_name='powerfeed', + name='rack', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='dcim.Rack'), + ), + migrations.AddField( + model_name='powerfeed', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterUniqueTogether( + name='powerpanel', + unique_together={('site', 'name')}, + ), + migrations.AlterUniqueTogether( + name='powerfeed', + unique_together={('powerpanel', 'name')}, + ), + ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index cbfce0b91..ad7e198fb 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2668,3 +2668,134 @@ class Cable(ChangeLoggedModel): b_endpoint = b_path[-1][2] return a_endpoint, b_endpoint, path_status + + +# +# Power +# + +class PowerPanel(ChangeLoggedModel): + """ + A distribution point for electrical power; e.g. a data center RPP. + """ + site = models.ForeignKey( + to='Site', + on_delete=models.PROTECT + ) + rackgroup = models.ForeignKey( + to='RackGroup', + on_delete=models.PROTECT, + blank=True, + null=True + ) + name = models.CharField( + max_length=50 + ) + + csv_headers = ['site', 'rackgroup', 'name'] + + class Meta: + ordering = ['site', 'name'] + unique_together = ['site', 'name'] + + def __str__(self): + return self.name + + def get_absolute_url(self): + return reverse('dcim:powerpanel', args=[self.pk]) + + def to_csv(self): + return ( + self.site.name, + self.rackgroup.name if self.rackgroup else None, + self.name, + ) + + +class PowerFeed(ChangeLoggedModel, CustomFieldModel): + """ + An electrical circuit delivered from a PowerPanel. + """ + powerpanel = models.ForeignKey( + to='PowerPanel', + on_delete=models.PROTECT, + related_name='powerfeeds' + ) + rack = models.ForeignKey( + to='Rack', + on_delete=models.PROTECT, + blank=True, + null=True + ) + name = models.CharField( + max_length=50 + ) + type = models.PositiveSmallIntegerField( + choices=POWERFEED_TYPE_CHOICES, + default=POWERFEED_TYPE_PRIMARY + ) + status = models.PositiveSmallIntegerField( + choices=POWERFEED_STATUS_CHOICES, + default=POWERFEED_STATUS_ACTIVE + ) + supply = models.PositiveSmallIntegerField( + choices=POWERFEED_SUPPLY_CHOICES, + default=POWERFEED_SUPPLY_AC + ) + voltage = models.PositiveSmallIntegerField( + validators=[MinValueValidator(1)], + default=120 + ) + amperage = models.PositiveSmallIntegerField( + validators=[MinValueValidator(1)], + default=20 + ) + phase = models.PositiveSmallIntegerField( + choices=POWERFEED_PHASE_CHOICES, + default=POWERFEED_PHASE_SINGLE + ) + max_utilization = models.PositiveSmallIntegerField( + validators=[MinValueValidator(1), MaxValueValidator(100)], + default=80, + help_text="Maximum permissible draw (percentage)" + ) + comments = models.TextField( + blank=True + ) + custom_field_values = GenericRelation( + to='extras.CustomFieldValue', + content_type_field='obj_type', + object_id_field='obj_id' + ) + + tags = TaggableManager(through=TaggedItem) + + csv_headers = [ + 'powerpanel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', 'max_utilization', + 'comments', + ] + + class Meta: + ordering = ['powerpanel', 'name'] + unique_together = ['powerpanel', 'name'] + + def __str__(self): + return self.name + + def get_absolute_url(self): + return reverse('dcim:powerfeed', args=[self.pk]) + + def to_csv(self): + return ( + self.powerpanel.name, + self.rack.name if self.rack else None, + self.name, + self.get_type_display(), + self.get_status_display(), + self.get_supply_display(), + self.voltage, + self.amperage, + self.get_phase_display(), + self.max_utilization, + self.comments, + ) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 436b9053d..8106d997a 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -6,8 +6,9 @@ from utilities.tables import BaseTable, BooleanColumn, ColorColumn, ToggleColumn from .models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, - InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, + InventoryItem, Manufacturer, Platform, PowerFeed, PowerOutlet, PowerOutletTemplate, PowerPanel, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, + VirtualChassis, ) REGION_LINK = """ @@ -786,3 +787,48 @@ class VirtualChassisTable(BaseTable): class Meta(BaseTable.Meta): model = VirtualChassis fields = ('pk', 'master', 'domain', 'member_count', 'actions') + + +# +# Power panels +# + +class PowerPanelTable(BaseTable): + pk = ToggleColumn() + name = tables.LinkColumn() + powerfeed_count = tables.Column( + verbose_name='Feeds' + ) + actions = tables.TemplateColumn( + template_code=RACKROLE_ACTIONS, + attrs={ + 'td': {'class': 'text-right noprint'} + }, + verbose_name='' + ) + + class Meta(BaseTable.Meta): + model = PowerPanel + fields = ('pk', 'name', 'site', 'rackgroup', 'powerfeed_count', 'actions') + + +# +# Power feeds +# + +class PowerFeedTable(BaseTable): + pk = ToggleColumn() + name = tables.LinkColumn() + powerpanel = tables.LinkColumn( + viewname='dcim:powerpanel', + args=[Accessor('powerpanel.pk')], + + ) + rack = tables.LinkColumn( + viewname='dcim:rack', + accessor=Accessor('rack.pk') + ) + + class Meta(BaseTable.Meta): + model = PowerFeed + fields = ('pk', 'name', 'powerpanel', 'rack', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase') diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 21d620af1..a087a0ae9 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -6,7 +6,8 @@ from secrets.views import secret_add from . import views from .models import ( Cable, ConsolePort, ConsoleServerPort, Device, DeviceRole, DeviceType, FrontPort, Interface, Manufacturer, Platform, - PowerPort, PowerOutlet, Rack, RackGroup, RackReservation, RackRole, RearPort, Region, Site, VirtualChassis, + PowerFeed, PowerPanel, PowerPort, PowerOutlet, Rack, RackGroup, RackReservation, RackRole, RearPort, Region, Site, + VirtualChassis, ) app_name = 'dcim' @@ -279,4 +280,23 @@ urlpatterns = [ url(r'^virtual-chassis/(?P\d+)/add-member/$', views.VirtualChassisAddMemberView.as_view(), name='virtualchassis_add_member'), url(r'^virtual-chassis-members/(?P\d+)/delete/$', views.VirtualChassisRemoveMemberView.as_view(), name='virtualchassis_remove_member'), + # Power panels + url(r'^power-panels/$', views.PowerPanelListView.as_view(), name='powerpanel_list'), + url(r'^power-panels/add/$', views.PowerPanelCreateView.as_view(), name='powerpanel_add'), + url(r'^power-panels/import/$', views.PowerPanelBulkImportView.as_view(), name='powerpanel_import'), + url(r'^power-panels/delete/$', views.PowerPanelBulkDeleteView.as_view(), name='powerpanel_bulk_delete'), + url(r'^power-panels/(?P\d+)/edit/$', views.PowerPanelEditView.as_view(), name='powerpanel_edit'), + url(r'^power-panels/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='powerpanel_changelog', kwargs={'model': PowerPanel}), + + # Racks + url(r'^power-feeds/$', views.PowerFeedListView.as_view(), name='powerfeed_list'), + url(r'^power-feeds/add/$', views.PowerFeedEditView.as_view(), name='powerfeed_add'), + url(r'^power-feeds/import/$', views.PowerFeedBulkImportView.as_view(), name='powerfeed_import'), + url(r'^power-feeds/edit/$', views.PowerFeedBulkEditView.as_view(), name='powerfeed_bulk_edit'), + url(r'^power-feeds/delete/$', views.PowerFeedBulkDeleteView.as_view(), name='powerfeed_bulk_delete'), + url(r'^power-feeds/(?P\d+)/$', views.PowerFeedView.as_view(), name='powerfeed'), + url(r'^power-feeds/(?P\d+)/edit/$', views.PowerFeedEditView.as_view(), name='powerfeed_edit'), + url(r'^power-feeds/(?P\d+)/delete/$', views.PowerFeedDeleteView.as_view(), name='powerfeed_delete'), + url(r'^power-feeds/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='powerfeed_changelog', kwargs={'model': PowerFeed}), + ] diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 27f90a3a2..958975e16 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -30,8 +30,9 @@ from . import filters, forms, tables from .models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, - InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, + InventoryItem, Manufacturer, Platform, PowerFeed, PowerOutlet, PowerOutletTemplate, PowerPanel, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, + VirtualChassis, ) @@ -2114,3 +2115,113 @@ class VirtualChassisRemoveMemberView(PermissionRequiredMixin, GetReturnURLMixin, 'form': form, 'return_url': self.get_return_url(request, device), }) + + +# +# Power panels +# + +class PowerPanelListView(ObjectListView): + queryset = PowerPanel.objects.select_related( + 'site', 'rackgroup' + ).annotate( + rack_count=Count('powerfeeds') + ) + table = tables.PowerPanelTable + template_name = 'dcim/powerpanel_list.html' + + +class PowerPanelCreateView(PermissionRequiredMixin, ObjectEditView): + permission_required = 'dcim.add_powerpanel' + model = PowerPanel + model_form = forms.PowerPanelForm + default_return_url = 'dcim:powerpanel_list' + + +class PowerPanelEditView(PowerPanelCreateView): + permission_required = 'dcim.change_powerpanel' + + +class PowerPanelBulkImportView(PermissionRequiredMixin, BulkImportView): + permission_required = 'dcim.add_powerpanel' + model_form = forms.PowerPanelCSVForm + table = tables.PowerPanelTable + default_return_url = 'dcim:powerpanel_list' + + +class PowerPanelBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_powerpanel' + queryset = PowerPanel.objects.select_related( + 'site', 'rack_group' + ).annotate( + rack_count=Count('powerfeeds') + ) + table = tables.PowerPanelTable + default_return_url = 'dcim:powerpanel_list' + + +# +# Power feeds +# + +class PowerFeedListView(ObjectListView): + queryset = PowerFeed.objects.select_related( + 'powerpanel', 'rack' + ) + # filter = filters.PowerFeedFilter + # filter_form = forms.PowerFeedFilterForm + table = tables.PowerFeedTable + template_name = 'dcim/powerfeed_list.html' + + +class PowerFeedView(View): + + def get(self, request, pk): + + powerfeed = get_object_or_404(PowerFeed.objects.select_related('panel', 'rack'), pk=pk) + + return render(request, 'dcim/powerfeed.html', { + 'powerfeed': powerfeed, + }) + + +class PowerFeedCreateView(PermissionRequiredMixin, ObjectEditView): + permission_required = 'dcim.add_powerfeed' + model = PowerFeed + model_form = forms.PowerFeedForm + template_name = 'dcim/powerfeed_edit.html' + default_return_url = 'dcim:powerfeed_list' + + +class PowerFeedEditView(PowerFeedCreateView): + permission_required = 'dcim.change_powerfeed' + + +class PowerFeedDeleteView(PermissionRequiredMixin, ObjectDeleteView): + permission_required = 'dcim.delete_powerfeed' + model = PowerFeed + default_return_url = 'dcim:powerfeed_list' + + +class PowerFeedBulkImportView(PermissionRequiredMixin, BulkImportView): + permission_required = 'dcim.add_powerfeed' + model_form = forms.PowerFeedCSVForm + table = tables.PowerFeedTable + default_return_url = 'dcim:powerfeed_list' + + +class PowerFeedBulkEditView(PermissionRequiredMixin, BulkEditView): + permission_required = 'dcim.change_powerfeed' + queryset = PowerFeed.objects.select_related('powerpanel', 'rack') + # filter = filters.PowerFeedFilter + table = tables.PowerFeedTable + form = forms.PowerFeedBulkEditForm + default_return_url = 'dcim:powerfeed_list' + + +class PowerFeedBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_powerfeed' + queryset = PowerFeed.objects.select_related('powerpanel', 'rack') + # filter = filters.PowerFeedFilter + table = tables.PowerFeedTable + default_return_url = 'dcim:powerfeed_list' diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html new file mode 100644 index 000000000..9dc4843f4 --- /dev/null +++ b/netbox/templates/dcim/powerfeed.html @@ -0,0 +1,111 @@ +{% extends '_base.html' %} +{% load static %} +{% load tz %} +{% load helpers %} + +{% block header %} +
+
+
    +
  1. Power Feeds
    2. +
  2. {{ powerfeed.site }}
    3. + {% if powerfeed.rackgroup %} +
  3. {{ powerfeed.rackgroup }}
    4. + {% endif %} +
  4. {{ site }}
    5. +
+
+
+
+
+ + + + +
+
+
+
+
+ {% if perms.dcim.change_powerfeed %} + + + Edit this power feed + + {% endif %} + {% if perms.dcim.delete_powerfeed %} + + + Delete this power feed + + {% endif %} +
+

{% block title %}{{ powerfeed }}{% endblock %}

+ {% include 'inc/created_updated.html' with obj=powerfeed %} +{% endblock %} + +{% block content %} +
+
+
+
+ Power Feed +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Power Panel + {{ powerfeed.powerpanel }} +
Rack + {% if powerfeed.rack %} + {{ powerfeed.rack }} + {% else %} + None + {% endif %} +
Type + {{ powerfeed.get_type_display }} +
Status + {{ powerfeed.get_status_display }} +
Supply{{ powerfeed.get_supply_display }}
Voltage{{ powerfeed.voltage }}V
Amperage{{ powerfeed.amperage }}A
Phase{{ powerfeed.get_phase_display }}
Max Utilization{{ powerfeed.max_utilization }}%
+
+
+
+
+
+{% endblock %} diff --git a/netbox/templates/dcim/powerfeed_edit.html b/netbox/templates/dcim/powerfeed_edit.html new file mode 100644 index 000000000..709112f93 --- /dev/null +++ b/netbox/templates/dcim/powerfeed_edit.html @@ -0,0 +1,45 @@ +{% extends 'utilities/obj_edit.html' %} +{% load form_helpers %} + +{% block form %} +
+
Power Feed
+
+ {% render_field form.powerpanel %} + {% render_field form.rack %} + {% render_field form.name %} + {% render_field form.type %} + {% render_field form.status %} +
+
+
+
Characteristics
+
+ {% render_field form.supply %} + {% render_field form.voltage %} + {% render_field form.amperage %} + {% render_field form.phase %} + {% render_field form.max_utilization %} +
+
+ {% if form.custom_fields %} +
+
Custom Fields
+
+ {% render_custom_fields form %} +
+
+ {% endif %} +
+
Tags
+
+ {% render_field form.tags %} +
+
+
+
Comments
+
+ {% render_field form.comments %} +
+
+{% endblock %} diff --git a/netbox/templates/dcim/powerfeed_list.html b/netbox/templates/dcim/powerfeed_list.html new file mode 100644 index 000000000..cfe2c989c --- /dev/null +++ b/netbox/templates/dcim/powerfeed_list.html @@ -0,0 +1,22 @@ +{% extends '_base.html' %} +{% load buttons %} + +{% block content %} +
+ {% if perms.dcim.add_powerfeed %} + {% add_button 'dcim:powerfeed_add' %} + {% import_button 'dcim:powerfeed_import' %} + {% endif %} + {% export_button content_type %} +
+

{% block title %}Power Feeds{% endblock %}

+
+
+ {% include 'utilities/obj_table.html' with bulk_edit_url='dcim:powerfeed_bulk_edit' bulk_delete_url='dcim:powerfeed_bulk_delete' %} +
+
+ {% include 'inc/search_panel.html' %} + {% include 'inc/tags_panel.html' %} +
+
+{% endblock %} diff --git a/netbox/templates/dcim/powerpanel_list.html b/netbox/templates/dcim/powerpanel_list.html new file mode 100644 index 000000000..b58469c12 --- /dev/null +++ b/netbox/templates/dcim/powerpanel_list.html @@ -0,0 +1,18 @@ +{% extends '_base.html' %} +{% load buttons %} + +{% block content %} +
+ {% if perms.dcim.add_powerpanel %} + {% add_button 'dcim:powerpanel_add' %} + {% import_button 'dcim:powerpanel_import' %} + {% endif %} + {% export_button content_type %} +
+

{% block title %}Power Panels{% endblock %}

+
+
+ {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:powerpanel_bulk_delete' %} +
+
+{% endblock %} diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html index 5f8f371d3..a08eb96e0 100644 --- a/netbox/templates/inc/nav_menu.html +++ b/netbox/templates/inc/nav_menu.html @@ -368,6 +368,29 @@ +
  • + +
      +
    • + {% if perms.dcim.add_powerfeed %} +
      + + +
      + {% endif %} + Power Feeds +
      • +
    • + {% if perms.dcim.add_powerpanel %} +
      + + +
      + {% endif %} + Power Panels +
      • +
    +
    • {% if request.user.is_authenticated %}
  • From 3b9c0e4c67665bf848a8a0d93784f5f56776da38 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 12 Mar 2019 10:15:56 -0400 Subject: [PATCH 017/140] Fixed up models & forms --- netbox/dcim/forms.py | 31 ++++++--- netbox/dcim/migrations/0072_powerfeeds.py | 10 +-- netbox/dcim/models.py | 16 ++--- netbox/dcim/urls.py | 2 + netbox/dcim/views.py | 19 +++++- netbox/templates/dcim/powerfeed.html | 10 +-- netbox/templates/dcim/powerfeed_edit.html | 3 +- netbox/templates/dcim/powerpanel.html | 79 +++++++++++++++++++++++ 8 files changed, 140 insertions(+), 30 deletions(-) create mode 100644 netbox/templates/dcim/powerpanel.html diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 8e429137a..6fe54cbbe 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -3163,7 +3163,7 @@ class VirtualChassisFilterForm(BootstrapMixin, CustomFieldFilterForm): # class PowerPanelForm(BootstrapMixin, forms.ModelForm): - rackgroup = ChainedModelChoiceField( + rack_group = ChainedModelChoiceField( queryset=RackGroup.objects.all(), chains=( ('site', 'site'), @@ -3177,7 +3177,7 @@ class PowerPanelForm(BootstrapMixin, forms.ModelForm): class Meta: model = PowerPanel fields = [ - 'site', 'rackgroup', 'name', + 'site', 'rack_group', 'name', ] widgets = { 'site': APISelect( @@ -3198,7 +3198,7 @@ class PowerPanelCSVForm(forms.ModelForm): 'invalid_choice': 'Site not found.', } ) - group_name = forms.CharField( + rackgroup_name = forms.CharField( help_text='Name of rack group', required=False ) @@ -3213,6 +3213,17 @@ class PowerPanelCSVForm(forms.ModelForm): # class PowerFeedForm(BootstrapMixin, CustomFieldForm): + site = ChainedModelChoiceField( + queryset=Site.objects.all(), + required=False, + widget=APISelect( + api_url='/api/dcim/sites/', + filter_for={ + 'power_panel': 'site_id', + 'rack': 'site_id', + } + ) + ) tags = TagField( required=False ) @@ -3220,15 +3231,15 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm): class Meta: model = PowerFeed fields = [ - 'powerpanel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', 'max_utilization', - 'comments', 'tags', + 'site', 'power_panel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', + 'max_utilization', 'comments', 'tags', ] widgets = { - 'site': APISelect( - api_url="/api/dcim/sites/", - filter_for={ - 'rackgroup': 'site_id', - } + 'power_panel': APISelect( + api_url="/api/dcim/power-panels/" + ), + 'rack': APISelect( + api_url="/api/dcim/racks/" ), 'type': StaticSelect2(), 'status': StaticSelect2(), diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py index ddfbb8ec1..57b86ff40 100644 --- a/netbox/dcim/migrations/0072_powerfeeds.py +++ b/netbox/dcim/migrations/0072_powerfeeds.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.7 on 2019-03-12 02:29 +# Generated by Django 2.1.7 on 2019-03-12 14:08 import django.core.validators from django.db import migrations, models @@ -31,7 +31,7 @@ class Migration(migrations.Migration): ('comments', models.TextField(blank=True)), ], options={ - 'ordering': ['powerpanel', 'name'], + 'ordering': ['power_panel', 'name'], }, ), migrations.CreateModel( @@ -41,7 +41,7 @@ class Migration(migrations.Migration): ('created', models.DateField(auto_now_add=True, null=True)), ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('name', models.CharField(max_length=50)), - ('rackgroup', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='dcim.RackGroup')), + ('rack_group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='dcim.RackGroup')), ('site', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='dcim.Site')), ], options={ @@ -50,7 +50,7 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='powerfeed', - name='powerpanel', + name='power_panel', field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='powerfeeds', to='dcim.PowerPanel'), ), migrations.AddField( @@ -69,6 +69,6 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='powerfeed', - unique_together={('powerpanel', 'name')}, + unique_together={('power_panel', 'name')}, ), ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index ad7e198fb..13efa6b8e 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2682,7 +2682,7 @@ class PowerPanel(ChangeLoggedModel): to='Site', on_delete=models.PROTECT ) - rackgroup = models.ForeignKey( + rack_group = models.ForeignKey( to='RackGroup', on_delete=models.PROTECT, blank=True, @@ -2692,7 +2692,7 @@ class PowerPanel(ChangeLoggedModel): max_length=50 ) - csv_headers = ['site', 'rackgroup', 'name'] + csv_headers = ['site', 'rack_group', 'name'] class Meta: ordering = ['site', 'name'] @@ -2707,7 +2707,7 @@ class PowerPanel(ChangeLoggedModel): def to_csv(self): return ( self.site.name, - self.rackgroup.name if self.rackgroup else None, + self.rack_group.name if self.rack_group else None, self.name, ) @@ -2716,7 +2716,7 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): """ An electrical circuit delivered from a PowerPanel. """ - powerpanel = models.ForeignKey( + power_panel = models.ForeignKey( to='PowerPanel', on_delete=models.PROTECT, related_name='powerfeeds' @@ -2771,13 +2771,13 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): tags = TaggableManager(through=TaggedItem) csv_headers = [ - 'powerpanel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', 'max_utilization', + 'power_panel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', 'max_utilization', 'comments', ] class Meta: - ordering = ['powerpanel', 'name'] - unique_together = ['powerpanel', 'name'] + ordering = ['power_panel', 'name'] + unique_together = ['power_panel', 'name'] def __str__(self): return self.name @@ -2787,7 +2787,7 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): def to_csv(self): return ( - self.powerpanel.name, + self.power_panel.name, self.rack.name if self.rack else None, self.name, self.get_type_display(), diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index a087a0ae9..f6ed55ff3 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -285,7 +285,9 @@ urlpatterns = [ url(r'^power-panels/add/$', views.PowerPanelCreateView.as_view(), name='powerpanel_add'), url(r'^power-panels/import/$', views.PowerPanelBulkImportView.as_view(), name='powerpanel_import'), url(r'^power-panels/delete/$', views.PowerPanelBulkDeleteView.as_view(), name='powerpanel_bulk_delete'), + url(r'^power-panels/(?P\d+)/$', views.PowerPanelView.as_view(), name='powerpanel'), url(r'^power-panels/(?P\d+)/edit/$', views.PowerPanelEditView.as_view(), name='powerpanel_edit'), + url(r'^power-panels/(?P\d+)/delete/$', views.PowerPanelDeleteView.as_view(), name='powerpanel_delete'), url(r'^power-panels/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='powerpanel_changelog', kwargs={'model': PowerPanel}), # Racks diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 958975e16..6c1518fe3 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2131,6 +2131,17 @@ class PowerPanelListView(ObjectListView): template_name = 'dcim/powerpanel_list.html' +class PowerPanelView(View): + + def get(self, request, pk): + + powerpanel = get_object_or_404(PowerPanel.objects.select_related('site', 'rack_group'), pk=pk) + + return render(request, 'dcim/powerpanel.html', { + 'powerpanel': powerpanel, + }) + + class PowerPanelCreateView(PermissionRequiredMixin, ObjectEditView): permission_required = 'dcim.add_powerpanel' model = PowerPanel @@ -2142,6 +2153,12 @@ class PowerPanelEditView(PowerPanelCreateView): permission_required = 'dcim.change_powerpanel' +class PowerPanelDeleteView(PermissionRequiredMixin, ObjectDeleteView): + permission_required = 'dcim.delete_powerpanel' + model = PowerPanel + default_return_url = 'dcim:powerpanel_list' + + class PowerPanelBulkImportView(PermissionRequiredMixin, BulkImportView): permission_required = 'dcim.add_powerpanel' model_form = forms.PowerPanelCSVForm @@ -2178,7 +2195,7 @@ class PowerFeedView(View): def get(self, request, pk): - powerfeed = get_object_or_404(PowerFeed.objects.select_related('panel', 'rack'), pk=pk) + powerfeed = get_object_or_404(PowerFeed.objects.select_related('power_panel', 'rack'), pk=pk) return render(request, 'dcim/powerfeed.html', { 'powerfeed': powerfeed, diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index 9dc4843f4..91d08aa12 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -8,11 +8,11 @@
    1. Power Feeds
      2. -
    2. {{ powerfeed.site }}
      3. - {% if powerfeed.rackgroup %} -
    3. {{ powerfeed.rackgroup }}
      4. +
    4. {{ powerfeed.power_panel }}
      5. + {% if powerfeed.rack %} +
    5. {{ powerfeed.rack }}
      6. {% endif %} -
    6. {{ site }}
      7. +
    7. {{ powerfeed }}
    @@ -57,7 +57,7 @@ Power Panel - {{ powerfeed.powerpanel }} + {{ powerfeed.power_panel }} diff --git a/netbox/templates/dcim/powerfeed_edit.html b/netbox/templates/dcim/powerfeed_edit.html index 709112f93..df34746f8 100644 --- a/netbox/templates/dcim/powerfeed_edit.html +++ b/netbox/templates/dcim/powerfeed_edit.html @@ -5,7 +5,8 @@
    Power Feed
    - {% render_field form.powerpanel %} + {% render_field form.site %} + {% render_field form.power_panel %} {% render_field form.rack %} {% render_field form.name %} {% render_field form.type %} diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html new file mode 100644 index 000000000..b023321c3 --- /dev/null +++ b/netbox/templates/dcim/powerpanel.html @@ -0,0 +1,79 @@ +{% extends '_base.html' %} +{% load static %} +{% load tz %} +{% load helpers %} + +{% block header %} +
    +
    +
      +
    1. Power Panels
      2. +
    2. {{ powerpanel.site }}
      3. + {% if powerpanel.rack_group %} +
    3. {{ powerpanel.rack_group }}
      4. + {% endif %} +
    4. {{ powerpanel }}
      5. +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + {% if perms.dcim.change_powerpanel %} + + + Edit this power panel + + {% endif %} + {% if perms.dcim.delete_powerpanel %} + + + Delete this power panel + + {% endif %} +
    +

    {% block title %}{{ powerpanel }}{% endblock %}

    + {% include 'inc/created_updated.html' with obj=powerpanel %} +{% endblock %} + +{% block content %} +
    +
    +
    +
    + Power Panel +
    + + + + + + + + + +
    Site + {{ powerpanel.site }} +
    Rack Group + {% if powerpanel.rack_group %} + {{ powerpanel.rack_group }} + {% else %} + None + {% endif %} +
    +
    +
    +
    +
    +
    +{% endblock %} From e06dece00c148a0a397662f9dbaf36d33616172e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 12 Mar 2019 11:36:29 -0400 Subject: [PATCH 018/140] More power work --- netbox/dcim/api/nested_serializers.py | 26 +++++- netbox/dcim/api/serializers.py | 58 ++++++++++++- netbox/dcim/api/urls.py | 4 + netbox/dcim/api/views.py | 25 +++++- netbox/dcim/constants.py | 4 +- netbox/dcim/forms.py | 36 ++++----- netbox/dcim/models.py | 28 ++++--- netbox/dcim/tables.py | 27 +++---- netbox/dcim/views.py | 12 +-- netbox/templates/dcim/powerfeed_edit.html | 2 +- netbox/templates/dcim/rack.html | 99 +++++++++++++++-------- 11 files changed, 230 insertions(+), 91 deletions(-) diff --git a/netbox/dcim/api/nested_serializers.py b/netbox/dcim/api/nested_serializers.py index e53259e94..edb1bb267 100644 --- a/netbox/dcim/api/nested_serializers.py +++ b/netbox/dcim/api/nested_serializers.py @@ -3,8 +3,8 @@ from rest_framework import serializers from dcim.constants import CONNECTION_STATUS_CHOICES from dcim.models import ( Cable, ConsolePort, ConsoleServerPort, Device, DeviceBay, DeviceType, DeviceRole, FrontPort, FrontPortTemplate, - Interface, Manufacturer, Platform, PowerOutlet, PowerPort, Rack, RackGroup, RackRole, RearPort, RearPortTemplate, - Region, Site, VirtualChassis, + Interface, Manufacturer, Platform, PowerFeed, PowerOutlet, PowerPanel, PowerPort, Rack, RackGroup, RackRole, + RearPort, RearPortTemplate, Region, Site, VirtualChassis, ) from utilities.api import ChoiceField, WritableNestedSerializer @@ -21,7 +21,9 @@ __all__ = [ 'NestedInterfaceSerializer', 'NestedManufacturerSerializer', 'NestedPlatformSerializer', + 'NestedPowerFeedSerializer', 'NestedPowerOutletSerializer', + 'NestedPowerPanelSerializer', 'NestedPowerPortSerializer', 'NestedRackGroupSerializer', 'NestedRackRoleSerializer', @@ -247,3 +249,23 @@ class NestedVirtualChassisSerializer(WritableNestedSerializer): class Meta: model = VirtualChassis fields = ['id', 'url', 'master'] + + +# +# Power panels/feeds +# + +class NestedPowerPanelSerializer(serializers.ModelSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerpanel-detail') + + class Meta: + model = PowerPanel + fields = ['id', 'url', 'name'] + + +class NestedPowerFeedSerializer(serializers.ModelSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerfeed-detail') + + class Meta: + model = PowerFeed + fields = ['id', 'url', 'name'] diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index d18c59be5..cbd0f7cb5 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -7,8 +7,9 @@ from dcim.constants import * from dcim.models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceType, DeviceRole, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, - Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, + Manufacturer, InventoryItem, Platform, PowerFeed, PowerOutlet, PowerOutletTemplate, PowerPanel, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, + VirtualChassis, ) from extras.api.customfields import CustomFieldModelSerializer from ipam.api.nested_serializers import NestedIPAddressSerializer, NestedVLANSerializer @@ -587,3 +588,56 @@ class VirtualChassisSerializer(TaggitSerializer, ValidatedModelSerializer): class Meta: model = VirtualChassis fields = ['id', 'master', 'domain', 'tags'] + + +# +# Power panels +# + + +class PowerPanelSerializer(ValidatedModelSerializer): + site = NestedSiteSerializer() + rack_group = NestedRackGroupSerializer( + required=False, + allow_null=True, + default=None + ) + + class Meta: + model = PowerPanel + fields = ['id', 'site', 'rack_group', 'name'] + + +class PowerFeedSerializer(TaggitSerializer, CustomFieldModelSerializer): + power_panel = NestedPowerPanelSerializer() + rack = NestedRackSerializer( + required=False, + allow_null=True, + default=None + ) + type = ChoiceField( + choices=POWERFEED_TYPE_CHOICES, + default=POWERFEED_TYPE_PRIMARY + ) + status = ChoiceField( + choices=POWERFEED_STATUS_CHOICES, + default=POWERFEED_STATUS_ACTIVE + ) + supply = ChoiceField( + choices=POWERFEED_SUPPLY_CHOICES, + default=POWERFEED_SUPPLY_AC + ) + phase = ChoiceField( + choices=POWERFEED_PHASE_CHOICES, + default=POWERFEED_PHASE_SINGLE + ) + tags = TagListSerializerField( + required=False + ) + + class Meta: + model = PowerFeed + fields = [ + 'id', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', + 'max_utilization', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', + ] diff --git a/netbox/dcim/api/urls.py b/netbox/dcim/api/urls.py index 006a61bad..fd55d9b05 100644 --- a/netbox/dcim/api/urls.py +++ b/netbox/dcim/api/urls.py @@ -68,6 +68,10 @@ router.register(r'cables', views.CableViewSet) # Virtual chassis router.register(r'virtual-chassis', views.VirtualChassisViewSet) +# Power +router.register(r'power-panels', views.PowerPanelViewSet) +router.register(r'power-feeds', views.PowerFeedViewSet) + # Miscellaneous router.register(r'connected-device', views.ConnectedDeviceViewSet, basename='connected-device') diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index bcb53c090..4f5edbee8 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -16,8 +16,9 @@ from dcim import filters from dcim.models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, - Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, + Manufacturer, InventoryItem, Platform, PowerFeed, PowerOutlet, PowerOutletTemplate, PowerPanel, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, + VirtualChassis, ) from extras.api.serializers import RenderedGraphSerializer from extras.api.views import CustomFieldModelViewSet @@ -534,6 +535,26 @@ class VirtualChassisViewSet(ModelViewSet): serializer_class = serializers.VirtualChassisSerializer +# +# Power panels +# + +class PowerPanelViewSet(ModelViewSet): + queryset = PowerPanel.objects.all() + serializer_class = serializers.PowerPanelSerializer + # filterset_class = filters.PowerPanelFilter + + +# +# Power feeds +# + +class PowerFeedViewSet(ModelViewSet): + queryset = PowerFeed.objects.all() + serializer_class = serializers.PowerFeedSerializer + # filterset_class = filters.PowerFeedFilter + + # # Miscellaneous # diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index e68493af6..0783b8648 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -448,8 +448,8 @@ RACK_DIMENSION_UNIT_CHOICES = ( POWERFEED_TYPE_PRIMARY = 1 POWERFEED_TYPE_REDUNDANT = 2 POWERFEED_TYPE_CHOICES = ( - (POWERFEED_TYPE_PRIMARY, 'AC'), - (POWERFEED_TYPE_REDUNDANT, 'DC'), + (POWERFEED_TYPE_PRIMARY, 'Primary'), + (POWERFEED_TYPE_REDUNDANT, 'Redundant'), ) POWERFEED_SUPPLY_AC = 1 POWERFEED_SUPPLY_DC = 2 diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 6fe54cbbe..7f0a3265c 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -3183,7 +3183,7 @@ class PowerPanelForm(BootstrapMixin, forms.ModelForm): 'site': APISelect( api_url="/api/dcim/sites/", filter_for={ - 'rackgroup': 'site_id', + 'rack_group': 'site_id', } ), } @@ -3231,7 +3231,7 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm): class Meta: model = PowerFeed fields = [ - 'site', 'power_panel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', + 'site', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'max_utilization', 'comments', 'tags', ] widgets = { @@ -3241,24 +3241,24 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm): 'rack': APISelect( api_url="/api/dcim/racks/" ), - 'type': StaticSelect2(), 'status': StaticSelect2(), + 'type': StaticSelect2(), 'supply': StaticSelect2(), 'phase': StaticSelect2(), } class PowerFeedCSVForm(forms.ModelForm): - type = CSVChoiceField( - choices=POWERFEED_TYPE_CHOICES, - required=False, - help_text='Primary or redundant' - ) status = CSVChoiceField( choices=POWERFEED_STATUS_CHOICES, required=False, help_text='Operational status' ) + type = CSVChoiceField( + choices=POWERFEED_TYPE_CHOICES, + required=False, + help_text='Primary or redundant' + ) supply = CSVChoiceField( choices=POWERFEED_SUPPLY_CHOICES, required=False, @@ -3292,14 +3292,14 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd api_url="/api/dcim/rack-groups", ) ) - type = forms.ChoiceField( - choices=add_blank_choice(POWERFEED_TYPE_CHOICES), + status = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_STATUS_CHOICES), required=False, initial='', widget=StaticSelect2() ) - status = forms.ChoiceField( - choices=add_blank_choice(POWERFEED_STATUS_CHOICES), + type = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_TYPE_CHOICES), required=False, initial='', widget=StaticSelect2() @@ -3310,18 +3310,18 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd initial='', widget=StaticSelect2() ) - voltage = forms.IntegerField( - required=False - ) - amperage = forms.IntegerField( - required=False - ) phase = forms.ChoiceField( choices=add_blank_choice(POWERFEED_PHASE_CHOICES), required=False, initial='', widget=StaticSelect2() ) + voltage = forms.IntegerField( + required=False + ) + amperage = forms.IntegerField( + required=False + ) max_utilization = forms.IntegerField( required=False ) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 13efa6b8e..021d4e1a1 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2730,18 +2730,22 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): name = models.CharField( max_length=50 ) - type = models.PositiveSmallIntegerField( - choices=POWERFEED_TYPE_CHOICES, - default=POWERFEED_TYPE_PRIMARY - ) status = models.PositiveSmallIntegerField( choices=POWERFEED_STATUS_CHOICES, default=POWERFEED_STATUS_ACTIVE ) + type = models.PositiveSmallIntegerField( + choices=POWERFEED_TYPE_CHOICES, + default=POWERFEED_TYPE_PRIMARY + ) supply = models.PositiveSmallIntegerField( choices=POWERFEED_SUPPLY_CHOICES, default=POWERFEED_SUPPLY_AC ) + phase = models.PositiveSmallIntegerField( + choices=POWERFEED_PHASE_CHOICES, + default=POWERFEED_PHASE_SINGLE + ) voltage = models.PositiveSmallIntegerField( validators=[MinValueValidator(1)], default=120 @@ -2750,10 +2754,6 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): validators=[MinValueValidator(1)], default=20 ) - phase = models.PositiveSmallIntegerField( - choices=POWERFEED_PHASE_CHOICES, - default=POWERFEED_PHASE_SINGLE - ) max_utilization = models.PositiveSmallIntegerField( validators=[MinValueValidator(1), MaxValueValidator(100)], default=80, @@ -2771,7 +2771,7 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): tags = TaggableManager(through=TaggedItem) csv_headers = [ - 'power_panel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', 'max_utilization', + 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'max_utilization', 'comments', ] @@ -2790,12 +2790,18 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): self.power_panel.name, self.rack.name if self.rack else None, self.name, - self.get_type_display(), self.get_status_display(), + self.get_type_display(), self.get_supply_display(), + self.get_phase_display(), self.voltage, self.amperage, - self.get_phase_display(), self.max_utilization, self.comments, ) + + def get_type_class(self): + return STATUS_CLASSES[self.type] + + def get_status_class(self): + return STATUS_CLASSES[self.status] diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 8106d997a..532ee96c1 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -145,6 +145,10 @@ STATUS_LABEL = """ {{ record.get_status_display }} """ +TYPE_LABEL = """ +{{ record.get_type_display }} +""" + DEVICE_PRIMARY_IP = """ {{ record.primary_ip6.address.ip|default:"" }} {% if record.primary_ip6 and record.primary_ip4 %}
    {% endif %} @@ -799,17 +803,10 @@ class PowerPanelTable(BaseTable): powerfeed_count = tables.Column( verbose_name='Feeds' ) - actions = tables.TemplateColumn( - template_code=RACKROLE_ACTIONS, - attrs={ - 'td': {'class': 'text-right noprint'} - }, - verbose_name='' - ) class Meta(BaseTable.Meta): model = PowerPanel - fields = ('pk', 'name', 'site', 'rackgroup', 'powerfeed_count', 'actions') + fields = ('pk', 'name', 'site', 'rack_group', 'powerfeed_count') # @@ -819,16 +816,18 @@ class PowerPanelTable(BaseTable): class PowerFeedTable(BaseTable): pk = ToggleColumn() name = tables.LinkColumn() - powerpanel = tables.LinkColumn( + power_panel = tables.LinkColumn( viewname='dcim:powerpanel', - args=[Accessor('powerpanel.pk')], + args=[Accessor('power_panel.pk')], ) - rack = tables.LinkColumn( - viewname='dcim:rack', - accessor=Accessor('rack.pk') + status = tables.TemplateColumn( + template_code=STATUS_LABEL + ) + type = tables.TemplateColumn( + template_code=TYPE_LABEL ) class Meta(BaseTable.Meta): model = PowerFeed - fields = ('pk', 'name', 'powerpanel', 'rack', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase') + fields = ('pk', 'name', 'power_panel', 'rack', 'status', 'type', 'supply', 'voltage', 'amperage', 'phase') diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 6c1518fe3..a97ef576b 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -392,10 +392,12 @@ class RackView(View): prev_rack = Rack.objects.filter(site=rack.site, name__lt=rack.name).order_by('-name').first() reservations = RackReservation.objects.filter(rack=rack) + power_feeds = PowerFeed.objects.filter(rack=rack).select_related('power_panel') return render(request, 'dcim/rack.html', { 'rack': rack, 'reservations': reservations, + 'power_feeds': power_feeds, 'nonracked_devices': nonracked_devices, 'next_rack': next_rack, 'prev_rack': prev_rack, @@ -2123,9 +2125,9 @@ class VirtualChassisRemoveMemberView(PermissionRequiredMixin, GetReturnURLMixin, class PowerPanelListView(ObjectListView): queryset = PowerPanel.objects.select_related( - 'site', 'rackgroup' + 'site', 'rack_group' ).annotate( - rack_count=Count('powerfeeds') + powerfeed_count=Count('powerfeeds') ) table = tables.PowerPanelTable template_name = 'dcim/powerpanel_list.html' @@ -2183,7 +2185,7 @@ class PowerPanelBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class PowerFeedListView(ObjectListView): queryset = PowerFeed.objects.select_related( - 'powerpanel', 'rack' + 'power_panel', 'rack' ) # filter = filters.PowerFeedFilter # filter_form = forms.PowerFeedFilterForm @@ -2229,7 +2231,7 @@ class PowerFeedBulkImportView(PermissionRequiredMixin, BulkImportView): class PowerFeedBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_powerfeed' - queryset = PowerFeed.objects.select_related('powerpanel', 'rack') + queryset = PowerFeed.objects.select_related('power_panel', 'rack') # filter = filters.PowerFeedFilter table = tables.PowerFeedTable form = forms.PowerFeedBulkEditForm @@ -2238,7 +2240,7 @@ class PowerFeedBulkEditView(PermissionRequiredMixin, BulkEditView): class PowerFeedBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_powerfeed' - queryset = PowerFeed.objects.select_related('powerpanel', 'rack') + queryset = PowerFeed.objects.select_related('power_panel', 'rack') # filter = filters.PowerFeedFilter table = tables.PowerFeedTable default_return_url = 'dcim:powerfeed_list' diff --git a/netbox/templates/dcim/powerfeed_edit.html b/netbox/templates/dcim/powerfeed_edit.html index df34746f8..f4b3ada46 100644 --- a/netbox/templates/dcim/powerfeed_edit.html +++ b/netbox/templates/dcim/powerfeed_edit.html @@ -9,13 +9,13 @@ {% render_field form.power_panel %} {% render_field form.rack %} {% render_field form.name %} - {% render_field form.type %} {% render_field form.status %}
    Characteristics
    + {% render_field form.type %} {% render_field form.supply %} {% render_field form.voltage %} {% render_field form.amperage %} diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 68ea75b6c..2a142ae6c 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -190,47 +190,37 @@ {% endif %}
    -
    -
    - Non-Racked Devices -
    - {% if nonracked_devices %} - + {% if power_feeds %} +
    +
    + Power Feeds +
    +
    - - + + + - - {% for device in nonracked_devices %} - + {% for powerfeed in power_feeds %} + - - + {% endfor %}
    NameRolePanelFeedStatus TypeParent
    - {{ device }} + {{ powerfeed.power_panel.name }} + + + {{ powerfeed.name }} {{ device.device_role }}{{ device.device_type.display_name }} - {% if device.parent_bay %} - {{ device.parent_bay }} - {% else %} - — - {% endif %} + {{ powerfeed.get_status_display }} + + {{ powerfeed.get_type_display }}
    - {% else %} -
    None
    - {% endif %} - {% if perms.dcim.add_device %} -
    - - - Add a non-racked device - -
    - {% endif %} -
    +
    + {% endif %}
    Images @@ -307,11 +297,52 @@ {% include 'dcim/inc/rack_elevation.html' with primary_face=front_elevation secondary_face=rear_elevation face_id=0 reserved_units=rack.get_reserved_units %}
    -
    +

    Rear

    -
    - {% include 'dcim/inc/rack_elevation.html' with primary_face=rear_elevation secondary_face=front_elevation face_id=1 reserved_units=rack.get_reserved_units %} +
    + {% include 'dcim/inc/rack_elevation.html' with primary_face=rear_elevation secondary_face=front_elevation face_id=1 reserved_units=rack.get_reserved_units %}
    +
    +
    + Non-Racked Devices +
    + {% if nonracked_devices %} + + + + + + + + {% for device in nonracked_devices %} + + + + + + + {% endfor %} +
    NameRoleTypeParent
    + {{ device }} + {{ device.device_role }}{{ device.device_type.display_name }} + {% if device.parent_bay %} + {{ device.parent_bay }} + {% else %} + — + {% endif %} +
    + {% else %} +
    None
    + {% endif %} + {% if perms.dcim.add_device %} +
    + + + Add a non-racked device + +
    + {% endif %} +
    {% endblock %} From 705f82e416c7071d15d08c61ee075744ec485417 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 12 Mar 2019 12:05:58 -0400 Subject: [PATCH 019/140] Added filters for power panels & feeds --- netbox/dcim/api/views.py | 4 +- netbox/dcim/filters.py | 87 +++++++++++++++++++++- netbox/dcim/forms.py | 76 +++++++++++++++++++ netbox/dcim/views.py | 11 ++- netbox/templates/dcim/powerpanel_list.html | 5 +- 5 files changed, 172 insertions(+), 11 deletions(-) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 4f5edbee8..1c4ec7838 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -542,7 +542,7 @@ class VirtualChassisViewSet(ModelViewSet): class PowerPanelViewSet(ModelViewSet): queryset = PowerPanel.objects.all() serializer_class = serializers.PowerPanelSerializer - # filterset_class = filters.PowerPanelFilter + filterset_class = filters.PowerPanelFilter # @@ -552,7 +552,7 @@ class PowerPanelViewSet(ModelViewSet): class PowerFeedViewSet(ModelViewSet): queryset = PowerFeed.objects.all() serializer_class = serializers.PowerFeedSerializer - # filterset_class = filters.PowerFeedFilter + filterset_class = filters.PowerFeedFilter # diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 2e303e325..c4db4ef83 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -15,8 +15,9 @@ from .constants import * from .models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, - InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, + InventoryItem, Manufacturer, Platform, PowerFeed, PowerOutlet, PowerOutletTemplate, PowerPanel, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, + VirtualChassis, ) @@ -37,7 +38,7 @@ class RegionFilter(NameSlugSearchFilterSet): fields = ['name', 'slug'] -class SiteFilter(CustomFieldFilterSet, django_filters.FilterSet): +class SiteFilter(CustomFieldFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -122,7 +123,7 @@ class RackRoleFilter(NameSlugSearchFilterSet): fields = ['name', 'slug', 'color'] -class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): +class RackFilter(CustomFieldFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -1065,3 +1066,81 @@ class InterfaceConnectionFilter(django_filters.FilterSet): Q(device__name__icontains=value) | Q(_connected_interface__device__name__icontains=value) ) + + +class PowerPanelFilter(django_filters.FilterSet): + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) + q = django_filters.CharFilter( + method='search', + label='Search', + ) + site_id = django_filters.ModelMultipleChoiceFilter( + queryset=Site.objects.all(), + label='Site (ID)', + ) + site = django_filters.ModelMultipleChoiceFilter( + field_name='site__slug', + queryset=Site.objects.all(), + to_field_name='slug', + label='Site name (slug)', + ) + rack_group_id = django_filters.ModelMultipleChoiceFilter( + field_name='rack_group', + queryset=RackGroup.objects.all(), + label='Rack group (ID)', + ) + + class Meta: + model = PowerPanel + fields = ['name'] + + def search(self, queryset, name, value): + if not value.strip(): + return queryset + qs_filter = ( + Q(name__icontains=value) + ) + return queryset.filter(qs_filter) + + +class PowerFeedFilter(CustomFieldFilterSet): + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) + q = django_filters.CharFilter( + method='search', + label='Search', + ) + site_id = django_filters.ModelMultipleChoiceFilter( + field_name='power_panel__site', + queryset=Site.objects.all(), + label='Site (ID)', + ) + site = django_filters.ModelMultipleChoiceFilter( + field_name='power_panel__site__slug', + queryset=Site.objects.all(), + to_field_name='slug', + label='Site name (slug)', + ) + rack_id = django_filters.ModelMultipleChoiceFilter( + field_name='rack', + queryset=Rack.objects.all(), + label='Rack (ID)', + ) + + class Meta: + model = PowerFeed + fields = ['name', 'status', 'type', 'supply', 'phase'] + + def search(self, queryset, name, value): + if not value.strip(): + return queryset + qs_filter = ( + Q(name__icontains=value) | + Q(comments__icontains=value) + ) + return queryset.filter(qs_filter) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 7f0a3265c..fd37f2839 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -3208,6 +3208,34 @@ class PowerPanelCSVForm(forms.ModelForm): fields = PowerPanel.csv_headers +class PowerPanelFilterForm(BootstrapMixin, CustomFieldFilterForm): + model = PowerPanel + q = forms.CharField( + required=False, + label='Search' + ) + site = FilterChoiceField( + queryset=Site.objects.all(), + to_field_name='slug', + widget=APISelectMultiple( + api_url="/api/dcim/sites/", + value_field="slug", + filter_for={ + 'rack_id': 'site', + } + ) + ) + rack_group_id = FilterChoiceField( + queryset=RackGroup.objects.all(), + label='Rack group (ID)', + null_label='-- None --', + widget=APISelectMultiple( + api_url="/api/dcim/rack-groups/", + null_option=True, + ) + ) + + # # Power feeds # @@ -3333,3 +3361,51 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd nullable_fields = [ 'rackgroup', 'comments', ] + + +class PowerFeedFilterForm(BootstrapMixin, CustomFieldFilterForm): + model = PowerFeed + q = forms.CharField( + required=False, + label='Search' + ) + site = FilterChoiceField( + queryset=Site.objects.all(), + to_field_name='slug', + widget=APISelectMultiple( + api_url="/api/dcim/sites/", + value_field="slug", + filter_for={ + 'rack_id': 'site', + } + ) + ) + rack_id = FilterChoiceField( + queryset=Rack.objects.all(), + label='Rack', + null_label='-- None --', + widget=APISelectMultiple( + api_url="/api/dcim/racks/", + null_option=True, + ) + ) + status = forms.MultipleChoiceField( + choices=POWERFEED_STATUS_CHOICES, + required=False, + widget=StaticSelect2Multiple() + ) + type = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_TYPE_CHOICES), + required=False, + widget=StaticSelect2() + ) + supply = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_SUPPLY_CHOICES), + required=False, + widget=StaticSelect2() + ) + phase = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_PHASE_CHOICES), + required=False, + widget=StaticSelect2() + ) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index a97ef576b..a8629245f 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2129,6 +2129,8 @@ class PowerPanelListView(ObjectListView): ).annotate( powerfeed_count=Count('powerfeeds') ) + filter = filters.PowerPanelFilter + filter_form = forms.PowerPanelFilterForm table = tables.PowerPanelTable template_name = 'dcim/powerpanel_list.html' @@ -2175,6 +2177,7 @@ class PowerPanelBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): ).annotate( rack_count=Count('powerfeeds') ) + filter = filters.PowerPanelFilter table = tables.PowerPanelTable default_return_url = 'dcim:powerpanel_list' @@ -2187,8 +2190,8 @@ class PowerFeedListView(ObjectListView): queryset = PowerFeed.objects.select_related( 'power_panel', 'rack' ) - # filter = filters.PowerFeedFilter - # filter_form = forms.PowerFeedFilterForm + filter = filters.PowerFeedFilter + filter_form = forms.PowerFeedFilterForm table = tables.PowerFeedTable template_name = 'dcim/powerfeed_list.html' @@ -2232,7 +2235,7 @@ class PowerFeedBulkImportView(PermissionRequiredMixin, BulkImportView): class PowerFeedBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_powerfeed' queryset = PowerFeed.objects.select_related('power_panel', 'rack') - # filter = filters.PowerFeedFilter + filter = filters.PowerFeedFilter table = tables.PowerFeedTable form = forms.PowerFeedBulkEditForm default_return_url = 'dcim:powerfeed_list' @@ -2241,6 +2244,6 @@ class PowerFeedBulkEditView(PermissionRequiredMixin, BulkEditView): class PowerFeedBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_powerfeed' queryset = PowerFeed.objects.select_related('power_panel', 'rack') - # filter = filters.PowerFeedFilter + filter = filters.PowerFeedFilter table = tables.PowerFeedTable default_return_url = 'dcim:powerfeed_list' diff --git a/netbox/templates/dcim/powerpanel_list.html b/netbox/templates/dcim/powerpanel_list.html index b58469c12..a0d49b30b 100644 --- a/netbox/templates/dcim/powerpanel_list.html +++ b/netbox/templates/dcim/powerpanel_list.html @@ -11,8 +11,11 @@

    {% block title %}Power Panels{% endblock %}

    -
    +
    {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:powerpanel_bulk_delete' %}
    +
    + {% include 'inc/search_panel.html' %} +
    {% endblock %} From 681e20133a8aacf1a764c28ec1b3235eb806e04d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 21 Mar 2019 17:47:43 -0400 Subject: [PATCH 020/140] Further work on power feed modeling --- netbox/dcim/api/views.py | 2 +- netbox/dcim/constants.py | 2 +- netbox/dcim/forms.py | 101 +++++++++++++++++++++- netbox/dcim/migrations/0072_powerfeeds.py | 27 +++++- netbox/dcim/models.py | 52 ++++++++++- netbox/dcim/views.py | 84 +++++++++++++++--- netbox/extras/models.py | 2 +- netbox/netbox/views.py | 2 +- netbox/templates/dcim/cable_connect.html | 43 +++++---- netbox/templates/dcim/inc/powerport.html | 6 +- 10 files changed, 282 insertions(+), 39 deletions(-) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 1c4ec7838..c1026dec7 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -496,7 +496,7 @@ class PowerConnectionViewSet(ListModelMixin, GenericViewSet): queryset = PowerPort.objects.select_related( 'device', 'connected_endpoint__device' ).filter( - connected_endpoint__isnull=False + _connected_poweroutlet__isnull=False ) serializer_class = serializers.PowerPortSerializer filterset_class = filters.PowerConnectionFilter diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index 0783b8648..c52806fe3 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -420,7 +420,7 @@ CABLE_TERMINATION_TYPE_CHOICES = { COMPATIBLE_TERMINATION_TYPES = { 'consoleport': ['consoleserverport', 'frontport', 'rearport'], 'consoleserverport': ['consoleport', 'frontport', 'rearport'], - 'powerport': ['poweroutlet'], + 'powerport': ['poweroutlet', 'powerfeed'], 'poweroutlet': ['powerport'], 'interface': ['interface', 'circuittermination', 'frontport', 'rearport'], 'frontport': ['consoleport', 'consoleserverport', 'interface', 'frontport', 'rearport', 'circuittermination'], diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index fd37f2839..6abde2fc6 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -10,6 +10,7 @@ from mptt.forms import TreeNodeChoiceField from taggit.forms import TagField from timezone_field import TimeZoneFormField +from circuits.models import Circuit, CircuitTermination, Provider from extras.forms import AddRemoveTagsForm, CustomFieldForm, CustomFieldBulkEditForm, CustomFieldFilterForm from ipam.models import IPAddress, VLAN, VLANGroup from tenancy.forms import TenancyForm @@ -2521,7 +2522,7 @@ class RearPortBulkDisconnectForm(ConfirmationForm): # Cables # -class CableCreateForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): +class ConnectCableToDeviceForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): termination_b_site = forms.ModelChoiceField( queryset=Site.objects.all(), label='Site', @@ -2602,6 +2603,104 @@ class CableCreateForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): ) +class ConnectCableToCircuitForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): + termination_b_provider = forms.ModelChoiceField( + queryset=Provider.objects.all(), + label='Provider', + widget=APISelect( + api_url='/api/circuits/providers/', + filter_for={ + 'termination_b_circuit': 'provider_id', + } + ) + ) + termination_b_circuit = ChainedModelChoiceField( + queryset=Circuit.objects.all(), + chains=( + ('provider', 'termination_b_provider'), + ), + label='Circuit', + widget=APISelect( + api_url='/api/circuits/circuits/', + display_field='cid', + filter_for={ + 'termination_b_id': 'circuit_id', + } + ) + ) + termination_b_id = forms.IntegerField( + label='Termination', + widget=APISelect( + api_url='/api/circuits/circuit-terminations/', + disabled_indicator='cable' + ) + ) + + class Meta: + model = Cable + fields = [ + 'termination_b_provider', 'termination_b_circuit', 'termination_b_id', 'type', 'status', 'label', 'color', + 'length', 'length_unit', + ] + + +class ConnectCableToPowerFeedForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): + termination_b_site = forms.ModelChoiceField( + queryset=Site.objects.all(), + label='Site', + widget=APISelect( + api_url='/api/dcim/sites/', + display_field='cid', + filter_for={ + 'termination_b_rackgroup': 'site_id', + 'termination_b_powerpanel': 'site_id', + } + ) + ) + termination_b_rackgroup = ChainedModelChoiceField( + queryset=RackGroup.objects.all(), + label='Rack Group', + chains=( + ('site', 'termination_b_site'), + ), + required=False, + widget=APISelect( + api_url='/api/dcim/rack-groups/', + display_field='cid', + filter_for={ + 'termination_b_powerpanel': 'rackgroup_id', + } + ) + ) + termination_b_powerpanel = ChainedModelChoiceField( + queryset=PowerPanel.objects.all(), + chains=( + ('site', 'termination_b_site'), + ('rack_group', 'termination_b_rackgroup'), + ), + label='Power Panel', + widget=APISelect( + api_url='/api/dcim/power-panels/', + filter_for={ + 'termination_b_powerfeed': 'powerpanel_id', + } + ) + ) + termination_b_id = forms.IntegerField( + label='Power Feed', + widget=APISelect( + api_url='/api/dcim/power-feeds/', + ) + ) + + class Meta: + model = Cable + fields = [ + 'termination_b_rackgroup', 'termination_b_powerpanel', 'termination_b_id', 'type', 'status', 'label', + 'color', 'length', 'length_unit', + ] + + class CableForm(BootstrapMixin, forms.ModelForm): class Meta: diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py index 57b86ff40..dc99a89ac 100644 --- a/netbox/dcim/migrations/0072_powerfeeds.py +++ b/netbox/dcim/migrations/0072_powerfeeds.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.7 on 2019-03-12 14:08 +# Generated by Django 2.1.7 on 2019-03-21 20:59 import django.core.validators from django.db import migrations, models @@ -21,14 +21,15 @@ class Migration(migrations.Migration): ('created', models.DateField(auto_now_add=True, null=True)), ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('name', models.CharField(max_length=50)), - ('type', models.PositiveSmallIntegerField(default=1)), ('status', models.PositiveSmallIntegerField(default=1)), + ('type', models.PositiveSmallIntegerField(default=1)), ('supply', models.PositiveSmallIntegerField(default=1)), + ('phase', models.PositiveSmallIntegerField(default=1)), ('voltage', models.PositiveSmallIntegerField(default=120, validators=[django.core.validators.MinValueValidator(1)])), ('amperage', models.PositiveSmallIntegerField(default=20, validators=[django.core.validators.MinValueValidator(1)])), - ('phase', models.PositiveSmallIntegerField(default=1)), ('max_utilization', models.PositiveSmallIntegerField(default=80, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])), ('comments', models.TextField(blank=True)), + ('cable', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable')), ], options={ 'ordering': ['power_panel', 'name'], @@ -63,6 +64,26 @@ class Migration(migrations.Migration): name='tags', field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), ), + migrations.AddField( + model_name='powerfeed', + name='connected_endpoint', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.PowerPort'), + ), + migrations.AddField( + model_name='powerfeed', + name='connection_status', + field=models.NullBooleanField(), + ), + migrations.RenameField( + model_name='powerport', + old_name='connected_endpoint', + new_name='_connected_poweroutlet', + ), + migrations.AddField( + model_name='powerport', + name='_connected_powerfeed', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.PowerFeed'), + ), migrations.AlterUniqueTogether( name='powerpanel', unique_together={('site', 'name')}, diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 021d4e1a1..0d9750dfd 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1828,13 +1828,20 @@ class PowerPort(CableTermination, ComponentModel): name = models.CharField( max_length=50 ) - connected_endpoint = models.OneToOneField( + _connected_poweroutlet = models.OneToOneField( to='dcim.PowerOutlet', on_delete=models.SET_NULL, related_name='connected_endpoint', blank=True, null=True ) + _connected_powerfeed = models.OneToOneField( + to='dcim.PowerFeed', + on_delete=models.SET_NULL, + related_name='+', + blank=True, + null=True + ) connection_status = models.NullBooleanField( choices=CONNECTION_STATUS_CHOICES, blank=True @@ -1862,6 +1869,28 @@ class PowerPort(CableTermination, ComponentModel): self.description, ) + @property + def connected_endpoint(self): + if self._connected_poweroutlet: + return self._connected_poweroutlet + return self._connected_powerfeed + + @connected_endpoint.setter + def connected_endpoint(self, value): + if value is None: + self._connected_poweroutlet = None + self._connected_powerfeed = None + elif isinstance(value, PowerOutlet): + self._connected_poweroutlet = value + self._connected_powerfeed = None + elif isinstance(value, PowerFeed): + self._connected_poweroutlet = None + self._connected_powerfeed = value + else: + raise ValueError( + "Connected endpoint must be a PowerOutlet or PowerFeed, not {}.".format(type(value)) + ) + # # Power outlets @@ -2646,6 +2675,14 @@ class Cable(ChangeLoggedModel): def get_status_class(self): return 'success' if self.status else 'info' + def get_compatible_types(self): + """ + Return all termination types compatible with termination A. + """ + if self.termination_a is None: + return + return COMPATIBLE_TERMINATION_TYPES[self.termination_a._meta.model_name] + def get_path_endpoints(self): """ Traverse both ends of a cable path and return its connected endpoints. Note that one or both endpoints may be @@ -2712,7 +2749,7 @@ class PowerPanel(ChangeLoggedModel): ) -class PowerFeed(ChangeLoggedModel, CustomFieldModel): +class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): """ An electrical circuit delivered from a PowerPanel. """ @@ -2727,6 +2764,17 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): blank=True, null=True ) + connected_endpoint = models.OneToOneField( + to='dcim.PowerPort', + on_delete=models.SET_NULL, + related_name='+', + blank=True, + null=True + ) + connection_status = models.NullBooleanField( + choices=CONNECTION_STATUS_CHOICES, + blank=True + ) name = models.CharField( max_length=50 ) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index a8629245f..853e6ed57 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -3,6 +3,7 @@ import re from django.conf import settings from django.contrib import messages from django.contrib.auth.mixins import PermissionRequiredMixin +from django.contrib.contenttypes.models import ContentType from django.core.paginator import EmptyPage, PageNotAnInteger from django.db import transaction from django.db.models import Count, F @@ -10,10 +11,11 @@ from django.forms import modelformset_factory from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse from django.utils.html import escape +from django.utils.http import is_safe_url from django.utils.safestring import mark_safe from django.views.generic import View -from circuits.models import Circuit +from circuits.models import Circuit, CircuitTermination from extras.models import Graph, TopologyMap, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE from extras.views import ObjectConfigContextView from ipam.models import Prefix, VLAN @@ -913,7 +915,7 @@ class DeviceView(View): consoleserverports = device.consoleserverports.select_related('connected_endpoint__device', 'cable') # Power ports - power_ports = device.powerports.select_related('connected_endpoint__device', 'cable') + power_ports = device.powerports.select_related('_connected_poweroutlet__device', 'cable') # Power outlets poweroutlets = device.poweroutlets.select_related('connected_endpoint__device', 'cable') @@ -1673,20 +1675,76 @@ class CableTraceView(View): }) -class CableCreateView(PermissionRequiredMixin, ObjectEditView): +class CableCreateView(PermissionRequiredMixin, GetReturnURLMixin, View): permission_required = 'dcim.add_cable' - model = Cable - model_form = forms.CableCreateForm template_name = 'dcim/cable_connect.html' - def alter_obj(self, obj, request, url_args, url_kwargs): + def _get_form_class(self): + if self.termination_b_type == 'circuit': + return forms.ConnectCableToCircuitForm + if self.termination_b_type == 'powerfeed': + return forms.ConnectCableToPowerFeedForm + return forms.ConnectCableToDeviceForm + + def dispatch(self, request, *args, **kwargs): # Retrieve endpoint A based on the given type and PK - termination_a_type = url_kwargs.get('termination_a_type') - termination_a_id = url_kwargs.get('termination_a_id') - obj.termination_a = termination_a_type.objects.get(pk=termination_a_id) + termination_a_type = kwargs.get('termination_a_type') + termination_a_id = kwargs.get('termination_a_id') + self.obj = Cable( + termination_a=termination_a_type.objects.get(pk=termination_a_id) + ) - return obj + self.termination_b_type = request.GET.get('type') + if self.termination_b_type == 'circuit': + self.obj.termination_b_type = ContentType.objects.get_for_model(CircuitTermination) + elif self.termination_b_type == 'powerfeed': + self.obj.termination_b_type = ContentType.objects.get_for_model(PowerFeed) + + return super().dispatch(request, *args, **kwargs) + + def get(self, request, *args, **kwargs): + + # Parse initial data manually to avoid setting field values as lists + initial_data = {k: request.GET[k] for k in request.GET} + + form = self._get_form_class()(instance=self.obj, initial=initial_data) + + return render(request, self.template_name, { + 'obj': self.obj, + 'obj_type': Cable._meta.verbose_name, + 'form': form, + 'return_url': self.get_return_url(request, self.obj), + }) + + def post(self, request, *args, **kwargs): + + form = self._get_form_class()(request.POST, request.FILES, instance=self.obj) + + if form.is_valid(): + obj = form.save() + + msg = 'Created cable {}'.format( + obj.get_absolute_url(), + escape(obj) + ) + messages.success(request, mark_safe(msg)) + + if '_addanother' in request.POST: + return redirect(request.get_full_path()) + + return_url = form.cleaned_data.get('return_url') + if return_url is not None and is_safe_url(url=return_url, allowed_hosts=request.get_host()): + return redirect(return_url) + else: + return redirect(self.get_return_url(request, obj)) + + return render(request, self.template_name, { + 'obj': self.obj, + 'obj_type': Cable._meta.verbose_name, + 'form': form, + 'return_url': self.get_return_url(request, self.obj), + }) class CableEditView(PermissionRequiredMixin, ObjectEditView): @@ -1763,11 +1821,11 @@ class ConsoleConnectionsListView(ObjectListView): class PowerConnectionsListView(ObjectListView): queryset = PowerPort.objects.select_related( - 'device', 'connected_endpoint__device' + 'device', '_connected_poweroutlet__device' ).filter( - connected_endpoint__isnull=False + _connected_poweroutlet__isnull=False ).order_by( - 'cable', 'connected_endpoint__device__name', 'connected_endpoint__name' + 'cable', '_connected_poweroutlet__device__name', '_connected_poweroutlet__name' ) filter = filters.PowerConnectionFilter filter_form = forms.PowerConnectionFilterForm diff --git a/netbox/extras/models.py b/netbox/extras/models.py index ccdcb51ab..7815a2fbf 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -541,7 +541,7 @@ class TopologyMap(models.Model): from dcim.models import PowerPort # Add all power connections to the graph - for pp in PowerPort.objects.filter(device__in=devices, connected_endpoint__device__in=devices): + for pp in PowerPort.objects.filter(device__in=devices, _connected_poweroutlet__device__in=devices): style = 'solid' if pp.connection_status == CONNECTION_STATUS_CONNECTED else 'dashed' self.graph.edge(pp.connected_endpoint.device.name, pp.device.name, style=style) diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index 837d9473d..a0e8d6a7e 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -166,7 +166,7 @@ class HomeView(View): connected_endpoint__isnull=False ) connected_powerports = PowerPort.objects.filter( - connected_endpoint__isnull=False + _connected_poweroutlet__isnull=False ) connected_interfaces = Interface.objects.filter( _connected_interface__isnull=False, diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html index cad396966..52c1444d4 100644 --- a/netbox/templates/dcim/cable_connect.html +++ b/netbox/templates/dcim/cable_connect.html @@ -101,21 +101,34 @@ B Side
    - -
    - -
    - {% render_field form.termination_b_site %} - {% render_field form.termination_b_rack %} -
    -
    - {% render_field form.termination_b_device %} - {% render_field form.termination_b_type %} + {# TODO: Clean this up #} + {% if 'termination_b_site' in form.fields %} + {% render_field form.termination_b_site %} + {% endif %} + {% if 'termination_b_rackgroup' in form.fields %} + {% render_field form.termination_b_rackgroup %} + {% endif %} + {% if 'termination_b_rack' in form.fields %} + {% render_field form.termination_b_rack %} + {% endif %} + {% if 'termination_b_device' in form.fields %} + {% render_field form.termination_b_device %} + {% endif %} + {% if 'termination_b_type' in form.fields %} + {% render_field form.termination_b_type %} + {% endif %} + {% if 'termination_b_provider' in form.fields %} + {% render_field form.termination_b_provider %} + {% endif %} + {% if 'termination_b_circuit' in form.fields %} + {% render_field form.termination_b_circuit %} + {% endif %} + {% if 'termination_b_powerpanel' in form.fields %} + {% render_field form.termination_b_powerpanel %} + {% endif %} + {% if 'termination_b_powerfeed' in form.fields %} + {% render_field form.termination_b_powerfeed %} + {% endif %} {% render_field form.termination_b_id %}
    diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index f2fe89330..458d1267a 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -20,13 +20,17 @@ {# Connection #} - {% if pp.connected_endpoint %} + {% if pp.connected_endpoint.device %} {{ pp.connected_endpoint.device }} {{ pp.connected_endpoint }} + {% elif pp.connected_endpoint %} + + {{ pp.connected_endpoint }} + {% else %} Not connected From a208cd156d0f2a2bfa1b953672c3a6e39224090b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 22 Mar 2019 21:58:45 -0400 Subject: [PATCH 021/140] Template and table polish --- netbox/dcim/tables.py | 7 +++++-- netbox/dcim/views.py | 6 ++++++ netbox/templates/dcim/powerfeed.html | 21 ++++++++++++++++++++- netbox/templates/dcim/powerpanel.html | 7 ++++--- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 532ee96c1..233c254e4 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -818,8 +818,11 @@ class PowerFeedTable(BaseTable): name = tables.LinkColumn() power_panel = tables.LinkColumn( viewname='dcim:powerpanel', - args=[Accessor('power_panel.pk')], - + args=[Accessor('rack.pk')], + ) + rack = tables.LinkColumn( + viewname='dcim:rack', + args=[Accessor('pk')] ) status = tables.TemplateColumn( template_code=STATUS_LABEL diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 853e6ed57..37ed42dc0 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2198,9 +2198,15 @@ class PowerPanelView(View): def get(self, request, pk): powerpanel = get_object_or_404(PowerPanel.objects.select_related('site', 'rack_group'), pk=pk) + powerfeed_table = tables.PowerFeedTable( + data=PowerFeed.objects.filter(power_panel=powerpanel).select_related('rack'), + orderable=False + ) + powerfeed_table.exclude = ['power_panel'] return render(request, 'dcim/powerpanel.html', { 'powerpanel': powerpanel, + 'powerfeed_table': powerfeed_table, }) diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index 91d08aa12..b48e2f602 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -48,7 +48,7 @@ {% block content %}
    -
    +
    Power Feed @@ -82,6 +82,25 @@ {{ powerfeed.get_status_display }} + + Connected Device + + {% if powerfeed.connected_endpoint %} + {{ powerfeed.connected_endpoint.device }} ({{ powerfeed.connected_endpoint }}) + {% else %} + None + {% endif %} + + + +
    +
    +
    +
    +
    + Electrical Characteristics +
    + diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html index b023321c3..88f90ae89 100644 --- a/netbox/templates/dcim/powerpanel.html +++ b/netbox/templates/dcim/powerpanel.html @@ -48,7 +48,7 @@ {% block content %}
    -
    +
    Power Panel @@ -73,7 +73,8 @@
    Supply {{ powerfeed.get_supply_display }}
    -
    -
    +
    + {% include 'panel_table.html' with table=powerfeed_table heading='Connected Feeds' %} +
    {% endblock %} From e0085ec8190bf2dc80a5710c941f9f27b8adc1c6 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 2 Apr 2019 13:37:53 -0400 Subject: [PATCH 022/140] Fixed table columns --- netbox/dcim/tables.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 233c254e4..0d874bed2 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -800,6 +800,10 @@ class VirtualChassisTable(BaseTable): class PowerPanelTable(BaseTable): pk = ToggleColumn() name = tables.LinkColumn() + site = tables.LinkColumn( + viewname='dcim:site', + args=[Accessor('site.slug')] + ) powerfeed_count = tables.Column( verbose_name='Feeds' ) @@ -818,7 +822,7 @@ class PowerFeedTable(BaseTable): name = tables.LinkColumn() power_panel = tables.LinkColumn( viewname='dcim:powerpanel', - args=[Accessor('rack.pk')], + args=[Accessor('pk')], ) rack = tables.LinkColumn( viewname='dcim:rack', From 0e5dff212e61a6f8237321f8eb125c1dc131ba6b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 2 Apr 2019 13:50:57 -0400 Subject: [PATCH 023/140] Fix rack elevation display --- netbox/templates/dcim/rack.html | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 2a142ae6c..e702405a2 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -289,19 +289,21 @@ {% endif %}
    -
    -
    -
    -

    Front

    -
    - {% include 'dcim/inc/rack_elevation.html' with primary_face=front_elevation secondary_face=rear_elevation face_id=0 reserved_units=rack.get_reserved_units %} -
    -
    -
    -

    Rear

    -
    - {% include 'dcim/inc/rack_elevation.html' with primary_face=rear_elevation secondary_face=front_elevation face_id=1 reserved_units=rack.get_reserved_units %} -
    +
    +
    +
    +
    +

    Front

    +
    + {% include 'dcim/inc/rack_elevation.html' with primary_face=front_elevation secondary_face=rear_elevation face_id=0 reserved_units=rack.get_reserved_units %} +
    +
    +
    +

    Rear

    +
    + {% include 'dcim/inc/rack_elevation.html' with primary_face=rear_elevation secondary_face=front_elevation face_id=1 reserved_units=rack.get_reserved_units %} +
    +
    Non-Racked Devices From 4884f3ac778cb27b153730c049900e7727a68894 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 2 Apr 2019 14:49:40 -0400 Subject: [PATCH 024/140] Fix column links --- netbox/dcim/tables.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 0d874bed2..e52e64fea 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -822,11 +822,11 @@ class PowerFeedTable(BaseTable): name = tables.LinkColumn() power_panel = tables.LinkColumn( viewname='dcim:powerpanel', - args=[Accessor('pk')], + args=[Accessor('power_panel.pk')], ) rack = tables.LinkColumn( viewname='dcim:rack', - args=[Accessor('pk')] + args=[Accessor('rack.pk')] ) status = tables.TemplateColumn( template_code=STATUS_LABEL From f1d1e8b537d521c364a9fda0fc1d2623c5f55dd5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 Apr 2019 14:22:45 -0400 Subject: [PATCH 025/140] Update migrations --- netbox/circuits/migrations/0015_custom_tag_models.py | 2 +- netbox/dcim/migrations/0070_custom_tag_models.py | 2 +- netbox/dcim/migrations/0072_powerfeeds.py | 2 +- .../{0018_tag_taggeditem.py => 0019_tag_taggeditem.py} | 2 +- netbox/extras/migrations/{0019_tag_data.py => 0020_tag_data.py} | 2 +- ...og_to_tag.py => 0021_add_color_comments_changelog_to_tag.py} | 2 +- netbox/ipam/migrations/0025_custom_tag_models.py | 2 +- netbox/secrets/migrations/0006_custom_tag_models.py | 2 +- netbox/tenancy/migrations/0006_custom_tag_models.py | 2 +- netbox/virtualization/migrations/0009_custom_tag_models.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename netbox/extras/migrations/{0018_tag_taggeditem.py => 0019_tag_taggeditem.py} (96%) rename netbox/extras/migrations/{0019_tag_data.py => 0020_tag_data.py} (97%) rename netbox/extras/migrations/{0020_add_color_comments_changelog_to_tag.py => 0021_add_color_comments_changelog_to_tag.py} (95%) diff --git a/netbox/circuits/migrations/0015_custom_tag_models.py b/netbox/circuits/migrations/0015_custom_tag_models.py index d00eb36d7..11bde72ff 100644 --- a/netbox/circuits/migrations/0015_custom_tag_models.py +++ b/netbox/circuits/migrations/0015_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('circuits', '0014_circuittermination_description'), - ('extras', '0018_tag_taggeditem'), + ('extras', '0019_tag_taggeditem'), ] operations = [ diff --git a/netbox/dcim/migrations/0070_custom_tag_models.py b/netbox/dcim/migrations/0070_custom_tag_models.py index e3b54b9cc..ee78bed02 100644 --- a/netbox/dcim/migrations/0070_custom_tag_models.py +++ b/netbox/dcim/migrations/0070_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('dcim', '0069_deprecate_nullablecharfield'), - ('extras', '0018_tag_taggeditem'), + ('extras', '0019_tag_taggeditem'), ] operations = [ diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py index dc99a89ac..676b431c3 100644 --- a/netbox/dcim/migrations/0072_powerfeeds.py +++ b/netbox/dcim/migrations/0072_powerfeeds.py @@ -9,7 +9,7 @@ import taggit.managers class Migration(migrations.Migration): dependencies = [ - ('extras', '0020_add_color_comments_changelog_to_tag'), + ('extras', '0021_add_color_comments_changelog_to_tag'), ('dcim', '0071_device_components_add_description'), ] diff --git a/netbox/extras/migrations/0018_tag_taggeditem.py b/netbox/extras/migrations/0019_tag_taggeditem.py similarity index 96% rename from netbox/extras/migrations/0018_tag_taggeditem.py rename to netbox/extras/migrations/0019_tag_taggeditem.py index 11a3a50a5..7f531a737 100644 --- a/netbox/extras/migrations/0018_tag_taggeditem.py +++ b/netbox/extras/migrations/0019_tag_taggeditem.py @@ -9,7 +9,7 @@ class Migration(migrations.Migration): dependencies = [ ('contenttypes', '0002_remove_content_type_name'), - ('extras', '0017_exporttemplate_mime_type_length'), + ('extras', '0018_exporttemplate_add_jinja2'), ] operations = [ diff --git a/netbox/extras/migrations/0019_tag_data.py b/netbox/extras/migrations/0020_tag_data.py similarity index 97% rename from netbox/extras/migrations/0019_tag_data.py rename to netbox/extras/migrations/0020_tag_data.py index af4641daa..615ded8e2 100644 --- a/netbox/extras/migrations/0019_tag_data.py +++ b/netbox/extras/migrations/0020_tag_data.py @@ -48,7 +48,7 @@ def delete_taggit_tags(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('extras', '0018_tag_taggeditem'), + ('extras', '0019_tag_taggeditem'), ('circuits', '0015_custom_tag_models'), ('dcim', '0070_custom_tag_models'), ('ipam', '0025_custom_tag_models'), diff --git a/netbox/extras/migrations/0020_add_color_comments_changelog_to_tag.py b/netbox/extras/migrations/0021_add_color_comments_changelog_to_tag.py similarity index 95% rename from netbox/extras/migrations/0020_add_color_comments_changelog_to_tag.py rename to netbox/extras/migrations/0021_add_color_comments_changelog_to_tag.py index 33171db98..26ed34b31 100644 --- a/netbox/extras/migrations/0020_add_color_comments_changelog_to_tag.py +++ b/netbox/extras/migrations/0021_add_color_comments_changelog_to_tag.py @@ -7,7 +7,7 @@ import utilities.fields class Migration(migrations.Migration): dependencies = [ - ('extras', '0019_tag_data'), + ('extras', '0020_tag_data'), ] operations = [ diff --git a/netbox/ipam/migrations/0025_custom_tag_models.py b/netbox/ipam/migrations/0025_custom_tag_models.py index a47335b58..002aefcb2 100644 --- a/netbox/ipam/migrations/0025_custom_tag_models.py +++ b/netbox/ipam/migrations/0025_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('ipam', '0024_vrf_allow_null_rd'), - ('extras', '0018_tag_taggeditem'), + ('extras', '0019_tag_taggeditem'), ] operations = [ diff --git a/netbox/secrets/migrations/0006_custom_tag_models.py b/netbox/secrets/migrations/0006_custom_tag_models.py index 8e5fc1b80..399dcc5bf 100644 --- a/netbox/secrets/migrations/0006_custom_tag_models.py +++ b/netbox/secrets/migrations/0006_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('secrets', '0005_change_logging'), - ('extras', '0018_tag_taggeditem'), + ('extras', '0019_tag_taggeditem'), ] operations = [ diff --git a/netbox/tenancy/migrations/0006_custom_tag_models.py b/netbox/tenancy/migrations/0006_custom_tag_models.py index 92e333520..dd39ff471 100644 --- a/netbox/tenancy/migrations/0006_custom_tag_models.py +++ b/netbox/tenancy/migrations/0006_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('tenancy', '0005_change_logging'), - ('extras', '0018_tag_taggeditem'), + ('extras', '0019_tag_taggeditem'), ] operations = [ diff --git a/netbox/virtualization/migrations/0009_custom_tag_models.py b/netbox/virtualization/migrations/0009_custom_tag_models.py index 3f70d5469..04d589bee 100644 --- a/netbox/virtualization/migrations/0009_custom_tag_models.py +++ b/netbox/virtualization/migrations/0009_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('virtualization', '0008_virtualmachine_local_context_data'), - ('extras', '0018_tag_taggeditem'), + ('extras', '0019_tag_taggeditem'), ] operations = [ From cd655d289bff6a706a1a7aad838de714b8ad59ac Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 Apr 2019 14:55:17 -0400 Subject: [PATCH 026/140] Fix CSV import forms --- netbox/dcim/forms.py | 78 +++++++++++++++++++++++++++++++++++++++++-- netbox/dcim/models.py | 6 ++-- 2 files changed, 78 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index ccbe2a23e..d02241560 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -3296,15 +3296,31 @@ class PowerPanelCSVForm(forms.ModelForm): 'invalid_choice': 'Site not found.', } ) - rackgroup_name = forms.CharField( - help_text='Name of rack group', - required=False + rack_group_name = forms.CharField( + required=False, + help_text="Rack group name (optional)" ) class Meta: model = PowerPanel fields = PowerPanel.csv_headers + def clean(self): + + super().clean() + + site = self.cleaned_data.get('site') + rack_group_name = self.cleaned_data.get('rack_group_name') + + # Validate rack group + if rack_group_name: + try: + self.instance.rack_group = RackGroup.objects.get(site=site, name=rack_group_name) + except RackGroup.DoesNotExist: + raise forms.ValidationError( + "Rack group {} not found in site {}".format(rack_group_name, site) + ) + class PowerPanelFilterForm(BootstrapMixin, CustomFieldFilterForm): model = PowerPanel @@ -3375,6 +3391,30 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm): class PowerFeedCSVForm(forms.ModelForm): + site = forms.ModelChoiceField( + queryset=Site.objects.all(), + to_field_name='name', + help_text='Name of parent site', + error_messages={ + 'invalid_choice': 'Site not found.', + } + ) + panel_name = forms.ModelChoiceField( + queryset=PowerPanel.objects.all(), + to_field_name='name', + help_text='Name of upstream power panel', + error_messages={ + 'invalid_choice': 'Power panel not found.', + } + ) + rack_group = forms.CharField( + required=False, + help_text="Rack group name (optional)" + ) + rack_name = forms.CharField( + required=False, + help_text="Rack name (optional)" + ) status = CSVChoiceField( choices=POWERFEED_STATUS_CHOICES, required=False, @@ -3390,11 +3430,43 @@ class PowerFeedCSVForm(forms.ModelForm): required=False, help_text='AC/DC' ) + phase = CSVChoiceField( + choices=POWERFEED_PHASE_CHOICES, + required=False, + help_text='Single or three-phase' + ) class Meta: model = PowerFeed fields = PowerFeed.csv_headers + def clean(self): + + super().clean() + + site = self.cleaned_data.get('site') + panel_name = self.cleaned_data.get('panel_name') + rack_group = self.cleaned_data.get('rack_group') + rack_name = self.cleaned_data.get('rack_name') + + # Validate power panel + if panel_name: + try: + self.instance.power_panel = PowerPanel.objects.get(site=site, name=panel_name) + except Rack.DoesNotExist: + raise forms.ValidationError( + "Power panel {} not found in site {}".format(panel_name, site) + ) + + # Validate rack + if rack_name: + try: + self.instance.rack = Rack.objects.get(site=site, rack_group=rack_group, name=rack_name) + except Rack.DoesNotExist: + raise forms.ValidationError( + "Rack {} not found in site {}, group {}".format(rack_name, site, rack_group) + ) + class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm): pk = forms.ModelMultipleChoiceField( diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 0d9750dfd..f0fa4ea5f 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2729,7 +2729,7 @@ class PowerPanel(ChangeLoggedModel): max_length=50 ) - csv_headers = ['site', 'rack_group', 'name'] + csv_headers = ['site', 'rack_group_name', 'name'] class Meta: ordering = ['site', 'name'] @@ -2819,8 +2819,8 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): tags = TaggableManager(through=TaggedItem) csv_headers = [ - 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'max_utilization', - 'comments', + 'site', 'panel_name', 'rack_group', 'rack_name', 'name', 'status', 'type', 'supply', 'phase', 'voltage', + 'amperage', 'max_utilization', 'comments', ] class Meta: From ef867e789d75ecfd7a83f4c2ac7427aee929bef0 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 Apr 2019 15:37:31 -0400 Subject: [PATCH 027/140] Finish power outlet/feed connection forms --- netbox/dcim/filters.py | 4 ++++ netbox/dcim/forms.py | 2 +- netbox/templates/dcim/inc/powerport.html | 12 +++++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index c4db4ef83..581ed76bf 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -1126,6 +1126,10 @@ class PowerFeedFilter(CustomFieldFilterSet): to_field_name='slug', label='Site name (slug)', ) + power_panel_id = django_filters.ModelMultipleChoiceFilter( + queryset=PowerPanel.objects.all(), + label='Power panel (ID)', + ) rack_id = django_filters.ModelMultipleChoiceFilter( field_name='rack', queryset=Rack.objects.all(), diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index d02241560..f28a35997 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -2681,7 +2681,7 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, ChainedFieldsMixin, forms.Mode widget=APISelect( api_url='/api/dcim/power-panels/', filter_for={ - 'termination_b_powerfeed': 'powerpanel_id', + 'termination_b_id': 'power_panel_id', } ) ) diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index 458d1267a..c3a83ad69 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -42,9 +42,15 @@ {% if pp.cable %} {% include 'dcim/inc/cable_toggle_buttons.html' with cable=pp.cable %} {% elif perms.dcim.add_cable %} - - - + + + + {% endif %} {% if perms.dcim.change_powerport %} From c1127148e28a3a70da19da5c1e5f8ca6ce594896 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 Apr 2019 16:49:04 -0400 Subject: [PATCH 028/140] Provide individual views for each type of cable connection --- netbox/circuits/urls.py | 2 +- netbox/dcim/forms.py | 124 +++++++++++++----- netbox/dcim/urls.py | 14 +- netbox/dcim/views.py | 41 +++--- netbox/templates/dcim/cable_connect.html | 29 ++-- netbox/templates/dcim/inc/consoleport.html | 13 +- .../templates/dcim/inc/consoleserverport.html | 13 +- netbox/templates/dcim/inc/frontport.html | 14 +- netbox/templates/dcim/inc/interface.html | 14 +- netbox/templates/dcim/inc/poweroutlet.html | 2 +- netbox/templates/dcim/inc/powerport.html | 4 +- netbox/templates/dcim/inc/rearport.html | 14 +- 12 files changed, 198 insertions(+), 86 deletions(-) diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py index be1106308..5b818a945 100644 --- a/netbox/circuits/urls.py +++ b/netbox/circuits/urls.py @@ -43,7 +43,7 @@ urlpatterns = [ url(r'^circuits/(?P\d+)/terminations/add/$', views.CircuitTerminationCreateView.as_view(), name='circuittermination_add'), url(r'^circuit-terminations/(?P\d+)/edit/$', views.CircuitTerminationEditView.as_view(), name='circuittermination_edit'), url(r'^circuit-terminations/(?P\d+)/delete/$', views.CircuitTerminationDeleteView.as_view(), name='circuittermination_delete'), - url(r'^circuit-terminations/(?P\d+)/connect/$', CableCreateView.as_view(), name='circuittermination_connect', kwargs={'termination_a_type': CircuitTermination}), + url(r'^circuit-terminations/(?P\d+)/connect/(?P[\w-]+)/$', CableCreateView.as_view(), name='circuittermination_connect', kwargs={'termination_a_type': CircuitTermination}), url(r'^circuit-terminations/(?P\d+)/trace/$', CableTraceView.as_view(), name='circuittermination_trace', kwargs={'model': CircuitTermination}), ] diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index f28a35997..661ec217b 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -2522,6 +2522,9 @@ class RearPortBulkDisconnectForm(ConfirmationForm): # class ConnectCableToDeviceForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): + """ + Base form for connecting a Cable to a Device component + """ termination_b_site = forms.ModelChoiceField( queryset=Site.objects.all(), label='Site', @@ -2567,42 +2570,89 @@ class ConnectCableToDeviceForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelFo } ) ) - termination_b_type = forms.ModelChoiceField( - queryset=ContentType.objects.all(), - label='Type', - widget=ContentTypeSelect() - ) - termination_b_id = forms.IntegerField( - label='Name', - widget=APISelect( - api_url='/api/dcim/{{termination_b_type}}s/', - disabled_indicator='cable', - conditional_query_params={ - 'termination_b_type__interface': 'type=physical', - } - ) - ) class Meta: model = Cable fields = [ - 'termination_b_site', 'termination_b_rack', 'termination_b_device', 'termination_b_type', - 'termination_b_id', 'type', 'status', 'label', 'color', 'length', 'length_unit', + 'termination_b_site', 'termination_b_rack', 'termination_b_device', 'termination_b_id', 'type', 'status', + 'label', 'color', 'length', 'length_unit', ] - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - # Define available types for endpoint B based on the type of endpoint A - termination_a_type = self.instance.termination_a._meta.model_name - self.fields['termination_b_type'].queryset = ContentType.objects.filter( - model__in=COMPATIBLE_TERMINATION_TYPES.get(termination_a_type) - ).exclude( - model='circuittermination' +class ConnectCableToConsolePortForm(ConnectCableToDeviceForm): + termination_b_id = forms.IntegerField( + label='Name', + widget=APISelect( + api_url='/api/dcim/console-ports/', + disabled_indicator='cable', ) + ) -class ConnectCableToCircuitForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): +class ConnectCableToConsoleServerPortForm(ConnectCableToDeviceForm): + termination_b_id = forms.IntegerField( + label='Name', + widget=APISelect( + api_url='/api/dcim/console-server-ports/', + disabled_indicator='cable', + ) + ) + + +class ConnectCableToPowerPortForm(ConnectCableToDeviceForm): + termination_b_id = forms.IntegerField( + label='Name', + widget=APISelect( + api_url='/api/dcim/power-ports/', + disabled_indicator='cable', + ) + ) + + +class ConnectCableToPowerOutletForm(ConnectCableToDeviceForm): + termination_b_id = forms.IntegerField( + label='Name', + widget=APISelect( + api_url='/api/dcim/power-outlets/', + disabled_indicator='cable', + ) + ) + + +class ConnectCableToInterfaceForm(ConnectCableToDeviceForm): + termination_b_id = forms.IntegerField( + label='Name', + widget=APISelect( + api_url='/api/dcim/interfaces/', + disabled_indicator='cable', + additional_query_params={ + 'type': 'physical', + } + ) + ) + + +class ConnectCableToFrontPortForm(ConnectCableToDeviceForm): + termination_b_id = forms.IntegerField( + label='Name', + widget=APISelect( + api_url='/api/dcim/front-ports/', + disabled_indicator='cable', + ) + ) + + +class ConnectCableToRearPortForm(ConnectCableToDeviceForm): + termination_b_id = forms.IntegerField( + label='Name', + widget=APISelect( + api_url='/api/dcim/rear-ports/', + disabled_indicator='cable', + ) + ) + + +class ConnectCableToCircuitTerminationForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): termination_b_provider = forms.ModelChoiceField( queryset=Provider.objects.all(), label='Provider', @@ -2613,6 +2663,17 @@ class ConnectCableToCircuitForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelF } ) ) + termination_b_site = forms.ModelChoiceField( + queryset=Site.objects.all(), + label='Site', + required=False, + widget=APISelect( + api_url='/api/dcim/sites/', + filter_for={ + 'termination_b_circuit': 'site_id', + } + ) + ) termination_b_circuit = ChainedModelChoiceField( queryset=Circuit.objects.all(), chains=( @@ -2628,18 +2689,19 @@ class ConnectCableToCircuitForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelF ) ) termination_b_id = forms.IntegerField( - label='Termination', + label='Side', widget=APISelect( api_url='/api/circuits/circuit-terminations/', - disabled_indicator='cable' + disabled_indicator='cable', + display_field='term_side' ) ) class Meta: model = Cable fields = [ - 'termination_b_provider', 'termination_b_circuit', 'termination_b_id', 'type', 'status', 'label', 'color', - 'length', 'length_unit', + 'termination_b_provider', 'termination_b_site', 'termination_b_circuit', 'termination_b_id', 'type', + 'status', 'label', 'color', 'length', 'length_unit', ] @@ -2686,7 +2748,7 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, ChainedFieldsMixin, forms.Mode ) ) termination_b_id = forms.IntegerField( - label='Power Feed', + label='Name', widget=APISelect( api_url='/api/dcim/power-feeds/', ) diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index f6ed55ff3..82e32dad2 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -162,7 +162,7 @@ urlpatterns = [ url(r'^devices/console-ports/add/$', views.DeviceBulkAddConsolePortView.as_view(), name='device_bulk_add_consoleport'), url(r'^devices/(?P\d+)/console-ports/add/$', views.ConsolePortCreateView.as_view(), name='consoleport_add'), url(r'^devices/(?P\d+)/console-ports/delete/$', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'), - url(r'^console-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='consoleport_connect', kwargs={'termination_a_type': ConsolePort}), + url(r'^console-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='consoleport_connect', kwargs={'termination_a_type': ConsolePort}), url(r'^console-ports/(?P\d+)/edit/$', views.ConsolePortEditView.as_view(), name='consoleport_edit'), url(r'^console-ports/(?P\d+)/delete/$', views.ConsolePortDeleteView.as_view(), name='consoleport_delete'), url(r'^console-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='consoleport_trace', kwargs={'model': ConsolePort}), @@ -171,7 +171,7 @@ urlpatterns = [ url(r'^devices/console-server-ports/add/$', views.DeviceBulkAddConsoleServerPortView.as_view(), name='device_bulk_add_consoleserverport'), url(r'^devices/(?P\d+)/console-server-ports/add/$', views.ConsoleServerPortCreateView.as_view(), name='consoleserverport_add'), url(r'^devices/(?P\d+)/console-server-ports/delete/$', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'), - url(r'^console-server-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'termination_a_type': ConsoleServerPort}), + url(r'^console-server-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'termination_a_type': ConsoleServerPort}), url(r'^console-server-ports/(?P\d+)/edit/$', views.ConsoleServerPortEditView.as_view(), name='consoleserverport_edit'), url(r'^console-server-ports/(?P\d+)/delete/$', views.ConsoleServerPortDeleteView.as_view(), name='consoleserverport_delete'), url(r'^console-server-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='consoleserverport_trace', kwargs={'model': ConsoleServerPort}), @@ -182,7 +182,7 @@ urlpatterns = [ url(r'^devices/power-ports/add/$', views.DeviceBulkAddPowerPortView.as_view(), name='device_bulk_add_powerport'), url(r'^devices/(?P\d+)/power-ports/add/$', views.PowerPortCreateView.as_view(), name='powerport_add'), url(r'^devices/(?P\d+)/power-ports/delete/$', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'), - url(r'^power-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='powerport_connect', kwargs={'termination_a_type': PowerPort}), + url(r'^power-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='powerport_connect', kwargs={'termination_a_type': PowerPort}), url(r'^power-ports/(?P\d+)/edit/$', views.PowerPortEditView.as_view(), name='powerport_edit'), url(r'^power-ports/(?P\d+)/delete/$', views.PowerPortDeleteView.as_view(), name='powerport_delete'), url(r'^power-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='powerport_trace', kwargs={'model': PowerPort}), @@ -191,7 +191,7 @@ urlpatterns = [ url(r'^devices/power-outlets/add/$', views.DeviceBulkAddPowerOutletView.as_view(), name='device_bulk_add_poweroutlet'), url(r'^devices/(?P\d+)/power-outlets/add/$', views.PowerOutletCreateView.as_view(), name='poweroutlet_add'), url(r'^devices/(?P\d+)/power-outlets/delete/$', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'), - url(r'^power-outlets/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'termination_a_type': PowerOutlet}), + url(r'^power-outlets/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'termination_a_type': PowerOutlet}), url(r'^power-outlets/(?P\d+)/edit/$', views.PowerOutletEditView.as_view(), name='poweroutlet_edit'), url(r'^power-outlets/(?P\d+)/delete/$', views.PowerOutletDeleteView.as_view(), name='poweroutlet_delete'), url(r'^power-outlets/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='poweroutlet_trace', kwargs={'model': PowerOutlet}), @@ -203,7 +203,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/interfaces/add/$', views.InterfaceCreateView.as_view(), name='interface_add'), url(r'^devices/(?P\d+)/interfaces/edit/$', views.InterfaceBulkEditView.as_view(), name='interface_bulk_edit'), url(r'^devices/(?P\d+)/interfaces/delete/$', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'), - url(r'^interfaces/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='interface_connect', kwargs={'termination_a_type': Interface}), + url(r'^interfaces/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='interface_connect', kwargs={'termination_a_type': Interface}), url(r'^interfaces/(?P\d+)/$', views.InterfaceView.as_view(), name='interface'), url(r'^interfaces/(?P\d+)/edit/$', views.InterfaceEditView.as_view(), name='interface_edit'), url(r'^interfaces/(?P\d+)/assign-vlans/$', views.InterfaceAssignVLANsView.as_view(), name='interface_assign_vlans'), @@ -218,7 +218,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/front-ports/add/$', views.FrontPortCreateView.as_view(), name='frontport_add'), url(r'^devices/(?P\d+)/front-ports/edit/$', views.FrontPortBulkEditView.as_view(), name='frontport_bulk_edit'), url(r'^devices/(?P\d+)/front-ports/delete/$', views.FrontPortBulkDeleteView.as_view(), name='frontport_bulk_delete'), - url(r'^front-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='frontport_connect', kwargs={'termination_a_type': FrontPort}), + url(r'^front-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='frontport_connect', kwargs={'termination_a_type': FrontPort}), url(r'^front-ports/(?P\d+)/edit/$', views.FrontPortEditView.as_view(), name='frontport_edit'), url(r'^front-ports/(?P\d+)/delete/$', views.FrontPortDeleteView.as_view(), name='frontport_delete'), url(r'^front-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='frontport_trace', kwargs={'model': FrontPort}), @@ -230,7 +230,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/rear-ports/add/$', views.RearPortCreateView.as_view(), name='rearport_add'), url(r'^devices/(?P\d+)/rear-ports/edit/$', views.RearPortBulkEditView.as_view(), name='rearport_bulk_edit'), url(r'^devices/(?P\d+)/rear-ports/delete/$', views.RearPortBulkDeleteView.as_view(), name='rearport_bulk_delete'), - url(r'^rear-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='rearport_connect', kwargs={'termination_a_type': RearPort}), + url(r'^rear-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='rearport_connect', kwargs={'termination_a_type': RearPort}), url(r'^rear-ports/(?P\d+)/edit/$', views.RearPortEditView.as_view(), name='rearport_edit'), url(r'^rear-ports/(?P\d+)/delete/$', views.RearPortDeleteView.as_view(), name='rearport_delete'), url(r'^rear-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='rearport_trace', kwargs={'model': RearPort}), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 37ed42dc0..b1403745d 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -15,7 +15,7 @@ from django.utils.http import is_safe_url from django.utils.safestring import mark_safe from django.views.generic import View -from circuits.models import Circuit, CircuitTermination +from circuits.models import Circuit from extras.models import Graph, TopologyMap, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE from extras.views import ObjectConfigContextView from ipam.models import Prefix, VLAN @@ -1679,27 +1679,28 @@ class CableCreateView(PermissionRequiredMixin, GetReturnURLMixin, View): permission_required = 'dcim.add_cable' template_name = 'dcim/cable_connect.html' - def _get_form_class(self): - if self.termination_b_type == 'circuit': - return forms.ConnectCableToCircuitForm - if self.termination_b_type == 'powerfeed': - return forms.ConnectCableToPowerFeedForm - return forms.ConnectCableToDeviceForm - def dispatch(self, request, *args, **kwargs): - # Retrieve endpoint A based on the given type and PK termination_a_type = kwargs.get('termination_a_type') termination_a_id = kwargs.get('termination_a_id') - self.obj = Cable( - termination_a=termination_a_type.objects.get(pk=termination_a_id) - ) - self.termination_b_type = request.GET.get('type') - if self.termination_b_type == 'circuit': - self.obj.termination_b_type = ContentType.objects.get_for_model(CircuitTermination) - elif self.termination_b_type == 'powerfeed': - self.obj.termination_b_type = ContentType.objects.get_for_model(PowerFeed) + termination_b_type_name = kwargs.get('termination_b_type') + self.termination_b_type = ContentType.objects.get(model=termination_b_type_name.replace('-', '')) + + self.obj = Cable( + termination_a=termination_a_type.objects.get(pk=termination_a_id), + termination_b_type=self.termination_b_type + ) + self.form_class = { + 'console-port': forms.ConnectCableToConsolePortForm, + 'console-server-port': forms.ConnectCableToConsoleServerPortForm, + 'power-port': forms.ConnectCableToPowerPortForm, + 'power-outlet': forms.ConnectCableToPowerOutletForm, + 'interface': forms.ConnectCableToInterfaceForm, + 'front-port': forms.ConnectCableToFrontPortForm, + 'power-feed': forms.ConnectCableToPowerFeedForm, + 'circuit-termination': forms.ConnectCableToCircuitTerminationForm, + }[termination_b_type_name] return super().dispatch(request, *args, **kwargs) @@ -1708,18 +1709,19 @@ class CableCreateView(PermissionRequiredMixin, GetReturnURLMixin, View): # Parse initial data manually to avoid setting field values as lists initial_data = {k: request.GET[k] for k in request.GET} - form = self._get_form_class()(instance=self.obj, initial=initial_data) + form = self.form_class(instance=self.obj, initial=initial_data) return render(request, self.template_name, { 'obj': self.obj, 'obj_type': Cable._meta.verbose_name, + 'termination_b_type': self.termination_b_type.name, 'form': form, 'return_url': self.get_return_url(request, self.obj), }) def post(self, request, *args, **kwargs): - form = self._get_form_class()(request.POST, request.FILES, instance=self.obj) + form = self.form_class(request.POST, request.FILES, instance=self.obj) if form.is_valid(): obj = form.save() @@ -1742,6 +1744,7 @@ class CableCreateView(PermissionRequiredMixin, GetReturnURLMixin, View): return render(request, self.template_name, { 'obj': self.obj, 'obj_type': Cable._meta.verbose_name, + 'termination_b_type': self.termination_b_type.name, 'form': form, 'return_url': self.get_return_url(request, self.obj), }) diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html index 52c1444d4..b1609f578 100644 --- a/netbox/templates/dcim/cable_connect.html +++ b/netbox/templates/dcim/cable_connect.html @@ -22,7 +22,7 @@
    {% endif %} {% with termination_a=form.instance.termination_a %} -

    {% block title %}Connect {{ termination_a.device }} {{ termination_a }}{% endblock %}

    +

    {% block title %}Connect {{ termination_a.device }} {{ termination_a }} to {{ termination_b_type|bettertitle }}{% endblock %}

    @@ -101,7 +101,16 @@ B Side
    - {# TODO: Clean this up #} + {% if tabs %} + + {% endif %} + {% if 'termination_b_provider' in form.fields %} + {% render_field form.termination_b_provider %} + {% endif %} {% if 'termination_b_site' in form.fields %} {% render_field form.termination_b_site %} {% endif %} @@ -117,18 +126,18 @@ {% if 'termination_b_type' in form.fields %} {% render_field form.termination_b_type %} {% endif %} - {% if 'termination_b_provider' in form.fields %} - {% render_field form.termination_b_provider %} + {% if 'termination_b_powerpanel' in form.fields %} + {% render_field form.termination_b_powerpanel %} {% endif %} {% if 'termination_b_circuit' in form.fields %} {% render_field form.termination_b_circuit %} {% endif %} - {% if 'termination_b_powerpanel' in form.fields %} - {% render_field form.termination_b_powerpanel %} - {% endif %} - {% if 'termination_b_powerfeed' in form.fields %} - {% render_field form.termination_b_powerfeed %} - {% endif %} +
    + +
    +

    {{ termination_b_type|capfirst }}

    +
    +
    {% render_field form.termination_b_id %}
    diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html index eea23db93..be531ef1b 100644 --- a/netbox/templates/dcim/inc/consoleport.html +++ b/netbox/templates/dcim/inc/consoleport.html @@ -38,9 +38,16 @@ {% if cp.cable %} {% include 'dcim/inc/cable_toggle_buttons.html' with cable=cp.cable %} {% elif perms.dcim.add_cable %} - - - + + + + {% endif %} {% if perms.dcim.change_consoleport %} diff --git a/netbox/templates/dcim/inc/consoleserverport.html b/netbox/templates/dcim/inc/consoleserverport.html index 2ce7818b6..d1dce00d3 100644 --- a/netbox/templates/dcim/inc/consoleserverport.html +++ b/netbox/templates/dcim/inc/consoleserverport.html @@ -47,9 +47,16 @@ {% if csp.cable %} {% include 'dcim/inc/cable_toggle_buttons.html' with cable=csp.cable %} {% elif perms.dcim.add_cable %} - - - + + + + {% endif %} {% if perms.dcim.change_consoleserverport %} diff --git a/netbox/templates/dcim/inc/frontport.html b/netbox/templates/dcim/inc/frontport.html index 2b468725d..ae86a36b4 100644 --- a/netbox/templates/dcim/inc/frontport.html +++ b/netbox/templates/dcim/inc/frontport.html @@ -58,9 +58,17 @@ {% if frontport.cable %} {% include 'dcim/inc/cable_toggle_buttons.html' with cable=frontport.cable %} {% elif perms.dcim.add_cable %} - - - + + + + {% endif %} {% if perms.dcim.change_frontport %} diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 584d1754d..4aa4e377d 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -151,9 +151,17 @@ {% if iface.cable %} {% include 'dcim/inc/cable_toggle_buttons.html' with cable=iface.cable %} {% elif iface.is_connectable and perms.dcim.add_cable %} - - - + + + + {% endif %} diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index 74f946495..042c9142a 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -47,7 +47,7 @@ {% if po.cable %} {% include 'dcim/inc/cable_toggle_buttons.html' with cable=po.cable %} {% elif perms.dcim.add_cable %} - + {% endif %} diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index c3a83ad69..e74e4f368 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -47,8 +47,8 @@ {% endif %} diff --git a/netbox/templates/dcim/inc/rearport.html b/netbox/templates/dcim/inc/rearport.html index 63aae1127..27609e726 100644 --- a/netbox/templates/dcim/inc/rearport.html +++ b/netbox/templates/dcim/inc/rearport.html @@ -57,9 +57,17 @@ {% if rearport.cable %} {% include 'dcim/inc/cable_toggle_buttons.html' with cable=rearport.cable %} {% elif perms.dcim.add_cable %} - - - + + + + {% endif %} {% if perms.dcim.change_rearport %} From 8230ea1c83d4eaf8c2f0fbe068a1c4f27b0f6c73 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 Apr 2019 17:32:04 -0400 Subject: [PATCH 029/140] Add max/allocated current draw fields to PowerPort --- netbox/dcim/api/serializers.py | 4 ++-- netbox/dcim/forms.py | 13 +++++----- netbox/dcim/migrations/0072_powerfeeds.py | 20 ++++++++++++++++ netbox/dcim/models.py | 28 +++++++++++++++++++++- netbox/templates/dcim/inc/consoleport.html | 1 + netbox/templates/dcim/inc/powerport.html | 9 +++++++ 6 files changed, 65 insertions(+), 10 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 59ac3b0ef..f9452cebf 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -210,7 +210,7 @@ class PowerPortTemplateSerializer(ValidatedModelSerializer): class Meta: model = PowerPortTemplate - fields = ['id', 'device_type', 'name'] + fields = ['id', 'device_type', 'name', 'maximum_draw', 'allocated_draw'] class PowerOutletTemplateSerializer(ValidatedModelSerializer): @@ -391,7 +391,7 @@ class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer): class Meta: model = PowerPort fields = [ - 'id', 'device', 'name', 'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', + 'id', 'device', 'name', 'maximum_draw', 'allocated_draw', 'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', 'tags', ] diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 661ec217b..cb97f0e84 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -10,17 +10,16 @@ from mptt.forms import TreeNodeChoiceField from taggit.forms import TagField from timezone_field import TimeZoneFormField -from circuits.models import Circuit, CircuitTermination, Provider +from circuits.models import Circuit, Provider from extras.forms import AddRemoveTagsForm, CustomFieldForm, CustomFieldBulkEditForm, CustomFieldFilterForm from ipam.models import IPAddress, VLAN, VLANGroup from tenancy.forms import TenancyForm from tenancy.models import Tenant from utilities.forms import ( APISelect, APISelectMultiple, add_blank_choice, ArrayFieldSelectMultiple, BootstrapMixin, BulkEditForm, - BulkEditNullBooleanSelect, ChainedFieldsMixin, ChainedModelChoiceField, ColorSelect, CommentField, - ComponentForm, ConfirmationForm, ContentTypeSelect, CSVChoiceField, ExpandableNameField, - FilterChoiceField, FlexibleModelChoiceField, JSONField, SelectWithPK, SmallTextarea, SlugField, - StaticSelect2, StaticSelect2Multiple, BOOLEAN_WITH_BLANK_CHOICES + BulkEditNullBooleanSelect, ChainedFieldsMixin, ChainedModelChoiceField, ColorSelect, CommentField, ComponentForm, + ConfirmationForm, CSVChoiceField, ExpandableNameField, FilterChoiceField, FlexibleModelChoiceField, JSONField, + SelectWithPK, SmallTextarea, SlugField, StaticSelect2, StaticSelect2Multiple, BOOLEAN_WITH_BLANK_CHOICES ) from virtualization.models import Cluster, ClusterGroup from .constants import * @@ -964,7 +963,7 @@ class PowerPortTemplateForm(BootstrapMixin, forms.ModelForm): class Meta: model = PowerPortTemplate fields = [ - 'device_type', 'name', + 'device_type', 'name', 'maximum_draw', 'allocated_draw', ] widgets = { 'device_type': forms.HiddenInput(), @@ -1948,7 +1947,7 @@ class PowerPortForm(BootstrapMixin, forms.ModelForm): class Meta: model = PowerPort fields = [ - 'device', 'name', 'description', 'tags', + 'device', 'name', 'maximum_draw', 'allocated_draw', 'description', 'tags', ] widgets = { 'device': forms.HiddenInput(), diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py index 676b431c3..d8dcbf252 100644 --- a/netbox/dcim/migrations/0072_powerfeeds.py +++ b/netbox/dcim/migrations/0072_powerfeeds.py @@ -84,6 +84,26 @@ class Migration(migrations.Migration): name='_connected_powerfeed', field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.PowerFeed'), ), + migrations.AddField( + model_name='powerport', + name='allocated_draw', + field=models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)]), + ), + migrations.AddField( + model_name='powerport', + name='maximum_draw', + field=models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)]), + ), + migrations.AddField( + model_name='powerporttemplate', + name='allocated_draw', + field=models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)]), + ), + migrations.AddField( + model_name='powerporttemplate', + name='maximum_draw', + field=models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)]), + ), migrations.AlterUniqueTogether( name='powerpanel', unique_together={('site', 'name')}, diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index f0fa4ea5f..9e2be6a43 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1053,6 +1053,18 @@ class PowerPortTemplate(ComponentTemplateModel): name = models.CharField( max_length=50 ) + maximum_draw = models.PositiveSmallIntegerField( + blank=True, + null=True, + validators=[MinValueValidator(1)], + help_text="Maximum current draw (watts)" + ) + allocated_draw = models.PositiveSmallIntegerField( + blank=True, + null=True, + validators=[MinValueValidator(1)], + help_text="Allocated current draw (watts)" + ) objects = DeviceComponentManager() @@ -1828,6 +1840,18 @@ class PowerPort(CableTermination, ComponentModel): name = models.CharField( max_length=50 ) + maximum_draw = models.PositiveSmallIntegerField( + blank=True, + null=True, + validators=[MinValueValidator(1)], + help_text="Maximum current draw (watts)" + ) + allocated_draw = models.PositiveSmallIntegerField( + blank=True, + null=True, + validators=[MinValueValidator(1)], + help_text="Allocated current draw (watts)" + ) _connected_poweroutlet = models.OneToOneField( to='dcim.PowerOutlet', on_delete=models.SET_NULL, @@ -1850,7 +1874,7 @@ class PowerPort(CableTermination, ComponentModel): objects = DeviceComponentManager() tags = TaggableManager(through=TaggedItem) - csv_headers = ['device', 'name', 'description'] + csv_headers = ['device', 'name', 'maximum_draw', 'allocated_draw', 'description'] class Meta: ordering = ['device', 'name'] @@ -1866,6 +1890,8 @@ class PowerPort(CableTermination, ComponentModel): return ( self.device.identifier, self.name, + self.maximum_draw, + self.allocated_draw, self.description, ) diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html index be531ef1b..e75e09076 100644 --- a/netbox/templates/dcim/inc/consoleport.html +++ b/netbox/templates/dcim/inc/consoleport.html @@ -4,6 +4,7 @@ {{ cp }} + {# Description #} diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index e74e4f368..e8cd77857 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -5,6 +5,15 @@ {{ pp }} + {# Current draw #} + + {% if pp.allocated_draw %} + {{ pp.allocated_draw }}W{% if pp.maximum_draw %} ({{ pp.maximum_draw }}W max){% endif %} + {% elif pp.maximum_draw %} + {{ pp.maximum_draw }}W + {% endif %} + + {# Description #} {{ pp.description }} From 0ddd71fc36675ac936a29ee69113453b035f757e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 10 Apr 2019 13:05:51 -0400 Subject: [PATCH 030/140] Include draw numbers of connected power ports --- netbox/templates/dcim/device.html | 2 +- netbox/templates/dcim/inc/poweroutlet.html | 23 +++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index a2eddc15f..5e01ef413 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -629,7 +629,7 @@ Name Description Cable - Connection + Connection diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index 042c9142a..f3a420c2e 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -30,14 +30,23 @@ {# Connection #} {% if po.connected_endpoint %} - - {{ po.connected_endpoint.device }} - - - {{ po.connected_endpoint }} - + {% with pp=po.connected_endpoint %} + + {{ pp.device }} + + + {{ pp }} + + + {% if pp.allocated_draw %} + {{ pp.allocated_draw }}W{% if pp.maximum_draw %} ({{ pp.maximum_draw }}W max){% endif %} + {% elif pp.maximum_draw %} + {{ pp.maximum_draw }}W + {% endif %} + + {% endwith %} {% else %} - + Not connected {% endif %} From 3d5f85c0cab0a0c5f003304b2b005bae13b97f2a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 10 Apr 2019 14:16:16 -0400 Subject: [PATCH 031/140] Add associatiton from power outlet to power port/phase --- netbox/dcim/api/serializers.py | 26 +++++++++--- netbox/dcim/api/views.py | 2 + netbox/dcim/constants.py | 8 ++++ netbox/dcim/forms.py | 33 +++++++++++++++- netbox/dcim/migrations/0072_powerfeeds.py | 22 ++++++++++- netbox/dcim/models.py | 46 +++++++++++++++++++++- netbox/templates/dcim/device.html | 1 + netbox/templates/dcim/inc/poweroutlet.html | 9 +++++ 8 files changed, 137 insertions(+), 10 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index f9452cebf..402fc5e13 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -215,10 +215,16 @@ class PowerPortTemplateSerializer(ValidatedModelSerializer): class PowerOutletTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() + power_port = PowerPortTemplateSerializer() + feed_leg = ChoiceField( + choices=POWERFEED_LEG_CHOICES, + required=False, + allow_null=True + ) class Meta: model = PowerOutletTemplate - fields = ['id', 'device_type', 'name'] + fields = ['id', 'device_type', 'name', 'power_port', 'feed_leg'] class InterfaceTemplateSerializer(ValidatedModelSerializer): @@ -372,14 +378,24 @@ class ConsolePortSerializer(TaggitSerializer, ConnectedEndpointSerializer): class PowerOutletSerializer(TaggitSerializer, ConnectedEndpointSerializer): device = NestedDeviceSerializer() - cable = NestedCableSerializer(read_only=True) - tags = TagListSerializerField(required=False) + power_port = NestedPowerPortSerializer() + feed_leg = ChoiceField( + choices=POWERFEED_LEG_CHOICES, + required=False, + allow_null=True + ) + cable = NestedCableSerializer( + read_only=True + ) + tags = TagListSerializerField( + required=False + ) class Meta: model = PowerOutlet fields = [ - 'id', 'device', 'name', 'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', - 'cable', 'tags', + 'id', 'device', 'name', 'power_port', 'feed_leg', 'description', 'connected_endpoint_type', + 'connected_endpoint', 'connection_status', 'cable', 'tags', ] diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index d4909b8e4..037a5a765 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -44,6 +44,8 @@ class DCIMFieldChoicesViewSet(FieldChoicesViewSet): (FrontPortTemplate, ['type']), (Interface, ['form_factor', 'mode']), (InterfaceTemplate, ['form_factor']), + (PowerOutlet, ['feed_leg']), + (PowerOutletTemplate, ['feed_leg']), (PowerPort, ['connection_status']), (Rack, ['outer_unit', 'status', 'type', 'width']), (RearPort, ['type']), diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index e3f4f190b..6c135254c 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -475,3 +475,11 @@ POWERFEED_STATUS_CHOICES = ( (POWERFEED_STATUS_PLANNED, 'Planned'), (POWERFEED_STATUS_FAILED, 'Failed'), ) +POWERFEED_LEG_A = 1 +POWERFEED_LEG_B = 2 +POWERFEED_LEG_C = 3 +POWERFEED_LEG_CHOICES = ( + (POWERFEED_LEG_A, 'A'), + (POWERFEED_LEG_B, 'B'), + (POWERFEED_LEG_C, 'C'), +) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index cb97f0e84..f8aa7708d 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -977,16 +977,29 @@ class PowerPortTemplateCreateForm(ComponentForm): class PowerOutletTemplateForm(BootstrapMixin, forms.ModelForm): + power_port = forms.ModelChoiceField( + queryset=PowerPortTemplate.objects.all(), + required=False + ) class Meta: model = PowerOutletTemplate fields = [ - 'device_type', 'name', + 'device_type', 'name', 'power_port', 'feed_leg', ] widgets = { 'device_type': forms.HiddenInput(), } + def __init__(self, *args, **kwargs): + + super().__init__(*args, **kwargs) + + # Limit power_port choices to current DeviceType + self.fields['power_port'].queryset = PowerPortTemplate.objects.filter( + device_type=self.parent + ) + class PowerOutletTemplateCreateForm(ComponentForm): name_pattern = ExpandableNameField( @@ -1972,6 +1985,10 @@ class PowerPortCreateForm(ComponentForm): # class PowerOutletForm(BootstrapMixin, forms.ModelForm): + power_port = forms.ModelChoiceField( + queryset=PowerPort.objects.all(), + required=False + ) tags = TagField( required=False ) @@ -1979,12 +1996,20 @@ class PowerOutletForm(BootstrapMixin, forms.ModelForm): class Meta: model = PowerOutlet fields = [ - 'device', 'name', 'description', 'tags', + 'device', 'name', 'power_port', 'feed_leg', 'description', 'tags', ] widgets = { 'device': forms.HiddenInput(), } + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + # Limit power_port choices to the local device + self.fields['power_port'].queryset = PowerPort.objects.filter( + device=self.instance.device + ) + class PowerOutletCreateForm(ComponentForm): name_pattern = ExpandableNameField( @@ -2004,6 +2029,10 @@ class PowerOutletBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): queryset=PowerOutlet.objects.all(), widget=forms.MultipleHiddenInput() ) + feed_leg = forms.ChoiceField( + choices=POWERFEED_LEG_CHOICES, + required=False, + ) description = forms.CharField( max_length=100, required=False diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py index d8dcbf252..4eb43c20b 100644 --- a/netbox/dcim/migrations/0072_powerfeeds.py +++ b/netbox/dcim/migrations/0072_powerfeeds.py @@ -1,5 +1,3 @@ -# Generated by Django 2.1.7 on 2019-03-21 20:59 - import django.core.validators from django.db import migrations, models import django.db.models.deletion @@ -112,4 +110,24 @@ class Migration(migrations.Migration): name='powerfeed', unique_together={('power_panel', 'name')}, ), + migrations.AddField( + model_name='poweroutlet', + name='feed_leg', + field=models.PositiveSmallIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='poweroutlet', + name='power_port', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='poweroutlets', to='dcim.PowerPort'), + ), + migrations.AddField( + model_name='poweroutlettemplate', + name='feed_leg', + field=models.PositiveSmallIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='poweroutlettemplate', + name='power_port', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='poweroutlet_templates', to='dcim.PowerPortTemplate'), + ), ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 9e2be6a43..fcf3252cf 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1088,6 +1088,19 @@ class PowerOutletTemplate(ComponentTemplateModel): name = models.CharField( max_length=50 ) + power_port = models.ForeignKey( + to='dcim.PowerPortTemplate', + on_delete=models.SET_NULL, + blank=True, + null=True, + related_name='poweroutlet_templates' + ) + feed_leg = models.PositiveSmallIntegerField( + choices=POWERFEED_LEG_CHOICES, + blank=True, + null=True, + help_text="Phase (for three-phase feeds)" + ) objects = DeviceComponentManager() @@ -1098,6 +1111,14 @@ class PowerOutletTemplate(ComponentTemplateModel): def __str__(self): return self.name + def clean(self): + + # Validate power port assignment + if self.power_port and self.power_port.device_type != self.device_type: + raise ValidationError( + "Parent power port ({}) must belong to the same device type".format(self.power_port) + ) + class InterfaceTemplate(ComponentTemplateModel): """ @@ -1934,6 +1955,19 @@ class PowerOutlet(CableTermination, ComponentModel): name = models.CharField( max_length=50 ) + power_port = models.ForeignKey( + to='dcim.PowerPort', + on_delete=models.SET_NULL, + blank=True, + null=True, + related_name='poweroutlets' + ) + feed_leg = models.PositiveSmallIntegerField( + choices=POWERFEED_LEG_CHOICES, + blank=True, + null=True, + help_text="Phase (for three-phase feeds)" + ) connection_status = models.NullBooleanField( choices=CONNECTION_STATUS_CHOICES, blank=True @@ -1942,7 +1976,7 @@ class PowerOutlet(CableTermination, ComponentModel): objects = DeviceComponentManager() tags = TaggableManager(through=TaggedItem) - csv_headers = ['device', 'name', 'description'] + csv_headers = ['device', 'name', 'power_port', 'feed_leg', 'description'] class Meta: unique_together = ['device', 'name'] @@ -1957,9 +1991,19 @@ class PowerOutlet(CableTermination, ComponentModel): return ( self.device.identifier, self.name, + self.power_port.name if self.power_port else None, + self.get_feed_leg_display(), self.description, ) + def clean(self): + + # Validate power port assignment + if self.power_port and self.power_port.device != self.device: + raise ValidationError( + "Parent power port ({}) must belong to the same device".format(self.power_port) + ) + # # Interfaces diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 5e01ef413..34811c4c0 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -627,6 +627,7 @@ {% endif %} Name + Input/Leg Description Cable Connection diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index f3a420c2e..bebf677f9 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -14,6 +14,15 @@ {{ po }} + {# Power port #} + + {% if po.power_port %} + {{ po.power_port }}{% if po.feed_leg %} / {{ po.get_feed_leg_display }}{% endif %} + {% else %} + None + {% endif %} + + {# Description #} {{ po.description|placeholder }} From ac3e899f5ec5cf4979325b4c072e386c22f5fb2d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 10 Apr 2019 16:32:13 -0400 Subject: [PATCH 032/140] First stab at power utilization tracking --- netbox/dcim/models.py | 44 ++++++++++++++++++++++++++++++- netbox/templates/dcim/device.html | 43 ++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index fcf3252cf..d1f9f59f2 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -9,7 +9,7 @@ from django.contrib.postgres.fields import ArrayField, JSONField from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models -from django.db.models import Count, Q +from django.db.models import Count, Q, Sum from django.urls import reverse from mptt.models import MPTTModel, TreeForeignKey from taggit.managers import TaggableManager @@ -1938,6 +1938,41 @@ class PowerPort(CableTermination, ComponentModel): "Connected endpoint must be a PowerOutlet or PowerFeed, not {}.".format(type(value)) ) + def get_power_stats(self): + """ + Return power utilization statistics + """ + feed = self._connected_powerfeed + if not feed or not self.poweroutlets.count(): + return None + + stats = [] + powerfeed_available = self._connected_powerfeed.available_power + + outlet_ids = PowerOutlet.objects.filter(power_port=self).values_list('pk', flat=True) + utilization = PowerPort.objects.filter(_connected_poweroutlet_id__in=outlet_ids).aggregate( + maximum_draw=Sum('maximum_draw'), + allocated_draw=Sum('allocated_draw'), + ) + utilization['outlets'] = len(outlet_ids) + utilization['available_power'] = powerfeed_available + stats.append(utilization) + + # Per-leg stats for three-phase feeds + if feed.phase == POWERFEED_PHASE_3PHASE: + for leg, leg_name in POWERFEED_LEG_CHOICES: + outlet_ids = PowerOutlet.objects.filter(power_port=self, feed_leg=leg).values_list('pk', flat=True) + utilization = PowerPort.objects.filter(_connected_poweroutlet_id__in=outlet_ids).aggregate( + maximum_draw=Sum('maximum_draw'), + allocated_draw=Sum('allocated_draw'), + ) + utilization['name'] = 'Leg {}'.format(leg_name) + utilization['outlets'] = len(outlet_ids) + utilization['available_power'] = powerfeed_available / 3 + stats.append(utilization) + + return stats + # # Power outlets @@ -2923,3 +2958,10 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): def get_status_class(self): return STATUS_CLASSES[self.status] + + @property + def available_power(self): + kva = self.voltage * self.amperage * self.max_utilization + if self.phase == POWERFEED_PHASE_3PHASE: + return kva * 1.732 + return kva diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 34811c4c0..b9f283837 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -332,6 +332,49 @@ {% endif %}
    {% endif %} + {% if power_ports and poweroutlets %} +
    +
    + Power Utilization +
    + + + + + + + + {% for pp in power_ports %} + {% for leg in pp.get_power_stats %} + + {% if leg.name %} + + {% else %} + + {% endif %} + + + + + {% endfor %} + {% endfor %} +
    InputOutletsAllocated/Max (W)Available (VA)
    {{ leg.name }}{{ pp }}{{ leg.outlets|placeholder }}{{ leg.allocated_draw }} / {{ leg.maximum_draw }}{{ leg.available_power }}
    + {% if perms.dcim.add_interface or perms.dcim.add_consoleport or perms.dcim.add_powerport %} +
    + {% if perms.dcim.add_consoleport %} + + Add console port + + {% endif %} + {% if perms.dcim.add_powerport %} + + Add power port + + {% endif %} +
    + {% endif %} +
    + {% endif %} {% if request.user.is_authenticated %}
    From b22fd2bc44db3b98adf8cce41d1cf0c754c4fdf5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 10 Apr 2019 16:36:38 -0400 Subject: [PATCH 033/140] Rename max_utilization to power_factor --- netbox/dcim/api/serializers.py | 2 +- netbox/dcim/forms.py | 4 ++-- netbox/dcim/migrations/0072_powerfeeds.py | 2 +- netbox/dcim/models.py | 8 ++++---- netbox/templates/dcim/powerfeed.html | 2 +- netbox/templates/dcim/powerfeed_edit.html | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 402fc5e13..8c3364a1b 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -660,5 +660,5 @@ class PowerFeedSerializer(TaggitSerializer, CustomFieldModelSerializer): model = PowerFeed fields = [ 'id', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', - 'max_utilization', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', + 'power_factor', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', ] diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index f8aa7708d..8fcad0bfe 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -3464,7 +3464,7 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm): model = PowerFeed fields = [ 'site', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', - 'max_utilization', 'comments', 'tags', + 'power_factor', 'comments', 'tags', ] widgets = { 'power_panel': APISelect( @@ -3610,7 +3610,7 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd amperage = forms.IntegerField( required=False ) - max_utilization = forms.IntegerField( + power_factor = forms.IntegerField( required=False ) comments = forms.CharField( diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py index 4eb43c20b..9bd24e041 100644 --- a/netbox/dcim/migrations/0072_powerfeeds.py +++ b/netbox/dcim/migrations/0072_powerfeeds.py @@ -25,7 +25,7 @@ class Migration(migrations.Migration): ('phase', models.PositiveSmallIntegerField(default=1)), ('voltage', models.PositiveSmallIntegerField(default=120, validators=[django.core.validators.MinValueValidator(1)])), ('amperage', models.PositiveSmallIntegerField(default=20, validators=[django.core.validators.MinValueValidator(1)])), - ('max_utilization', models.PositiveSmallIntegerField(default=80, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])), + ('power_factor', models.PositiveSmallIntegerField(default=80, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])), ('comments', models.TextField(blank=True)), ('cable', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable')), ], diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index d1f9f59f2..cdaf247c8 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2907,7 +2907,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): validators=[MinValueValidator(1)], default=20 ) - max_utilization = models.PositiveSmallIntegerField( + power_factor = models.PositiveSmallIntegerField( validators=[MinValueValidator(1), MaxValueValidator(100)], default=80, help_text="Maximum permissible draw (percentage)" @@ -2925,7 +2925,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): csv_headers = [ 'site', 'panel_name', 'rack_group', 'rack_name', 'name', 'status', 'type', 'supply', 'phase', 'voltage', - 'amperage', 'max_utilization', 'comments', + 'amperage', 'power_factor', 'comments', ] class Meta: @@ -2949,7 +2949,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): self.get_phase_display(), self.voltage, self.amperage, - self.max_utilization, + self.power_factor, self.comments, ) @@ -2961,7 +2961,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): @property def available_power(self): - kva = self.voltage * self.amperage * self.max_utilization + kva = self.voltage * self.amperage * self.power_factor if self.phase == POWERFEED_PHASE_3PHASE: return kva * 1.732 return kva diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index b48e2f602..0686afd20 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -119,7 +119,7 @@ Max Utilization - {{ powerfeed.max_utilization }}% + {{ powerfeed.power_factor }}%
    diff --git a/netbox/templates/dcim/powerfeed_edit.html b/netbox/templates/dcim/powerfeed_edit.html index f4b3ada46..bdfbfd77d 100644 --- a/netbox/templates/dcim/powerfeed_edit.html +++ b/netbox/templates/dcim/powerfeed_edit.html @@ -20,7 +20,7 @@ {% render_field form.voltage %} {% render_field form.amperage %} {% render_field form.phase %} - {% render_field form.max_utilization %} + {% render_field form.power_factor %}
    {% if form.custom_fields %} From 05c19af2a37eb77b648f6d4ac10d3a77cb417497 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 11 Apr 2019 10:49:43 -0400 Subject: [PATCH 034/140] Misc cleanup --- netbox/dcim/api/views.py | 6 +++--- netbox/dcim/filters.py | 3 ++- netbox/dcim/forms.py | 24 +++++++++++++++++++++--- netbox/dcim/models.py | 16 ++++++++++++++++ netbox/templates/dcim/powerfeed.html | 3 ++- 5 files changed, 44 insertions(+), 8 deletions(-) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 037a5a765..ee17c0062 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -544,7 +544,7 @@ class VirtualChassisViewSet(ModelViewSet): # class PowerPanelViewSet(ModelViewSet): - queryset = PowerPanel.objects.all() + queryset = PowerPanel.objects.select_related('site', 'rack_group') serializer_class = serializers.PowerPanelSerializer filterset_class = filters.PowerPanelFilter @@ -553,8 +553,8 @@ class PowerPanelViewSet(ModelViewSet): # Power feeds # -class PowerFeedViewSet(ModelViewSet): - queryset = PowerFeed.objects.all() +class PowerFeedViewSet(CustomFieldModelViewSet): + queryset = PowerFeed.objects.select_related('power_panel', 'rack').prefetch_related('tags') serializer_class = serializers.PowerFeedSerializer filterset_class = filters.PowerFeedFilter diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 581ed76bf..ea535f4f2 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -1135,10 +1135,11 @@ class PowerFeedFilter(CustomFieldFilterSet): queryset=Rack.objects.all(), label='Rack (ID)', ) + tag = TagFilter() class Meta: model = PowerFeed - fields = ['name', 'status', 'type', 'supply', 'phase'] + fields = ['name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'power_factor'] def search(self, queryset, name, value): if not value.strip(): diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 8fcad0bfe..ba639a646 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -3456,6 +3456,7 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm): } ) ) + comments = CommentField() tags = TagField( required=False ) @@ -3479,6 +3480,14 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm): 'phase': StaticSelect2(), } + def __init__(self, *args, **kwargs): + + super().__init__(*args, **kwargs) + + # Initialize site field + if self.instance and self.instance.power_panel: + self.initial['site'] = self.instance.power_panel.site + class PowerFeedCSVForm(forms.ModelForm): site = forms.ModelChoiceField( @@ -3573,11 +3582,11 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd } ) ) - rackgroup = forms.ModelChoiceField( - queryset=RackGroup.objects.all(), + rack = forms.ModelChoiceField( + queryset=Rack.objects.all(), required=False, widget=APISelect( - api_url="/api/dcim/rack-groups", + api_url="/api/dcim/racks", ) ) status = forms.ChoiceField( @@ -3669,3 +3678,12 @@ class PowerFeedFilterForm(BootstrapMixin, CustomFieldFilterForm): required=False, widget=StaticSelect2() ) + voltage = forms.IntegerField( + required=False + ) + amperage = forms.IntegerField( + required=False + ) + power_factor = forms.IntegerField( + required=False + ) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index cdaf247c8..020d30618 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2853,6 +2853,14 @@ class PowerPanel(ChangeLoggedModel): self.name, ) + def clean(self): + + # RackGroup must belong to assigned Site + if self.rack_group and self.rack_group.site != self.site: + raise ValidationError("Rack group {} ({}) is in a different site than {}".format( + self.rack_group, self.rack_group.site, self.site + )) + class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): """ @@ -2953,6 +2961,14 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): self.comments, ) + def clean(self): + + # Rack must belong to same Site as PowerPanel + if self.rack and self.rack.site != self.power_panel.site: + raise ValidationError("Rack {} ({}) and power panel {} ({}) are in different sites".format( + self.rack, self.rack.site, self.power_panel, self.power_panel.site + )) + def get_type_class(self): return STATUS_CLASSES[self.type] diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index 0686afd20..f2c16927b 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -8,6 +8,7 @@
    1. Power Feeds
      2. +
    2. {{ powerfeed.power_panel.site }}
    3. {{ powerfeed.power_panel }}
      4. {% if powerfeed.rack %}
    4. {{ powerfeed.rack }}
      5. @@ -118,7 +119,7 @@ {{ powerfeed.get_phase_display }} - Max Utilization + Power Factor {{ powerfeed.power_factor }}% From bfa07aec39476a4151adfed16ba15681ede2ef96 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 11 Apr 2019 11:37:44 -0400 Subject: [PATCH 035/140] Fix tests --- netbox/dcim/api/serializers.py | 8 ++++-- netbox/dcim/api/views.py | 2 +- netbox/dcim/fixtures/dcim.json | 50 +++++++++++++++++----------------- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 8c3364a1b..c31dc5c09 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -215,7 +215,9 @@ class PowerPortTemplateSerializer(ValidatedModelSerializer): class PowerOutletTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() - power_port = PowerPortTemplateSerializer() + power_port = PowerPortTemplateSerializer( + required=False + ) feed_leg = ChoiceField( choices=POWERFEED_LEG_CHOICES, required=False, @@ -378,7 +380,9 @@ class ConsolePortSerializer(TaggitSerializer, ConnectedEndpointSerializer): class PowerOutletSerializer(TaggitSerializer, ConnectedEndpointSerializer): device = NestedDeviceSerializer() - power_port = NestedPowerPortSerializer() + power_port = NestedPowerPortSerializer( + required=False + ) feed_leg = ChoiceField( choices=POWERFEED_LEG_CHOICES, required=False, diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index ee17c0062..88d604505 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -410,7 +410,7 @@ class ConsoleServerPortViewSet(CableTraceMixin, ModelViewSet): class PowerPortViewSet(CableTraceMixin, ModelViewSet): queryset = PowerPort.objects.select_related( - 'device', 'connected_endpoint__device', 'cable' + 'device', '_connected_poweroutlet__device', '_connected_powerfeed', 'cable' ).prefetch_related( 'tags' ) diff --git a/netbox/dcim/fixtures/dcim.json b/netbox/dcim/fixtures/dcim.json index 215fbb702..cdcc860e8 100644 --- a/netbox/dcim/fixtures/dcim.json +++ b/netbox/dcim/fixtures/dcim.json @@ -2667,7 +2667,7 @@ "fields": { "device": 1, "name": "PEM0", - "connected_endpoint": 25, + "_connected_poweroutlet": 25, "connection_status": true } }, @@ -2677,7 +2677,7 @@ "fields": { "device": 1, "name": "PEM1", - "connected_endpoint": 49, + "_connected_poweroutlet": 49, "connection_status": true } }, @@ -2687,7 +2687,7 @@ "fields": { "device": 1, "name": "PEM2", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2697,7 +2697,7 @@ "fields": { "device": 1, "name": "PEM3", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2707,7 +2707,7 @@ "fields": { "device": 2, "name": "PEM0", - "connected_endpoint": 26, + "_connected_poweroutlet": 26, "connection_status": true } }, @@ -2717,7 +2717,7 @@ "fields": { "device": 2, "name": "PEM1", - "connected_endpoint": 50, + "_connected_poweroutlet": 50, "connection_status": true } }, @@ -2727,7 +2727,7 @@ "fields": { "device": 2, "name": "PEM2", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2737,7 +2737,7 @@ "fields": { "device": 2, "name": "PEM3", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2747,7 +2747,7 @@ "fields": { "device": 4, "name": "PSU0", - "connected_endpoint": 28, + "_connected_poweroutlet": 28, "connection_status": true } }, @@ -2757,7 +2757,7 @@ "fields": { "device": 4, "name": "PSU1", - "connected_endpoint": 52, + "_connected_poweroutlet": 52, "connection_status": true } }, @@ -2767,7 +2767,7 @@ "fields": { "device": 5, "name": "PSU0", - "connected_endpoint": 56, + "_connected_poweroutlet": 56, "connection_status": true } }, @@ -2777,7 +2777,7 @@ "fields": { "device": 5, "name": "PSU1", - "connected_endpoint": 32, + "_connected_poweroutlet": 32, "connection_status": true } }, @@ -2787,7 +2787,7 @@ "fields": { "device": 3, "name": "PSU0", - "connected_endpoint": 27, + "_connected_poweroutlet": 27, "connection_status": true } }, @@ -2797,7 +2797,7 @@ "fields": { "device": 3, "name": "PSU1", - "connected_endpoint": 51, + "_connected_poweroutlet": 51, "connection_status": true } }, @@ -2807,7 +2807,7 @@ "fields": { "device": 7, "name": "PEM0", - "connected_endpoint": 53, + "_connected_poweroutlet": 53, "connection_status": true } }, @@ -2817,7 +2817,7 @@ "fields": { "device": 7, "name": "PEM1", - "connected_endpoint": 29, + "_connected_poweroutlet": 29, "connection_status": true } }, @@ -2827,7 +2827,7 @@ "fields": { "device": 7, "name": "PEM2", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2837,7 +2837,7 @@ "fields": { "device": 7, "name": "PEM3", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2847,7 +2847,7 @@ "fields": { "device": 8, "name": "PEM0", - "connected_endpoint": 54, + "_connected_poweroutlet": 54, "connection_status": true } }, @@ -2857,7 +2857,7 @@ "fields": { "device": 8, "name": "PEM1", - "connected_endpoint": 30, + "_connected_poweroutlet": 30, "connection_status": true } }, @@ -2867,7 +2867,7 @@ "fields": { "device": 8, "name": "PEM2", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2877,7 +2877,7 @@ "fields": { "device": 8, "name": "PEM3", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2887,7 +2887,7 @@ "fields": { "device": 6, "name": "PSU0", - "connected_endpoint": 55, + "_connected_poweroutlet": 55, "connection_status": true } }, @@ -2897,7 +2897,7 @@ "fields": { "device": 6, "name": "PSU1", - "connected_endpoint": 31, + "_connected_poweroutlet": 31, "connection_status": true } }, @@ -2907,7 +2907,7 @@ "fields": { "device": 9, "name": "PSU", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, From 3b062517202a4ae3c0b35c9d4b5582d400acd32c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 11 Apr 2019 12:29:43 -0400 Subject: [PATCH 036/140] Added tests for power panels, power feeds --- netbox/dcim/api/nested_serializers.py | 4 +- netbox/dcim/tests/test_api.py | 261 +++++++++++++++++++++++++- 2 files changed, 261 insertions(+), 4 deletions(-) diff --git a/netbox/dcim/api/nested_serializers.py b/netbox/dcim/api/nested_serializers.py index edb1bb267..16d77bd69 100644 --- a/netbox/dcim/api/nested_serializers.py +++ b/netbox/dcim/api/nested_serializers.py @@ -255,7 +255,7 @@ class NestedVirtualChassisSerializer(WritableNestedSerializer): # Power panels/feeds # -class NestedPowerPanelSerializer(serializers.ModelSerializer): +class NestedPowerPanelSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerpanel-detail') class Meta: @@ -263,7 +263,7 @@ class NestedPowerPanelSerializer(serializers.ModelSerializer): fields = ['id', 'url', 'name'] -class NestedPowerFeedSerializer(serializers.ModelSerializer): +class NestedPowerFeedSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerfeed-detail') class Meta: diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 3f9021bc6..f572047b5 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -7,8 +7,8 @@ from dcim.constants import * from dcim.models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, Interface, InterfaceTemplate, Manufacturer, - InventoryItem, Platform, PowerPort, PowerPortTemplate, PowerOutlet, PowerOutletTemplate, Rack, RackGroup, - RackReservation, RackRole, RearPort, Region, Site, VirtualChassis, + InventoryItem, Platform, PowerFeed, PowerPort, PowerPortTemplate, PowerOutlet, PowerOutletTemplate, PowerPanel, + Rack, RackGroup, RackReservation, RackRole, RearPort, Region, Site, VirtualChassis, ) from ipam.models import IPAddress, VLAN from extras.models import Graph, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE @@ -3532,3 +3532,260 @@ class VirtualChassisTest(APITestCase): self.assertTrue( Device.objects.filter(pk=d.pk, virtual_chassis=None, vc_position=None, vc_priority=None) ) + + +class PowerPanelTest(APITestCase): + + def setUp(self): + + super().setUp() + + self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1') + self.rackgroup1 = RackGroup.objects.create(site=self.site1, name='Test Rack Group 1', slug='test-rack-group-1') + self.rackgroup2 = RackGroup.objects.create(site=self.site1, name='Test Rack Group 2', slug='test-rack-group-2') + self.rackgroup3 = RackGroup.objects.create(site=self.site1, name='Test Rack Group 3', slug='test-rack-group-3') + self.powerpanel1 = PowerPanel.objects.create( + site=self.site1, rack_group=self.rackgroup1, name='Test Power Panel 1' + ) + self.powerpanel2 = PowerPanel.objects.create( + site=self.site1, rack_group=self.rackgroup2, name='Test Power Panel 2' + ) + self.powerpanel3 = PowerPanel.objects.create( + site=self.site1, rack_group=self.rackgroup3, name='Test Power Panel 3' + ) + + def test_get_powerpanel(self): + + url = reverse('dcim-api:powerpanel-detail', kwargs={'pk': self.powerpanel1.pk}) + response = self.client.get(url, **self.header) + + self.assertEqual(response.data['name'], self.powerpanel1.name) + + def test_list_powerpanels(self): + + url = reverse('dcim-api:powerpanel-list') + response = self.client.get(url, **self.header) + + self.assertEqual(response.data['count'], 3) + + def test_list_powerpanels_brief(self): + + url = reverse('dcim-api:powerpanel-list') + response = self.client.get('{}?brief=1'.format(url), **self.header) + + self.assertEqual( + sorted(response.data['results'][0]), + ['id', 'name', 'url'] + ) + + def test_create_powerpanel(self): + + data = { + 'name': 'Test Power Panel 4', + 'site': self.site1.pk, + 'rack_group': self.rackgroup1.pk, + } + + url = reverse('dcim-api:powerpanel-list') + response = self.client.post(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_201_CREATED) + self.assertEqual(PowerPanel.objects.count(), 4) + powerpanel4 = PowerPanel.objects.get(pk=response.data['id']) + self.assertEqual(powerpanel4.name, data['name']) + self.assertEqual(powerpanel4.site_id, data['site']) + self.assertEqual(powerpanel4.rack_group_id, data['rack_group']) + + def test_create_powerpanel_bulk(self): + + data = [ + { + 'name': 'Test Power Panel 4', + 'site': self.site1.pk, + 'rack_group': self.rackgroup1.pk, + }, + { + 'name': 'Test Power Panel 5', + 'site': self.site1.pk, + 'rack_group': self.rackgroup2.pk, + }, + { + 'name': 'Test Power Panel 6', + 'site': self.site1.pk, + 'rack_group': self.rackgroup3.pk, + }, + ] + + url = reverse('dcim-api:powerpanel-list') + response = self.client.post(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_201_CREATED) + self.assertEqual(PowerPanel.objects.count(), 6) + self.assertEqual(response.data[0]['name'], data[0]['name']) + self.assertEqual(response.data[1]['name'], data[1]['name']) + self.assertEqual(response.data[2]['name'], data[2]['name']) + + def test_update_powerpanel(self): + + data = { + 'name': 'Test Power Panel X', + 'rack_group': self.rackgroup2.pk, + } + + url = reverse('dcim-api:powerpanel-detail', kwargs={'pk': self.powerpanel1.pk}) + response = self.client.patch(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_200_OK) + self.assertEqual(PowerPanel.objects.count(), 3) + powerpanel1 = PowerPanel.objects.get(pk=response.data['id']) + self.assertEqual(powerpanel1.name, data['name']) + self.assertEqual(powerpanel1.rack_group_id, data['rack_group']) + + def test_delete_powerpanel(self): + + url = reverse('dcim-api:powerpanel-detail', kwargs={'pk': self.powerpanel1.pk}) + response = self.client.delete(url, **self.header) + + self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT) + self.assertEqual(PowerPanel.objects.count(), 2) + + +class PowerFeedTest(APITestCase): + + def setUp(self): + + super().setUp() + + self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1') + self.rackgroup1 = RackGroup.objects.create(site=self.site1, name='Test Rack Group 1', slug='test-rack-group-1') + self.rackrole1 = RackRole.objects.create(name='Test Rack Role 1', slug='test-rack-role-1', color='ff0000') + self.rack1 = Rack.objects.create( + site=self.site1, group=self.rackgroup1, role=self.rackrole1, name='Test Rack 1', u_height=42, + ) + self.rack2 = Rack.objects.create( + site=self.site1, group=self.rackgroup1, role=self.rackrole1, name='Test Rack 2', u_height=42, + ) + self.rack3 = Rack.objects.create( + site=self.site1, group=self.rackgroup1, role=self.rackrole1, name='Test Rack 3', u_height=42, + ) + self.rack4 = Rack.objects.create( + site=self.site1, group=self.rackgroup1, role=self.rackrole1, name='Test Rack 4', u_height=42, + ) + self.powerpanel1 = PowerPanel.objects.create( + site=self.site1, rack_group=self.rackgroup1, name='Test Power Panel 1' + ) + self.powerpanel2 = PowerPanel.objects.create( + site=self.site1, rack_group=self.rackgroup1, name='Test Power Panel 2' + ) + self.powerfeed1 = PowerFeed.objects.create( + power_panel=self.powerpanel1, rack=self.rack1, name='Test Power Feed 1A', type=POWERFEED_TYPE_PRIMARY + ) + self.powerfeed2 = PowerFeed.objects.create( + power_panel=self.powerpanel2, rack=self.rack1, name='Test Power Feed 1B', type=POWERFEED_TYPE_REDUNDANT + ) + self.powerfeed3 = PowerFeed.objects.create( + power_panel=self.powerpanel1, rack=self.rack2, name='Test Power Feed 2A', type=POWERFEED_TYPE_PRIMARY + ) + self.powerfeed4 = PowerFeed.objects.create( + power_panel=self.powerpanel2, rack=self.rack2, name='Test Power Feed 2B', type=POWERFEED_TYPE_REDUNDANT + ) + self.powerfeed5 = PowerFeed.objects.create( + power_panel=self.powerpanel1, rack=self.rack3, name='Test Power Feed 3A', type=POWERFEED_TYPE_PRIMARY + ) + self.powerfeed6 = PowerFeed.objects.create( + power_panel=self.powerpanel2, rack=self.rack3, name='Test Power Feed 3B', type=POWERFEED_TYPE_REDUNDANT + ) + + def test_get_powerfeed(self): + + url = reverse('dcim-api:powerfeed-detail', kwargs={'pk': self.powerfeed1.pk}) + response = self.client.get(url, **self.header) + + self.assertEqual(response.data['name'], self.powerfeed1.name) + + def test_list_powerfeeds(self): + + url = reverse('dcim-api:powerfeed-list') + response = self.client.get(url, **self.header) + + self.assertEqual(response.data['count'], 6) + + def test_list_powerfeeds_brief(self): + + url = reverse('dcim-api:powerfeed-list') + response = self.client.get('{}?brief=1'.format(url), **self.header) + + self.assertEqual( + sorted(response.data['results'][0]), + ['id', 'name', 'url'] + ) + + def test_create_powerfeed(self): + + data = { + 'name': 'Test Power Feed 4A', + 'power_panel': self.powerpanel1.pk, + 'rack': self.rack4.pk, + 'type': POWERFEED_TYPE_PRIMARY, + } + + url = reverse('dcim-api:powerfeed-list') + response = self.client.post(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_201_CREATED) + self.assertEqual(PowerFeed.objects.count(), 7) + powerfeed4 = PowerFeed.objects.get(pk=response.data['id']) + self.assertEqual(powerfeed4.name, data['name']) + self.assertEqual(powerfeed4.power_panel_id, data['power_panel']) + self.assertEqual(powerfeed4.rack_id, data['rack']) + + def test_create_powerfeed_bulk(self): + + data = [ + { + 'name': 'Test Power Feed 4A', + 'power_panel': self.powerpanel1.pk, + 'rack': self.rack4.pk, + 'type': POWERFEED_TYPE_PRIMARY, + }, + { + 'name': 'Test Power Feed 4B', + 'power_panel': self.powerpanel1.pk, + 'rack': self.rack4.pk, + 'type': POWERFEED_TYPE_REDUNDANT, + }, + ] + + url = reverse('dcim-api:powerfeed-list') + response = self.client.post(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_201_CREATED) + self.assertEqual(PowerFeed.objects.count(), 8) + self.assertEqual(response.data[0]['name'], data[0]['name']) + self.assertEqual(response.data[1]['name'], data[1]['name']) + + def test_update_powerfeed(self): + + data = { + 'name': 'Test Power Feed X', + 'rack': self.rack4.pk, + 'type': POWERFEED_TYPE_REDUNDANT, + } + + url = reverse('dcim-api:powerfeed-detail', kwargs={'pk': self.powerfeed1.pk}) + response = self.client.patch(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_200_OK) + self.assertEqual(PowerFeed.objects.count(), 6) + powerfeed1 = PowerFeed.objects.get(pk=response.data['id']) + self.assertEqual(powerfeed1.name, data['name']) + self.assertEqual(powerfeed1.rack_id, data['rack']) + self.assertEqual(powerfeed1.type, data['type']) + + def test_delete_powerfeed(self): + + url = reverse('dcim-api:powerfeed-detail', kwargs={'pk': self.powerfeed1.pk}) + response = self.client.delete(url, **self.header) + + self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT) + self.assertEqual(PowerFeed.objects.count(), 5) From e710ccb0e66e7027ffa4174d86c845f086fc9c24 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 11 Apr 2019 17:27:38 -0400 Subject: [PATCH 037/140] Enforce view permissions for UI views --- netbox/circuits/tests/test_views.py | 16 ++-- netbox/circuits/views.py | 15 ++-- netbox/dcim/tests/test_views.py | 64 +++++++-------- netbox/dcim/views.py | 99 +++++++++++++++-------- netbox/extras/tests/test_views.py | 10 +-- netbox/extras/views.py | 18 +++-- netbox/ipam/tests/test_views.py | 34 ++++---- netbox/ipam/views.py | 58 ++++++++----- netbox/secrets/tests/test_views.py | 19 ++--- netbox/secrets/views.py | 13 +-- netbox/tenancy/tests/test_views.py | 7 +- netbox/tenancy/views.py | 9 ++- netbox/users/views.py | 14 +--- netbox/utilities/testing.py | 15 +++- netbox/virtualization/tests/test_views.py | 13 ++- netbox/virtualization/views.py | 21 +++-- 16 files changed, 257 insertions(+), 168 deletions(-) diff --git a/netbox/circuits/tests/test_views.py b/netbox/circuits/tests/test_views.py index 65ae6d7db..cb0ea0a32 100644 --- a/netbox/circuits/tests/test_views.py +++ b/netbox/circuits/tests/test_views.py @@ -4,13 +4,15 @@ from django.test import Client, TestCase from django.urls import reverse from circuits.models import Circuit, CircuitType, Provider +from utilities.testing import create_test_user class ProviderTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['circuits.view_provider']) self.client = Client() + self.client.force_login(user) Provider.objects.bulk_create([ Provider(name='Provider 1', slug='provider-1', asn=65001), @@ -38,8 +40,9 @@ class ProviderTestCase(TestCase): class CircuitTypeTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['circuits.view_circuittype']) self.client = Client() + self.client.force_login(user) CircuitType.objects.bulk_create([ CircuitType(name='Circuit Type 1', slug='circuit-type-1'), @@ -58,8 +61,9 @@ class CircuitTypeTestCase(TestCase): class CircuitTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['circuits.view_circuit']) self.client = Client() + self.client.force_login(user) provider = Provider(name='Provider 1', slug='provider-1', asn=65001) provider.save() @@ -84,8 +88,8 @@ class CircuitTestCase(TestCase): response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) self.assertEqual(response.status_code, 200) - def test_provider(self): + def test_circuit(self): - provider = Provider.objects.first() - response = self.client.get(provider.get_absolute_url()) + circuit = Circuit.objects.first() + response = self.client.get(circuit.get_absolute_url()) self.assertEqual(response.status_code, 200) diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index 661f78e8e..24b4259f4 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -20,7 +20,8 @@ from .models import Circuit, CircuitTermination, CircuitType, Provider # Providers # -class ProviderListView(ObjectListView): +class ProviderListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'circuits.view_provider' queryset = Provider.objects.annotate(count_circuits=Count('circuits')) filter = filters.ProviderFilter filter_form = forms.ProviderFilterForm @@ -28,7 +29,8 @@ class ProviderListView(ObjectListView): template_name = 'circuits/provider_list.html' -class ProviderView(View): +class ProviderView(PermissionRequiredMixin, View): + permission_required = 'circuits.view_provider' def get(self, request, slug): @@ -93,7 +95,8 @@ class ProviderBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Circuit Types # -class CircuitTypeListView(ObjectListView): +class CircuitTypeListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'circuits.view_circuittype' queryset = CircuitType.objects.annotate(circuit_count=Count('circuits')) table = tables.CircuitTypeTable template_name = 'circuits/circuittype_list.html' @@ -128,7 +131,8 @@ class CircuitTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Circuits # -class CircuitListView(ObjectListView): +class CircuitListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'circuits.view_circuit' queryset = Circuit.objects.select_related( 'provider', 'type', 'tenant' ).prefetch_related( @@ -140,7 +144,8 @@ class CircuitListView(ObjectListView): template_name = 'circuits/circuit_list.html' -class CircuitView(View): +class CircuitView(PermissionRequiredMixin, View): + permission_required = 'circuits.view_circuit' def get(self, request, pk): diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py index 79f38a5c9..088806597 100644 --- a/netbox/dcim/tests/test_views.py +++ b/netbox/dcim/tests/test_views.py @@ -1,6 +1,5 @@ import urllib.parse -from django.contrib.auth import get_user_model from django.test import Client, TestCase from django.urls import reverse @@ -9,13 +8,15 @@ from dcim.models import ( Cable, Device, DeviceRole, DeviceType, Interface, InventoryItem, Manufacturer, Platform, Rack, RackGroup, RackReservation, RackRole, Site, Region, VirtualChassis, ) +from utilities.testing import create_test_user class RegionTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['dcim.view_region']) self.client = Client() + self.client.force_login(user) # Create three Regions for i in range(1, 4): @@ -32,8 +33,9 @@ class RegionTestCase(TestCase): class SiteTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['dcim.view_site']) self.client = Client() + self.client.force_login(user) region = Region(name='Region 1', slug='region-1') region.save() @@ -64,8 +66,9 @@ class SiteTestCase(TestCase): class RackGroupTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['dcim.view_rackgroup']) self.client = Client() + self.client.force_login(user) site = Site(name='Site 1', slug='site-1') site.save() @@ -84,11 +87,12 @@ class RackGroupTestCase(TestCase): self.assertEqual(response.status_code, 200) -class RackTypeTestCase(TestCase): +class RackRoleTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['dcim.view_rackrole']) self.client = Client() + self.client.force_login(user) RackRole.objects.bulk_create([ RackRole(name='Rack Role 1', slug='rack-role-1'), @@ -107,12 +111,9 @@ class RackTypeTestCase(TestCase): class RackReservationTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['dcim.view_rackreservation']) self.client = Client() - - User = get_user_model() - user = User(username='testuser', email='testuser@example.com') - user.save() + self.client.force_login(user) site = Site(name='Site 1', slug='site-1') site.save() @@ -137,8 +138,9 @@ class RackReservationTestCase(TestCase): class RackTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['dcim.view_rack']) self.client = Client() + self.client.force_login(user) site = Site(name='Site 1', slug='site-1') site.save() @@ -169,8 +171,9 @@ class RackTestCase(TestCase): class ManufacturerTypeTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['dcim.view_manufacturer']) self.client = Client() + self.client.force_login(user) Manufacturer.objects.bulk_create([ Manufacturer(name='Manufacturer 1', slug='manufacturer-1'), @@ -189,8 +192,9 @@ class ManufacturerTypeTestCase(TestCase): class DeviceTypeTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['dcim.view_devicetype']) self.client = Client() + self.client.force_login(user) manufacturer = Manufacturer(name='Manufacturer 1', slug='manufacturer-1') manufacturer.save() @@ -221,8 +225,9 @@ class DeviceTypeTestCase(TestCase): class DeviceRoleTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['dcim.view_devicerole']) self.client = Client() + self.client.force_login(user) DeviceRole.objects.bulk_create([ DeviceRole(name='Device Role 1', slug='device-role-1'), @@ -241,8 +246,9 @@ class DeviceRoleTestCase(TestCase): class PlatformTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['dcim.view_platform']) self.client = Client() + self.client.force_login(user) Platform.objects.bulk_create([ Platform(name='Platform 1', slug='platform-1'), @@ -261,8 +267,9 @@ class PlatformTestCase(TestCase): class DeviceTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['dcim.view_device']) self.client = Client() + self.client.force_login(user) site = Site(name='Site 1', slug='site-1') site.save() @@ -303,8 +310,9 @@ class DeviceTestCase(TestCase): class InventoryItemTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['dcim.view_inventoryitem']) self.client = Client() + self.client.force_login(user) site = Site(name='Site 1', slug='site-1') site.save() @@ -337,18 +345,13 @@ class InventoryItemTestCase(TestCase): response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) self.assertEqual(response.status_code, 200) - def test_inventoryitem(self): - - inventoryitem = InventoryItem.objects.first() - response = self.client.get(inventoryitem.get_absolute_url()) - self.assertEqual(response.status_code, 200) - class CableTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['dcim.view_cable']) self.client = Client() + self.client.force_login(user) site = Site(name='Site 1', slug='site-1') site.save() @@ -401,11 +404,12 @@ class CableTestCase(TestCase): self.assertEqual(response.status_code, 200) -class VirtualMachineTestCase(TestCase): +class VirtualChassisTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['dcim.view_virtualchassis']) self.client = Client() + self.client.force_login(user) site = Site.objects.create(name='Site 1', slug='site-1') manufacturer = Manufacturer.objects.create(name='Manufacturer', slug='manufacturer-1') @@ -450,9 +454,3 @@ class VirtualMachineTestCase(TestCase): response = self.client.get(url) self.assertEqual(response.status_code, 200) - - def test_virtualchassis(self): - - virtualchassis = VirtualChassis.objects.first() - response = self.client.get(virtualchassis.get_absolute_url()) - self.assertEqual(response.status_code, 200) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index b1403745d..c82f795b5 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -138,7 +138,8 @@ class BulkDisconnectView(GetReturnURLMixin, View): # Regions # -class RegionListView(ObjectListView): +class RegionListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_region' queryset = Region.objects.add_related_count( Region.objects.all(), Site, @@ -182,7 +183,8 @@ class RegionBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Sites # -class SiteListView(ObjectListView): +class SiteListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_site' queryset = Site.objects.select_related('region', 'tenant') filter = filters.SiteFilter filter_form = forms.SiteFilterForm @@ -190,7 +192,8 @@ class SiteListView(ObjectListView): template_name = 'dcim/site_list.html' -class SiteView(View): +class SiteView(PermissionRequiredMixin, View): + permission_required = 'dcim.view_site' def get(self, request, slug): @@ -254,7 +257,8 @@ class SiteBulkEditView(PermissionRequiredMixin, BulkEditView): # Rack groups # -class RackGroupListView(ObjectListView): +class RackGroupListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_rackgroup' queryset = RackGroup.objects.select_related('site').annotate(rack_count=Count('racks')) filter = filters.RackGroupFilter filter_form = forms.RackGroupFilterForm @@ -292,7 +296,8 @@ class RackGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Rack roles # -class RackRoleListView(ObjectListView): +class RackRoleListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_rackrole' queryset = RackRole.objects.annotate(rack_count=Count('racks')) table = tables.RackRoleTable template_name = 'dcim/rackrole_list.html' @@ -327,7 +332,8 @@ class RackRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Racks # -class RackListView(ObjectListView): +class RackListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_rack' queryset = Rack.objects.select_related( 'site', 'group', 'tenant', 'role' ).prefetch_related( @@ -341,10 +347,11 @@ class RackListView(ObjectListView): template_name = 'dcim/rack_list.html' -class RackElevationListView(View): +class RackElevationListView(PermissionRequiredMixin, View): """ Display a set of rack elevations side-by-side. """ + permission_required = 'dcim.view_rack' def get(self, request): @@ -382,7 +389,8 @@ class RackElevationListView(View): }) -class RackView(View): +class RackView(PermissionRequiredMixin, View): + permission_required = 'dcim.view_rack' def get(self, request, pk): @@ -454,7 +462,8 @@ class RackBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Rack reservations # -class RackReservationListView(ObjectListView): +class RackReservationListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_rackreservation' queryset = RackReservation.objects.all() filter = filters.RackReservationFilter filter_form = forms.RackReservationFilterForm @@ -510,7 +519,8 @@ class RackReservationBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Manufacturers # -class ManufacturerListView(ObjectListView): +class ManufacturerListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_manufacturer' queryset = Manufacturer.objects.annotate( devicetype_count=Count('device_types', distinct=True), platform_count=Count('platforms', distinct=True), @@ -548,7 +558,8 @@ class ManufacturerBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Device types # -class DeviceTypeListView(ObjectListView): +class DeviceTypeListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_devicetype' queryset = DeviceType.objects.select_related('manufacturer').annotate(instance_count=Count('instances')) filter = filters.DeviceTypeFilter filter_form = forms.DeviceTypeFilterForm @@ -556,7 +567,8 @@ class DeviceTypeListView(ObjectListView): template_name = 'dcim/devicetype_list.html' -class DeviceTypeView(View): +class DeviceTypeView(PermissionRequiredMixin, View): + permission_required = 'dcim.view_devicetype' def get(self, request, pk): @@ -812,7 +824,8 @@ class DeviceBayTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Device roles # -class DeviceRoleListView(ObjectListView): +class DeviceRoleListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_devicerole' queryset = DeviceRole.objects.all() table = tables.DeviceRoleTable template_name = 'dcim/devicerole_list.html' @@ -847,7 +860,8 @@ class DeviceRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Platforms # -class PlatformListView(ObjectListView): +class PlatformListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_platform' queryset = Platform.objects.all() table = tables.PlatformTable template_name = 'dcim/platform_list.html' @@ -882,7 +896,8 @@ class PlatformBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Devices # -class DeviceListView(ObjectListView): +class DeviceListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_device' queryset = Device.objects.select_related( 'device_type__manufacturer', 'device_role', 'tenant', 'site', 'rack', 'primary_ip4', 'primary_ip6' ) @@ -892,7 +907,8 @@ class DeviceListView(ObjectListView): template_name = 'dcim/device_list.html' -class DeviceView(View): +class DeviceView(PermissionRequiredMixin, View): + permission_required = 'dcim.view_device' def get(self, request, pk): @@ -972,7 +988,8 @@ class DeviceView(View): }) -class DeviceInventoryView(View): +class DeviceInventoryView(PermissionRequiredMixin, View): + permission_required = 'dcim.view_device' def get(self, request, pk): @@ -993,7 +1010,7 @@ class DeviceInventoryView(View): class DeviceStatusView(PermissionRequiredMixin, View): - permission_required = 'dcim.napalm_read' + permission_required = ('dcim.view_device', 'dcim.napalm_read') def get(self, request, pk): @@ -1006,7 +1023,7 @@ class DeviceStatusView(PermissionRequiredMixin, View): class DeviceLLDPNeighborsView(PermissionRequiredMixin, View): - permission_required = 'dcim.napalm_read' + permission_required = ('dcim.view_device', 'dcim.napalm_read') def get(self, request, pk): @@ -1023,7 +1040,7 @@ class DeviceLLDPNeighborsView(PermissionRequiredMixin, View): class DeviceConfigView(PermissionRequiredMixin, View): - permission_required = 'dcim.napalm_read' + permission_required = ('dcim.view_device', 'dcim.napalm_read') def get(self, request, pk): @@ -1035,7 +1052,8 @@ class DeviceConfigView(PermissionRequiredMixin, View): }) -class DeviceConfigContextView(ObjectConfigContextView): +class DeviceConfigContextView(PermissionRequiredMixin, ObjectConfigContextView): + permission_required = 'dcim.view_device' object_class = Device base_template = 'dcim/device.html' @@ -1258,7 +1276,8 @@ class PowerOutletBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Interfaces # -class InterfaceView(View): +class InterfaceView(PermissionRequiredMixin, View): + permission_required = 'dcim.view_interface' def get(self, request, pk): @@ -1639,7 +1658,8 @@ class DeviceBulkAddDeviceBayView(PermissionRequiredMixin, BulkComponentCreateVie # Cables # -class CableListView(ObjectListView): +class CableListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_cable' queryset = Cable.objects.prefetch_related( 'termination_a', 'termination_b' ) @@ -1649,7 +1669,8 @@ class CableListView(ObjectListView): template_name = 'dcim/cable_list.html' -class CableView(View): +class CableView(PermissionRequiredMixin, View): + permission_required = 'dcim.view_cable' def get(self, request, pk): @@ -1660,10 +1681,11 @@ class CableView(View): }) -class CableTraceView(View): +class CableTraceView(PermissionRequiredMixin, View): """ Trace a cable path beginning from the given termination. """ + permission_required = 'dcim.view_cable' def get(self, request, model, pk): @@ -1792,7 +1814,8 @@ class CableBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Connections # -class ConsoleConnectionsListView(ObjectListView): +class ConsoleConnectionsListView(PermissionRequiredMixin, ObjectListView): + permission_required = ('dcim.view_consoleport', 'dcim.view_consoleserverport') queryset = ConsolePort.objects.select_related( 'device', 'connected_endpoint__device' ).filter( @@ -1822,7 +1845,8 @@ class ConsoleConnectionsListView(ObjectListView): return csv_data -class PowerConnectionsListView(ObjectListView): +class PowerConnectionsListView(PermissionRequiredMixin, ObjectListView): + permission_required = ('dcim.view_powerport', 'dcim.view_poweroutlet') queryset = PowerPort.objects.select_related( 'device', '_connected_poweroutlet__device' ).filter( @@ -1852,7 +1876,8 @@ class PowerConnectionsListView(ObjectListView): return csv_data -class InterfaceConnectionsListView(ObjectListView): +class InterfaceConnectionsListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.interface' queryset = Interface.objects.select_related( 'device', 'cable', '_connected_interface__device' ).filter( @@ -1894,7 +1919,8 @@ class InterfaceConnectionsListView(ObjectListView): # Inventory items # -class InventoryItemListView(ObjectListView): +class InventoryItemListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_inventoryitem' queryset = InventoryItem.objects.select_related('device', 'manufacturer') filter = filters.InventoryItemFilter filter_form = forms.InventoryItemFilterForm @@ -1949,7 +1975,8 @@ class InventoryItemBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Virtual chassis # -class VirtualChassisListView(ObjectListView): +class VirtualChassisListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_virtualchassis' queryset = VirtualChassis.objects.select_related('master').annotate(member_count=Count('members')) table = tables.VirtualChassisTable filter = filters.VirtualChassisFilter @@ -2184,7 +2211,8 @@ class VirtualChassisRemoveMemberView(PermissionRequiredMixin, GetReturnURLMixin, # Power panels # -class PowerPanelListView(ObjectListView): +class PowerPanelListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_powerpanel' queryset = PowerPanel.objects.select_related( 'site', 'rack_group' ).annotate( @@ -2196,7 +2224,8 @@ class PowerPanelListView(ObjectListView): template_name = 'dcim/powerpanel_list.html' -class PowerPanelView(View): +class PowerPanelView(PermissionRequiredMixin, View): + permission_required = 'dcim.view_powerpanel' def get(self, request, pk): @@ -2253,7 +2282,8 @@ class PowerPanelBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Power feeds # -class PowerFeedListView(ObjectListView): +class PowerFeedListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'dcim.view_powerfeed' queryset = PowerFeed.objects.select_related( 'power_panel', 'rack' ) @@ -2263,7 +2293,8 @@ class PowerFeedListView(ObjectListView): template_name = 'dcim/powerfeed_list.html' -class PowerFeedView(View): +class PowerFeedView(PermissionRequiredMixin, View): + permission_required = 'dcim.view_powerfeed' def get(self, request, pk): diff --git a/netbox/extras/tests/test_views.py b/netbox/extras/tests/test_views.py index 4c91fbb50..8b13c323d 100644 --- a/netbox/extras/tests/test_views.py +++ b/netbox/extras/tests/test_views.py @@ -7,6 +7,7 @@ from django.urls import reverse from dcim.models import Site from extras.models import ConfigContext, ObjectChange, Tag +from utilities.testing import create_test_user class TagTestCase(TestCase): @@ -35,8 +36,9 @@ class TagTestCase(TestCase): class ConfigContextTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['extras.view_configcontext']) self.client = Client() + self.client.force_login(user) site = Site(name='Site 1', slug='site-1') site.save() @@ -70,11 +72,9 @@ class ConfigContextTestCase(TestCase): class ObjectChangeTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['extras.view_objectchange']) self.client = Client() - - user = User(username='testuser', email='testuser@example.com') - user.save() + self.client.force_login(user) site = Site(name='Site 1', slug='site-1') site.save() diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 517c3e5b4..21ea4f1c9 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -96,7 +96,8 @@ class TagBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Config contexts # -class ConfigContextListView(ObjectListView): +class ConfigContextListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'extras.view_configcontext' queryset = ConfigContext.objects.all() filter = filters.ConfigContextFilter filter_form = ConfigContextFilterForm @@ -104,7 +105,8 @@ class ConfigContextListView(ObjectListView): template_name = 'extras/configcontext_list.html' -class ConfigContextView(View): +class ConfigContextView(PermissionRequiredMixin, View): + permission_required = 'extras.view_configcontext' def get(self, request, pk): @@ -173,7 +175,8 @@ class ObjectConfigContextView(View): # Change logging # -class ObjectChangeListView(ObjectListView): +class ObjectChangeListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'extras.view_objectchange' queryset = ObjectChange.objects.select_related('user', 'changed_object_type') filter = filters.ObjectChangeFilter filter_form = ObjectChangeFilterForm @@ -181,7 +184,8 @@ class ObjectChangeListView(ObjectListView): template_name = 'extras/objectchange_list.html' -class ObjectChangeView(View): +class ObjectChangeView(PermissionRequiredMixin, View): + permission_required = 'extras.view_objectchange' def get(self, request, pk): @@ -272,10 +276,11 @@ class ImageAttachmentDeleteView(PermissionRequiredMixin, ObjectDeleteView): # Reports # -class ReportListView(View): +class ReportListView(PermissionRequiredMixin, View): """ Retrieve all of the available reports from disk and the recorded ReportResult (if any) for each. """ + permission_required = 'extras.view_reportresult' def get(self, request): @@ -295,10 +300,11 @@ class ReportListView(View): }) -class ReportView(View): +class ReportView(PermissionRequiredMixin, View): """ Display a single Report and its associated ReportResult (if any). """ + permission_required = 'extras.view_reportresult' def get(self, request, name): diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py index 20c16df9b..e14a257d6 100644 --- a/netbox/ipam/tests/test_views.py +++ b/netbox/ipam/tests/test_views.py @@ -7,13 +7,15 @@ from django.urls import reverse from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Site from ipam.constants import IP_PROTOCOL_TCP from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF +from utilities.testing import create_test_user class VRFTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['ipam.view_vrf']) self.client = Client() + self.client.force_login(user) VRF.objects.bulk_create([ VRF(name='VRF 1', rd='65000:1'), @@ -41,8 +43,9 @@ class VRFTestCase(TestCase): class RIRTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['ipam.view_rir']) self.client = Client() + self.client.force_login(user) RIR.objects.bulk_create([ RIR(name='RIR 1', slug='rir-1'), @@ -57,18 +60,13 @@ class RIRTestCase(TestCase): response = self.client.get(url) self.assertEqual(response.status_code, 200) - def test_rir(self): - - rir = RIR.objects.first() - response = self.client.get(rir.get_absolute_url()) - self.assertEqual(response.status_code, 200) - class AggregateTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['ipam.view_aggregate']) self.client = Client() + self.client.force_login(user) rir = RIR(name='RIR 1', slug='rir-1') rir.save() @@ -99,8 +97,9 @@ class AggregateTestCase(TestCase): class RoleTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['ipam.view_role']) self.client = Client() + self.client.force_login(user) Role.objects.bulk_create([ Role(name='Role 1', slug='role-1'), @@ -119,8 +118,9 @@ class RoleTestCase(TestCase): class PrefixTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['ipam.view_prefix']) self.client = Client() + self.client.force_login(user) site = Site(name='Site 1', slug='site-1') site.save() @@ -151,8 +151,9 @@ class PrefixTestCase(TestCase): class IPAddressTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['ipam.view_ipaddress']) self.client = Client() + self.client.force_login(user) vrf = VRF(name='VRF 1', rd='65000:1') vrf.save() @@ -183,8 +184,9 @@ class IPAddressTestCase(TestCase): class VLANGroupTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['ipam.view_vlangroup']) self.client = Client() + self.client.force_login(user) site = Site(name='Site 1', slug='site-1') site.save() @@ -209,8 +211,9 @@ class VLANGroupTestCase(TestCase): class VLANTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['ipam.view_vlan']) self.client = Client() + self.client.force_login(user) vlangroup = VLANGroup(name='VLAN Group 1', slug='vlan-group-1') vlangroup.save() @@ -241,8 +244,9 @@ class VLANTestCase(TestCase): class ServiceTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['ipam.view_service']) self.client = Client() + self.client.force_login(user) site = Site(name='Site 1', slug='site-1') site.save() diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 2f76089a2..d80646bb0 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -113,7 +113,8 @@ def add_available_vlans(vlan_group, vlans): # VRFs # -class VRFListView(ObjectListView): +class VRFListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'ipam.view_vrf' queryset = VRF.objects.select_related('tenant') filter = filters.VRFFilter filter_form = forms.VRFFilterForm @@ -121,7 +122,8 @@ class VRFListView(ObjectListView): template_name = 'ipam/vrf_list.html' -class VRFView(View): +class VRFView(PermissionRequiredMixin, View): + permission_required = 'ipam.view_vrf' def get(self, request, pk): @@ -180,7 +182,8 @@ class VRFBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # RIRs # -class RIRListView(ObjectListView): +class RIRListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'ipam.view_rir' queryset = RIR.objects.annotate(aggregate_count=Count('aggregates')) filter = filters.RIRFilter filter_form = forms.RIRFilterForm @@ -286,7 +289,8 @@ class RIRBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Aggregates # -class AggregateListView(ObjectListView): +class AggregateListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'ipam.view_aggregate' queryset = Aggregate.objects.select_related('rir').extra(select={ 'child_count': 'SELECT COUNT(*) FROM ipam_prefix WHERE ipam_prefix.prefix <<= ipam_aggregate.prefix', }) @@ -312,7 +316,8 @@ class AggregateListView(ObjectListView): } -class AggregateView(View): +class AggregateView(PermissionRequiredMixin, View): + permission_required = 'ipam.view_aggregate' def get(self, request, pk): @@ -398,7 +403,8 @@ class AggregateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Prefix/VLAN roles # -class RoleListView(ObjectListView): +class RoleListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'ipam.view_role' queryset = Role.objects.all() table = tables.RoleTable template_name = 'ipam/role_list.html' @@ -433,7 +439,8 @@ class RoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Prefixes # -class PrefixListView(ObjectListView): +class PrefixListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'ipam.view_prefix' queryset = Prefix.objects.select_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role') filter = filters.PrefixFilter filter_form = forms.PrefixFilterForm @@ -446,7 +453,8 @@ class PrefixListView(ObjectListView): return self.queryset.annotate_depth(limit=limit) -class PrefixView(View): +class PrefixView(PermissionRequiredMixin, View): + permission_required = 'ipam.view_prefix' def get(self, request, pk): @@ -489,7 +497,8 @@ class PrefixView(View): }) -class PrefixPrefixesView(View): +class PrefixPrefixesView(PermissionRequiredMixin, View): + permission_required = 'ipam.view_prefix' def get(self, request, pk): @@ -531,7 +540,8 @@ class PrefixPrefixesView(View): }) -class PrefixIPAddressesView(View): +class PrefixIPAddressesView(PermissionRequiredMixin, View): + permission_required = 'ipam.view_prefix' def get(self, request, pk): @@ -617,7 +627,8 @@ class PrefixBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # IP addresses # -class IPAddressListView(ObjectListView): +class IPAddressListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'ipam.view_ipaddress' queryset = IPAddress.objects.select_related( 'vrf__tenant', 'tenant', 'nat_inside' ).prefetch_related( @@ -629,7 +640,8 @@ class IPAddressListView(ObjectListView): template_name = 'ipam/ipaddress_list.html' -class IPAddressView(View): +class IPAddressView(PermissionRequiredMixin, View): + permission_required = 'ipam.view_ipaddress' def get(self, request, pk): @@ -788,7 +800,8 @@ class IPAddressBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # VLAN groups # -class VLANGroupListView(ObjectListView): +class VLANGroupListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'ipam.view_vlangroup' queryset = VLANGroup.objects.select_related('site').annotate(vlan_count=Count('vlans')) filter = filters.VLANGroupFilter filter_form = forms.VLANGroupFilterForm @@ -822,7 +835,9 @@ class VLANGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): default_return_url = 'ipam:vlangroup_list' -class VLANGroupVLANsView(View): +class VLANGroupVLANsView(PermissionRequiredMixin, View): + permission_required = 'ipam.view_vlangroup' + def get(self, request, pk): vlan_group = get_object_or_404(VLANGroup.objects.all(), pk=pk) @@ -861,7 +876,8 @@ class VLANGroupVLANsView(View): # VLANs # -class VLANListView(ObjectListView): +class VLANListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'ipam.view_vlan' queryset = VLAN.objects.select_related('site', 'group', 'tenant', 'role').prefetch_related('prefixes') filter = filters.VLANFilter filter_form = forms.VLANFilterForm @@ -869,7 +885,8 @@ class VLANListView(ObjectListView): template_name = 'ipam/vlan_list.html' -class VLANView(View): +class VLANView(PermissionRequiredMixin, View): + permission_required = 'ipam.view_vlan' def get(self, request, pk): @@ -886,7 +903,8 @@ class VLANView(View): }) -class VLANMembersView(View): +class VLANMembersView(PermissionRequiredMixin, View): + permission_required = 'ipam.view_vlan' def get(self, request, pk): @@ -954,7 +972,8 @@ class VLANBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Services # -class ServiceListView(ObjectListView): +class ServiceListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'ipam.view_service' queryset = Service.objects.select_related('device', 'virtual_machine') filter = filters.ServiceFilter filter_form = forms.ServiceFilterForm @@ -962,7 +981,8 @@ class ServiceListView(ObjectListView): template_name = 'ipam/service_list.html' -class ServiceView(View): +class ServiceView(PermissionRequiredMixin, View): + permission_required = 'ipam.view_service' def get(self, request, pk): diff --git a/netbox/secrets/tests/test_views.py b/netbox/secrets/tests/test_views.py index f9985db28..5ba5cdcf6 100644 --- a/netbox/secrets/tests/test_views.py +++ b/netbox/secrets/tests/test_views.py @@ -1,25 +1,19 @@ import urllib.parse -from django.contrib.auth import get_user_model from django.test import Client, TestCase from django.urls import reverse from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Site from secrets.models import Secret, SecretRole +from utilities.testing import create_test_user class SecretRoleTestCase(TestCase): def setUp(self): - - TEST_USERNAME = 'testuser' - TEST_PASSWORD = 'testpassword' - - User = get_user_model() - User.objects.create(username=TEST_USERNAME, email='testuser@example.com', password=TEST_PASSWORD) - + user = create_test_user(permissions=['secrets.view_secretrole']) self.client = Client() - self.client.login(username=TEST_USERNAME, password=TEST_PASSWORD) + self.client.force_login(user) SecretRole.objects.bulk_create([ SecretRole(name='Secret Role 1', slug='secret-role-1'), @@ -29,7 +23,7 @@ class SecretRoleTestCase(TestCase): def test_secretrole_list(self): - url = reverse('secrets:secret_list') + url = reverse('secrets:secretrole_list') response = self.client.get(url, follow=True) self.assertEqual(response.status_code, 200) @@ -38,8 +32,9 @@ class SecretRoleTestCase(TestCase): class SecretTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['secrets.view_secret']) self.client = Client() + self.client.force_login(user) site = Site(name='Site 1', slug='site-1') site.save() @@ -75,7 +70,7 @@ class SecretTestCase(TestCase): response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)), follow=True) self.assertEqual(response.status_code, 200) - def test_configcontext(self): + def test_secret(self): secret = Secret.objects.first() response = self.client.get(secret.get_absolute_url(), follow=True) diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py index 99b725528..74772beb0 100644 --- a/netbox/secrets/views.py +++ b/netbox/secrets/views.py @@ -32,7 +32,8 @@ def get_session_key(request): # Secret roles # -class SecretRoleListView(ObjectListView): +class SecretRoleListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'secrets.view_secretrole' queryset = SecretRole.objects.annotate(secret_count=Count('secrets')) table = tables.SecretRoleTable template_name = 'secrets/secretrole_list.html' @@ -67,8 +68,8 @@ class SecretRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Secrets # -@method_decorator(login_required, name='dispatch') -class SecretListView(ObjectListView): +class SecretListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'secrets.view_secret' queryset = Secret.objects.select_related('role', 'device') filter = filters.SecretFilter filter_form = forms.SecretFilterForm @@ -76,8 +77,8 @@ class SecretListView(ObjectListView): template_name = 'secrets/secret_list.html' -@method_decorator(login_required, name='dispatch') -class SecretView(View): +class SecretView(PermissionRequiredMixin, View): + permission_required = 'secrets.view_secret' def get(self, request, pk): @@ -198,7 +199,7 @@ class SecretDeleteView(PermissionRequiredMixin, ObjectDeleteView): class SecretBulkImportView(BulkImportView): - permission_required = 'ipam.add_vlan' + permission_required = 'secrets.add_secret' model_form = forms.SecretCSVForm table = tables.SecretTable template_name = 'secrets/secret_import.html' diff --git a/netbox/tenancy/tests/test_views.py b/netbox/tenancy/tests/test_views.py index a6ca8f358..877b70145 100644 --- a/netbox/tenancy/tests/test_views.py +++ b/netbox/tenancy/tests/test_views.py @@ -4,13 +4,15 @@ from django.test import Client, TestCase from django.urls import reverse from tenancy.models import Tenant, TenantGroup +from utilities.testing import create_test_user class TenantGroupTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['tenancy.view_tenantgroup']) self.client = Client() + self.client.force_login(user) TenantGroup.objects.bulk_create([ TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), @@ -29,8 +31,9 @@ class TenantGroupTestCase(TestCase): class TenantTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['tenancy.view_tenant']) self.client = Client() + self.client.force_login(user) tenantgroup = TenantGroup(name='Tenant Group 1', slug='tenant-group-1') tenantgroup.save() diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py index 97334c9f0..5d43309de 100644 --- a/netbox/tenancy/views.py +++ b/netbox/tenancy/views.py @@ -18,7 +18,8 @@ from .models import Tenant, TenantGroup # Tenant groups # -class TenantGroupListView(ObjectListView): +class TenantGroupListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'tenancy.view_tenantgroup' queryset = TenantGroup.objects.annotate(tenant_count=Count('tenants')) table = tables.TenantGroupTable template_name = 'tenancy/tenantgroup_list.html' @@ -53,7 +54,8 @@ class TenantGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Tenants # -class TenantListView(ObjectListView): +class TenantListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'tenancy.view_tenant' queryset = Tenant.objects.select_related('group') filter = filters.TenantFilter filter_form = forms.TenantFilterForm @@ -61,7 +63,8 @@ class TenantListView(ObjectListView): template_name = 'tenancy/tenant_list.html' -class TenantView(View): +class TenantView(PermissionRequiredMixin, View): + permission_required = 'tenancy.view_tenant' def get(self, request, slug): diff --git a/netbox/users/views.py b/netbox/users/views.py index 6ec984936..d71a5a502 100644 --- a/netbox/users/views.py +++ b/netbox/users/views.py @@ -1,6 +1,5 @@ from django.contrib import messages from django.contrib.auth import login as auth_login, logout as auth_logout, update_session_auth_hash -from django.contrib.auth.decorators import login_required from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin from django.http import HttpResponseForbidden, HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render @@ -74,8 +73,7 @@ class LogoutView(View): # User profiles # -@method_decorator(login_required, name='dispatch') -class ProfileView(View): +class ProfileView(LoginRequiredMixin, View): template_name = 'users/profile.html' def get(self, request): @@ -85,8 +83,7 @@ class ProfileView(View): }) -@method_decorator(login_required, name='dispatch') -class ChangePasswordView(View): +class ChangePasswordView(LoginRequiredMixin, View): template_name = 'users/change_password.html' def get(self, request): @@ -111,8 +108,7 @@ class ChangePasswordView(View): }) -@method_decorator(login_required, name='dispatch') -class UserKeyView(View): +class UserKeyView(LoginRequiredMixin, View): template_name = 'users/userkey.html' def get(self, request): @@ -127,10 +123,9 @@ class UserKeyView(View): }) -class UserKeyEditView(View): +class UserKeyEditView(LoginRequiredMixin, View): template_name = 'users/userkey_edit.html' - @method_decorator(login_required) def dispatch(self, request, *args, **kwargs): try: self.userkey = UserKey.objects.get(user=request.user) @@ -164,7 +159,6 @@ class UserKeyEditView(View): }) -@method_decorator(login_required, name='dispatch') class SessionKeyDeleteView(LoginRequiredMixin, View): def get(self, request): diff --git a/netbox/utilities/testing.py b/netbox/utilities/testing.py index 86fa8c836..0534a340b 100644 --- a/netbox/utilities/testing.py +++ b/netbox/utilities/testing.py @@ -1,4 +1,4 @@ -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from rest_framework.test import APITestCase as _APITestCase from users.models import Token @@ -22,3 +22,16 @@ class APITestCase(_APITestCase): self.assertEqual(response.status_code, expected_status, err_message.format( expected_status, response.status_code, response.data )) + + +def create_test_user(username='testuser', permissions=list()): + """ + Create a User with the given permissions. + """ + user = User.objects.create_user(username=username) + for perm_name in permissions: + app, codename = perm_name.split('.') + perm = Permission.objects.get(content_type__app_label=app, codename=codename) + user.user_permissions.add(perm) + + return user diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py index 1b86e2015..b967eeefc 100644 --- a/netbox/virtualization/tests/test_views.py +++ b/netbox/virtualization/tests/test_views.py @@ -3,14 +3,16 @@ import urllib.parse from django.test import Client, TestCase from django.urls import reverse +from utilities.testing import create_test_user from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine class ClusterGroupTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['virtualization.view_clustergroup']) self.client = Client() + self.client.force_login(user) ClusterGroup.objects.bulk_create([ ClusterGroup(name='Cluster Group 1', slug='cluster-group-1'), @@ -29,8 +31,9 @@ class ClusterGroupTestCase(TestCase): class ClusterTypeTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['virtualization.view_clustertype']) self.client = Client() + self.client.force_login(user) ClusterType.objects.bulk_create([ ClusterType(name='Cluster Type 1', slug='cluster-type-1'), @@ -49,8 +52,9 @@ class ClusterTypeTestCase(TestCase): class ClusterTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['virtualization.view_cluster']) self.client = Client() + self.client.force_login(user) clustergroup = ClusterGroup(name='Cluster Group 1', slug='cluster-group-1') clustergroup.save() @@ -85,8 +89,9 @@ class ClusterTestCase(TestCase): class VirtualMachineTestCase(TestCase): def setUp(self): - + user = create_test_user(permissions=['virtualization.view_virtualmachine']) self.client = Client() + self.client.force_login(user) clustertype = ClusterType(name='Cluster Type 1', slug='cluster-type-1') clustertype.save() diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index aa8a585a9..712c7acb5 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -22,7 +22,8 @@ from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine # Cluster types # -class ClusterTypeListView(ObjectListView): +class ClusterTypeListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'virtualization.view_clustertype' queryset = ClusterType.objects.annotate(cluster_count=Count('clusters')) table = tables.ClusterTypeTable template_name = 'virtualization/clustertype_list.html' @@ -57,7 +58,8 @@ class ClusterTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Cluster groups # -class ClusterGroupListView(ObjectListView): +class ClusterGroupListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'virtualization.view_clustergroup' queryset = ClusterGroup.objects.annotate(cluster_count=Count('clusters')) table = tables.ClusterGroupTable template_name = 'virtualization/clustergroup_list.html' @@ -92,7 +94,8 @@ class ClusterGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # Clusters # -class ClusterListView(ObjectListView): +class ClusterListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'virtualization.view_cluster' queryset = Cluster.objects.select_related('type', 'group', 'site') table = tables.ClusterTable filter = filters.ClusterFilter @@ -100,7 +103,8 @@ class ClusterListView(ObjectListView): template_name = 'virtualization/cluster_list.html' -class ClusterView(View): +class ClusterView(PermissionRequiredMixin, View): + permission_required = 'virtualization.view_cluster' def get(self, request, pk): @@ -247,7 +251,8 @@ class ClusterRemoveDevicesView(PermissionRequiredMixin, View): # Virtual machines # -class VirtualMachineListView(ObjectListView): +class VirtualMachineListView(PermissionRequiredMixin, ObjectListView): + permission_required = 'virtualization.view_virtualmachine' queryset = VirtualMachine.objects.select_related('cluster', 'tenant', 'role', 'primary_ip4', 'primary_ip6') filter = filters.VirtualMachineFilter filter_form = forms.VirtualMachineFilterForm @@ -255,7 +260,8 @@ class VirtualMachineListView(ObjectListView): template_name = 'virtualization/virtualmachine_list.html' -class VirtualMachineView(View): +class VirtualMachineView(PermissionRequiredMixin, View): + permission_required = 'virtualization.view_virtualmachine' def get(self, request, pk): @@ -270,7 +276,8 @@ class VirtualMachineView(View): }) -class VirtualMachineConfigContextView(ObjectConfigContextView): +class VirtualMachineConfigContextView(PermissionRequiredMixin, ObjectConfigContextView): + permission_required = 'virtualization.view_virtualmachine' object_class = VirtualMachine base_template = 'virtualization/virtualmachine.html' From 43a569d18a41907befc0795442034ea3d194d941 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 11 Apr 2019 17:40:46 -0400 Subject: [PATCH 038/140] Enforce view permissions for API views --- netbox/netbox/api.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/netbox/netbox/api.py b/netbox/netbox/api.py index d8592f341..5e4a7a028 100644 --- a/netbox/netbox/api.py +++ b/netbox/netbox/api.py @@ -55,16 +55,31 @@ class TokenPermissions(DjangoModelPermissions): Custom permissions handler which extends the built-in DjangoModelPermissions to validate a Token's write ability for unsafe requests (POST/PUT/PATCH/DELETE). """ + # Override the stock perm_map to enforce view permissions + perms_map = { + 'GET': ['%(app_label)s.view_%(model_name)s'], + 'OPTIONS': [], + 'HEAD': ['%(app_label)s.view_%(model_name)s'], + 'POST': ['%(app_label)s.add_%(model_name)s'], + 'PUT': ['%(app_label)s.change_%(model_name)s'], + 'PATCH': ['%(app_label)s.change_%(model_name)s'], + 'DELETE': ['%(app_label)s.delete_%(model_name)s'], + } + def __init__(self): + # LOGIN_REQUIRED determines whether read-only access is provided to anonymous users. self.authenticated_users_only = settings.LOGIN_REQUIRED + super().__init__() def has_permission(self, request, view): + # If token authentication is in use, verify that the token allows write operations (for unsafe methods). if request.method not in SAFE_METHODS and isinstance(request.auth, Token): if not request.auth.write_enabled: return False + return super().has_permission(request, view) From 3e818cde694f14b7acb5660f053ce89d137ce09c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 11 Apr 2019 21:08:40 -0400 Subject: [PATCH 039/140] Disable navigation links for objects user does not have permission to view --- netbox/templates/inc/nav_menu.html | 84 +++++++++++++++--------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html index a08eb96e0..8d6fa3439 100644 --- a/netbox/templates/inc/nav_menu.html +++ b/netbox/templates/inc/nav_menu.html @@ -20,7 +20,7 @@
      • Sites
        • -
      • + {% if perms.dcim.add_site %}
        @@ -29,7 +29,7 @@ {% endif %} Sites
        • -
      • + {% if perms.dcim.add_region %}
        @@ -40,7 +40,7 @@
      • Tenancy
        • -
      • + {% if perms.tenancy.add_tenant %}
        @@ -49,7 +49,7 @@ {% endif %} Tenants
        • -
      • + {% if perms.tenancy.add_tenantgroup %}
        @@ -60,16 +60,16 @@
      • Miscellaneous
        • -
      • + Tags
        • -
      • + Config Contexts
        • -
      • + Reports
        • -
      • + Changelog
      @@ -78,7 +78,7 @@
      • Racks
        • -
      • + {% if perms.dcim.add_rack %}
        @@ -87,7 +87,7 @@ {% endif %} Racks
        • -
      • + {% if perms.dcim.add_rackgroup %}
        @@ -96,7 +96,7 @@ {% endif %} Rack Groups
        • -
      • + {% if perms.dcim.add_rackrole %}
        @@ -105,10 +105,10 @@ {% endif %} Rack Roles
        • -
      • + Elevations
        • -
      • + Reservations
      @@ -117,7 +117,7 @@
      • Devices
        • -
      • + {% if perms.dcim.add_device %}
        @@ -126,7 +126,7 @@ {% endif %} Devices
        • -
      • + {% if perms.dcim.add_devicerole %}
        @@ -135,7 +135,7 @@ {% endif %} Device Roles
        • -
      • + {% if perms.dcim.add_platform %}
        @@ -144,12 +144,12 @@ {% endif %} Platforms
        • -
      • + Virtual Chassis
      • Device Types
        • -
      • + {% if perms.dcim.add_devicetype %}
        @@ -158,7 +158,7 @@ {% endif %} Device Types
        • -
      • + {% if perms.dcim.add_manufacturer %}
        @@ -169,7 +169,7 @@
      • Inventory
        • -
      • + {% if perms.dcim.add_inventoryitem %}
        @@ -179,7 +179,7 @@
      • Connections
        • -
      • + {% if perms.dcim.add_cable %}
        @@ -187,13 +187,13 @@ {% endif %} Cables
        • -
      • + Console Connections
        • -
      • + Power Connections
        • -
      • + Interface Connections
      @@ -202,7 +202,7 @@
      • IP Addresses
        • -
      • + {% if perms.ipam.add_ipaddress %}
        @@ -213,7 +213,7 @@
      • Prefixes
        • -
      • + {% if perms.ipam.add_prefix %}
        @@ -222,7 +222,7 @@ {% endif %} Prefixes
        • -
      • + {% if perms.ipam.add_role %}
        @@ -233,7 +233,7 @@
      • Aggregates
        • -
      • + {% if perms.ipam.add_aggregate %}
        @@ -242,7 +242,7 @@ {% endif %} Aggregates
        • -
      • + {% if perms.ipam.add_rir %}
        @@ -253,7 +253,7 @@
      • VRFs
        • -
      • + {% if perms.ipam.add_vrf %}
        @@ -264,7 +264,7 @@
      • VLANs
        • -
      • + {% if perms.ipam.add_vlan %}
        @@ -273,7 +273,7 @@ {% endif %} VLANs
        • -
      • + {% if perms.ipam.add_vlangroup %}
        @@ -284,7 +284,7 @@
      • Services
        • -
      • + Services
      @@ -293,7 +293,7 @@
      • Virtual Machines
        • -
      • + {% if perms.virtualization.add_virtualmachine %}
        @@ -304,7 +304,7 @@
      • Clusters
        • -
      • + {% if perms.virtualization.add_cluster %}
        @@ -313,7 +313,7 @@ {% endif %} Clusters
        • -
      • + {% if perms.virtualization.add_clustertype %}
        @@ -322,7 +322,7 @@ {% endif %} Cluster Types
        • -
      • + {% if perms.virtualization.add_clustergroup %}
        @@ -337,7 +337,7 @@
        • Circuits
          • -
        • + {% if perms.circuits.add_circuit %}
          @@ -346,7 +346,7 @@ {% endif %} Circuits
          • -
        • + {% if perms.circuits.add_circuittype %}
          @@ -357,7 +357,7 @@
        • Providers
          • -
        • + {% if perms.circuits.add_provider %}
          @@ -371,7 +371,7 @@
          • -
          • + {% if perms.dcim.add_powerfeed %}
            @@ -380,7 +380,7 @@ {% endif %} Power Feeds
            • -
          • + {% if perms.dcim.add_powerpanel %}
            From df0686a1bd15ea158c0dc51e535306b1e9fe0de1 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 11 Apr 2019 22:01:26 -0400 Subject: [PATCH 040/140] Implement custom auth backend and EXEMPT_VIEW_PERMISSIONS setting --- docs/configuration/optional-settings.md | 24 +++++++++++++++++++++ netbox/netbox/configuration.example.py | 8 +++++++ netbox/netbox/settings.py | 9 ++++++-- netbox/utilities/auth_backends.py | 28 +++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 netbox/utilities/auth_backends.py diff --git a/docs/configuration/optional-settings.md b/docs/configuration/optional-settings.md index f8bd70e88..f6725a92e 100644 --- a/docs/configuration/optional-settings.md +++ b/docs/configuration/optional-settings.md @@ -89,6 +89,30 @@ In order to send email, NetBox needs an email server configured. The following i --- +## EXEMPT_VIEW_PERMISSIONS + +Default: Empty list + +A list of models to exempt from the enforcement of view permissions. Models listed here will be viewable by all users and by anonymous users. + +List models in the form `.`. For example: + +``` +EXEMPT_VIEW_PERMISSIONS = [ + 'dcim.site', + 'dcim.region', + 'ipam.prefix', +] +``` + +To exempt _all_ models from view permission enforcement, set the following. (Note that `EXEMPT_VIEW_PERMISSIONS` must be an iterable.) + +``` +EXEMPT_VIEW_PERMISSIONS = ['*'] +``` + +--- + # ENFORCE_GLOBAL_UNIQUE Default: False diff --git a/netbox/netbox/configuration.example.py b/netbox/netbox/configuration.example.py index 145ebf0e6..6efecdf35 100644 --- a/netbox/netbox/configuration.example.py +++ b/netbox/netbox/configuration.example.py @@ -83,6 +83,14 @@ EMAIL = { # (all prefixes and IP addresses not assigned to a VRF), set ENFORCE_GLOBAL_UNIQUE to True. ENFORCE_GLOBAL_UNIQUE = False +# Exempt certain models from the enforcement of view permissions. Models listed here will be viewable by all users and +# by anonymous users. List models in the form `.`. Add '*' to this list to exempt all models. +EXEMPT_VIEW_PERMISSIONS = [ + # 'dcim.site', + # 'dcim.region', + # 'ipam.prefix', +] + # Enable custom logging. Please see the Django documentation for detailed guidance on configuring custom logs: # https://docs.djangoproject.com/en/1.11/topics/logging/ LOGGING = {} diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 86c509e1e..69a9c13f7 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -51,8 +51,9 @@ CORS_ORIGIN_WHITELIST = getattr(configuration, 'CORS_ORIGIN_WHITELIST', []) DATE_FORMAT = getattr(configuration, 'DATE_FORMAT', 'N j, Y') DATETIME_FORMAT = getattr(configuration, 'DATETIME_FORMAT', 'N j, Y g:i a') DEBUG = getattr(configuration, 'DEBUG', False) -ENFORCE_GLOBAL_UNIQUE = getattr(configuration, 'ENFORCE_GLOBAL_UNIQUE', False) EMAIL = getattr(configuration, 'EMAIL', {}) +ENFORCE_GLOBAL_UNIQUE = getattr(configuration, 'ENFORCE_GLOBAL_UNIQUE', False) +EXEMPT_VIEW_PERMISSIONS = getattr(configuration, 'EXEMPT_VIEW_PERMISSIONS', []) LOGGING = getattr(configuration, 'LOGGING', {}) LOGIN_REQUIRED = getattr(configuration, 'LOGIN_REQUIRED', False) LOGIN_TIMEOUT = getattr(configuration, 'LOGIN_TIMEOUT', None) @@ -93,7 +94,7 @@ if LDAP_CONFIGURED: # Prepend LDAPBackend to the default ModelBackend AUTHENTICATION_BACKENDS = [ 'django_auth_ldap.backend.LDAPBackend', - 'django.contrib.auth.backends.ModelBackend', + 'utilities.auth_backends.ViewExemptModelBackend', ] # Optionally disable strict certificate checking if LDAP_IGNORE_CERT_ERRORS: @@ -107,6 +108,10 @@ if LDAP_CONFIGURED: "LDAP authentication has been configured, but django-auth-ldap is not installed. You can remove " "netbox/ldap_config.py to disable LDAP." ) +else: + AUTHENTICATION_BACKENDS = [ + 'utilities.auth_backends.ViewExemptModelBackend', + ] # Database configuration.DATABASE.update({'ENGINE': 'django.db.backends.postgresql'}) diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py new file mode 100644 index 000000000..54541b0b5 --- /dev/null +++ b/netbox/utilities/auth_backends.py @@ -0,0 +1,28 @@ +from django.conf import settings +from django.contrib.auth.backends import ModelBackend + + +class ViewExemptModelBackend(ModelBackend): + """ + Custom implementation of Django's stock ModelBackend which allows for the exemption of arbitrary models from view + permission enforcement. + """ + def has_perm(self, user_obj, perm, obj=None): + + # If this is a view permission, check whether the model has been exempted from enforcement + try: + app, codename = perm.split('.') + action, model = codename.split('_') + if action == 'view': + if ( + # All models are exempt from view permission enforcement + '*' in settings.EXEMPT_VIEW_PERMISSIONS + ) or ( + # This specific model is exempt from view permission enforcement + '{}.{}'.format(app, model) in settings.EXEMPT_VIEW_PERMISSIONS + ): + return True + except ValueError: + pass + + return super().has_perm(user_obj, perm, obj) From 8c5d544734621bcccea0880e97556c4a2aac41da Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 12 Apr 2019 09:07:22 -0400 Subject: [PATCH 041/140] Changelog for #323 --- CHANGELOG.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dea8e81ed..0c09f3f91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,31 @@ NetBox now makes use of its own `Tag` model instead of the vanilla model which s lives in the `extras` app and thus any permissions that you may have configured using "Taggit | Tag" should be changed to now use "Extras | Tag." +### View Permissions + +Django 2.1 introduced the ability to enforce view-only permissions for different object types. NetBox now enforces +these by default. You can grant view permission to a user or group by assigning the "can view" permission for the +desired object(s). + +To exempt certain objects from the enforcement of view permissions, so that any user (including anonymous users) can +view them, add them to the new `EXEMPT_VIEW_PERMISSIONS` setting in `configuration.py`: + +``` +EXEMPT_VIEW_PERMISSIONS = [ + 'dcim.site', + 'ipam.prefix', +] +``` + +To exclude _all_ objects, effectively disabling view permissions, set: + +``` +EXEMPT_VIEW_PERMISSIONS = ['*'] +``` + ## Enhancements +* [#323](https://github.com/digitalocean/netbox/issues/323) - Enforce per-object type view permissions * [#1792](https://github.com/digitalocean/netbox/issues/1792) - Add CustomFieldChoices API endpoint * [#2324](https://github.com/digitalocean/netbox/issues/2324) - Add `color` option for tags * [#2643](https://github.com/digitalocean/netbox/issues/2643) - Add `description` field to console/power components and device bays From dfa26cc5e284aa690a4ffe0ee5444170573d2cde Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 12 Apr 2019 09:18:05 -0400 Subject: [PATCH 042/140] Hide non-viewable object types on home page --- netbox/templates/home.html | 296 +++++++++++++++++++++---------------- 1 file changed, 167 insertions(+), 129 deletions(-) diff --git a/netbox/templates/home.html b/netbox/templates/home.html index 76d90bad7..c6c6cb3f6 100644 --- a/netbox/templates/home.html +++ b/netbox/templates/home.html @@ -10,16 +10,20 @@ Organization
            -
            - {{ stats.site_count }} -

            Sites

            -

            Geographic locations

            -
            -
            - {{ stats.tenant_count }} -

            Tenants

            -

            Customers or departments

            -
            + {% if perms.dcim.view_site %} +
            + {{ stats.site_count }} +

            Sites

            +

            Geographic locations

            +
            + {% endif %} + {% if perms.tenancy.view_tenant %} +
            + {{ stats.tenant_count }} +

            Tenants

            +

            Customers or departments

            +
            + {% endif %}
        @@ -27,26 +31,38 @@ DCIM
        -
        - {{ stats.rack_count }} -

        Racks

        -

        Equipment racks, optionally organized by group

        -
        -
        - {{ stats.device_count }} -

        Devices

        -

        Rack-mounted network equipment, servers, and other devices

        -
        + {% if perms.dcim.view_rack %} +
        + {{ stats.rack_count }} +

        Racks

        +

        Equipment racks, optionally organized by group

        +
        + {% endif %} + {% if perms.dcim.view_device %} +
        + {{ stats.device_count }} +

        Devices

        +

        Rack-mounted network equipment, servers, and other devices

        +
        + {% endif %}

        Connections

        - {{ stats.cable_count }} -

        Cables

        - {{ stats.interface_connections_count }} -

        Interfaces

        - {{ stats.console_connections_count }} -

        Console

        - {{ stats.power_connections_count }} -

        Power

        + {% if perms.dcim.view_cable %} + {{ stats.cable_count }} +

        Cables

        + {% endif %} + {% if perms.dcim.view_interface %} + {{ stats.interface_connections_count }} +

        Interfaces

        + {% endif %} + {% if perms.dcim.view_consoleport and perms.dcim.view_consoleserverport %} + {{ stats.console_connections_count }} +

        Console

        + {% endif %} + {% if perms.dcim.view_powerport and perms.dcim.view_poweroutlet %} + {{ stats.power_connections_count }} +

        Power

        + {% endif %}
    @@ -55,16 +71,20 @@ Virtualization
    -
    - {{ stats.cluster_count }} -

    Clusters

    -

    Clusters of physical hosts in which VMs reside

    -
    -
    - {{ stats.virtualmachine_count }} -

    Virtual Machines

    -

    Virtual compute instances running inside clusters

    -
    + {% if perms.virtualization.view_cluster %} +
    + {{ stats.cluster_count }} +

    Clusters

    +

    Clusters of physical hosts in which VMs reside

    +
    + {% endif %} + {% if perms.virtualization.view_virtualmachine %} +
    + {{ stats.virtualmachine_count }} +

    Virtual Machines

    +

    Virtual compute instances running inside clusters

    +
    + {% endif %}
    @@ -74,31 +94,41 @@ IPAM
    -
    - {{ stats.vrf_count }} -

    VRFs

    -

    Virtual routing and forwarding tables

    -
    -
    - {{ stats.aggregate_count }} -

    Aggregates

    -

    Top-level IP allocations

    -
    -
    - {{ stats.prefix_count }} -

    Prefixes

    -

    IPv4 and IPv6 network assignments

    -
    -
    - {{ stats.ipaddress_count }} -

    IP Addresses

    -

    Individual IPv4 and IPv6 addresses

    -
    -
    - {{ stats.vlan_count }} -

    VLANs

    -

    Layer two domains, identified by VLAN ID

    -
    + {% if perms.ipam.view_vrf %} +
    + {{ stats.vrf_count }} +

    VRFs

    +

    Virtual routing and forwarding tables

    +
    + {% endif %} + {% if perms.ipam.view_aggregate %} +
    + {{ stats.aggregate_count }} +

    Aggregates

    +

    Top-level IP allocations

    +
    + {% endif %} + {% if perms.ipam.view_prefix %} +
    + {{ stats.prefix_count }} +

    Prefixes

    +

    IPv4 and IPv6 network assignments

    +
    + {% endif %} + {% if perms.ipam.view_ipaddress %} +
    + {{ stats.ipaddress_count }} +

    IP Addresses

    +

    Individual IPv4 and IPv6 addresses

    +
    + {% endif %} + {% if perms.ipam.view_vlan %} +
    + {{ stats.vlan_count }} +

    VLANs

    +

    Layer two domains, identified by VLAN ID

    +
    + {% endif %}
    @@ -106,16 +136,20 @@ Circuits
    -
    - {{ stats.provider_count }} -

    Providers

    -

    Organizations which provide circuit connectivity

    -
    -
    - {{ stats.circuit_count }} -

    Circuits

    -

    Communication links for Internet transit, peering, and other services

    -
    + {% if perms.circuits.view_provider %} +
    + {{ stats.provider_count }} +

    Providers

    +

    Organizations which provide circuit connectivity

    +
    + {% endif %} + {% if perms.circuits.view_circuit %} +
    + {{ stats.circuit_count }} +

    Circuits

    +

    Communication links for Internet transit, peering, and other services

    +
    + {% endif %}
    {% if perms.secrets %} @@ -134,26 +168,28 @@ {% endif %}
    -
    -
    - Global Topology Maps -
    - {% if topology_maps %} - - {% for tm in topology_maps %} - - - - - {% endfor %} -
    {{ tm }}{{ tm.description }}
    - {% else %} -
    - None + {% if perms.extras.view_topologymap %} +
    +
    + Global Topology Maps
    - {% endif %} -
    - {% if report_results %} + {% if topology_maps %} + + {% for tm in topology_maps %} + + + + + {% endfor %} +
    {{ tm }}{{ tm.description }}
    + {% else %} +
    + None +
    + {% endif %} +
    + {% endif %} + {% if report_results and perms.extras.view_reportresult %}
    Reports @@ -168,44 +204,46 @@
    {% endif %} -
    -
    - Changelog + {% if perms.extras.view_objectchange %} +
    +
    + Changelog +
    +
    + {% for change in changelog %} + {% with action=change.get_action_display|lower %} +
    + {% if action == 'created' %} + + {% elif action == 'updated' %} + + {% elif action == 'deleted' %} + + {% endif %} + {{ change.changed_object_type.name|bettertitle }} + {% if change.changed_object.get_absolute_url %} + {{ change.changed_object }} + {% else %} + {{ change.changed_object|default:change.object_repr }} + {% endif %} +
    + + {{ change.user|default:change.user_name }} - + {{ change.time|date:'SHORT_DATETIME_FORMAT' }} + +
    + {% endwith %} + {% if forloop.last %} +
    + View All Changes +
    + {% endif %} + {% empty %} +
    No change history found
    + {% endfor %} +
    -
    - {% for change in changelog %} - {% with action=change.get_action_display|lower %} -
    - {% if action == 'created' %} - - {% elif action == 'updated' %} - - {% elif action == 'deleted' %} - - {% endif %} - {{ change.changed_object_type.name|bettertitle }} - {% if change.changed_object.get_absolute_url %} - {{ change.changed_object }} - {% else %} - {{ change.changed_object|default:change.object_repr }} - {% endif %} -
    - - {{ change.user|default:change.user_name }} - - {{ change.time|date:'SHORT_DATETIME_FORMAT' }} - -
    - {% endwith %} - {% if forloop.last %} -
    - View All Changes -
    - {% endif %} - {% empty %} -
    No change history found
    - {% endfor %} -
    -
    + {% endif %}
    {% endblock %} From b29944d5d74cbeca42e057ac631ed87b9ee00b03 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 12 Apr 2019 09:29:36 -0400 Subject: [PATCH 043/140] Check view permissions for object navigation tabs --- netbox/templates/circuits/circuit.html | 8 +++++--- netbox/templates/circuits/provider.html | 8 +++++--- netbox/templates/dcim/cable.html | 8 +++++--- netbox/templates/dcim/device.html | 16 ++++++++++------ netbox/templates/dcim/devicetype.html | 8 +++++--- netbox/templates/dcim/interface.html | 8 +++++--- netbox/templates/dcim/rack.html | 8 +++++--- netbox/templates/dcim/site.html | 8 +++++--- netbox/templates/extras/tag.html | 8 +++++--- netbox/templates/ipam/aggregate.html | 8 +++++--- netbox/templates/ipam/ipaddress.html | 8 +++++--- netbox/templates/ipam/prefix.html | 16 ++++++++++------ netbox/templates/ipam/vlan.html | 8 +++++--- netbox/templates/ipam/vrf.html | 8 +++++--- netbox/templates/secrets/secret.html | 8 +++++--- netbox/templates/tenancy/tenant.html | 8 +++++--- netbox/templates/virtualization/cluster.html | 8 +++++--- .../templates/virtualization/virtualmachine.html | 16 ++++++++++------ 18 files changed, 105 insertions(+), 63 deletions(-) diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html index 890b2a880..8c9620dc1 100644 --- a/netbox/templates/circuits/circuit.html +++ b/netbox/templates/circuits/circuit.html @@ -45,9 +45,11 @@
    • - + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index 3dd5d973f..13318492b 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -51,9 +51,11 @@ - + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html index 953e6caf4..07a7c49b9 100644 --- a/netbox/templates/dcim/cable.html +++ b/netbox/templates/dcim/cable.html @@ -27,9 +27,11 @@ - + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index b9f283837..dc39959a5 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -86,12 +86,16 @@ {% include 'dcim/inc/device_napalm_tabs.html' %} {% endif %} {% endif %} - - + {% if perms.extras.view_configcontext %} + + {% endif %} + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 5b5410457..52edf5e09 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -50,9 +50,11 @@ - + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index 3c3951417..8d12535c0 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -32,9 +32,11 @@ - + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index e702405a2..f3083198c 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -47,9 +47,11 @@ - + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index 0ef14ee1b..bf95e3050 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -56,9 +56,11 @@ - + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/extras/tag.html b/netbox/templates/extras/tag.html index 3c37729e7..3011e2d3b 100644 --- a/netbox/templates/extras/tag.html +++ b/netbox/templates/extras/tag.html @@ -42,9 +42,11 @@ - + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html index 6fe79810f..d2bedf13d 100644 --- a/netbox/templates/ipam/aggregate.html +++ b/netbox/templates/ipam/aggregate.html @@ -43,9 +43,11 @@ - + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html index c13653e3c..f4e0b495f 100644 --- a/netbox/templates/ipam/ipaddress.html +++ b/netbox/templates/ipam/ipaddress.html @@ -45,9 +45,11 @@ - + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index 281515278..72be2e491 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -59,12 +59,16 @@ - - + {% if perms.ipam.view_ipaddress %} + + {% endif %} + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index 7798bf9e0..ae87b5e29 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -51,9 +51,11 @@ - + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html index fb81d7ee1..dbf426321 100644 --- a/netbox/templates/ipam/vrf.html +++ b/netbox/templates/ipam/vrf.html @@ -42,9 +42,11 @@ - + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/secrets/secret.html b/netbox/templates/secrets/secret.html index 2825e6770..ce5ab68b4 100644 --- a/netbox/templates/secrets/secret.html +++ b/netbox/templates/secrets/secret.html @@ -33,9 +33,11 @@ - + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html index 2cb925303..80b40e05b 100644 --- a/netbox/templates/tenancy/tenant.html +++ b/netbox/templates/tenancy/tenant.html @@ -45,9 +45,11 @@ - + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/virtualization/cluster.html b/netbox/templates/virtualization/cluster.html index d6a589775..513e122a1 100644 --- a/netbox/templates/virtualization/cluster.html +++ b/netbox/templates/virtualization/cluster.html @@ -45,9 +45,11 @@ - + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html index b1a8a1505..cac90df42 100644 --- a/netbox/templates/virtualization/virtualmachine.html +++ b/netbox/templates/virtualization/virtualmachine.html @@ -44,12 +44,16 @@ - - + {% if perms.extras.view_configcontext %} + + {% endif %} + {% if perms.extras.view_objectchange %} + + {% endif %} {% endblock %} From 78c90ba24b321aa68f324de8f23c372689c161bc Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 12 Apr 2019 10:00:43 -0400 Subject: [PATCH 044/140] Changelog for #54 --- CHANGELOG.md | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c09f3f91..19fd2535a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,22 +1,17 @@ v2.6.0 (FUTURE) -## Changes +## New Features -### API Device/VM Config Context Included by Default ([#2350](https://github.com/digitalocean/netbox/issues/2350)) +### Power Panels and Feeds ([#54](https://github.com/digitalocean/netbox/issues/54)) -The rendered Config Context for Devices and VMs is now included by default in all API results (list and detail views). -Previously the rendered Config Context was only available in the detail view for objects. Users with large amounts of -context data may observe a performance drop when returning multiple objects. To combat this, in cases where the rendered -Config Context is not needed, the query parameter `?exclude=config_context` may be added to the request as to remove -the Config Context from being included in any results. +NetBox now includes support for power supply modeling, through two new models: power panels and power feeds. Power feeds +are terminated to power panels and otpionally associated with individual racks. Each power feed defines a supply type +(AC/DC), amperage, voltage, and phase. Power ports can be connected directly to power feeds. -### Tag Permissions Changed +Additionally, the power port model has been extended to include fields denoting maximum and allocated draw, in watts. +This allows a device (e.g. a PDU) to calculate its total load compared to its connected power feed. -NetBox now makes use of its own `Tag` model instead of the vanilla model which ships with django-taggit. This new model -lives in the `extras` app and thus any permissions that you may have configured using "Taggit | Tag" should be changed -to now use "Extras | Tag." - -### View Permissions +### View Permissions ([#323](https://github.com/digitalocean/netbox/issues/323)) Django 2.1 introduced the ability to enforce view-only permissions for different object types. NetBox now enforces these by default. You can grant view permission to a user or group by assigning the "can view" permission for the @@ -38,6 +33,22 @@ To exclude _all_ objects, effectively disabling view permissions, set: EXEMPT_VIEW_PERMISSIONS = ['*'] ``` +## Changes + +### API Device/VM Config Context Included by Default ([#2350](https://github.com/digitalocean/netbox/issues/2350)) + +The rendered Config Context for Devices and VMs is now included by default in all API results (list and detail views). +Previously the rendered Config Context was only available in the detail view for objects. Users with large amounts of +context data may observe a performance drop when returning multiple objects. To combat this, in cases where the rendered +Config Context is not needed, the query parameter `?exclude=config_context` may be added to the request as to remove +the Config Context from being included in any results. + +### Tag Permissions Changed + +NetBox now makes use of its own `Tag` model instead of the vanilla model which ships with django-taggit. This new model +lives in the `extras` app and thus any permissions that you may have configured using "Taggit | Tag" should be changed +to now use "Extras | Tag." + ## Enhancements * [#323](https://github.com/digitalocean/netbox/issues/323) - Enforce per-object type view permissions From 067c788df713b379959e46ba7b5de335447ea6c2 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 12 Apr 2019 10:16:34 -0400 Subject: [PATCH 045/140] Add changelog tabs for power panel, power feed & clean up nav links --- netbox/dcim/urls.py | 2 +- netbox/templates/dcim/powerfeed.html | 10 ++++++ netbox/templates/dcim/powerpanel.html | 10 ++++++ netbox/templates/inc/nav_menu.html | 49 +++++++++++++-------------- 4 files changed, 45 insertions(+), 26 deletions(-) diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 82e32dad2..220f4b405 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -290,7 +290,7 @@ urlpatterns = [ url(r'^power-panels/(?P\d+)/delete/$', views.PowerPanelDeleteView.as_view(), name='powerpanel_delete'), url(r'^power-panels/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='powerpanel_changelog', kwargs={'model': PowerPanel}), - # Racks + # Power feeds url(r'^power-feeds/$', views.PowerFeedListView.as_view(), name='powerfeed_list'), url(r'^power-feeds/add/$', views.PowerFeedEditView.as_view(), name='powerfeed_add'), url(r'^power-feeds/import/$', views.PowerFeedBulkImportView.as_view(), name='powerfeed_import'), diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index f2c16927b..18af53350 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -45,6 +45,16 @@

    {% block title %}{{ powerfeed }}{% endblock %}

    {% include 'inc/created_updated.html' with obj=powerfeed %} +
      + + {% if perms.extras.view_objectchange %} + + {% endif %} +
    {% endblock %} {% block content %} diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html index 88f90ae89..282582061 100644 --- a/netbox/templates/dcim/powerpanel.html +++ b/netbox/templates/dcim/powerpanel.html @@ -44,6 +44,16 @@

    {% block title %}{{ powerpanel }}{% endblock %}

    {% include 'inc/created_updated.html' with obj=powerpanel %} +
      + + {% if perms.extras.view_objectchange %} + + {% endif %} +
    {% endblock %} {% block content %} diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html index 8d6fa3439..76dc61ef3 100644 --- a/netbox/templates/inc/nav_menu.html +++ b/netbox/templates/inc/nav_menu.html @@ -371,6 +371,7 @@
    • +
    • Power
      • {% if perms.dcim.add_powerfeed %}
      @@ -391,31 +392,29 @@
    • - {% if request.user.is_authenticated %} -
  • - -
      -
    • Secrets
      • -
    • - {% if perms.secrets.add_secret %} -
      - -
      - {% endif %} - Secrets -
      • -
    • - {% if perms.secrets.add_secretrole %} -
      - - -
      - {% endif %} - Secret Roles -
      • -
    -
    • - {% endif %} +
  • + +
      +
    • Secrets
      • + + {% if perms.secrets.add_secret %} +
      + +
      + {% endif %} + Secrets + + + {% if perms.secrets.add_secretrole %} +
      + + +
      + {% endif %} + Secret Roles + +
    +
    • {% endif %}
      From 1a2c9e3bba979e2c5c917245a0c68796a2a64135 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 12 Apr 2019 13:42:56 -0400 Subject: [PATCH 046/140] Rename form_factor to type on dcim.Interface --- netbox/dcim/api/serializers.py | 8 +- netbox/dcim/api/views.py | 4 +- netbox/dcim/constants.py | 254 +++---- netbox/dcim/filters.py | 18 +- netbox/dcim/fixtures/dcim.json | 628 +++++++++--------- netbox/dcim/forms.py | 36 +- netbox/dcim/managers.py | 2 +- .../0073_interface_form_factor_to_type.py | 23 + netbox/dcim/models.py | 48 +- netbox/dcim/tables.py | 4 +- netbox/dcim/tests/test_api.py | 22 +- netbox/dcim/tests/test_models.py | 2 +- netbox/dcim/tests/test_views.py | 14 +- .../templates/dcim/device_lldp_neighbors.html | 2 +- .../templates/dcim/inc/cable_trace_end.html | 2 +- netbox/templates/dcim/inc/interface.html | 4 +- netbox/templates/dcim/interface.html | 6 +- netbox/templates/dcim/interface_edit.html | 2 +- netbox/virtualization/api/serializers.py | 6 +- netbox/virtualization/forms.py | 22 +- netbox/virtualization/tests/test_api.py | 8 +- 21 files changed, 569 insertions(+), 546 deletions(-) create mode 100644 netbox/dcim/migrations/0073_interface_form_factor_to_type.py diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index c31dc5c09..fe0ea9da8 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -231,11 +231,11 @@ class PowerOutletTemplateSerializer(ValidatedModelSerializer): class InterfaceTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() - form_factor = ChoiceField(choices=IFACE_FF_CHOICES, required=False) + type = ChoiceField(choices=IFACE_TYPE_CHOICES, required=False) class Meta: model = InterfaceTemplate - fields = ['id', 'device_type', 'name', 'form_factor', 'mgmt_only'] + fields = ['id', 'device_type', 'name', 'type', 'mgmt_only'] class RearPortTemplateSerializer(ValidatedModelSerializer): @@ -418,7 +418,7 @@ class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer): class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer): device = NestedDeviceSerializer() - form_factor = ChoiceField(choices=IFACE_FF_CHOICES, required=False) + type = ChoiceField(choices=IFACE_TYPE_CHOICES, required=False) lag = NestedInterfaceSerializer(required=False, allow_null=True) mode = ChoiceField(choices=IFACE_MODE_CHOICES, required=False, allow_null=True) untagged_vlan = NestedVLANSerializer(required=False, allow_null=True) @@ -434,7 +434,7 @@ class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer): class Meta: model = Interface fields = [ - 'id', 'device', 'name', 'form_factor', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description', + 'id', 'device', 'name', 'type', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', 'mode', 'untagged_vlan', 'tagged_vlans', 'tags', 'count_ipaddresses', ] diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 88d604505..f37c4d452 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -42,8 +42,8 @@ class DCIMFieldChoicesViewSet(FieldChoicesViewSet): (DeviceType, ['subdevice_role']), (FrontPort, ['type']), (FrontPortTemplate, ['type']), - (Interface, ['form_factor', 'mode']), - (InterfaceTemplate, ['form_factor']), + (Interface, ['type', 'mode']), + (InterfaceTemplate, ['type']), (PowerOutlet, ['feed_leg']), (PowerOutletTemplate, ['feed_leg']), (PowerPort, ['connection_status']), diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index 6c135254c..9f07abf18 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -66,200 +66,200 @@ IFACE_ORDERING_CHOICES = [ [IFACE_ORDERING_NAME, 'Name (alphabetically)'] ] -# Interface form factors +# Interface types # Virtual -IFACE_FF_VIRTUAL = 0 -IFACE_FF_LAG = 200 +IFACE_TYPE_VIRTUAL = 0 +IFACE_TYPE_LAG = 200 # Ethernet -IFACE_FF_100ME_FIXED = 800 -IFACE_FF_1GE_FIXED = 1000 -IFACE_FF_1GE_GBIC = 1050 -IFACE_FF_1GE_SFP = 1100 -IFACE_FF_10GE_FIXED = 1150 -IFACE_FF_10GE_CX4 = 1170 -IFACE_FF_10GE_SFP_PLUS = 1200 -IFACE_FF_10GE_XFP = 1300 -IFACE_FF_10GE_XENPAK = 1310 -IFACE_FF_10GE_X2 = 1320 -IFACE_FF_25GE_SFP28 = 1350 -IFACE_FF_40GE_QSFP_PLUS = 1400 -IFACE_FF_50GE_QSFP28 = 1420 -IFACE_FF_100GE_CFP = 1500 -IFACE_FF_100GE_CFP2 = 1510 -IFACE_FF_100GE_CFP4 = 1520 -IFACE_FF_100GE_CPAK = 1550 -IFACE_FF_100GE_QSFP28 = 1600 -IFACE_FF_200GE_CFP2 = 1650 -IFACE_FF_200GE_QSFP56 = 1700 -IFACE_FF_400GE_QSFP_DD = 1750 +IFACE_TYPE_100ME_FIXED = 800 +IFACE_TYPE_1GE_FIXED = 1000 +IFACE_TYPE_1GE_GBIC = 1050 +IFACE_TYPE_1GE_SFP = 1100 +IFACE_TYPE_10GE_FIXED = 1150 +IFACE_TYPE_10GE_CX4 = 1170 +IFACE_TYPE_10GE_SFP_PLUS = 1200 +IFACE_TYPE_10GE_XFP = 1300 +IFACE_TYPE_10GE_XENPAK = 1310 +IFACE_TYPE_10GE_X2 = 1320 +IFACE_TYPE_25GE_SFP28 = 1350 +IFACE_TYPE_40GE_QSFP_PLUS = 1400 +IFACE_TYPE_50GE_QSFP28 = 1420 +IFACE_TYPE_100GE_CFP = 1500 +IFACE_TYPE_100GE_CFP2 = 1510 +IFACE_TYPE_100GE_CFP4 = 1520 +IFACE_TYPE_100GE_CPAK = 1550 +IFACE_TYPE_100GE_QSFP28 = 1600 +IFACE_TYPE_200GE_CFP2 = 1650 +IFACE_TYPE_200GE_QSFP56 = 1700 +IFACE_TYPE_400GE_QSFP_DD = 1750 # Wireless -IFACE_FF_80211A = 2600 -IFACE_FF_80211G = 2610 -IFACE_FF_80211N = 2620 -IFACE_FF_80211AC = 2630 -IFACE_FF_80211AD = 2640 +IFACE_TYPE_80211A = 2600 +IFACE_TYPE_80211G = 2610 +IFACE_TYPE_80211N = 2620 +IFACE_TYPE_80211AC = 2630 +IFACE_TYPE_80211AD = 2640 # Cellular -IFACE_FF_GSM = 2810 -IFACE_FF_CDMA = 2820 -IFACE_FF_LTE = 2830 +IFACE_TYPE_GSM = 2810 +IFACE_TYPE_CDMA = 2820 +IFACE_TYPE_LTE = 2830 # SONET -IFACE_FF_SONET_OC3 = 6100 -IFACE_FF_SONET_OC12 = 6200 -IFACE_FF_SONET_OC48 = 6300 -IFACE_FF_SONET_OC192 = 6400 -IFACE_FF_SONET_OC768 = 6500 -IFACE_FF_SONET_OC1920 = 6600 -IFACE_FF_SONET_OC3840 = 6700 +IFACE_TYPE_SONET_OC3 = 6100 +IFACE_TYPE_SONET_OC12 = 6200 +IFACE_TYPE_SONET_OC48 = 6300 +IFACE_TYPE_SONET_OC192 = 6400 +IFACE_TYPE_SONET_OC768 = 6500 +IFACE_TYPE_SONET_OC1920 = 6600 +IFACE_TYPE_SONET_OC3840 = 6700 # Fibrechannel -IFACE_FF_1GFC_SFP = 3010 -IFACE_FF_2GFC_SFP = 3020 -IFACE_FF_4GFC_SFP = 3040 -IFACE_FF_8GFC_SFP_PLUS = 3080 -IFACE_FF_16GFC_SFP_PLUS = 3160 -IFACE_FF_32GFC_SFP28 = 3320 -IFACE_FF_128GFC_QSFP28 = 3400 +IFACE_TYPE_1GFC_SFP = 3010 +IFACE_TYPE_2GFC_SFP = 3020 +IFACE_TYPE_4GFC_SFP = 3040 +IFACE_TYPE_8GFC_SFP_PLUS = 3080 +IFACE_TYPE_16GFC_SFP_PLUS = 3160 +IFACE_TYPE_32GFC_SFP28 = 3320 +IFACE_TYPE_128GFC_QSFP28 = 3400 # Serial -IFACE_FF_T1 = 4000 -IFACE_FF_E1 = 4010 -IFACE_FF_T3 = 4040 -IFACE_FF_E3 = 4050 +IFACE_TYPE_T1 = 4000 +IFACE_TYPE_E1 = 4010 +IFACE_TYPE_T3 = 4040 +IFACE_TYPE_E3 = 4050 # Stacking -IFACE_FF_STACKWISE = 5000 -IFACE_FF_STACKWISE_PLUS = 5050 -IFACE_FF_FLEXSTACK = 5100 -IFACE_FF_FLEXSTACK_PLUS = 5150 -IFACE_FF_JUNIPER_VCP = 5200 -IFACE_FF_SUMMITSTACK = 5300 -IFACE_FF_SUMMITSTACK128 = 5310 -IFACE_FF_SUMMITSTACK256 = 5320 -IFACE_FF_SUMMITSTACK512 = 5330 +IFACE_TYPE_STACKWISE = 5000 +IFACE_TYPE_STACKWISE_PLUS = 5050 +IFACE_TYPE_FLEXSTACK = 5100 +IFACE_TYPE_FLEXSTACK_PLUS = 5150 +IFACE_TYPE_JUNIPER_VCP = 5200 +IFACE_TYPE_SUMMITSTACK = 5300 +IFACE_TYPE_SUMMITSTACK128 = 5310 +IFACE_TYPE_SUMMITSTACK256 = 5320 +IFACE_TYPE_SUMMITSTACK512 = 5330 # Other -IFACE_FF_OTHER = 32767 +IFACE_TYPE_OTHER = 32767 -IFACE_FF_CHOICES = [ +IFACE_TYPE_CHOICES = [ [ 'Virtual interfaces', [ - [IFACE_FF_VIRTUAL, 'Virtual'], - [IFACE_FF_LAG, 'Link Aggregation Group (LAG)'], + [IFACE_TYPE_VIRTUAL, 'Virtual'], + [IFACE_TYPE_LAG, 'Link Aggregation Group (LAG)'], ], ], [ 'Ethernet (fixed)', [ - [IFACE_FF_100ME_FIXED, '100BASE-TX (10/100ME)'], - [IFACE_FF_1GE_FIXED, '1000BASE-T (1GE)'], - [IFACE_FF_10GE_FIXED, '10GBASE-T (10GE)'], - [IFACE_FF_10GE_CX4, '10GBASE-CX4 (10GE)'], + [IFACE_TYPE_100ME_FIXED, '100BASE-TX (10/100ME)'], + [IFACE_TYPE_1GE_FIXED, '1000BASE-T (1GE)'], + [IFACE_TYPE_10GE_FIXED, '10GBASE-T (10GE)'], + [IFACE_TYPE_10GE_CX4, '10GBASE-CX4 (10GE)'], ] ], [ 'Ethernet (modular)', [ - [IFACE_FF_1GE_GBIC, 'GBIC (1GE)'], - [IFACE_FF_1GE_SFP, 'SFP (1GE)'], - [IFACE_FF_10GE_SFP_PLUS, 'SFP+ (10GE)'], - [IFACE_FF_10GE_XFP, 'XFP (10GE)'], - [IFACE_FF_10GE_XENPAK, 'XENPAK (10GE)'], - [IFACE_FF_10GE_X2, 'X2 (10GE)'], - [IFACE_FF_25GE_SFP28, 'SFP28 (25GE)'], - [IFACE_FF_40GE_QSFP_PLUS, 'QSFP+ (40GE)'], - [IFACE_FF_50GE_QSFP28, 'QSFP28 (50GE)'], - [IFACE_FF_100GE_CFP, 'CFP (100GE)'], - [IFACE_FF_100GE_CFP2, 'CFP2 (100GE)'], - [IFACE_FF_200GE_CFP2, 'CFP2 (200GE)'], - [IFACE_FF_100GE_CFP4, 'CFP4 (100GE)'], - [IFACE_FF_100GE_CPAK, 'Cisco CPAK (100GE)'], - [IFACE_FF_100GE_QSFP28, 'QSFP28 (100GE)'], - [IFACE_FF_200GE_QSFP56, 'QSFP56 (200GE)'], - [IFACE_FF_400GE_QSFP_DD, 'QSFP-DD (400GE)'], + [IFACE_TYPE_1GE_GBIC, 'GBIC (1GE)'], + [IFACE_TYPE_1GE_SFP, 'SFP (1GE)'], + [IFACE_TYPE_10GE_SFP_PLUS, 'SFP+ (10GE)'], + [IFACE_TYPE_10GE_XFP, 'XFP (10GE)'], + [IFACE_TYPE_10GE_XENPAK, 'XENPAK (10GE)'], + [IFACE_TYPE_10GE_X2, 'X2 (10GE)'], + [IFACE_TYPE_25GE_SFP28, 'SFP28 (25GE)'], + [IFACE_TYPE_40GE_QSFP_PLUS, 'QSFP+ (40GE)'], + [IFACE_TYPE_50GE_QSFP28, 'QSFP28 (50GE)'], + [IFACE_TYPE_100GE_CFP, 'CFP (100GE)'], + [IFACE_TYPE_100GE_CFP2, 'CFP2 (100GE)'], + [IFACE_TYPE_200GE_CFP2, 'CFP2 (200GE)'], + [IFACE_TYPE_100GE_CFP4, 'CFP4 (100GE)'], + [IFACE_TYPE_100GE_CPAK, 'Cisco CPAK (100GE)'], + [IFACE_TYPE_100GE_QSFP28, 'QSFP28 (100GE)'], + [IFACE_TYPE_200GE_QSFP56, 'QSFP56 (200GE)'], + [IFACE_TYPE_400GE_QSFP_DD, 'QSFP-DD (400GE)'], ] ], [ 'Wireless', [ - [IFACE_FF_80211A, 'IEEE 802.11a'], - [IFACE_FF_80211G, 'IEEE 802.11b/g'], - [IFACE_FF_80211N, 'IEEE 802.11n'], - [IFACE_FF_80211AC, 'IEEE 802.11ac'], - [IFACE_FF_80211AD, 'IEEE 802.11ad'], + [IFACE_TYPE_80211A, 'IEEE 802.11a'], + [IFACE_TYPE_80211G, 'IEEE 802.11b/g'], + [IFACE_TYPE_80211N, 'IEEE 802.11n'], + [IFACE_TYPE_80211AC, 'IEEE 802.11ac'], + [IFACE_TYPE_80211AD, 'IEEE 802.11ad'], ] ], [ 'Cellular', [ - [IFACE_FF_GSM, 'GSM'], - [IFACE_FF_CDMA, 'CDMA'], - [IFACE_FF_LTE, 'LTE'], + [IFACE_TYPE_GSM, 'GSM'], + [IFACE_TYPE_CDMA, 'CDMA'], + [IFACE_TYPE_LTE, 'LTE'], ] ], [ 'SONET', [ - [IFACE_FF_SONET_OC3, 'OC-3/STM-1'], - [IFACE_FF_SONET_OC12, 'OC-12/STM-4'], - [IFACE_FF_SONET_OC48, 'OC-48/STM-16'], - [IFACE_FF_SONET_OC192, 'OC-192/STM-64'], - [IFACE_FF_SONET_OC768, 'OC-768/STM-256'], - [IFACE_FF_SONET_OC1920, 'OC-1920/STM-640'], - [IFACE_FF_SONET_OC3840, 'OC-3840/STM-1234'], + [IFACE_TYPE_SONET_OC3, 'OC-3/STM-1'], + [IFACE_TYPE_SONET_OC12, 'OC-12/STM-4'], + [IFACE_TYPE_SONET_OC48, 'OC-48/STM-16'], + [IFACE_TYPE_SONET_OC192, 'OC-192/STM-64'], + [IFACE_TYPE_SONET_OC768, 'OC-768/STM-256'], + [IFACE_TYPE_SONET_OC1920, 'OC-1920/STM-640'], + [IFACE_TYPE_SONET_OC3840, 'OC-3840/STM-1234'], ] ], [ 'FibreChannel', [ - [IFACE_FF_1GFC_SFP, 'SFP (1GFC)'], - [IFACE_FF_2GFC_SFP, 'SFP (2GFC)'], - [IFACE_FF_4GFC_SFP, 'SFP (4GFC)'], - [IFACE_FF_8GFC_SFP_PLUS, 'SFP+ (8GFC)'], - [IFACE_FF_16GFC_SFP_PLUS, 'SFP+ (16GFC)'], - [IFACE_FF_32GFC_SFP28, 'SFP28 (32GFC)'], - [IFACE_FF_128GFC_QSFP28, 'QSFP28 (128GFC)'], + [IFACE_TYPE_1GFC_SFP, 'SFP (1GFC)'], + [IFACE_TYPE_2GFC_SFP, 'SFP (2GFC)'], + [IFACE_TYPE_4GFC_SFP, 'SFP (4GFC)'], + [IFACE_TYPE_8GFC_SFP_PLUS, 'SFP+ (8GFC)'], + [IFACE_TYPE_16GFC_SFP_PLUS, 'SFP+ (16GFC)'], + [IFACE_TYPE_32GFC_SFP28, 'SFP28 (32GFC)'], + [IFACE_TYPE_128GFC_QSFP28, 'QSFP28 (128GFC)'], ] ], [ 'Serial', [ - [IFACE_FF_T1, 'T1 (1.544 Mbps)'], - [IFACE_FF_E1, 'E1 (2.048 Mbps)'], - [IFACE_FF_T3, 'T3 (45 Mbps)'], - [IFACE_FF_E3, 'E3 (34 Mbps)'], + [IFACE_TYPE_T1, 'T1 (1.544 Mbps)'], + [IFACE_TYPE_E1, 'E1 (2.048 Mbps)'], + [IFACE_TYPE_T3, 'T3 (45 Mbps)'], + [IFACE_TYPE_E3, 'E3 (34 Mbps)'], ] ], [ 'Stacking', [ - [IFACE_FF_STACKWISE, 'Cisco StackWise'], - [IFACE_FF_STACKWISE_PLUS, 'Cisco StackWise Plus'], - [IFACE_FF_FLEXSTACK, 'Cisco FlexStack'], - [IFACE_FF_FLEXSTACK_PLUS, 'Cisco FlexStack Plus'], - [IFACE_FF_JUNIPER_VCP, 'Juniper VCP'], - [IFACE_FF_SUMMITSTACK, 'Extreme SummitStack'], - [IFACE_FF_SUMMITSTACK128, 'Extreme SummitStack-128'], - [IFACE_FF_SUMMITSTACK256, 'Extreme SummitStack-256'], - [IFACE_FF_SUMMITSTACK512, 'Extreme SummitStack-512'], + [IFACE_TYPE_STACKWISE, 'Cisco StackWise'], + [IFACE_TYPE_STACKWISE_PLUS, 'Cisco StackWise Plus'], + [IFACE_TYPE_FLEXSTACK, 'Cisco FlexStack'], + [IFACE_TYPE_FLEXSTACK_PLUS, 'Cisco FlexStack Plus'], + [IFACE_TYPE_JUNIPER_VCP, 'Juniper VCP'], + [IFACE_TYPE_SUMMITSTACK, 'Extreme SummitStack'], + [IFACE_TYPE_SUMMITSTACK128, 'Extreme SummitStack-128'], + [IFACE_TYPE_SUMMITSTACK256, 'Extreme SummitStack-256'], + [IFACE_TYPE_SUMMITSTACK512, 'Extreme SummitStack-512'], ] ], [ 'Other', [ - [IFACE_FF_OTHER, 'Other'], + [IFACE_TYPE_OTHER, 'Other'], ] ], ] VIRTUAL_IFACE_TYPES = [ - IFACE_FF_VIRTUAL, - IFACE_FF_LAG, + IFACE_TYPE_VIRTUAL, + IFACE_TYPE_LAG, ] WIRELESS_IFACE_TYPES = [ - IFACE_FF_80211A, - IFACE_FF_80211G, - IFACE_FF_80211N, - IFACE_FF_80211AC, - IFACE_FF_80211AD, + IFACE_TYPE_80211A, + IFACE_TYPE_80211G, + IFACE_TYPE_80211N, + IFACE_TYPE_80211AC, + IFACE_TYPE_80211AD, ] NONCONNECTABLE_IFACE_TYPES = VIRTUAL_IFACE_TYPES + WIRELESS_IFACE_TYPES diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index ea535f4f2..c1fc76191 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -400,7 +400,7 @@ class InterfaceTemplateFilter(DeviceTypeComponentFilterSet): class Meta: model = InterfaceTemplate - fields = ['name', 'form_factor', 'mgmt_only'] + fields = ['name', 'type', 'mgmt_only'] class FrontPortTemplateFilter(DeviceTypeComponentFilterSet): @@ -753,7 +753,8 @@ class InterfaceFilter(django_filters.FilterSet): lookup_expr='isnull', exclude=True ) - type = django_filters.CharFilter( + class_ = django_filters.CharFilter( + field_name='class', method='filter_type', label='Interface type', ) @@ -775,14 +776,14 @@ class InterfaceFilter(django_filters.FilterSet): method='filter_vlan', label='Assigned VID' ) - form_factor = django_filters.MultipleChoiceFilter( - choices=IFACE_FF_CHOICES, + type = django_filters.MultipleChoiceFilter( + choices=IFACE_TYPE_CHOICES, null_value=None ) class Meta: model = Interface - fields = ['name', 'connection_status', 'form_factor', 'enabled', 'mtu', 'mgmt_only', 'description'] + fields = ['name', 'connection_status', 'type', 'enabled', 'mtu', 'mgmt_only', 'description'] def search(self, queryset, name, value): if not value.strip(): @@ -821,10 +822,9 @@ class InterfaceFilter(django_filters.FilterSet): def filter_type(self, queryset, name, value): value = value.strip().lower() return { - 'physical': queryset.exclude(form_factor__in=NONCONNECTABLE_IFACE_TYPES), - 'virtual': queryset.filter(form_factor__in=VIRTUAL_IFACE_TYPES), - 'wireless': queryset.filter(form_factor__in=WIRELESS_IFACE_TYPES), - 'lag': queryset.filter(form_factor=IFACE_FF_LAG), + 'physical': queryset.exclude(type__in=NONCONNECTABLE_IFACE_TYPES), + 'virtual': queryset.filter(type__in=VIRTUAL_IFACE_TYPES), + 'wireless': queryset.filter(type__in=WIRELESS_IFACE_TYPES), }.get(value, queryset.none()) def _mac_address(self, queryset, name, value): diff --git a/netbox/dcim/fixtures/dcim.json b/netbox/dcim/fixtures/dcim.json index cdcc860e8..ece19a83c 100644 --- a/netbox/dcim/fixtures/dcim.json +++ b/netbox/dcim/fixtures/dcim.json @@ -902,7 +902,7 @@ "fields": { "device_type": 1, "name": "fxp0 (RE0)", - "form_factor": 1000, + "type": 1000, "mgmt_only": true } }, @@ -912,7 +912,7 @@ "fields": { "device_type": 1, "name": "fxp0 (RE1)", - "form_factor": 800, + "type": 800, "mgmt_only": true } }, @@ -922,7 +922,7 @@ "fields": { "device_type": 1, "name": "lo0", - "form_factor": 0, + "type": 0, "mgmt_only": false } }, @@ -932,7 +932,7 @@ "fields": { "device_type": 2, "name": "fxp0 (RE0)", - "form_factor": 1000, + "type": 1000, "mgmt_only": true } }, @@ -942,7 +942,7 @@ "fields": { "device_type": 2, "name": "fxp0 (RE1)", - "form_factor": 1000, + "type": 1000, "mgmt_only": true } }, @@ -952,7 +952,7 @@ "fields": { "device_type": 2, "name": "lo0", - "form_factor": 0, + "type": 0, "mgmt_only": false } }, @@ -962,7 +962,7 @@ "fields": { "device_type": 3, "name": "em0", - "form_factor": 800, + "type": 800, "mgmt_only": true } }, @@ -972,7 +972,7 @@ "fields": { "device_type": 3, "name": "et-0/0/0", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -982,7 +982,7 @@ "fields": { "device_type": 3, "name": "et-0/0/1", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -992,7 +992,7 @@ "fields": { "device_type": 3, "name": "et-0/0/2", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1002,7 +1002,7 @@ "fields": { "device_type": 3, "name": "et-0/0/3", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1012,7 +1012,7 @@ "fields": { "device_type": 3, "name": "et-0/0/4", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1022,7 +1022,7 @@ "fields": { "device_type": 3, "name": "et-0/0/5", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1032,7 +1032,7 @@ "fields": { "device_type": 3, "name": "et-0/0/6", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1042,7 +1042,7 @@ "fields": { "device_type": 3, "name": "et-0/0/7", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1052,7 +1052,7 @@ "fields": { "device_type": 3, "name": "et-0/0/8", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1062,7 +1062,7 @@ "fields": { "device_type": 3, "name": "et-0/0/9", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1072,7 +1072,7 @@ "fields": { "device_type": 3, "name": "et-0/0/10", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1082,7 +1082,7 @@ "fields": { "device_type": 3, "name": "et-0/0/11", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1092,7 +1092,7 @@ "fields": { "device_type": 3, "name": "et-0/0/12", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1102,7 +1102,7 @@ "fields": { "device_type": 3, "name": "et-0/0/13", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1112,7 +1112,7 @@ "fields": { "device_type": 3, "name": "et-0/0/14", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1122,7 +1122,7 @@ "fields": { "device_type": 3, "name": "et-0/0/15", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1132,7 +1132,7 @@ "fields": { "device_type": 3, "name": "et-0/0/16", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1142,7 +1142,7 @@ "fields": { "device_type": 3, "name": "et-0/0/17", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1152,7 +1152,7 @@ "fields": { "device_type": 3, "name": "et-0/0/18", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1162,7 +1162,7 @@ "fields": { "device_type": 3, "name": "et-0/0/19", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1172,7 +1172,7 @@ "fields": { "device_type": 3, "name": "et-0/0/20", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1182,7 +1182,7 @@ "fields": { "device_type": 3, "name": "et-0/0/21", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1192,7 +1192,7 @@ "fields": { "device_type": 3, "name": "et-0/0/22", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1202,7 +1202,7 @@ "fields": { "device_type": 3, "name": "et-0/1/0", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1212,7 +1212,7 @@ "fields": { "device_type": 3, "name": "et-0/1/1", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1222,7 +1222,7 @@ "fields": { "device_type": 3, "name": "et-0/1/2", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1232,7 +1232,7 @@ "fields": { "device_type": 3, "name": "et-0/1/3", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1242,7 +1242,7 @@ "fields": { "device_type": 3, "name": "et-0/2/0", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1252,7 +1252,7 @@ "fields": { "device_type": 3, "name": "et-0/2/1", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1262,7 +1262,7 @@ "fields": { "device_type": 3, "name": "et-0/2/2", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1272,7 +1272,7 @@ "fields": { "device_type": 3, "name": "et-0/2/3", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1282,7 +1282,7 @@ "fields": { "device_type": 4, "name": "em0", - "form_factor": 1000, + "type": 1000, "mgmt_only": true } }, @@ -1292,7 +1292,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/0", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1302,7 +1302,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/1", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1312,7 +1312,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/2", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1322,7 +1322,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/3", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1332,7 +1332,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/4", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1342,7 +1342,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/5", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1352,7 +1352,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/6", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1362,7 +1362,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/7", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1372,7 +1372,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/8", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1382,7 +1382,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/9", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1392,7 +1392,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/10", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1402,7 +1402,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/11", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1412,7 +1412,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/12", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1422,7 +1422,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/13", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1432,7 +1432,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/14", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1442,7 +1442,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/15", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1452,7 +1452,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/16", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1462,7 +1462,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/17", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1472,7 +1472,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/18", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1482,7 +1482,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/19", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1492,7 +1492,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/20", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1502,7 +1502,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/21", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1512,7 +1512,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/22", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1522,7 +1522,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/23", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1532,7 +1532,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/24", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1542,7 +1542,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/25", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1552,7 +1552,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/26", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1562,7 +1562,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/27", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1572,7 +1572,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/28", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1582,7 +1582,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/29", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1592,7 +1592,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/30", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1602,7 +1602,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/31", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1612,7 +1612,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/32", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1622,7 +1622,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/33", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1632,7 +1632,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/34", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1642,7 +1642,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/35", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1652,7 +1652,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/36", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1662,7 +1662,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/37", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1672,7 +1672,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/38", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1682,7 +1682,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/39", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1692,7 +1692,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/40", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1702,7 +1702,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/41", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1712,7 +1712,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/42", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1722,7 +1722,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/43", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1732,7 +1732,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/44", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1742,7 +1742,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/45", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1752,7 +1752,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/46", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1762,7 +1762,7 @@ "fields": { "device_type": 4, "name": "xe-0/0/47", - "form_factor": 1200, + "type": 1200, "mgmt_only": false } }, @@ -1772,7 +1772,7 @@ "fields": { "device_type": 4, "name": "et-0/0/48", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1782,7 +1782,7 @@ "fields": { "device_type": 4, "name": "et-0/0/49", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1792,7 +1792,7 @@ "fields": { "device_type": 4, "name": "et-0/0/50", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1802,7 +1802,7 @@ "fields": { "device_type": 4, "name": "et-0/0/51", - "form_factor": 1400, + "type": 1400, "mgmt_only": false } }, @@ -1812,7 +1812,7 @@ "fields": { "device_type": 5, "name": "eth0", - "form_factor": 1000, + "type": 1000, "mgmt_only": true } }, @@ -1822,7 +1822,7 @@ "fields": { "device_type": 6, "name": "Net", - "form_factor": 800, + "type": 800, "mgmt_only": true } }, @@ -3301,7 +3301,7 @@ "fields": { "device": 1, "name": "fxp0 (RE0)", - "form_factor": 1000, + "type": 1000, "mgmt_only": true, "description": "" } @@ -3312,7 +3312,7 @@ "fields": { "device": 1, "name": "fxp0 (RE1)", - "form_factor": 800, + "type": 800, "mgmt_only": true, "description": "" } @@ -3323,7 +3323,7 @@ "fields": { "device": 1, "name": "lo0", - "form_factor": 0, + "type": 0, "mgmt_only": false, "description": "" } @@ -3334,7 +3334,7 @@ "fields": { "device": 1, "name": "xe-0/0/0", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "TEST" } @@ -3345,7 +3345,7 @@ "fields": { "device": 1, "name": "xe-0/0/1", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3356,7 +3356,7 @@ "fields": { "device": 1, "name": "xe-0/0/2", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3367,7 +3367,7 @@ "fields": { "device": 1, "name": "xe-0/0/3", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3378,7 +3378,7 @@ "fields": { "device": 1, "name": "xe-0/0/4", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3389,7 +3389,7 @@ "fields": { "device": 1, "name": "xe-0/0/5", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3400,7 +3400,7 @@ "fields": { "device": 2, "name": "fxp0 (RE0)", - "form_factor": 1000, + "type": 1000, "mgmt_only": true, "description": "" } @@ -3411,7 +3411,7 @@ "fields": { "device": 2, "name": "fxp0 (RE1)", - "form_factor": 1000, + "type": 1000, "mgmt_only": true, "description": "" } @@ -3422,7 +3422,7 @@ "fields": { "device": 2, "name": "lo0", - "form_factor": 0, + "type": 0, "mgmt_only": false, "description": "" } @@ -3434,7 +3434,7 @@ "device": 3, "name": "em0", "mac_address": "00-00-00-AA-BB-CC", - "form_factor": 800, + "type": 800, "mgmt_only": true, "description": "" } @@ -3445,7 +3445,7 @@ "fields": { "device": 3, "name": "et-0/0/0", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3456,7 +3456,7 @@ "fields": { "device": 3, "name": "et-0/0/1", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3467,7 +3467,7 @@ "fields": { "device": 3, "name": "et-0/0/10", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3478,7 +3478,7 @@ "fields": { "device": 3, "name": "et-0/0/11", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3489,7 +3489,7 @@ "fields": { "device": 3, "name": "et-0/0/12", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3500,7 +3500,7 @@ "fields": { "device": 3, "name": "et-0/0/13", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3511,7 +3511,7 @@ "fields": { "device": 3, "name": "et-0/0/14", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3522,7 +3522,7 @@ "fields": { "device": 3, "name": "et-0/0/15", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3533,7 +3533,7 @@ "fields": { "device": 3, "name": "et-0/0/16", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3544,7 +3544,7 @@ "fields": { "device": 3, "name": "et-0/0/17", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3555,7 +3555,7 @@ "fields": { "device": 3, "name": "et-0/0/18", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3566,7 +3566,7 @@ "fields": { "device": 3, "name": "et-0/0/19", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3577,7 +3577,7 @@ "fields": { "device": 3, "name": "et-0/0/2", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3588,7 +3588,7 @@ "fields": { "device": 3, "name": "et-0/0/20", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3599,7 +3599,7 @@ "fields": { "device": 3, "name": "et-0/0/21", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3610,7 +3610,7 @@ "fields": { "device": 3, "name": "et-0/0/22", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3621,7 +3621,7 @@ "fields": { "device": 3, "name": "et-0/0/3", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3632,7 +3632,7 @@ "fields": { "device": 3, "name": "et-0/0/4", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3643,7 +3643,7 @@ "fields": { "device": 3, "name": "et-0/0/5", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3654,7 +3654,7 @@ "fields": { "device": 3, "name": "et-0/0/6", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3665,7 +3665,7 @@ "fields": { "device": 3, "name": "et-0/0/7", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3676,7 +3676,7 @@ "fields": { "device": 3, "name": "et-0/0/8", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3687,7 +3687,7 @@ "fields": { "device": 3, "name": "et-0/0/9", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3698,7 +3698,7 @@ "fields": { "device": 3, "name": "et-0/1/0", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3709,7 +3709,7 @@ "fields": { "device": 3, "name": "et-0/1/1", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3720,7 +3720,7 @@ "fields": { "device": 3, "name": "et-0/1/2", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3731,7 +3731,7 @@ "fields": { "device": 3, "name": "et-0/1/3", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3742,7 +3742,7 @@ "fields": { "device": 3, "name": "et-0/2/0", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3753,7 +3753,7 @@ "fields": { "device": 3, "name": "et-0/2/1", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3764,7 +3764,7 @@ "fields": { "device": 3, "name": "et-0/2/2", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3775,7 +3775,7 @@ "fields": { "device": 3, "name": "et-0/2/3", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3786,7 +3786,7 @@ "fields": { "device": 4, "name": "em0", - "form_factor": 1000, + "type": 1000, "mac_address": "ff-ee-dd-33-22-11", "mgmt_only": true, "description": "" @@ -3798,7 +3798,7 @@ "fields": { "device": 4, "name": "et-0/0/48", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3809,7 +3809,7 @@ "fields": { "device": 4, "name": "et-0/0/49", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3820,7 +3820,7 @@ "fields": { "device": 4, "name": "et-0/0/50", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3831,7 +3831,7 @@ "fields": { "device": 4, "name": "et-0/0/51", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -3842,7 +3842,7 @@ "fields": { "device": 4, "name": "xe-0/0/0", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3853,7 +3853,7 @@ "fields": { "device": 4, "name": "xe-0/0/1", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3864,7 +3864,7 @@ "fields": { "device": 4, "name": "xe-0/0/10", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3875,7 +3875,7 @@ "fields": { "device": 4, "name": "xe-0/0/11", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3886,7 +3886,7 @@ "fields": { "device": 4, "name": "xe-0/0/12", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3897,7 +3897,7 @@ "fields": { "device": 4, "name": "xe-0/0/13", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3908,7 +3908,7 @@ "fields": { "device": 4, "name": "xe-0/0/14", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3919,7 +3919,7 @@ "fields": { "device": 4, "name": "xe-0/0/15", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3930,7 +3930,7 @@ "fields": { "device": 4, "name": "xe-0/0/16", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3941,7 +3941,7 @@ "fields": { "device": 4, "name": "xe-0/0/17", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3952,7 +3952,7 @@ "fields": { "device": 4, "name": "xe-0/0/18", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3963,7 +3963,7 @@ "fields": { "device": 4, "name": "xe-0/0/19", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3974,7 +3974,7 @@ "fields": { "device": 4, "name": "xe-0/0/2", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3985,7 +3985,7 @@ "fields": { "device": 4, "name": "xe-0/0/20", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -3996,7 +3996,7 @@ "fields": { "device": 4, "name": "xe-0/0/21", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4007,7 +4007,7 @@ "fields": { "device": 4, "name": "xe-0/0/22", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4018,7 +4018,7 @@ "fields": { "device": 4, "name": "xe-0/0/23", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4029,7 +4029,7 @@ "fields": { "device": 4, "name": "xe-0/0/24", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4040,7 +4040,7 @@ "fields": { "device": 4, "name": "xe-0/0/25", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4051,7 +4051,7 @@ "fields": { "device": 4, "name": "xe-0/0/26", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4062,7 +4062,7 @@ "fields": { "device": 4, "name": "xe-0/0/27", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4073,7 +4073,7 @@ "fields": { "device": 4, "name": "xe-0/0/28", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4084,7 +4084,7 @@ "fields": { "device": 4, "name": "xe-0/0/29", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4095,7 +4095,7 @@ "fields": { "device": 4, "name": "xe-0/0/3", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4106,7 +4106,7 @@ "fields": { "device": 4, "name": "xe-0/0/30", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4117,7 +4117,7 @@ "fields": { "device": 4, "name": "xe-0/0/31", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4128,7 +4128,7 @@ "fields": { "device": 4, "name": "xe-0/0/32", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4139,7 +4139,7 @@ "fields": { "device": 4, "name": "xe-0/0/33", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4150,7 +4150,7 @@ "fields": { "device": 4, "name": "xe-0/0/34", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4161,7 +4161,7 @@ "fields": { "device": 4, "name": "xe-0/0/35", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4172,7 +4172,7 @@ "fields": { "device": 4, "name": "xe-0/0/36", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4183,7 +4183,7 @@ "fields": { "device": 4, "name": "xe-0/0/37", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4194,7 +4194,7 @@ "fields": { "device": 4, "name": "xe-0/0/38", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4205,7 +4205,7 @@ "fields": { "device": 4, "name": "xe-0/0/39", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4216,7 +4216,7 @@ "fields": { "device": 4, "name": "xe-0/0/4", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4227,7 +4227,7 @@ "fields": { "device": 4, "name": "xe-0/0/40", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4238,7 +4238,7 @@ "fields": { "device": 4, "name": "xe-0/0/41", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4249,7 +4249,7 @@ "fields": { "device": 4, "name": "xe-0/0/42", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4260,7 +4260,7 @@ "fields": { "device": 4, "name": "xe-0/0/43", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4271,7 +4271,7 @@ "fields": { "device": 4, "name": "xe-0/0/44", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4282,7 +4282,7 @@ "fields": { "device": 4, "name": "xe-0/0/45", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4293,7 +4293,7 @@ "fields": { "device": 4, "name": "xe-0/0/46", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4304,7 +4304,7 @@ "fields": { "device": 4, "name": "xe-0/0/47", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4315,7 +4315,7 @@ "fields": { "device": 4, "name": "xe-0/0/5", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4326,7 +4326,7 @@ "fields": { "device": 4, "name": "xe-0/0/6", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4337,7 +4337,7 @@ "fields": { "device": 4, "name": "xe-0/0/7", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4348,7 +4348,7 @@ "fields": { "device": 4, "name": "xe-0/0/8", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4359,7 +4359,7 @@ "fields": { "device": 4, "name": "xe-0/0/9", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4370,7 +4370,7 @@ "fields": { "device": 5, "name": "em0", - "form_factor": 1000, + "type": 1000, "mgmt_only": true, "description": "" } @@ -4381,7 +4381,7 @@ "fields": { "device": 5, "name": "et-0/0/48", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -4392,7 +4392,7 @@ "fields": { "device": 5, "name": "et-0/0/49", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -4403,7 +4403,7 @@ "fields": { "device": 5, "name": "et-0/0/50", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -4414,7 +4414,7 @@ "fields": { "device": 5, "name": "et-0/0/51", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -4425,7 +4425,7 @@ "fields": { "device": 5, "name": "xe-0/0/0", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4436,7 +4436,7 @@ "fields": { "device": 5, "name": "xe-0/0/1", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4447,7 +4447,7 @@ "fields": { "device": 5, "name": "xe-0/0/10", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4458,7 +4458,7 @@ "fields": { "device": 5, "name": "xe-0/0/11", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4469,7 +4469,7 @@ "fields": { "device": 5, "name": "xe-0/0/12", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4480,7 +4480,7 @@ "fields": { "device": 5, "name": "xe-0/0/13", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4491,7 +4491,7 @@ "fields": { "device": 5, "name": "xe-0/0/14", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4502,7 +4502,7 @@ "fields": { "device": 5, "name": "xe-0/0/15", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4513,7 +4513,7 @@ "fields": { "device": 5, "name": "xe-0/0/16", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4524,7 +4524,7 @@ "fields": { "device": 5, "name": "xe-0/0/17", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4535,7 +4535,7 @@ "fields": { "device": 5, "name": "xe-0/0/18", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4546,7 +4546,7 @@ "fields": { "device": 5, "name": "xe-0/0/19", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4557,7 +4557,7 @@ "fields": { "device": 5, "name": "xe-0/0/2", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4568,7 +4568,7 @@ "fields": { "device": 5, "name": "xe-0/0/20", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4579,7 +4579,7 @@ "fields": { "device": 5, "name": "xe-0/0/21", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4590,7 +4590,7 @@ "fields": { "device": 5, "name": "xe-0/0/22", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4601,7 +4601,7 @@ "fields": { "device": 5, "name": "xe-0/0/23", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4612,7 +4612,7 @@ "fields": { "device": 5, "name": "xe-0/0/24", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4623,7 +4623,7 @@ "fields": { "device": 5, "name": "xe-0/0/25", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4634,7 +4634,7 @@ "fields": { "device": 5, "name": "xe-0/0/26", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4645,7 +4645,7 @@ "fields": { "device": 5, "name": "xe-0/0/27", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4656,7 +4656,7 @@ "fields": { "device": 5, "name": "xe-0/0/28", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4667,7 +4667,7 @@ "fields": { "device": 5, "name": "xe-0/0/29", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4678,7 +4678,7 @@ "fields": { "device": 5, "name": "xe-0/0/3", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4689,7 +4689,7 @@ "fields": { "device": 5, "name": "xe-0/0/30", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4700,7 +4700,7 @@ "fields": { "device": 5, "name": "xe-0/0/31", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4711,7 +4711,7 @@ "fields": { "device": 5, "name": "xe-0/0/32", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4722,7 +4722,7 @@ "fields": { "device": 5, "name": "xe-0/0/33", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4733,7 +4733,7 @@ "fields": { "device": 5, "name": "xe-0/0/34", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4744,7 +4744,7 @@ "fields": { "device": 5, "name": "xe-0/0/35", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4755,7 +4755,7 @@ "fields": { "device": 5, "name": "xe-0/0/36", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4766,7 +4766,7 @@ "fields": { "device": 5, "name": "xe-0/0/37", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4777,7 +4777,7 @@ "fields": { "device": 5, "name": "xe-0/0/38", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4788,7 +4788,7 @@ "fields": { "device": 5, "name": "xe-0/0/39", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4799,7 +4799,7 @@ "fields": { "device": 5, "name": "xe-0/0/4", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4810,7 +4810,7 @@ "fields": { "device": 5, "name": "xe-0/0/40", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4821,7 +4821,7 @@ "fields": { "device": 5, "name": "xe-0/0/41", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4832,7 +4832,7 @@ "fields": { "device": 5, "name": "xe-0/0/42", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4843,7 +4843,7 @@ "fields": { "device": 5, "name": "xe-0/0/43", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4854,7 +4854,7 @@ "fields": { "device": 5, "name": "xe-0/0/44", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4865,7 +4865,7 @@ "fields": { "device": 5, "name": "xe-0/0/45", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4876,7 +4876,7 @@ "fields": { "device": 5, "name": "xe-0/0/46", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4887,7 +4887,7 @@ "fields": { "device": 5, "name": "xe-0/0/47", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4898,7 +4898,7 @@ "fields": { "device": 5, "name": "xe-0/0/5", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4909,7 +4909,7 @@ "fields": { "device": 5, "name": "xe-0/0/6", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4920,7 +4920,7 @@ "fields": { "device": 5, "name": "xe-0/0/7", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4931,7 +4931,7 @@ "fields": { "device": 5, "name": "xe-0/0/8", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4942,7 +4942,7 @@ "fields": { "device": 5, "name": "xe-0/0/9", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -4953,7 +4953,7 @@ "fields": { "device": 6, "name": "em0", - "form_factor": 800, + "type": 800, "mgmt_only": true, "description": "" } @@ -4964,7 +4964,7 @@ "fields": { "device": 6, "name": "et-0/0/0", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -4975,7 +4975,7 @@ "fields": { "device": 6, "name": "et-0/0/1", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -4986,7 +4986,7 @@ "fields": { "device": 6, "name": "et-0/0/10", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -4997,7 +4997,7 @@ "fields": { "device": 6, "name": "et-0/0/11", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5008,7 +5008,7 @@ "fields": { "device": 6, "name": "et-0/0/12", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5019,7 +5019,7 @@ "fields": { "device": 6, "name": "et-0/0/13", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5030,7 +5030,7 @@ "fields": { "device": 6, "name": "et-0/0/14", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5041,7 +5041,7 @@ "fields": { "device": 6, "name": "et-0/0/15", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5052,7 +5052,7 @@ "fields": { "device": 6, "name": "et-0/0/16", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5063,7 +5063,7 @@ "fields": { "device": 6, "name": "et-0/0/17", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5074,7 +5074,7 @@ "fields": { "device": 6, "name": "et-0/0/18", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5085,7 +5085,7 @@ "fields": { "device": 6, "name": "et-0/0/19", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5096,7 +5096,7 @@ "fields": { "device": 6, "name": "et-0/0/2", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5107,7 +5107,7 @@ "fields": { "device": 6, "name": "et-0/0/20", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5118,7 +5118,7 @@ "fields": { "device": 6, "name": "et-0/0/21", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5129,7 +5129,7 @@ "fields": { "device": 6, "name": "et-0/0/22", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5140,7 +5140,7 @@ "fields": { "device": 6, "name": "et-0/0/3", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5151,7 +5151,7 @@ "fields": { "device": 6, "name": "et-0/0/4", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5162,7 +5162,7 @@ "fields": { "device": 6, "name": "et-0/0/5", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5173,7 +5173,7 @@ "fields": { "device": 6, "name": "et-0/0/6", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5184,7 +5184,7 @@ "fields": { "device": 6, "name": "et-0/0/7", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5195,7 +5195,7 @@ "fields": { "device": 6, "name": "et-0/0/8", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5206,7 +5206,7 @@ "fields": { "device": 6, "name": "et-0/0/9", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5217,7 +5217,7 @@ "fields": { "device": 6, "name": "et-0/1/0", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5228,7 +5228,7 @@ "fields": { "device": 6, "name": "et-0/1/1", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5239,7 +5239,7 @@ "fields": { "device": 6, "name": "et-0/1/2", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5250,7 +5250,7 @@ "fields": { "device": 6, "name": "et-0/1/3", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5261,7 +5261,7 @@ "fields": { "device": 6, "name": "et-0/2/0", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5272,7 +5272,7 @@ "fields": { "device": 6, "name": "et-0/2/1", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5283,7 +5283,7 @@ "fields": { "device": 6, "name": "et-0/2/2", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5294,7 +5294,7 @@ "fields": { "device": 6, "name": "et-0/2/3", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5305,7 +5305,7 @@ "fields": { "device": 7, "name": "fxp0 (RE0)", - "form_factor": 1000, + "type": 1000, "mgmt_only": true, "description": "" } @@ -5316,7 +5316,7 @@ "fields": { "device": 7, "name": "fxp0 (RE1)", - "form_factor": 800, + "type": 800, "mgmt_only": true, "description": "" } @@ -5327,7 +5327,7 @@ "fields": { "device": 7, "name": "lo0", - "form_factor": 0, + "type": 0, "mgmt_only": false, "description": "" } @@ -5338,7 +5338,7 @@ "fields": { "device": 8, "name": "fxp0 (RE0)", - "form_factor": 1000, + "type": 1000, "mgmt_only": true, "description": "" } @@ -5349,7 +5349,7 @@ "fields": { "device": 8, "name": "fxp0 (RE1)", - "form_factor": 1000, + "type": 1000, "mgmt_only": true, "description": "" } @@ -5360,7 +5360,7 @@ "fields": { "device": 8, "name": "lo0", - "form_factor": 0, + "type": 0, "mgmt_only": false, "description": "" } @@ -5371,7 +5371,7 @@ "fields": { "device": 2, "name": "et-0/0/0", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5382,7 +5382,7 @@ "fields": { "device": 2, "name": "et-0/0/1", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5393,7 +5393,7 @@ "fields": { "device": 2, "name": "et-0/0/2", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5404,7 +5404,7 @@ "fields": { "device": 2, "name": "et-0/1/0", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5415,7 +5415,7 @@ "fields": { "device": 2, "name": "et-0/1/1", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5426,7 +5426,7 @@ "fields": { "device": 2, "name": "et-0/1/2", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5437,7 +5437,7 @@ "fields": { "device": 8, "name": "et-0/0/0", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5448,7 +5448,7 @@ "fields": { "device": 8, "name": "et-0/0/1", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5459,7 +5459,7 @@ "fields": { "device": 8, "name": "et-0/0/2", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5470,7 +5470,7 @@ "fields": { "device": 8, "name": "et-0/1/0", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5481,7 +5481,7 @@ "fields": { "device": 8, "name": "et-0/1/1", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5492,7 +5492,7 @@ "fields": { "device": 8, "name": "et-0/1/2", - "form_factor": 1400, + "type": 1400, "mgmt_only": false, "description": "" } @@ -5503,7 +5503,7 @@ "fields": { "device": 2, "name": "xe-0/0/0", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5514,7 +5514,7 @@ "fields": { "device": 2, "name": "xe-0/0/1", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5525,7 +5525,7 @@ "fields": { "device": 2, "name": "xe-0/0/2", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5536,7 +5536,7 @@ "fields": { "device": 2, "name": "xe-0/0/3", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5547,7 +5547,7 @@ "fields": { "device": 2, "name": "xe-0/0/4", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5558,7 +5558,7 @@ "fields": { "device": 2, "name": "xe-0/0/5", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5569,7 +5569,7 @@ "fields": { "device": 8, "name": "xe-0/0/0", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5580,7 +5580,7 @@ "fields": { "device": 8, "name": "xe-0/0/1", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5591,7 +5591,7 @@ "fields": { "device": 8, "name": "xe-0/0/2", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5602,7 +5602,7 @@ "fields": { "device": 8, "name": "xe-0/0/3", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5613,7 +5613,7 @@ "fields": { "device": 8, "name": "xe-0/0/4", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5624,7 +5624,7 @@ "fields": { "device": 8, "name": "xe-0/0/5", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5635,7 +5635,7 @@ "fields": { "device": 7, "name": "xe-0/0/0", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5646,7 +5646,7 @@ "fields": { "device": 7, "name": "xe-0/0/1", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5657,7 +5657,7 @@ "fields": { "device": 7, "name": "xe-0/0/2", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5668,7 +5668,7 @@ "fields": { "device": 7, "name": "xe-0/0/3", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5679,7 +5679,7 @@ "fields": { "device": 7, "name": "xe-0/0/4", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5690,7 +5690,7 @@ "fields": { "device": 7, "name": "xe-0/0/5", - "form_factor": 1200, + "type": 1200, "mgmt_only": false, "description": "" } @@ -5701,7 +5701,7 @@ "fields": { "device": 9, "name": "eth0", - "form_factor": 1000, + "type": 1000, "mac_address": "44-55-66-77-88-99", "mgmt_only": true, "description": "" @@ -5713,7 +5713,7 @@ "fields": { "device": 11, "name": "Net", - "form_factor": 800, + "type": 800, "mgmt_only": true, "description": "" } @@ -5724,7 +5724,7 @@ "fields": { "device": 12, "name": "Net", - "form_factor": 800, + "type": 800, "mgmt_only": true, "description": "" } diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index ba639a646..0c74a4fc3 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1012,11 +1012,11 @@ class InterfaceTemplateForm(BootstrapMixin, forms.ModelForm): class Meta: model = InterfaceTemplate fields = [ - 'device_type', 'name', 'form_factor', 'mgmt_only', + 'device_type', 'name', 'type', 'mgmt_only', ] widgets = { 'device_type': forms.HiddenInput(), - 'form_factor': StaticSelect2(), + 'type': StaticSelect2(), } @@ -1024,8 +1024,8 @@ class InterfaceTemplateCreateForm(ComponentForm): name_pattern = ExpandableNameField( label='Name' ) - form_factor = forms.ChoiceField( - choices=IFACE_FF_CHOICES, + type = forms.ChoiceField( + choices=IFACE_TYPE_CHOICES, widget=StaticSelect2() ) mgmt_only = forms.BooleanField( @@ -1039,8 +1039,8 @@ class InterfaceTemplateBulkEditForm(BootstrapMixin, BulkEditForm): queryset=InterfaceTemplate.objects.all(), widget=forms.MultipleHiddenInput() ) - form_factor = forms.ChoiceField( - choices=add_blank_choice(IFACE_FF_CHOICES), + type = forms.ChoiceField( + choices=add_blank_choice(IFACE_TYPE_CHOICES), required=False, widget=StaticSelect2() ) @@ -1830,8 +1830,8 @@ class DeviceBulkAddComponentForm(BootstrapMixin, forms.Form): class DeviceBulkAddInterfaceForm(DeviceBulkAddComponentForm): - form_factor = forms.ChoiceField( - choices=IFACE_FF_CHOICES, + type = forms.ChoiceField( + choices=IFACE_TYPE_CHOICES, widget=StaticSelect2() ) enabled = forms.BooleanField( @@ -2070,12 +2070,12 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm): class Meta: model = Interface fields = [ - 'device', 'name', 'form_factor', 'enabled', 'lag', 'mac_address', 'mtu', 'mgmt_only', 'description', + 'device', 'name', 'type', 'enabled', 'lag', 'mac_address', 'mtu', 'mgmt_only', 'description', 'mode', 'untagged_vlan', 'tagged_vlans', 'tags', ] widgets = { 'device': forms.HiddenInput(), - 'form_factor': StaticSelect2(), + 'type': StaticSelect2(), 'lag': StaticSelect2(), 'mode': StaticSelect2(), } @@ -2093,12 +2093,12 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm): if self.is_bound: device = Device.objects.get(pk=self.data['device']) self.fields['lag'].queryset = Interface.objects.filter( - device__in=[device, device.get_vc_master()], form_factor=IFACE_FF_LAG + device__in=[device, device.get_vc_master()], type=IFACE_TYPE_LAG ) else: device = self.instance.device self.fields['lag'].queryset = Interface.objects.filter( - device__in=[self.instance.device, self.instance.device.get_vc_master()], form_factor=IFACE_FF_LAG + device__in=[self.instance.device, self.instance.device.get_vc_master()], type=IFACE_TYPE_LAG ) def clean(self): @@ -2210,8 +2210,8 @@ class InterfaceCreateForm(ComponentForm, forms.Form): name_pattern = ExpandableNameField( label='Name' ) - form_factor = forms.ChoiceField( - choices=IFACE_FF_CHOICES, + type = forms.ChoiceField( + choices=IFACE_TYPE_CHOICES, widget=StaticSelect2(), ) enabled = forms.BooleanField( @@ -2262,7 +2262,7 @@ class InterfaceCreateForm(ComponentForm, forms.Form): # Limit LAG choices to interfaces belonging to this device (or its VC master) if self.parent is not None: self.fields['lag'].queryset = Interface.objects.filter( - device__in=[self.parent, self.parent.get_vc_master()], form_factor=IFACE_FF_LAG + device__in=[self.parent, self.parent.get_vc_master()], type=IFACE_TYPE_LAG ) else: self.fields['lag'].queryset = Interface.objects.none() @@ -2273,8 +2273,8 @@ class InterfaceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): queryset=Interface.objects.all(), widget=forms.MultipleHiddenInput() ) - form_factor = forms.ChoiceField( - choices=add_blank_choice(IFACE_FF_CHOICES), + type = forms.ChoiceField( + choices=add_blank_choice(IFACE_TYPE_CHOICES), required=False, widget=StaticSelect2() ) @@ -2326,7 +2326,7 @@ class InterfaceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): if device is not None: self.fields['lag'].queryset = Interface.objects.filter( device__in=[device, device.get_vc_master()], - form_factor=IFACE_FF_LAG + type=IFACE_TYPE_LAG ) else: self.fields['lag'].choices = [] diff --git a/netbox/dcim/managers.py b/netbox/dcim/managers.py index 9e4e5fca2..8b1000529 100644 --- a/netbox/dcim/managers.py +++ b/netbox/dcim/managers.py @@ -37,7 +37,7 @@ class InterfaceQuerySet(QuerySet): Return only physical interfaces which are capable of being connected to other interfaces (i.e. not virtual or wireless). """ - return self.exclude(form_factor__in=NONCONNECTABLE_IFACE_TYPES) + return self.exclude(type__in=NONCONNECTABLE_IFACE_TYPES) class InterfaceManager(Manager): diff --git a/netbox/dcim/migrations/0073_interface_form_factor_to_type.py b/netbox/dcim/migrations/0073_interface_form_factor_to_type.py new file mode 100644 index 000000000..38016ea00 --- /dev/null +++ b/netbox/dcim/migrations/0073_interface_form_factor_to_type.py @@ -0,0 +1,23 @@ +# Generated by Django 2.1.7 on 2019-04-12 17:27 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0072_powerfeeds'), + ] + + operations = [ + migrations.RenameField( + model_name='interface', + old_name='form_factor', + new_name='type', + ), + migrations.RenameField( + model_name='interfacetemplate', + old_name='form_factor', + new_name='type', + ), + ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 020d30618..0fd060115 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1132,9 +1132,9 @@ class InterfaceTemplate(ComponentTemplateModel): name = models.CharField( max_length=64 ) - form_factor = models.PositiveSmallIntegerField( - choices=IFACE_FF_CHOICES, - default=IFACE_FF_10GE_SFP_PLUS + type = models.PositiveSmallIntegerField( + choices=IFACE_TYPE_CHOICES, + default=IFACE_TYPE_10GE_SFP_PLUS ) mgmt_only = models.BooleanField( default=False, @@ -1647,7 +1647,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): self.device_type.poweroutlet_templates.all()] ) Interface.objects.bulk_create( - [Interface(device=self, name=template.name, form_factor=template.form_factor, + [Interface(device=self, name=template.name, type=template.type, mgmt_only=template.mgmt_only) for template in self.device_type.interface_templates.all()] ) RearPort.objects.bulk_create([ @@ -2092,9 +2092,9 @@ class Interface(CableTermination, ComponentModel): blank=True, verbose_name='Parent LAG' ) - form_factor = models.PositiveSmallIntegerField( - choices=IFACE_FF_CHOICES, - default=IFACE_FF_10GE_SFP_PLUS + type = models.PositiveSmallIntegerField( + choices=IFACE_TYPE_CHOICES, + default=IFACE_TYPE_10GE_SFP_PLUS ) enabled = models.BooleanField( default=True @@ -2139,7 +2139,7 @@ class Interface(CableTermination, ComponentModel): tags = TaggableManager(through=TaggedItem) csv_headers = [ - 'device', 'virtual_machine', 'name', 'lag', 'form_factor', 'enabled', 'mac_address', 'mtu', 'mgmt_only', + 'device', 'virtual_machine', 'name', 'lag', 'type', 'enabled', 'mac_address', 'mtu', 'mgmt_only', 'description', 'mode', ] @@ -2159,7 +2159,7 @@ class Interface(CableTermination, ComponentModel): self.virtual_machine.name if self.virtual_machine else None, self.name, self.lag.name if self.lag else None, - self.get_form_factor_display(), + self.get_type_display(), self.enabled, self.mac_address, self.mtu, @@ -2177,18 +2177,18 @@ class Interface(CableTermination, ComponentModel): raise ValidationError("An interface must belong to either a device or a virtual machine.") # VM interfaces must be virtual - if self.virtual_machine and self.form_factor is not IFACE_FF_VIRTUAL: + if self.virtual_machine and self.type is not IFACE_TYPE_VIRTUAL: raise ValidationError({ - 'form_factor': "Virtual machines can only have virtual interfaces." + 'type': "Virtual machines can only have virtual interfaces." }) # Virtual interfaces cannot be connected - if self.form_factor in NONCONNECTABLE_IFACE_TYPES and ( + if self.type in NONCONNECTABLE_IFACE_TYPES and ( self.cable or getattr(self, 'circuit_termination', False) ): raise ValidationError({ - 'form_factor': "Virtual and wireless interfaces cannot be connected to another interface or circuit. " - "Disconnect the interface or choose a suitable form factor." + 'type': "Virtual and wireless interfaces cannot be connected to another interface or circuit. " + "Disconnect the interface or choose a suitable type." }) # An interface's LAG must belong to the same device (or VC master) @@ -2200,15 +2200,15 @@ class Interface(CableTermination, ComponentModel): }) # A virtual interface cannot have a parent LAG - if self.form_factor in NONCONNECTABLE_IFACE_TYPES and self.lag is not None: + if self.type in NONCONNECTABLE_IFACE_TYPES and self.lag is not None: raise ValidationError({ - 'lag': "{} interfaces cannot have a parent LAG interface.".format(self.get_form_factor_display()) + 'lag': "{} interfaces cannot have a parent LAG interface.".format(self.get_type_display()) }) # Only a LAG can have LAG members - if self.form_factor != IFACE_FF_LAG and self.member_interfaces.exists(): + if self.type != IFACE_TYPE_LAG and self.member_interfaces.exists(): raise ValidationError({ - 'form_factor': "Cannot change interface form factor; it has LAG members ({}).".format( + 'type': "Cannot change interface type; it has LAG members ({}).".format( ", ".join([iface.name for iface in self.member_interfaces.all()]) ) }) @@ -2284,19 +2284,19 @@ class Interface(CableTermination, ComponentModel): @property def is_connectable(self): - return self.form_factor not in NONCONNECTABLE_IFACE_TYPES + return self.type not in NONCONNECTABLE_IFACE_TYPES @property def is_virtual(self): - return self.form_factor in VIRTUAL_IFACE_TYPES + return self.type in VIRTUAL_IFACE_TYPES @property def is_wireless(self): - return self.form_factor in WIRELESS_IFACE_TYPES + return self.type in WIRELESS_IFACE_TYPES @property def is_lag(self): - return self.form_factor == IFACE_FF_LAG + return self.type == IFACE_TYPE_LAG @property def count_ipaddresses(self): @@ -2740,11 +2740,11 @@ class Cable(ChangeLoggedModel): if ( ( isinstance(endpoint_a, Interface) and - endpoint_a.form_factor == IFACE_FF_VIRTUAL + endpoint_a.type == IFACE_TYPE_VIRTUAL ) or ( isinstance(endpoint_b, Interface) and - endpoint_b.form_factor == IFACE_FF_VIRTUAL + endpoint_b.type == IFACE_TYPE_VIRTUAL ) ): raise ValidationError("Cannot connect to a virtual interface") diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 785166bb4..03f77fc4a 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -415,7 +415,7 @@ class InterfaceTemplateTable(BaseTable): class Meta(BaseTable.Meta): model = InterfaceTemplate - fields = ('pk', 'name', 'mgmt_only', 'form_factor') + fields = ('pk', 'name', 'mgmt_only', 'type') empty_text = "None" @@ -593,7 +593,7 @@ class InterfaceTable(BaseTable): class Meta(BaseTable.Meta): model = Interface - fields = ('name', 'form_factor', 'lag', 'enabled', 'mgmt_only', 'description') + fields = ('name', 'type', 'lag', 'enabled', 'mgmt_only', 'description') class FrontPortTable(BaseTable): diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index f572047b5..ea06c2ae6 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -2553,7 +2553,7 @@ class InterfaceTest(APITestCase): def test_update_interface(self): lag_interface = Interface.objects.create( - device=self.device, name='Test LAG Interface', form_factor=IFACE_FF_LAG + device=self.device, name='Test LAG Interface', type=IFACE_TYPE_LAG ) data = { @@ -2841,7 +2841,7 @@ class CableTest(APITestCase): ) for device in [self.device1, self.device2]: for i in range(0, 10): - Interface(device=device, form_factor=IFACE_FF_1GE_FIXED, name='eth{}'.format(i)).save() + Interface(device=device, type=IFACE_TYPE_1GE_FIXED, name='eth{}'.format(i)).save() self.cable1 = Cable( termination_a=self.device1.interfaces.get(name='eth0'), @@ -3410,23 +3410,23 @@ class VirtualChassisTest(APITestCase): device_type=device_type, device_role=device_role, name='StackSwitch9', site=site ) for i in range(0, 13): - Interface.objects.create(device=self.device1, name='1/{}'.format(i), form_factor=IFACE_FF_1GE_FIXED) + Interface.objects.create(device=self.device1, name='1/{}'.format(i), type=IFACE_TYPE_1GE_FIXED) for i in range(0, 13): - Interface.objects.create(device=self.device2, name='2/{}'.format(i), form_factor=IFACE_FF_1GE_FIXED) + Interface.objects.create(device=self.device2, name='2/{}'.format(i), type=IFACE_TYPE_1GE_FIXED) for i in range(0, 13): - Interface.objects.create(device=self.device3, name='3/{}'.format(i), form_factor=IFACE_FF_1GE_FIXED) + Interface.objects.create(device=self.device3, name='3/{}'.format(i), type=IFACE_TYPE_1GE_FIXED) for i in range(0, 13): - Interface.objects.create(device=self.device4, name='1/{}'.format(i), form_factor=IFACE_FF_1GE_FIXED) + Interface.objects.create(device=self.device4, name='1/{}'.format(i), type=IFACE_TYPE_1GE_FIXED) for i in range(0, 13): - Interface.objects.create(device=self.device5, name='2/{}'.format(i), form_factor=IFACE_FF_1GE_FIXED) + Interface.objects.create(device=self.device5, name='2/{}'.format(i), type=IFACE_TYPE_1GE_FIXED) for i in range(0, 13): - Interface.objects.create(device=self.device6, name='3/{}'.format(i), form_factor=IFACE_FF_1GE_FIXED) + Interface.objects.create(device=self.device6, name='3/{}'.format(i), type=IFACE_TYPE_1GE_FIXED) for i in range(0, 13): - Interface.objects.create(device=self.device7, name='1/{}'.format(i), form_factor=IFACE_FF_1GE_FIXED) + Interface.objects.create(device=self.device7, name='1/{}'.format(i), type=IFACE_TYPE_1GE_FIXED) for i in range(0, 13): - Interface.objects.create(device=self.device8, name='2/{}'.format(i), form_factor=IFACE_FF_1GE_FIXED) + Interface.objects.create(device=self.device8, name='2/{}'.format(i), type=IFACE_TYPE_1GE_FIXED) for i in range(0, 13): - Interface.objects.create(device=self.device9, name='3/{}'.format(i), form_factor=IFACE_FF_1GE_FIXED) + Interface.objects.create(device=self.device9, name='3/{}'.format(i), type=IFACE_TYPE_1GE_FIXED) # Create two VirtualChassis with three members each self.vc1 = VirtualChassis.objects.create(master=self.device1, domain='test-domain-1') diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py index 757af61f4..e0af86b20 100644 --- a/netbox/dcim/tests/test_models.py +++ b/netbox/dcim/tests/test_models.py @@ -249,7 +249,7 @@ class CableTestCase(TestCase): """ A cable connection cannot include a virtual interface """ - virtual_interface = Interface(device=self.device1, name="V1", form_factor=0) + virtual_interface = Interface(device=self.device1, name="V1", type=0) cable = Cable(termination_a=self.interface2, termination_b=virtual_interface) with self.assertRaises(ValidationError): cable.clean() diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py index 088806597..6e34b8ae9 100644 --- a/netbox/dcim/tests/test_views.py +++ b/netbox/dcim/tests/test_views.py @@ -3,7 +3,7 @@ import urllib.parse from django.test import Client, TestCase from django.urls import reverse -from dcim.constants import CABLE_TYPE_CAT6, IFACE_FF_1GE_FIXED +from dcim.constants import CABLE_TYPE_CAT6, IFACE_TYPE_1GE_FIXED from dcim.models import ( Cable, Device, DeviceRole, DeviceType, Interface, InventoryItem, Manufacturer, Platform, Rack, RackGroup, RackReservation, RackRole, Site, Region, VirtualChassis, @@ -370,17 +370,17 @@ class CableTestCase(TestCase): device2 = Device(name='Device 2', site=site, device_type=devicetype, device_role=devicerole) device2.save() - iface1 = Interface(device=device1, name='Interface 1', form_factor=IFACE_FF_1GE_FIXED) + iface1 = Interface(device=device1, name='Interface 1', type=IFACE_TYPE_1GE_FIXED) iface1.save() - iface2 = Interface(device=device1, name='Interface 2', form_factor=IFACE_FF_1GE_FIXED) + iface2 = Interface(device=device1, name='Interface 2', type=IFACE_TYPE_1GE_FIXED) iface2.save() - iface3 = Interface(device=device1, name='Interface 3', form_factor=IFACE_FF_1GE_FIXED) + iface3 = Interface(device=device1, name='Interface 3', type=IFACE_TYPE_1GE_FIXED) iface3.save() - iface4 = Interface(device=device2, name='Interface 1', form_factor=IFACE_FF_1GE_FIXED) + iface4 = Interface(device=device2, name='Interface 1', type=IFACE_TYPE_1GE_FIXED) iface4.save() - iface5 = Interface(device=device2, name='Interface 2', form_factor=IFACE_FF_1GE_FIXED) + iface5 = Interface(device=device2, name='Interface 2', type=IFACE_TYPE_1GE_FIXED) iface5.save() - iface6 = Interface(device=device2, name='Interface 3', form_factor=IFACE_FF_1GE_FIXED) + iface6 = Interface(device=device2, name='Interface 3', type=IFACE_TYPE_1GE_FIXED) iface6.save() Cable(termination_a=iface1, termination_b=iface4, type=CABLE_TYPE_CAT6).save() diff --git a/netbox/templates/dcim/device_lldp_neighbors.html b/netbox/templates/dcim/device_lldp_neighbors.html index d2bba9562..4764fffa2 100644 --- a/netbox/templates/dcim/device_lldp_neighbors.html +++ b/netbox/templates/dcim/device_lldp_neighbors.html @@ -27,7 +27,7 @@ {{ iface.connected_endpoint.device }} - {{ iface.connected_endpoint }} + {{ iface.connected_endpoint }} {% elif iface.connected_endpoint.circuit %} {% with circuit=iface.connected_endpoint.circuit %} diff --git a/netbox/templates/dcim/inc/cable_trace_end.html b/netbox/templates/dcim/inc/cable_trace_end.html index c4c41e4ba..4eab4d1d7 100644 --- a/netbox/templates/dcim/inc/cable_trace_end.html +++ b/netbox/templates/dcim/inc/cable_trace_end.html @@ -20,7 +20,7 @@ {% with model=end|model_name %} {{ model|bettertitle }} {{ end }}
      {% if model == 'interface' %} - {{ end.get_form_factor_display }} + {{ end.get_type_display }} {% elif model == 'front port' or model == 'rear port' %} {{ end.get_type_display }} {% endif %} diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 4aa4e377d..fec69c875 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -10,7 +10,7 @@ {# Icon and name #} - + {{ iface }} @@ -81,7 +81,7 @@ - + {{ iface.connected_endpoint }} diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index 8d12535c0..4e7cc6306 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -60,7 +60,7 @@ Type - {{ interface.get_form_factor_display }} + {{ interface.get_type_display }} Enabled @@ -125,7 +125,7 @@ Type - {{ connected_interface.get_form_factor_display }} + {{ connected_interface.get_type_display }} Enabled @@ -227,7 +227,7 @@ {{ member }} - {{ member.get_form_factor_display }} + {{ member.get_type_display }} {% empty %} diff --git a/netbox/templates/dcim/interface_edit.html b/netbox/templates/dcim/interface_edit.html index 6acdf39e3..fedb1b61a 100644 --- a/netbox/templates/dcim/interface_edit.html +++ b/netbox/templates/dcim/interface_edit.html @@ -6,7 +6,7 @@
      Interface
      {% render_field form.name %} - {% render_field form.form_factor %} + {% render_field form.type %} {% render_field form.enabled %} {% render_field form.lag %} {% render_field form.mac_address %} diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py index 86953cadc..23ab67741 100644 --- a/netbox/virtualization/api/serializers.py +++ b/netbox/virtualization/api/serializers.py @@ -3,7 +3,7 @@ from rest_framework import serializers from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField from dcim.api.nested_serializers import NestedDeviceRoleSerializer, NestedPlatformSerializer, NestedSiteSerializer -from dcim.constants import IFACE_FF_CHOICES, IFACE_FF_VIRTUAL, IFACE_MODE_CHOICES +from dcim.constants import IFACE_TYPE_CHOICES, IFACE_TYPE_VIRTUAL, IFACE_MODE_CHOICES from dcim.models import Interface from extras.api.customfields import CustomFieldModelSerializer from ipam.api.nested_serializers import NestedIPAddressSerializer, NestedVLANSerializer @@ -92,7 +92,7 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer): class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer): virtual_machine = NestedVirtualMachineSerializer() - form_factor = ChoiceField(choices=IFACE_FF_CHOICES, default=IFACE_FF_VIRTUAL, required=False) + type = ChoiceField(choices=IFACE_TYPE_CHOICES, default=IFACE_TYPE_VIRTUAL, required=False) mode = ChoiceField(choices=IFACE_MODE_CHOICES, required=False, allow_null=True) untagged_vlan = NestedVLANSerializer(required=False, allow_null=True) tagged_vlans = SerializedPKRelatedField( @@ -106,6 +106,6 @@ class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer): class Meta: model = Interface fields = [ - 'id', 'virtual_machine', 'name', 'form_factor', 'enabled', 'mtu', 'mac_address', 'description', 'mode', + 'id', 'virtual_machine', 'name', 'type', 'enabled', 'mtu', 'mac_address', 'description', 'mode', 'untagged_vlan', 'tagged_vlans', 'tags', ] diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py index 1e5f42160..710c41ffb 100644 --- a/netbox/virtualization/forms.py +++ b/netbox/virtualization/forms.py @@ -2,7 +2,7 @@ from django import forms from django.core.exceptions import ValidationError from taggit.forms import TagField -from dcim.constants import IFACE_FF_VIRTUAL, IFACE_MODE_ACCESS, IFACE_MODE_TAGGED_ALL +from dcim.constants import IFACE_TYPE_VIRTUAL, IFACE_MODE_ACCESS, IFACE_MODE_TAGGED_ALL from dcim.forms import INTERFACE_MODE_HELP_TEXT from dcim.models import Device, DeviceRole, Interface, Platform, Rack, Region, Site from extras.forms import AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldForm, CustomFieldFilterForm @@ -18,8 +18,8 @@ from utilities.forms import ( from .constants import VM_STATUS_CHOICES from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine -VIFACE_FF_CHOICES = ( - (IFACE_FF_VIRTUAL, 'Virtual'), +VIFACE_TYPE_CHOICES = ( + (IFACE_TYPE_VIRTUAL, 'Virtual'), ) @@ -625,12 +625,12 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm): class Meta: model = Interface fields = [ - 'virtual_machine', 'name', 'form_factor', 'enabled', 'mac_address', 'mtu', 'description', 'mode', 'tags', + 'virtual_machine', 'name', 'type', 'enabled', 'mac_address', 'mtu', 'description', 'mode', 'tags', 'untagged_vlan', 'tagged_vlans', ] widgets = { 'virtual_machine': forms.HiddenInput(), - 'form_factor': forms.HiddenInput(), + 'type': forms.HiddenInput(), 'mode': StaticSelect2() } labels = { @@ -661,9 +661,9 @@ class InterfaceCreateForm(ComponentForm): name_pattern = ExpandableNameField( label='Name' ) - form_factor = forms.ChoiceField( - choices=VIFACE_FF_CHOICES, - initial=IFACE_FF_VIRTUAL, + type = forms.ChoiceField( + choices=VIFACE_TYPE_CHOICES, + initial=IFACE_TYPE_VIRTUAL, widget=forms.HiddenInput() ) enabled = forms.BooleanField( @@ -737,9 +737,9 @@ class VirtualMachineBulkAddComponentForm(BootstrapMixin, forms.Form): class VirtualMachineBulkAddInterfaceForm(VirtualMachineBulkAddComponentForm): - form_factor = forms.ChoiceField( - choices=VIFACE_FF_CHOICES, - initial=IFACE_FF_VIRTUAL, + type = forms.ChoiceField( + choices=VIFACE_TYPE_CHOICES, + initial=IFACE_TYPE_VIRTUAL, widget=forms.HiddenInput() ) enabled = forms.BooleanField( diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py index eef304c2f..49ae849a2 100644 --- a/netbox/virtualization/tests/test_api.py +++ b/netbox/virtualization/tests/test_api.py @@ -2,7 +2,7 @@ from django.urls import reverse from netaddr import IPNetwork from rest_framework import status -from dcim.constants import IFACE_FF_VIRTUAL, IFACE_MODE_TAGGED +from dcim.constants import IFACE_TYPE_VIRTUAL, IFACE_MODE_TAGGED from dcim.models import Interface from ipam.models import IPAddress, VLAN from utilities.testing import APITestCase @@ -489,17 +489,17 @@ class InterfaceTest(APITestCase): self.interface1 = Interface.objects.create( virtual_machine=self.virtualmachine, name='Test Interface 1', - form_factor=IFACE_FF_VIRTUAL + type=IFACE_TYPE_VIRTUAL ) self.interface2 = Interface.objects.create( virtual_machine=self.virtualmachine, name='Test Interface 2', - form_factor=IFACE_FF_VIRTUAL + type=IFACE_TYPE_VIRTUAL ) self.interface3 = Interface.objects.create( virtual_machine=self.virtualmachine, name='Test Interface 3', - form_factor=IFACE_FF_VIRTUAL + type=IFACE_TYPE_VIRTUAL ) self.vlan1 = VLAN.objects.create(name="Test VLAN 1", vid=1) From 778d56ac1209b7ed953cd336cf91c356c45e9f22 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 12 Apr 2019 13:46:37 -0400 Subject: [PATCH 047/140] Update 'form_factor' in docs --- docs/core-functionality/devices.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/core-functionality/devices.md b/docs/core-functionality/devices.md index 176a70676..51486f7c1 100644 --- a/docs/core-functionality/devices.md +++ b/docs/core-functionality/devices.md @@ -81,7 +81,7 @@ Power ports connect only to power outlets. Power connections can be marked as ei Interfaces connect to one another in a symmetric manner: If interface A connects to interface B, interface B therefore connects to interface A. Each type of connection can be classified as either *planned* or *connected*. -Each interface is a assigned a form factor denoting its physical properties. Two special form factors exist: the "virtual" form factor can be used to designate logical interfaces (such as SVIs), and the "LAG" form factor can be used to desinate link aggregation groups to which physical interfaces can be assigned. +Each interface is a assigned a type denoting its physical properties. Two special types exist: the "virtual" type can be used to designate logical interfaces (such as SVIs), and the "LAG" type can be used to desinate link aggregation groups to which physical interfaces can be assigned. Each interface can also be enabled or disabled, and optionally designated as management-only (for out-of-band management). Fields are also provided to store an interface's MTU and MAC address. From 4acd84223718733fb65961658f979654c91d295b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 12 Apr 2019 13:57:33 -0400 Subject: [PATCH 048/140] Maintain backward-compatibile support for Interface.form_factor until v2.7 --- netbox/dcim/api/serializers.py | 12 ++++++++---- netbox/dcim/models.py | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index fe0ea9da8..ab1be0b01 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -232,10 +232,12 @@ class PowerOutletTemplateSerializer(ValidatedModelSerializer): class InterfaceTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() type = ChoiceField(choices=IFACE_TYPE_CHOICES, required=False) + # TODO: Remove in v2.7 (backward-compatibility for form_factor) + form_factor = ChoiceField(choices=IFACE_TYPE_CHOICES, required=False) class Meta: model = InterfaceTemplate - fields = ['id', 'device_type', 'name', 'type', 'mgmt_only'] + fields = ['id', 'device_type', 'name', 'type', 'form_factor', 'mgmt_only'] class RearPortTemplateSerializer(ValidatedModelSerializer): @@ -419,6 +421,8 @@ class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer): class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer): device = NestedDeviceSerializer() type = ChoiceField(choices=IFACE_TYPE_CHOICES, required=False) + # TODO: Remove in v2.7 (backward-compatibility for form_factor) + form_factor = ChoiceField(choices=IFACE_TYPE_CHOICES, required=False) lag = NestedInterfaceSerializer(required=False, allow_null=True) mode = ChoiceField(choices=IFACE_MODE_CHOICES, required=False, allow_null=True) untagged_vlan = NestedVLANSerializer(required=False, allow_null=True) @@ -434,9 +438,9 @@ class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer): class Meta: model = Interface fields = [ - 'id', 'device', 'name', 'type', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description', - 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', 'mode', 'untagged_vlan', - 'tagged_vlans', 'tags', 'count_ipaddresses', + 'id', 'device', 'name', 'type', 'form_factor', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', + 'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', 'mode', + 'untagged_vlan', 'tagged_vlans', 'tags', 'count_ipaddresses', ] # TODO: This validation should be handled by Interface.clean() diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 0fd060115..d1eb0d98d 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1150,6 +1150,22 @@ class InterfaceTemplate(ComponentTemplateModel): def __str__(self): return self.name + # TODO: Remove in v2.7 + @property + def form_factor(self): + """ + Backward-compatibility for form_factor + """ + return self.type + + # TODO: Remove in v2.7 + @form_factor.setter + def form_factor(self, value): + """ + Backward-compatibility for form_factor + """ + self.type = value + class FrontPortTemplate(ComponentTemplateModel): """ @@ -2254,6 +2270,22 @@ class Interface(CableTermination, ComponentModel): object_data=serialize_object(self) ).save() + # TODO: Remove in v2.7 + @property + def form_factor(self): + """ + Backward-compatibility for form_factor + """ + return self.type + + # TODO: Remove in v2.7 + @form_factor.setter + def form_factor(self, value): + """ + Backward-compatibility for form_factor + """ + self.type = value + @property def connected_endpoint(self): if self._connected_interface: From 533520ec1f30e11352aa4de8d0e3d37887984ae4 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 12 Apr 2019 14:09:03 -0400 Subject: [PATCH 049/140] Rename Interface type (classification) filter to kind --- CHANGELOG.md | 6 ++++++ netbox/dcim/filters.py | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19fd2535a..5cc743f4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,8 +56,14 @@ to now use "Extras | Tag." * [#2324](https://github.com/digitalocean/netbox/issues/2324) - Add `color` option for tags * [#2643](https://github.com/digitalocean/netbox/issues/2643) - Add `description` field to console/power components and device bays * [#2791](https://github.com/digitalocean/netbox/issues/2791) - Add a `comment` field for tags +* [#2920](https://github.com/digitalocean/netbox/issues/2920) - Rename Interface `form_factor` to `type` * [#2926](https://github.com/digitalocean/netbox/issues/2926) - Add changelog to the Tag model +## API Changes + +* dcim.Interface: `form_factor` has been renamed to `type`. Backward-compatibile support for `form_factor` will be maintained until NetBox v2.7. +* dcim.Interface: The `type` filter has been renamed to `kind`. + ## Bug Fixes * [#2968](https://github.com/digitalocean/netbox/issues/2968) - Correct API documentation for SerializerMethodFields diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index c1fc76191..eb7636c94 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -753,10 +753,9 @@ class InterfaceFilter(django_filters.FilterSet): lookup_expr='isnull', exclude=True ) - class_ = django_filters.CharFilter( - field_name='class', - method='filter_type', - label='Interface type', + kind = django_filters.CharFilter( + method='filter_kind', + label='Kind of interface', ) lag_id = django_filters.ModelMultipleChoiceFilter( field_name='lag', @@ -819,7 +818,7 @@ class InterfaceFilter(django_filters.FilterSet): Q(tagged_vlans__vid=value) ) - def filter_type(self, queryset, name, value): + def filter_kind(self, queryset, name, value): value = value.strip().lower() return { 'physical': queryset.exclude(type__in=NONCONNECTABLE_IFACE_TYPES), From a46b43bff6181856ff1a62c522d9e1ca1cfb6993 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 12 Apr 2019 17:07:56 -0400 Subject: [PATCH 050/140] Added child counts to API serializers (WIP) --- CHANGELOG.md | 2 + netbox/circuits/api/nested_serializers.py | 6 ++- netbox/circuits/api/serializers.py | 7 ++- netbox/circuits/api/views.py | 9 +++- netbox/circuits/tests/test_api.py | 4 +- netbox/dcim/api/nested_serializers.py | 32 ++++++++---- netbox/dcim/api/serializers.py | 37 +++++++++----- netbox/dcim/api/views.py | 50 +++++++++++++++---- netbox/dcim/tests/test_api.py | 20 ++++---- netbox/ipam/api/nested_serializers.py | 13 +++-- netbox/ipam/api/serializers.py | 13 +++-- netbox/ipam/api/views.py | 24 +++++++-- netbox/ipam/tests/test_api.py | 8 +-- netbox/netbox/api.py | 10 ++-- netbox/secrets/api/nested_serializers.py | 3 +- netbox/secrets/api/serializers.py | 3 +- netbox/secrets/api/views.py | 5 +- netbox/secrets/tests/test_api.py | 2 +- netbox/tenancy/api/nested_serializers.py | 3 +- netbox/tenancy/api/serializers.py | 4 +- netbox/tenancy/api/views.py | 6 ++- netbox/tenancy/tests/test_api.py | 2 +- .../virtualization/api/nested_serializers.py | 9 ++-- netbox/virtualization/api/serializers.py | 8 ++- netbox/virtualization/api/views.py | 14 ++++-- netbox/virtualization/tests/test_api.py | 6 +-- 26 files changed, 206 insertions(+), 94 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cc743f4c..bd9aa35cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,8 @@ to now use "Extras | Tag." * dcim.Interface: `form_factor` has been renamed to `type`. Backward-compatibile support for `form_factor` will be maintained until NetBox v2.7. * dcim.Interface: The `type` filter has been renamed to `kind`. +* dcim.DeviceType: `instance_count` has been renamed to `device_count`. + ## Bug Fixes diff --git a/netbox/circuits/api/nested_serializers.py b/netbox/circuits/api/nested_serializers.py index 211dc4007..067b82282 100644 --- a/netbox/circuits/api/nested_serializers.py +++ b/netbox/circuits/api/nested_serializers.py @@ -17,10 +17,11 @@ __all__ = [ class NestedProviderSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='circuits-api:provider-detail') + circuit_count = serializers.IntegerField(read_only=True) class Meta: model = Provider - fields = ['id', 'url', 'name', 'slug'] + fields = ['id', 'url', 'name', 'slug', 'circuit_count'] # @@ -29,10 +30,11 @@ class NestedProviderSerializer(WritableNestedSerializer): class NestedCircuitTypeSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittype-detail') + circuit_count = serializers.IntegerField(read_only=True) class Meta: model = CircuitType - fields = ['id', 'url', 'name', 'slug'] + fields = ['id', 'url', 'name', 'slug', 'circuit_count'] class NestedCircuitSerializer(WritableNestedSerializer): diff --git a/netbox/circuits/api/serializers.py b/netbox/circuits/api/serializers.py index e94875c21..39a0b6b26 100644 --- a/netbox/circuits/api/serializers.py +++ b/netbox/circuits/api/serializers.py @@ -1,3 +1,4 @@ +from rest_framework import serializers from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField from circuits.constants import CIRCUIT_STATUS_CHOICES @@ -16,12 +17,13 @@ from .nested_serializers import * class ProviderSerializer(TaggitSerializer, CustomFieldModelSerializer): tags = TagListSerializerField(required=False) + circuit_count = serializers.IntegerField(read_only=True) class Meta: model = Provider fields = [ 'id', 'name', 'slug', 'asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', 'comments', 'tags', - 'custom_fields', 'created', 'last_updated', + 'custom_fields', 'created', 'last_updated', 'circuit_count', ] @@ -30,10 +32,11 @@ class ProviderSerializer(TaggitSerializer, CustomFieldModelSerializer): # class CircuitTypeSerializer(ValidatedModelSerializer): + circuit_count = serializers.IntegerField(read_only=True) class Meta: model = CircuitType - fields = ['id', 'name', 'slug'] + fields = ['id', 'name', 'slug', 'circuit_count'] class CircuitSerializer(TaggitSerializer, CustomFieldModelSerializer): diff --git a/netbox/circuits/api/views.py b/netbox/circuits/api/views.py index 877d85f85..ad48174e6 100644 --- a/netbox/circuits/api/views.py +++ b/netbox/circuits/api/views.py @@ -1,3 +1,4 @@ +from django.db.models import Count from django.shortcuts import get_object_or_404 from rest_framework.decorators import action from rest_framework.response import Response @@ -27,7 +28,9 @@ class CircuitsFieldChoicesViewSet(FieldChoicesViewSet): # class ProviderViewSet(CustomFieldModelViewSet): - queryset = Provider.objects.prefetch_related('tags') + queryset = Provider.objects.prefetch_related('tags').annotate( + circuit_count=Count('circuits') + ) serializer_class = serializers.ProviderSerializer filterset_class = filters.ProviderFilter @@ -47,7 +50,9 @@ class ProviderViewSet(CustomFieldModelViewSet): # class CircuitTypeViewSet(ModelViewSet): - queryset = CircuitType.objects.all() + queryset = CircuitType.objects.annotate( + circuit_count=Count('circuits') + ) serializer_class = serializers.CircuitTypeSerializer filterset_class = filters.CircuitTypeFilter diff --git a/netbox/circuits/tests/test_api.py b/netbox/circuits/tests/test_api.py index 0810f0ff9..e53c2c402 100644 --- a/netbox/circuits/tests/test_api.py +++ b/netbox/circuits/tests/test_api.py @@ -61,7 +61,7 @@ class ProviderTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'slug', 'url'] + ['circuit_count', 'id', 'name', 'slug', 'url'] ) def test_create_provider(self): @@ -162,7 +162,7 @@ class CircuitTypeTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'slug', 'url'] + ['circuit_count', 'id', 'name', 'slug', 'url'] ) def test_create_circuittype(self): diff --git a/netbox/dcim/api/nested_serializers.py b/netbox/dcim/api/nested_serializers.py index 16d77bd69..cf22916ad 100644 --- a/netbox/dcim/api/nested_serializers.py +++ b/netbox/dcim/api/nested_serializers.py @@ -42,10 +42,11 @@ __all__ = [ class NestedRegionSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:region-detail') + site_count = serializers.IntegerField(read_only=True) class Meta: model = Region - fields = ['id', 'url', 'name', 'slug'] + fields = ['id', 'url', 'name', 'slug', 'site_count'] class NestedSiteSerializer(WritableNestedSerializer): @@ -62,26 +63,29 @@ class NestedSiteSerializer(WritableNestedSerializer): class NestedRackGroupSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackgroup-detail') + rack_count = serializers.IntegerField(read_only=True) class Meta: model = RackGroup - fields = ['id', 'url', 'name', 'slug'] + fields = ['id', 'url', 'name', 'slug', 'rack_count'] class NestedRackRoleSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackrole-detail') + rack_count = serializers.IntegerField(read_only=True) class Meta: model = RackRole - fields = ['id', 'url', 'name', 'slug'] + fields = ['id', 'url', 'name', 'slug', 'rack_count'] class NestedRackSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rack-detail') + device_count = serializers.IntegerField(read_only=True) class Meta: model = Rack - fields = ['id', 'url', 'name', 'display_name'] + fields = ['id', 'url', 'name', 'display_name', 'device_count'] # @@ -90,19 +94,21 @@ class NestedRackSerializer(WritableNestedSerializer): class NestedManufacturerSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:manufacturer-detail') + devicetype_count = serializers.IntegerField(read_only=True) class Meta: model = Manufacturer - fields = ['id', 'url', 'name', 'slug'] + fields = ['id', 'url', 'name', 'slug', 'devicetype_count'] class NestedDeviceTypeSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicetype-detail') manufacturer = NestedManufacturerSerializer(read_only=True) + device_count = serializers.IntegerField(read_only=True) class Meta: model = DeviceType - fields = ['id', 'url', 'manufacturer', 'model', 'slug', 'display_name'] + fields = ['id', 'url', 'manufacturer', 'model', 'slug', 'display_name', 'device_count'] class NestedRearPortTemplateSerializer(WritableNestedSerializer): @@ -127,18 +133,22 @@ class NestedFrontPortTemplateSerializer(WritableNestedSerializer): class NestedDeviceRoleSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicerole-detail') + device_count = serializers.IntegerField(read_only=True) + virtualmachine_count = serializers.IntegerField(read_only=True) class Meta: model = DeviceRole - fields = ['id', 'url', 'name', 'slug'] + fields = ['id', 'url', 'name', 'slug', 'device_count', 'virtualmachine_count'] class NestedPlatformSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:platform-detail') + device_count = serializers.IntegerField(read_only=True) + virtualmachine_count = serializers.IntegerField(read_only=True) class Meta: model = Platform - fields = ['id', 'url', 'name', 'slug'] + fields = ['id', 'url', 'name', 'slug', 'device_count', 'virtualmachine_count'] class NestedDeviceSerializer(WritableNestedSerializer): @@ -245,10 +255,11 @@ class NestedCableSerializer(serializers.ModelSerializer): class NestedVirtualChassisSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:virtualchassis-detail') master = NestedDeviceSerializer() + member_count = serializers.IntegerField(read_only=True) class Meta: model = VirtualChassis - fields = ['id', 'url', 'master'] + fields = ['id', 'url', 'master', 'member_count'] # @@ -257,10 +268,11 @@ class NestedVirtualChassisSerializer(WritableNestedSerializer): class NestedPowerPanelSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerpanel-detail') + powerfeed_count = serializers.IntegerField(read_only=True) class Meta: model = PowerPanel - fields = ['id', 'url', 'name'] + fields = ['id', 'url', 'name', 'powerfeed_count'] class NestedPowerFeedSerializer(WritableNestedSerializer): diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index ab1be0b01..46d46b0a1 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -59,10 +59,11 @@ class ConnectedEndpointSerializer(ValidatedModelSerializer): class RegionSerializer(serializers.ModelSerializer): parent = NestedRegionSerializer(required=False, allow_null=True) + site_count = serializers.IntegerField(read_only=True) class Meta: model = Region - fields = ['id', 'name', 'slug', 'parent'] + fields = ['id', 'name', 'slug', 'parent', 'site_count'] class SiteSerializer(TaggitSerializer, CustomFieldModelSerializer): @@ -93,17 +94,19 @@ class SiteSerializer(TaggitSerializer, CustomFieldModelSerializer): class RackGroupSerializer(ValidatedModelSerializer): site = NestedSiteSerializer() + rack_count = serializers.IntegerField(read_only=True) class Meta: model = RackGroup - fields = ['id', 'name', 'slug', 'site'] + fields = ['id', 'name', 'slug', 'site', 'rack_count'] class RackRoleSerializer(ValidatedModelSerializer): + rack_count = serializers.IntegerField(read_only=True) class Meta: model = RackRole - fields = ['id', 'name', 'slug', 'color'] + fields = ['id', 'name', 'slug', 'color', 'rack_count'] class RackSerializer(TaggitSerializer, CustomFieldModelSerializer): @@ -116,13 +119,14 @@ class RackSerializer(TaggitSerializer, CustomFieldModelSerializer): width = ChoiceField(choices=RACK_WIDTH_CHOICES, required=False) outer_unit = ChoiceField(choices=RACK_DIMENSION_UNIT_CHOICES, required=False) tags = TagListSerializerField(required=False) + device_count = serializers.IntegerField(read_only=True) class Meta: model = Rack fields = [ 'id', 'name', 'facility_id', 'display_name', 'site', 'group', 'tenant', 'status', 'role', 'serial', 'asset_tag', 'type', 'width', 'u_height', 'desc_units', 'outer_width', 'outer_depth', 'outer_unit', - 'comments', 'tags', 'custom_fields', 'created', 'last_updated', + 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'device_count', ] # Omit the UniqueTogetherValidator that would be automatically added to validate (group, facility_id). This # prevents facility_id from being interpreted as a required field. @@ -169,23 +173,24 @@ class RackReservationSerializer(ValidatedModelSerializer): # class ManufacturerSerializer(ValidatedModelSerializer): + devicetype_count = serializers.IntegerField(read_only=True) class Meta: model = Manufacturer - fields = ['id', 'name', 'slug'] + fields = ['id', 'name', 'slug', 'devicetype_count'] class DeviceTypeSerializer(TaggitSerializer, CustomFieldModelSerializer): manufacturer = NestedManufacturerSerializer() subdevice_role = ChoiceField(choices=SUBDEVICE_ROLE_CHOICES, required=False, allow_null=True) - instance_count = serializers.IntegerField(source='instances.count', read_only=True) tags = TagListSerializerField(required=False) + device_count = serializers.IntegerField(read_only=True) class Meta: model = DeviceType fields = [ 'id', 'manufacturer', 'model', 'slug', 'display_name', 'part_number', 'u_height', 'is_full_depth', - 'subdevice_role', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'instance_count', + 'subdevice_role', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'device_count', ] @@ -272,18 +277,25 @@ class DeviceBayTemplateSerializer(ValidatedModelSerializer): # class DeviceRoleSerializer(ValidatedModelSerializer): + device_count = serializers.IntegerField(read_only=True) + virtualmachine_count = serializers.IntegerField(read_only=True) class Meta: model = DeviceRole - fields = ['id', 'name', 'slug', 'color', 'vm_role'] + fields = ['id', 'name', 'slug', 'color', 'vm_role', 'device_count', 'virtualmachine_count'] class PlatformSerializer(ValidatedModelSerializer): manufacturer = NestedManufacturerSerializer(required=False, allow_null=True) + device_count = serializers.IntegerField(read_only=True) + virtualmachine_count = serializers.IntegerField(read_only=True) class Meta: model = Platform - fields = ['id', 'name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_args'] + fields = [ + 'id', 'name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_args', 'device_count', + 'virtualmachine_count', + ] class DeviceSerializer(TaggitSerializer, CustomFieldModelSerializer): @@ -613,17 +625,17 @@ class InterfaceConnectionSerializer(ValidatedModelSerializer): class VirtualChassisSerializer(TaggitSerializer, ValidatedModelSerializer): master = NestedDeviceSerializer() tags = TagListSerializerField(required=False) + member_count = serializers.IntegerField(read_only=True) class Meta: model = VirtualChassis - fields = ['id', 'master', 'domain', 'tags'] + fields = ['id', 'master', 'domain', 'tags', 'member_count'] # # Power panels # - class PowerPanelSerializer(ValidatedModelSerializer): site = NestedSiteSerializer() rack_group = NestedRackGroupSerializer( @@ -631,10 +643,11 @@ class PowerPanelSerializer(ValidatedModelSerializer): allow_null=True, default=None ) + powerfeed_count = serializers.IntegerField(read_only=True) class Meta: model = PowerPanel - fields = ['id', 'site', 'rack_group', 'name'] + fields = ['id', 'site', 'rack_group', 'name', 'powerfeed_count'] class PowerFeedSerializer(TaggitSerializer, CustomFieldModelSerializer): diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index f37c4d452..dc7e1f34d 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -1,7 +1,7 @@ from collections import OrderedDict from django.conf import settings -from django.db.models import F +from django.db.models import Count, F from django.http import HttpResponseForbidden from django.shortcuts import get_object_or_404 from drf_yasg import openapi @@ -93,7 +93,9 @@ class CableTraceMixin(object): # class RegionViewSet(ModelViewSet): - queryset = Region.objects.all() + queryset = Region.objects.annotate( + site_count=Count('sites') + ) serializer_class = serializers.RegionSerializer filterset_class = filters.RegionFilter @@ -123,7 +125,9 @@ class SiteViewSet(CustomFieldModelViewSet): # class RackGroupViewSet(ModelViewSet): - queryset = RackGroup.objects.select_related('site') + queryset = RackGroup.objects.select_related('site').annotate( + rack_count=Count('racks') + ) serializer_class = serializers.RackGroupSerializer filterset_class = filters.RackGroupFilter @@ -133,7 +137,9 @@ class RackGroupViewSet(ModelViewSet): # class RackRoleViewSet(ModelViewSet): - queryset = RackRole.objects.all() + queryset = RackRole.objects.annotate( + rack_count=Count('racks') + ) serializer_class = serializers.RackRoleSerializer filterset_class = filters.RackRoleFilter @@ -143,7 +149,13 @@ class RackRoleViewSet(ModelViewSet): # class RackViewSet(CustomFieldModelViewSet): - queryset = Rack.objects.select_related('site', 'group__site', 'tenant').prefetch_related('tags') + queryset = Rack.objects.select_related( + 'site', 'group__site', 'tenant' + ).prefetch_related( + 'tags' + ).annotate( + device_count=Count('devices') + ) serializer_class = serializers.RackSerializer filterset_class = filters.RackFilter @@ -192,7 +204,9 @@ class RackReservationViewSet(ModelViewSet): # class ManufacturerViewSet(ModelViewSet): - queryset = Manufacturer.objects.all() + queryset = Manufacturer.objects.annotate( + devicetype_count=Count('device_types') + ) serializer_class = serializers.ManufacturerSerializer filterset_class = filters.ManufacturerFilter @@ -202,7 +216,9 @@ class ManufacturerViewSet(ModelViewSet): # class DeviceTypeViewSet(CustomFieldModelViewSet): - queryset = DeviceType.objects.select_related('manufacturer').prefetch_related('tags') + queryset = DeviceType.objects.select_related('manufacturer').prefetch_related('tags').annotate( + device_count=Count('instances') + ) serializer_class = serializers.DeviceTypeSerializer filterset_class = filters.DeviceTypeFilter @@ -264,7 +280,10 @@ class DeviceBayTemplateViewSet(ModelViewSet): # class DeviceRoleViewSet(ModelViewSet): - queryset = DeviceRole.objects.all() + queryset = DeviceRole.objects.annotate( + device_count=Count('devices', distinct=True), + virtualmachine_count=Count('virtual_machines', distinct=True) + ) serializer_class = serializers.DeviceRoleSerializer filterset_class = filters.DeviceRoleFilter @@ -274,7 +293,10 @@ class DeviceRoleViewSet(ModelViewSet): # class PlatformViewSet(ModelViewSet): - queryset = Platform.objects.all() + queryset = Platform.objects.annotate( + device_count=Count('devices', distinct=True), + virtualmachine_count=Count('virtual_machines', distinct=True) + ) serializer_class = serializers.PlatformSerializer filterset_class = filters.PlatformFilter @@ -535,7 +557,9 @@ class CableViewSet(ModelViewSet): # class VirtualChassisViewSet(ModelViewSet): - queryset = VirtualChassis.objects.prefetch_related('tags') + queryset = VirtualChassis.objects.prefetch_related('tags').annotate( + member_count=Count('members') + ) serializer_class = serializers.VirtualChassisSerializer @@ -544,7 +568,11 @@ class VirtualChassisViewSet(ModelViewSet): # class PowerPanelViewSet(ModelViewSet): - queryset = PowerPanel.objects.select_related('site', 'rack_group') + queryset = PowerPanel.objects.select_related( + 'site', 'rack_group' + ).annotate( + powerfeed_count=Count('powerfeeds') + ) serializer_class = serializers.PowerPanelSerializer filterset_class = filters.PowerPanelFilter diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index ea06c2ae6..9c873c886 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -47,7 +47,7 @@ class RegionTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'slug', 'url'] + ['id', 'name', 'site_count', 'slug', 'url'] ) def test_create_region(self): @@ -285,7 +285,7 @@ class RackGroupTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'slug', 'url'] + ['id', 'name', 'rack_count', 'slug', 'url'] ) def test_create_rackgroup(self): @@ -393,7 +393,7 @@ class RackRoleTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'slug', 'url'] + ['id', 'name', 'rack_count', 'slug', 'url'] ) def test_create_rackrole(self): @@ -520,7 +520,7 @@ class RackTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['display_name', 'id', 'name', 'url'] + ['device_count', 'display_name', 'id', 'name', 'url'] ) def test_create_rack(self): @@ -746,7 +746,7 @@ class ManufacturerTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'slug', 'url'] + ['devicetype_count', 'id', 'name', 'slug', 'url'] ) def test_create_manufacturer(self): @@ -855,7 +855,7 @@ class DeviceTypeTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['display_name', 'id', 'manufacturer', 'model', 'slug', 'url'] + ['device_count', 'display_name', 'id', 'manufacturer', 'model', 'slug', 'url'] ) def test_create_devicetype(self): @@ -1569,7 +1569,7 @@ class DeviceRoleTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'slug', 'url'] + ['device_count', 'id', 'name', 'slug', 'url', 'virtualmachine_count'] ) def test_create_devicerole(self): @@ -1677,7 +1677,7 @@ class PlatformTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'slug', 'url'] + ['device_count', 'id', 'name', 'slug', 'url', 'virtualmachine_count'] ) def test_create_platform(self): @@ -3457,7 +3457,7 @@ class VirtualChassisTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'master', 'url'] + ['id', 'master', 'member_count', 'url'] ) def test_create_virtualchassis(self): @@ -3575,7 +3575,7 @@ class PowerPanelTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'url'] + ['id', 'name', 'powerfeed_count', 'url'] ) def test_create_powerpanel(self): diff --git a/netbox/ipam/api/nested_serializers.py b/netbox/ipam/api/nested_serializers.py index 2ffaa0ae2..aa7c95f1c 100644 --- a/netbox/ipam/api/nested_serializers.py +++ b/netbox/ipam/api/nested_serializers.py @@ -21,10 +21,11 @@ __all__ = [ class NestedVRFSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vrf-detail') + prefix_count = serializers.IntegerField(read_only=True) class Meta: model = VRF - fields = ['id', 'url', 'name', 'rd'] + fields = ['id', 'url', 'name', 'rd', 'prefix_count'] # @@ -33,10 +34,11 @@ class NestedVRFSerializer(WritableNestedSerializer): class NestedRIRSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:rir-detail') + aggregate_count = serializers.IntegerField(read_only=True) class Meta: model = RIR - fields = ['id', 'url', 'name', 'slug'] + fields = ['id', 'url', 'name', 'slug', 'aggregate_count'] class NestedAggregateSerializer(WritableNestedSerializer): @@ -53,18 +55,21 @@ class NestedAggregateSerializer(WritableNestedSerializer): class NestedRoleSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:role-detail') + prefix_count = serializers.IntegerField(read_only=True) + vlan_count = serializers.IntegerField(read_only=True) class Meta: model = Role - fields = ['id', 'url', 'name', 'slug'] + fields = ['id', 'url', 'name', 'slug', 'prefix_count', 'vlan_count'] class NestedVLANGroupSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlangroup-detail') + vlan_count = serializers.IntegerField(read_only=True) class Meta: model = VLANGroup - fields = ['id', 'url', 'name', 'slug'] + fields = ['id', 'url', 'name', 'slug', 'vlan_count'] class NestedVLANSerializer(WritableNestedSerializer): diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py index 9b2c45371..8587c086b 100644 --- a/netbox/ipam/api/serializers.py +++ b/netbox/ipam/api/serializers.py @@ -25,12 +25,13 @@ from .nested_serializers import * class VRFSerializer(TaggitSerializer, CustomFieldModelSerializer): tenant = NestedTenantSerializer(required=False, allow_null=True) tags = TagListSerializerField(required=False) + prefix_count = serializers.IntegerField(read_only=True) class Meta: model = VRF fields = [ 'id', 'name', 'rd', 'tenant', 'enforce_unique', 'description', 'tags', 'display_name', 'custom_fields', - 'created', 'last_updated', + 'created', 'last_updated', 'prefix_count', ] @@ -39,10 +40,11 @@ class VRFSerializer(TaggitSerializer, CustomFieldModelSerializer): # class RIRSerializer(ValidatedModelSerializer): + aggregate_count = serializers.IntegerField(read_only=True) class Meta: model = RIR - fields = ['id', 'name', 'slug', 'is_private'] + fields = ['id', 'name', 'slug', 'is_private', 'aggregate_count'] class AggregateSerializer(TaggitSerializer, CustomFieldModelSerializer): @@ -63,18 +65,21 @@ class AggregateSerializer(TaggitSerializer, CustomFieldModelSerializer): # class RoleSerializer(ValidatedModelSerializer): + prefix_count = serializers.IntegerField(read_only=True) + vlan_count = serializers.IntegerField(read_only=True) class Meta: model = Role - fields = ['id', 'name', 'slug', 'weight'] + fields = ['id', 'name', 'slug', 'weight', 'prefix_count', 'vlan_count'] class VLANGroupSerializer(ValidatedModelSerializer): site = NestedSiteSerializer(required=False, allow_null=True) + vlan_count = serializers.IntegerField(read_only=True) class Meta: model = VLANGroup - fields = ['id', 'name', 'slug', 'site'] + fields = ['id', 'name', 'slug', 'site', 'vlan_count'] validators = [] def validate(self, data): diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py index e846f0489..a1578eb97 100644 --- a/netbox/ipam/api/views.py +++ b/netbox/ipam/api/views.py @@ -1,4 +1,5 @@ from django.conf import settings +from django.db.models import Count, OuterRef, Subquery from django.shortcuts import get_object_or_404 from rest_framework import status from rest_framework.decorators import action @@ -31,7 +32,9 @@ class IPAMFieldChoicesViewSet(FieldChoicesViewSet): # class VRFViewSet(CustomFieldModelViewSet): - queryset = VRF.objects.select_related('tenant').prefetch_related('tags') + queryset = VRF.objects.select_related('tenant').prefetch_related('tags').annotate( + prefix_count=Count('prefixes') + ) serializer_class = serializers.VRFSerializer filterset_class = filters.VRFFilter @@ -41,7 +44,9 @@ class VRFViewSet(CustomFieldModelViewSet): # class RIRViewSet(ModelViewSet): - queryset = RIR.objects.all() + queryset = RIR.objects.annotate( + aggregate_count=Count('aggregates') + ) serializer_class = serializers.RIRSerializer filterset_class = filters.RIRFilter @@ -61,7 +66,10 @@ class AggregateViewSet(CustomFieldModelViewSet): # class RoleViewSet(ModelViewSet): - queryset = Role.objects.all() + queryset = Role.objects.annotate( + prefix_count=Count('prefixes', distinct=True), + vlan_count=Count('vlans', distinct=True) + ) serializer_class = serializers.RoleSerializer filterset_class = filters.RoleFilter @@ -71,7 +79,11 @@ class RoleViewSet(ModelViewSet): # class PrefixViewSet(CustomFieldModelViewSet): - queryset = Prefix.objects.select_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role').prefetch_related('tags') + queryset = Prefix.objects.select_related( + 'site', 'vrf__tenant', 'tenant', 'vlan', 'role' + ).prefetch_related( + 'tags' + ) serializer_class = serializers.PrefixSerializer filterset_class = filters.PrefixFilter @@ -263,7 +275,9 @@ class IPAddressViewSet(CustomFieldModelViewSet): # class VLANGroupViewSet(ModelViewSet): - queryset = VLANGroup.objects.select_related('site') + queryset = VLANGroup.objects.select_related('site').annotate( + vlan_count=Count('vlans') + ) serializer_class = serializers.VLANGroupSerializer filterset_class = filters.VLANGroupFilter diff --git a/netbox/ipam/tests/test_api.py b/netbox/ipam/tests/test_api.py index 3f4555b55..391ba7310 100644 --- a/netbox/ipam/tests/test_api.py +++ b/netbox/ipam/tests/test_api.py @@ -39,7 +39,7 @@ class VRFTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'rd', 'url'] + ['id', 'name', 'prefix_count', 'rd', 'url'] ) def test_create_vrf(self): @@ -147,7 +147,7 @@ class RIRTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'slug', 'url'] + ['aggregate_count', 'id', 'name', 'slug', 'url'] ) def test_create_rir(self): @@ -351,7 +351,7 @@ class RoleTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'slug', 'url'] + ['id', 'name', 'prefix_count', 'slug', 'url', 'vlan_count'] ) def test_create_role(self): @@ -790,7 +790,7 @@ class VLANGroupTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'slug', 'url'] + ['id', 'name', 'slug', 'url', 'vlan_count'] ) def test_create_vlangroup(self): diff --git a/netbox/netbox/api.py b/netbox/netbox/api.py index 5e4a7a028..50d66c543 100644 --- a/netbox/netbox/api.py +++ b/netbox/netbox/api.py @@ -1,4 +1,5 @@ from django.conf import settings +from django.db.models import QuerySet from rest_framework import authentication, exceptions from rest_framework.pagination import LimitOffsetPagination from rest_framework.permissions import DjangoModelPermissions, SAFE_METHODS @@ -96,13 +97,8 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination): def paginate_queryset(self, queryset, request, view=None): - if hasattr(queryset, 'all'): - # TODO: This breaks filtering by annotated values - # Make a clone of the queryset with any annotations stripped (performance hack) - qs = queryset.all() - qs.query.annotations.clear() - self.count = qs.count() - + if type(queryset) is QuerySet: + self.count = queryset.count() else: # We're dealing with an iterable, not a QuerySet self.count = len(queryset) diff --git a/netbox/secrets/api/nested_serializers.py b/netbox/secrets/api/nested_serializers.py index 819546c63..7aa8087da 100644 --- a/netbox/secrets/api/nested_serializers.py +++ b/netbox/secrets/api/nested_serializers.py @@ -10,7 +10,8 @@ __all__ = [ class NestedSecretRoleSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='secrets-api:secretrole-detail') + secret_count = serializers.IntegerField(read_only=True) class Meta: model = SecretRole - fields = ['id', 'url', 'name', 'slug'] + fields = ['id', 'url', 'name', 'slug', 'secret_count'] diff --git a/netbox/secrets/api/serializers.py b/netbox/secrets/api/serializers.py index 1faf85dcf..7a0447a39 100644 --- a/netbox/secrets/api/serializers.py +++ b/netbox/secrets/api/serializers.py @@ -14,10 +14,11 @@ from .nested_serializers import * # class SecretRoleSerializer(ValidatedModelSerializer): + secret_count = serializers.IntegerField(read_only=True) class Meta: model = SecretRole - fields = ['id', 'name', 'slug'] + fields = ['id', 'name', 'slug', 'secret_count'] class SecretSerializer(TaggitSerializer, CustomFieldModelSerializer): diff --git a/netbox/secrets/api/views.py b/netbox/secrets/api/views.py index 0c164de07..88537b649 100644 --- a/netbox/secrets/api/views.py +++ b/netbox/secrets/api/views.py @@ -1,6 +1,7 @@ import base64 from Crypto.PublicKey import RSA +from django.db.models import Count from django.http import HttpResponseBadRequest from rest_framework.exceptions import ValidationError from rest_framework.permissions import IsAuthenticated @@ -32,7 +33,9 @@ class SecretsFieldChoicesViewSet(FieldChoicesViewSet): # class SecretRoleViewSet(ModelViewSet): - queryset = SecretRole.objects.all() + queryset = SecretRole.objects.annotate( + secret_count=Count('secrets') + ) serializer_class = serializers.SecretRoleSerializer permission_classes = [IsAuthenticated] filterset_class = filters.SecretRoleFilter diff --git a/netbox/secrets/tests/test_api.py b/netbox/secrets/tests/test_api.py index c260f1a48..ce0295d83 100644 --- a/netbox/secrets/tests/test_api.py +++ b/netbox/secrets/tests/test_api.py @@ -78,7 +78,7 @@ class SecretRoleTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'slug', 'url'] + ['id', 'name', 'secret_count', 'slug', 'url'] ) def test_create_secretrole(self): diff --git a/netbox/tenancy/api/nested_serializers.py b/netbox/tenancy/api/nested_serializers.py index d26ac4675..80780dba3 100644 --- a/netbox/tenancy/api/nested_serializers.py +++ b/netbox/tenancy/api/nested_serializers.py @@ -15,10 +15,11 @@ __all__ = [ class NestedTenantGroupSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:tenantgroup-detail') + tenant_count = serializers.IntegerField(read_only=True) class Meta: model = TenantGroup - fields = ['id', 'url', 'name', 'slug'] + fields = ['id', 'url', 'name', 'slug', 'tenant_count'] class NestedTenantSerializer(WritableNestedSerializer): diff --git a/netbox/tenancy/api/serializers.py b/netbox/tenancy/api/serializers.py index 80f3b948d..b00c6cf3d 100644 --- a/netbox/tenancy/api/serializers.py +++ b/netbox/tenancy/api/serializers.py @@ -1,3 +1,4 @@ +from rest_framework import serializers from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField from extras.api.customfields import CustomFieldModelSerializer @@ -11,10 +12,11 @@ from .nested_serializers import * # class TenantGroupSerializer(ValidatedModelSerializer): + tenant_count = serializers.IntegerField(read_only=True) class Meta: model = TenantGroup - fields = ['id', 'name', 'slug'] + fields = ['id', 'name', 'slug', 'tenant_count'] class TenantSerializer(TaggitSerializer, CustomFieldModelSerializer): diff --git a/netbox/tenancy/api/views.py b/netbox/tenancy/api/views.py index af3e318fc..32015e316 100644 --- a/netbox/tenancy/api/views.py +++ b/netbox/tenancy/api/views.py @@ -1,3 +1,5 @@ +from django.db.models import Count + from extras.api.views import CustomFieldModelViewSet from tenancy import filters from tenancy.models import Tenant, TenantGroup @@ -18,7 +20,9 @@ class TenancyFieldChoicesViewSet(FieldChoicesViewSet): # class TenantGroupViewSet(ModelViewSet): - queryset = TenantGroup.objects.all() + queryset = TenantGroup.objects.annotate( + tenant_count=Count('tenants') + ) serializer_class = serializers.TenantGroupSerializer filterset_class = filters.TenantGroupFilter diff --git a/netbox/tenancy/tests/test_api.py b/netbox/tenancy/tests/test_api.py index 69db73ac6..121898019 100644 --- a/netbox/tenancy/tests/test_api.py +++ b/netbox/tenancy/tests/test_api.py @@ -36,7 +36,7 @@ class TenantGroupTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'slug', 'url'] + ['id', 'name', 'slug', 'tenant_count', 'url'] ) def test_create_tenantgroup(self): diff --git a/netbox/virtualization/api/nested_serializers.py b/netbox/virtualization/api/nested_serializers.py index fb6e2b0be..47b7e6442 100644 --- a/netbox/virtualization/api/nested_serializers.py +++ b/netbox/virtualization/api/nested_serializers.py @@ -19,26 +19,29 @@ __all__ = [ class NestedClusterTypeSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:clustertype-detail') + cluster_count = serializers.IntegerField(read_only=True) class Meta: model = ClusterType - fields = ['id', 'url', 'name', 'slug'] + fields = ['id', 'url', 'name', 'slug', 'cluster_count'] class NestedClusterGroupSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:clustergroup-detail') + cluster_count = serializers.IntegerField(read_only=True) class Meta: model = ClusterGroup - fields = ['id', 'url', 'name', 'slug'] + fields = ['id', 'url', 'name', 'slug', 'cluster_count'] class NestedClusterSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:cluster-detail') + virtualmachine_count = serializers.IntegerField(read_only=True) class Meta: model = Cluster - fields = ['id', 'url', 'name'] + fields = ['id', 'url', 'name', 'virtualmachine_count'] # diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py index 23ab67741..18b8e878e 100644 --- a/netbox/virtualization/api/serializers.py +++ b/netbox/virtualization/api/serializers.py @@ -20,17 +20,19 @@ from .nested_serializers import * # class ClusterTypeSerializer(ValidatedModelSerializer): + cluster_count = serializers.IntegerField(read_only=True) class Meta: model = ClusterType - fields = ['id', 'name', 'slug'] + fields = ['id', 'name', 'slug', 'cluster_count'] class ClusterGroupSerializer(ValidatedModelSerializer): + cluster_count = serializers.IntegerField(read_only=True) class Meta: model = ClusterGroup - fields = ['id', 'name', 'slug'] + fields = ['id', 'name', 'slug', 'cluster_count'] class ClusterSerializer(TaggitSerializer, CustomFieldModelSerializer): @@ -38,11 +40,13 @@ class ClusterSerializer(TaggitSerializer, CustomFieldModelSerializer): group = NestedClusterGroupSerializer(required=False, allow_null=True) site = NestedSiteSerializer(required=False, allow_null=True) tags = TagListSerializerField(required=False) + virtualmachine_count = serializers.IntegerField(read_only=True) class Meta: model = Cluster fields = [ 'id', 'name', 'type', 'group', 'site', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', + 'virtualmachine_count', ] diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py index ce7ee4934..9ce505310 100644 --- a/netbox/virtualization/api/views.py +++ b/netbox/virtualization/api/views.py @@ -1,3 +1,5 @@ +from django.db.models import Count + from dcim.models import Interface from extras.api.views import CustomFieldModelViewSet from utilities.api import FieldChoicesViewSet, ModelViewSet @@ -21,19 +23,25 @@ class VirtualizationFieldChoicesViewSet(FieldChoicesViewSet): # class ClusterTypeViewSet(ModelViewSet): - queryset = ClusterType.objects.all() + queryset = ClusterType.objects.annotate( + cluster_count=Count('clusters') + ) serializer_class = serializers.ClusterTypeSerializer filterset_class = filters.ClusterTypeFilter class ClusterGroupViewSet(ModelViewSet): - queryset = ClusterGroup.objects.all() + queryset = ClusterGroup.objects.annotate( + cluster_count=Count('clusters') + ) serializer_class = serializers.ClusterGroupSerializer filterset_class = filters.ClusterGroupFilter class ClusterViewSet(CustomFieldModelViewSet): - queryset = Cluster.objects.select_related('type', 'group').prefetch_related('tags') + queryset = Cluster.objects.select_related('type', 'group').prefetch_related('tags').annotate( + virtualmachine_count=Count('virtual_machines') + ) serializer_class = serializers.ClusterSerializer filterset_class = filters.ClusterFilter diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py index 49ae849a2..814e05854 100644 --- a/netbox/virtualization/tests/test_api.py +++ b/netbox/virtualization/tests/test_api.py @@ -40,7 +40,7 @@ class ClusterTypeTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'slug', 'url'] + ['cluster_count', 'id', 'name', 'slug', 'url'] ) def test_create_clustertype(self): @@ -141,7 +141,7 @@ class ClusterGroupTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'slug', 'url'] + ['cluster_count', 'id', 'name', 'slug', 'url'] ) def test_create_clustergroup(self): @@ -245,7 +245,7 @@ class ClusterTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'name', 'url'] + ['id', 'name', 'url', 'virtualmachine_count'] ) def test_create_cluster(self): From ad4d23fa202c07c0d405dd6f2c32e4d54b568322 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 12 Apr 2019 17:18:04 -0400 Subject: [PATCH 051/140] Replace distinct annotations with subqueries for much better performance --- netbox/dcim/api/views.py | 23 ++++++++++++++++++----- netbox/ipam/api/views.py | 10 ++++++++-- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index dc7e1f34d..4540133b9 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -1,7 +1,7 @@ from collections import OrderedDict from django.conf import settings -from django.db.models import Count, F +from django.db.models import Count, F, OuterRef, Subquery from django.http import HttpResponseForbidden from django.shortcuts import get_object_or_404 from drf_yasg import openapi @@ -26,6 +26,7 @@ from extras.models import Graph, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE from utilities.api import ( get_serializer_for_model, IsAuthenticatedOrLoginNotRequired, FieldChoicesViewSet, ModelViewSet, ServiceUnavailable, ) +from virtualization.models import VirtualMachine from . import serializers from .exceptions import MissingFilterException @@ -280,9 +281,15 @@ class DeviceBayTemplateViewSet(ModelViewSet): # class DeviceRoleViewSet(ModelViewSet): + device_count = Device.objects.filter( + device_role=OuterRef('pk') + ).order_by().values('device_role').annotate(c=Count('*')).values('c') + virtualmachine_count = VirtualMachine.objects.filter( + role=OuterRef('pk') + ).order_by().values('role').annotate(c=Count('*')).values('c') queryset = DeviceRole.objects.annotate( - device_count=Count('devices', distinct=True), - virtualmachine_count=Count('virtual_machines', distinct=True) + device_count=Subquery(device_count), + virtualmachine_count=Subquery(virtualmachine_count) ) serializer_class = serializers.DeviceRoleSerializer filterset_class = filters.DeviceRoleFilter @@ -293,9 +300,15 @@ class DeviceRoleViewSet(ModelViewSet): # class PlatformViewSet(ModelViewSet): + device_count = Device.objects.filter( + platform=OuterRef('pk') + ).order_by().values('platform').annotate(c=Count('*')).values('c') + virtualmachine_count = VirtualMachine.objects.filter( + platform=OuterRef('pk') + ).order_by().values('platform').annotate(c=Count('*')).values('c') queryset = Platform.objects.annotate( - device_count=Count('devices', distinct=True), - virtualmachine_count=Count('virtual_machines', distinct=True) + device_count=Subquery(device_count), + virtualmachine_count=Subquery(virtualmachine_count) ) serializer_class = serializers.PlatformSerializer filterset_class = filters.PlatformFilter diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py index a1578eb97..962ce0e84 100644 --- a/netbox/ipam/api/views.py +++ b/netbox/ipam/api/views.py @@ -66,9 +66,15 @@ class AggregateViewSet(CustomFieldModelViewSet): # class RoleViewSet(ModelViewSet): + prefix_count = Prefix.objects.filter( + role=OuterRef('pk') + ).order_by().values('role').annotate(c=Count('*')).values('c') + vlan_count = VLAN.objects.filter( + role=OuterRef('pk') + ).order_by().values('role').annotate(c=Count('*')).values('c') queryset = Role.objects.annotate( - prefix_count=Count('prefixes', distinct=True), - vlan_count=Count('vlans', distinct=True) + prefix_count=Subquery(prefix_count), + vlan_count=Subquery(vlan_count) ) serializer_class = serializers.RoleSerializer filterset_class = filters.RoleFilter From 04c1945abcb9ca652a06585c8b142b52a3f9c192 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 12 Apr 2019 17:21:04 -0400 Subject: [PATCH 052/140] Changelog for #1863 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd9aa35cd..0e331dc92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ to now use "Extras | Tag." * [#323](https://github.com/digitalocean/netbox/issues/323) - Enforce per-object type view permissions * [#1792](https://github.com/digitalocean/netbox/issues/1792) - Add CustomFieldChoices API endpoint +* [#1863](https://github.com/digitalocean/netbox/issues/1863) - Add child object counts to API representation of organizational objects * [#2324](https://github.com/digitalocean/netbox/issues/2324) - Add `color` option for tags * [#2643](https://github.com/digitalocean/netbox/issues/2643) - Add `description` field to console/power components and device bays * [#2791](https://github.com/digitalocean/netbox/issues/2791) - Add a `comment` field for tags @@ -64,7 +65,7 @@ to now use "Extras | Tag." * dcim.Interface: `form_factor` has been renamed to `type`. Backward-compatibile support for `form_factor` will be maintained until NetBox v2.7. * dcim.Interface: The `type` filter has been renamed to `kind`. * dcim.DeviceType: `instance_count` has been renamed to `device_count`. - +* Organizational objects now include child object counts. For example, the Role serializer includes `prefix_count` and `vlan_count`. ## Bug Fixes From f0505477b8ff76d2fdb002cd1378c84d7b2ce53f Mon Sep 17 00:00:00 2001 From: John Anderson Date: Mon, 15 Apr 2019 03:55:33 -0400 Subject: [PATCH 053/140] intial work on #2647 - caching --- base_requirements.txt | 8 + netbox/circuits/urls.py | 21 +-- netbox/dcim/urls.py | 203 +++++++++++++------------ netbox/extras/urls.py | 21 +-- netbox/ipam/urls.py | 75 ++++----- netbox/netbox/configuration.example.py | 35 +++-- netbox/netbox/settings.py | 39 ++++- netbox/netbox/urls.py | 14 +- netbox/secrets/urls.py | 13 +- netbox/tenancy/urls.py | 15 +- netbox/utilities/api.py | 19 +++ netbox/utilities/urls.py | 9 ++ requirements.txt | 2 + 13 files changed, 288 insertions(+), 186 deletions(-) create mode 100644 netbox/utilities/urls.py diff --git a/base_requirements.txt b/base_requirements.txt index 3d1578400..cd7d9ef45 100644 --- a/base_requirements.txt +++ b/base_requirements.txt @@ -18,6 +18,14 @@ django-filter # https://github.com/django-mptt/django-mptt django-mptt +# Prometheus metrics client implementation for Django +# https://github.com/korfuri/django-prometheus +django-prometheus + +# Django caching using Redis +# https://github.com/niwinz/django-redis +django-redis + # Abstraction models for rendering and paginating HTML tables # https://github.com/jieter/django-tables2 django-tables2 diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py index 5b818a945..8fe4f4803 100644 --- a/netbox/circuits/urls.py +++ b/netbox/circuits/urls.py @@ -2,6 +2,7 @@ from django.conf.urls import url from dcim.views import CableCreateView, CableTraceView from extras.views import ObjectChangeLogView +from utilities.urls import cached from . import views from .models import Circuit, CircuitTermination, CircuitType, Provider @@ -9,41 +10,41 @@ app_name = 'circuits' urlpatterns = [ # Providers - url(r'^providers/$', views.ProviderListView.as_view(), name='provider_list'), + url(r'^providers/$', cached(views.ProviderListView.as_view()), name='provider_list'), url(r'^providers/add/$', views.ProviderCreateView.as_view(), name='provider_add'), url(r'^providers/import/$', views.ProviderBulkImportView.as_view(), name='provider_import'), url(r'^providers/edit/$', views.ProviderBulkEditView.as_view(), name='provider_bulk_edit'), url(r'^providers/delete/$', views.ProviderBulkDeleteView.as_view(), name='provider_bulk_delete'), - url(r'^providers/(?P[\w-]+)/$', views.ProviderView.as_view(), name='provider'), + url(r'^providers/(?P[\w-]+)/$', cached(views.ProviderView.as_view()), name='provider'), url(r'^providers/(?P[\w-]+)/edit/$', views.ProviderEditView.as_view(), name='provider_edit'), url(r'^providers/(?P[\w-]+)/delete/$', views.ProviderDeleteView.as_view(), name='provider_delete'), - url(r'^providers/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='provider_changelog', kwargs={'model': Provider}), + url(r'^providers/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='provider_changelog', kwargs={'model': Provider}), # Circuit types - url(r'^circuit-types/$', views.CircuitTypeListView.as_view(), name='circuittype_list'), + url(r'^circuit-types/$', cached(views.CircuitTypeListView.as_view()), name='circuittype_list'), url(r'^circuit-types/add/$', views.CircuitTypeCreateView.as_view(), name='circuittype_add'), url(r'^circuit-types/import/$', views.CircuitTypeBulkImportView.as_view(), name='circuittype_import'), url(r'^circuit-types/delete/$', views.CircuitTypeBulkDeleteView.as_view(), name='circuittype_bulk_delete'), url(r'^circuit-types/(?P[\w-]+)/edit/$', views.CircuitTypeEditView.as_view(), name='circuittype_edit'), - url(r'^circuit-types/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='circuittype_changelog', kwargs={'model': CircuitType}), + url(r'^circuit-types/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='circuittype_changelog', kwargs={'model': CircuitType}), # Circuits - url(r'^circuits/$', views.CircuitListView.as_view(), name='circuit_list'), + url(r'^circuits/$', cached(views.CircuitListView.as_view()), name='circuit_list'), url(r'^circuits/add/$', views.CircuitCreateView.as_view(), name='circuit_add'), url(r'^circuits/import/$', views.CircuitBulkImportView.as_view(), name='circuit_import'), url(r'^circuits/edit/$', views.CircuitBulkEditView.as_view(), name='circuit_bulk_edit'), url(r'^circuits/delete/$', views.CircuitBulkDeleteView.as_view(), name='circuit_bulk_delete'), - url(r'^circuits/(?P\d+)/$', views.CircuitView.as_view(), name='circuit'), + url(r'^circuits/(?P\d+)/$', cached(views.CircuitView.as_view()), name='circuit'), url(r'^circuits/(?P\d+)/edit/$', views.CircuitEditView.as_view(), name='circuit_edit'), url(r'^circuits/(?P\d+)/delete/$', views.CircuitDeleteView.as_view(), name='circuit_delete'), - url(r'^circuits/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='circuit_changelog', kwargs={'model': Circuit}), - url(r'^circuits/(?P\d+)/terminations/swap/$', views.circuit_terminations_swap, name='circuit_terminations_swap'), + url(r'^circuits/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='circuit_changelog', kwargs={'model': Circuit}), + url(r'^circuits/(?P\d+)/terminations/swap/$', cached(views.circuit_terminations_swap), name='circuit_terminations_swap'), # Circuit terminations url(r'^circuits/(?P\d+)/terminations/add/$', views.CircuitTerminationCreateView.as_view(), name='circuittermination_add'), url(r'^circuit-terminations/(?P\d+)/edit/$', views.CircuitTerminationEditView.as_view(), name='circuittermination_edit'), url(r'^circuit-terminations/(?P\d+)/delete/$', views.CircuitTerminationDeleteView.as_view(), name='circuittermination_delete'), url(r'^circuit-terminations/(?P\d+)/connect/(?P[\w-]+)/$', CableCreateView.as_view(), name='circuittermination_connect', kwargs={'termination_a_type': CircuitTermination}), - url(r'^circuit-terminations/(?P\d+)/trace/$', CableTraceView.as_view(), name='circuittermination_trace', kwargs={'model': CircuitTermination}), + url(r'^circuit-terminations/(?P\d+)/trace/$', cached(CableTraceView.as_view()), name='circuittermination_trace', kwargs={'model': CircuitTermination}), ] diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 220f4b405..95b539d8b 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -3,6 +3,7 @@ from django.conf.urls import url from extras.views import ObjectChangeLogView, ImageAttachmentEditView from ipam.views import ServiceCreateView from secrets.views import secret_add +from utilities.urls import cached from . import views from .models import ( Cable, ConsolePort, ConsoleServerPort, Device, DeviceRole, DeviceType, FrontPort, Interface, Manufacturer, Platform, @@ -14,291 +15,291 @@ app_name = 'dcim' urlpatterns = [ # Regions - url(r'^regions/$', views.RegionListView.as_view(), name='region_list'), - url(r'^regions/add/$', views.RegionCreateView.as_view(), name='region_add'), + url(r'^regions/$', cached(views.RegionListView.as_view()), name='region_list'), + url(r'^regions/add/$', cached(views.RegionCreateView.as_view()), name='region_add'), url(r'^regions/import/$', views.RegionBulkImportView.as_view(), name='region_import'), url(r'^regions/delete/$', views.RegionBulkDeleteView.as_view(), name='region_bulk_delete'), url(r'^regions/(?P\d+)/edit/$', views.RegionEditView.as_view(), name='region_edit'), - url(r'^regions/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='region_changelog', kwargs={'model': Region}), + url(r'^regions/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='region_changelog', kwargs={'model': Region}), # Sites - url(r'^sites/$', views.SiteListView.as_view(), name='site_list'), - url(r'^sites/add/$', views.SiteCreateView.as_view(), name='site_add'), + url(r'^sites/$', cached(views.SiteListView.as_view()), name='site_list'), + url(r'^sites/add/$', cached(views.SiteCreateView.as_view()), name='site_add'), url(r'^sites/import/$', views.SiteBulkImportView.as_view(), name='site_import'), url(r'^sites/edit/$', views.SiteBulkEditView.as_view(), name='site_bulk_edit'), - url(r'^sites/(?P[\w-]+)/$', views.SiteView.as_view(), name='site'), + url(r'^sites/(?P[\w-]+)/$', cached(views.SiteView.as_view()), name='site'), url(r'^sites/(?P[\w-]+)/edit/$', views.SiteEditView.as_view(), name='site_edit'), url(r'^sites/(?P[\w-]+)/delete/$', views.SiteDeleteView.as_view(), name='site_delete'), - url(r'^sites/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='site_changelog', kwargs={'model': Site}), - url(r'^sites/(?P\d+)/images/add/$', ImageAttachmentEditView.as_view(), name='site_add_image', kwargs={'model': Site}), + url(r'^sites/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='site_changelog', kwargs={'model': Site}), + url(r'^sites/(?P\d+)/images/add/$', cached(ImageAttachmentEditView.as_view()), name='site_add_image', kwargs={'model': Site}), # Rack groups - url(r'^rack-groups/$', views.RackGroupListView.as_view(), name='rackgroup_list'), - url(r'^rack-groups/add/$', views.RackGroupCreateView.as_view(), name='rackgroup_add'), + url(r'^rack-groups/$', cached(views.RackGroupListView.as_view()), name='rackgroup_list'), + url(r'^rack-groups/add/$', cached(views.RackGroupCreateView.as_view()), name='rackgroup_add'), url(r'^rack-groups/import/$', views.RackGroupBulkImportView.as_view(), name='rackgroup_import'), url(r'^rack-groups/delete/$', views.RackGroupBulkDeleteView.as_view(), name='rackgroup_bulk_delete'), url(r'^rack-groups/(?P\d+)/edit/$', views.RackGroupEditView.as_view(), name='rackgroup_edit'), - url(r'^rack-groups/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='rackgroup_changelog', kwargs={'model': RackGroup}), + url(r'^rack-groups/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='rackgroup_changelog', kwargs={'model': RackGroup}), # Rack roles - url(r'^rack-roles/$', views.RackRoleListView.as_view(), name='rackrole_list'), - url(r'^rack-roles/add/$', views.RackRoleCreateView.as_view(), name='rackrole_add'), + url(r'^rack-roles/$', cached(views.RackRoleListView.as_view()), name='rackrole_list'), + url(r'^rack-roles/add/$', cached(views.RackRoleCreateView.as_view()), name='rackrole_add'), url(r'^rack-roles/import/$', views.RackRoleBulkImportView.as_view(), name='rackrole_import'), url(r'^rack-roles/delete/$', views.RackRoleBulkDeleteView.as_view(), name='rackrole_bulk_delete'), url(r'^rack-roles/(?P\d+)/edit/$', views.RackRoleEditView.as_view(), name='rackrole_edit'), - url(r'^rack-roles/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='rackrole_changelog', kwargs={'model': RackRole}), + url(r'^rack-roles/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='rackrole_changelog', kwargs={'model': RackRole}), # Rack reservations - url(r'^rack-reservations/$', views.RackReservationListView.as_view(), name='rackreservation_list'), + url(r'^rack-reservations/$', cached(views.RackReservationListView.as_view()), name='rackreservation_list'), url(r'^rack-reservations/edit/$', views.RackReservationBulkEditView.as_view(), name='rackreservation_bulk_edit'), url(r'^rack-reservations/delete/$', views.RackReservationBulkDeleteView.as_view(), name='rackreservation_bulk_delete'), url(r'^rack-reservations/(?P\d+)/edit/$', views.RackReservationEditView.as_view(), name='rackreservation_edit'), url(r'^rack-reservations/(?P\d+)/delete/$', views.RackReservationDeleteView.as_view(), name='rackreservation_delete'), - url(r'^rack-reservations/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='rackreservation_changelog', kwargs={'model': RackReservation}), + url(r'^rack-reservations/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='rackreservation_changelog', kwargs={'model': RackReservation}), # Racks - url(r'^racks/$', views.RackListView.as_view(), name='rack_list'), - url(r'^rack-elevations/$', views.RackElevationListView.as_view(), name='rack_elevation_list'), - url(r'^racks/add/$', views.RackEditView.as_view(), name='rack_add'), + url(r'^racks/$', cached(views.RackListView.as_view()), name='rack_list'), + url(r'^rack-elevations/$', cached(views.RackElevationListView.as_view()), name='rack_elevation_list'), + url(r'^racks/add/$', cached(views.RackEditView.as_view()), name='rack_add'), url(r'^racks/import/$', views.RackBulkImportView.as_view(), name='rack_import'), url(r'^racks/edit/$', views.RackBulkEditView.as_view(), name='rack_bulk_edit'), url(r'^racks/delete/$', views.RackBulkDeleteView.as_view(), name='rack_bulk_delete'), - url(r'^racks/(?P\d+)/$', views.RackView.as_view(), name='rack'), + url(r'^racks/(?P\d+)/$', cached(views.RackView.as_view()), name='rack'), url(r'^racks/(?P\d+)/edit/$', views.RackEditView.as_view(), name='rack_edit'), url(r'^racks/(?P\d+)/delete/$', views.RackDeleteView.as_view(), name='rack_delete'), - url(r'^racks/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='rack_changelog', kwargs={'model': Rack}), - url(r'^racks/(?P\d+)/reservations/add/$', views.RackReservationCreateView.as_view(), name='rack_add_reservation'), - url(r'^racks/(?P\d+)/images/add/$', ImageAttachmentEditView.as_view(), name='rack_add_image', kwargs={'model': Rack}), + url(r'^racks/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='rack_changelog', kwargs={'model': Rack}), + url(r'^racks/(?P\d+)/reservations/add/$', cached(views.RackReservationCreateView.as_view()), name='rack_add_reservation'), + url(r'^racks/(?P\d+)/images/add/$', cached(ImageAttachmentEditView.as_view()), name='rack_add_image', kwargs={'model': Rack}), # Manufacturers - url(r'^manufacturers/$', views.ManufacturerListView.as_view(), name='manufacturer_list'), - url(r'^manufacturers/add/$', views.ManufacturerCreateView.as_view(), name='manufacturer_add'), + url(r'^manufacturers/$', cached(views.ManufacturerListView.as_view()), name='manufacturer_list'), + url(r'^manufacturers/add/$', cached(views.ManufacturerCreateView.as_view()), name='manufacturer_add'), url(r'^manufacturers/import/$', views.ManufacturerBulkImportView.as_view(), name='manufacturer_import'), url(r'^manufacturers/delete/$', views.ManufacturerBulkDeleteView.as_view(), name='manufacturer_bulk_delete'), url(r'^manufacturers/(?P[\w-]+)/edit/$', views.ManufacturerEditView.as_view(), name='manufacturer_edit'), - url(r'^manufacturers/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='manufacturer_changelog', kwargs={'model': Manufacturer}), + url(r'^manufacturers/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='manufacturer_changelog', kwargs={'model': Manufacturer}), # Device types - url(r'^device-types/$', views.DeviceTypeListView.as_view(), name='devicetype_list'), - url(r'^device-types/add/$', views.DeviceTypeCreateView.as_view(), name='devicetype_add'), + url(r'^device-types/$', cached(views.DeviceTypeListView.as_view()), name='devicetype_list'), + url(r'^device-types/add/$', cached(views.DeviceTypeCreateView.as_view()), name='devicetype_add'), url(r'^device-types/import/$', views.DeviceTypeBulkImportView.as_view(), name='devicetype_import'), 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\d+)/$', views.DeviceTypeView.as_view(), name='devicetype'), + url(r'^device-types/(?P\d+)/$', cached(views.DeviceTypeView.as_view()), name='devicetype'), url(r'^device-types/(?P\d+)/edit/$', views.DeviceTypeEditView.as_view(), name='devicetype_edit'), url(r'^device-types/(?P\d+)/delete/$', views.DeviceTypeDeleteView.as_view(), name='devicetype_delete'), - url(r'^device-types/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='devicetype_changelog', kwargs={'model': DeviceType}), + url(r'^device-types/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='devicetype_changelog', kwargs={'model': DeviceType}), # Console port templates - url(r'^device-types/(?P\d+)/console-ports/add/$', views.ConsolePortTemplateCreateView.as_view(), name='devicetype_add_consoleport'), + url(r'^device-types/(?P\d+)/console-ports/add/$', cached(views.ConsolePortTemplateCreateView.as_view()), name='devicetype_add_consoleport'), url(r'^device-types/(?P\d+)/console-ports/delete/$', views.ConsolePortTemplateBulkDeleteView.as_view(), name='devicetype_delete_consoleport'), # Console server port templates - url(r'^device-types/(?P\d+)/console-server-ports/add/$', views.ConsoleServerPortTemplateCreateView.as_view(), name='devicetype_add_consoleserverport'), + url(r'^device-types/(?P\d+)/console-server-ports/add/$', cached(views.ConsoleServerPortTemplateCreateView.as_view()), name='devicetype_add_consoleserverport'), url(r'^device-types/(?P\d+)/console-server-ports/delete/$', views.ConsoleServerPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_consoleserverport'), # Power port templates - url(r'^device-types/(?P\d+)/power-ports/add/$', views.PowerPortTemplateCreateView.as_view(), name='devicetype_add_powerport'), + url(r'^device-types/(?P\d+)/power-ports/add/$', cached(views.PowerPortTemplateCreateView.as_view()), name='devicetype_add_powerport'), url(r'^device-types/(?P\d+)/power-ports/delete/$', views.PowerPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_powerport'), # Power outlet templates - url(r'^device-types/(?P\d+)/power-outlets/add/$', views.PowerOutletTemplateCreateView.as_view(), name='devicetype_add_poweroutlet'), + url(r'^device-types/(?P\d+)/power-outlets/add/$', cached(views.PowerOutletTemplateCreateView.as_view()), name='devicetype_add_poweroutlet'), url(r'^device-types/(?P\d+)/power-outlets/delete/$', views.PowerOutletTemplateBulkDeleteView.as_view(), name='devicetype_delete_poweroutlet'), # Interface templates - url(r'^device-types/(?P\d+)/interfaces/add/$', views.InterfaceTemplateCreateView.as_view(), name='devicetype_add_interface'), + url(r'^device-types/(?P\d+)/interfaces/add/$', cached(views.InterfaceTemplateCreateView.as_view()), name='devicetype_add_interface'), url(r'^device-types/(?P\d+)/interfaces/edit/$', views.InterfaceTemplateBulkEditView.as_view(), name='devicetype_bulkedit_interface'), url(r'^device-types/(?P\d+)/interfaces/delete/$', views.InterfaceTemplateBulkDeleteView.as_view(), name='devicetype_delete_interface'), # Front port templates - url(r'^device-types/(?P\d+)/front-ports/add/$', views.FrontPortTemplateCreateView.as_view(), name='devicetype_add_frontport'), + url(r'^device-types/(?P\d+)/front-ports/add/$', cached(views.FrontPortTemplateCreateView.as_view()), name='devicetype_add_frontport'), url(r'^device-types/(?P\d+)/front-ports/delete/$', views.FrontPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_frontport'), # Rear port templates - url(r'^device-types/(?P\d+)/rear-ports/add/$', views.RearPortTemplateCreateView.as_view(), name='devicetype_add_rearport'), + url(r'^device-types/(?P\d+)/rear-ports/add/$', cached(views.RearPortTemplateCreateView.as_view()), name='devicetype_add_rearport'), url(r'^device-types/(?P\d+)/rear-ports/delete/$', views.RearPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_rearport'), # Device bay templates - url(r'^device-types/(?P\d+)/device-bays/add/$', views.DeviceBayTemplateCreateView.as_view(), name='devicetype_add_devicebay'), + url(r'^device-types/(?P\d+)/device-bays/add/$', cached(views.DeviceBayTemplateCreateView.as_view()), name='devicetype_add_devicebay'), url(r'^device-types/(?P\d+)/device-bays/delete/$', views.DeviceBayTemplateBulkDeleteView.as_view(), name='devicetype_delete_devicebay'), # Device roles - url(r'^device-roles/$', views.DeviceRoleListView.as_view(), name='devicerole_list'), - url(r'^device-roles/add/$', views.DeviceRoleCreateView.as_view(), name='devicerole_add'), + url(r'^device-roles/$', cached(views.DeviceRoleListView.as_view()), name='devicerole_list'), + url(r'^device-roles/add/$', cached(views.DeviceRoleCreateView.as_view()), name='devicerole_add'), url(r'^device-roles/import/$', views.DeviceRoleBulkImportView.as_view(), name='devicerole_import'), url(r'^device-roles/delete/$', views.DeviceRoleBulkDeleteView.as_view(), name='devicerole_bulk_delete'), url(r'^device-roles/(?P[\w-]+)/edit/$', views.DeviceRoleEditView.as_view(), name='devicerole_edit'), - url(r'^device-roles/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='devicerole_changelog', kwargs={'model': DeviceRole}), + url(r'^device-roles/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='devicerole_changelog', kwargs={'model': DeviceRole}), # Platforms - url(r'^platforms/$', views.PlatformListView.as_view(), name='platform_list'), - url(r'^platforms/add/$', views.PlatformCreateView.as_view(), name='platform_add'), + url(r'^platforms/$', cached(views.PlatformListView.as_view()), name='platform_list'), + url(r'^platforms/add/$', cached(views.PlatformCreateView.as_view()), name='platform_add'), url(r'^platforms/import/$', views.PlatformBulkImportView.as_view(), name='platform_import'), url(r'^platforms/delete/$', views.PlatformBulkDeleteView.as_view(), name='platform_bulk_delete'), url(r'^platforms/(?P[\w-]+)/edit/$', views.PlatformEditView.as_view(), name='platform_edit'), - url(r'^platforms/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='platform_changelog', kwargs={'model': Platform}), + url(r'^platforms/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='platform_changelog', kwargs={'model': Platform}), # Devices - url(r'^devices/$', views.DeviceListView.as_view(), name='device_list'), - url(r'^devices/add/$', views.DeviceCreateView.as_view(), name='device_add'), + url(r'^devices/$', cached(views.DeviceListView.as_view()), name='device_list'), + url(r'^devices/add/$', cached(views.DeviceCreateView.as_view()), name='device_add'), url(r'^devices/import/$', views.DeviceBulkImportView.as_view(), name='device_import'), url(r'^devices/import/child-devices/$', views.ChildDeviceBulkImportView.as_view(), name='device_import_child'), url(r'^devices/edit/$', views.DeviceBulkEditView.as_view(), name='device_bulk_edit'), url(r'^devices/delete/$', views.DeviceBulkDeleteView.as_view(), name='device_bulk_delete'), - url(r'^devices/(?P\d+)/$', views.DeviceView.as_view(), name='device'), + url(r'^devices/(?P\d+)/$', cached(views.DeviceView.as_view()), name='device'), url(r'^devices/(?P\d+)/edit/$', views.DeviceEditView.as_view(), name='device_edit'), url(r'^devices/(?P\d+)/delete/$', views.DeviceDeleteView.as_view(), name='device_delete'), - url(r'^devices/(?P\d+)/config-context/$', views.DeviceConfigContextView.as_view(), name='device_configcontext'), - url(r'^devices/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='device_changelog', kwargs={'model': Device}), - url(r'^devices/(?P\d+)/inventory/$', views.DeviceInventoryView.as_view(), name='device_inventory'), + url(r'^devices/(?P\d+)/config-context/$', cached(views.DeviceConfigContextView.as_view()), name='device_configcontext'), + url(r'^devices/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='device_changelog', kwargs={'model': Device}), + url(r'^devices/(?P\d+)/inventory/$', cached(views.DeviceInventoryView.as_view()), name='device_inventory'), url(r'^devices/(?P\d+)/status/$', views.DeviceStatusView.as_view(), name='device_status'), url(r'^devices/(?P\d+)/lldp-neighbors/$', views.DeviceLLDPNeighborsView.as_view(), name='device_lldp_neighbors'), url(r'^devices/(?P\d+)/config/$', views.DeviceConfigView.as_view(), name='device_config'), url(r'^devices/(?P\d+)/add-secret/$', secret_add, name='device_addsecret'), - url(r'^devices/(?P\d+)/services/assign/$', ServiceCreateView.as_view(), name='device_service_assign'), - url(r'^devices/(?P\d+)/images/add/$', ImageAttachmentEditView.as_view(), name='device_add_image', kwargs={'model': Device}), + url(r'^devices/(?P\d+)/services/assign/$', cached(ServiceCreateView.as_view()), name='device_service_assign'), + url(r'^devices/(?P\d+)/images/add/$', cached(ImageAttachmentEditView.as_view()), name='device_add_image', kwargs={'model': Device}), # Console ports - url(r'^devices/console-ports/add/$', views.DeviceBulkAddConsolePortView.as_view(), name='device_bulk_add_consoleport'), - url(r'^devices/(?P\d+)/console-ports/add/$', views.ConsolePortCreateView.as_view(), name='consoleport_add'), + url(r'^devices/console-ports/add/$', cached(views.DeviceBulkAddConsolePortView.as_view()), name='device_bulk_add_consoleport'), + url(r'^devices/(?P\d+)/console-ports/add/$', cached(views.ConsolePortCreateView.as_view()), name='consoleport_add'), url(r'^devices/(?P\d+)/console-ports/delete/$', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'), url(r'^console-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='consoleport_connect', kwargs={'termination_a_type': ConsolePort}), url(r'^console-ports/(?P\d+)/edit/$', views.ConsolePortEditView.as_view(), name='consoleport_edit'), url(r'^console-ports/(?P\d+)/delete/$', views.ConsolePortDeleteView.as_view(), name='consoleport_delete'), - url(r'^console-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='consoleport_trace', kwargs={'model': ConsolePort}), + url(r'^console-ports/(?P\d+)/trace/$', cached(views.CableTraceView.as_view()), name='consoleport_trace', kwargs={'model': ConsolePort}), # Console server ports - url(r'^devices/console-server-ports/add/$', views.DeviceBulkAddConsoleServerPortView.as_view(), name='device_bulk_add_consoleserverport'), - url(r'^devices/(?P\d+)/console-server-ports/add/$', views.ConsoleServerPortCreateView.as_view(), name='consoleserverport_add'), + url(r'^devices/console-server-ports/add/$', cached(views.DeviceBulkAddConsoleServerPortView.as_view()), name='device_bulk_add_consoleserverport'), + url(r'^devices/(?P\d+)/console-server-ports/add/$', cached(views.ConsoleServerPortCreateView.as_view()), name='consoleserverport_add'), url(r'^devices/(?P\d+)/console-server-ports/delete/$', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'), url(r'^console-server-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'termination_a_type': ConsoleServerPort}), url(r'^console-server-ports/(?P\d+)/edit/$', views.ConsoleServerPortEditView.as_view(), name='consoleserverport_edit'), url(r'^console-server-ports/(?P\d+)/delete/$', views.ConsoleServerPortDeleteView.as_view(), name='consoleserverport_delete'), - url(r'^console-server-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='consoleserverport_trace', kwargs={'model': ConsoleServerPort}), - url(r'^console-server-ports/rename/$', views.ConsoleServerPortBulkRenameView.as_view(), name='consoleserverport_bulk_rename'), + url(r'^console-server-ports/(?P\d+)/trace/$', cached(views.CableTraceView.as_view()), name='consoleserverport_trace', kwargs={'model': ConsoleServerPort}), + url(r'^console-server-ports/rename/$', cached(views.ConsoleServerPortBulkRenameView.as_view()), name='consoleserverport_bulk_rename'), url(r'^console-server-ports/disconnect/$', views.ConsoleServerPortBulkDisconnectView.as_view(), name='consoleserverport_bulk_disconnect'), # Power ports - url(r'^devices/power-ports/add/$', views.DeviceBulkAddPowerPortView.as_view(), name='device_bulk_add_powerport'), - url(r'^devices/(?P\d+)/power-ports/add/$', views.PowerPortCreateView.as_view(), name='powerport_add'), + url(r'^devices/power-ports/add/$', cached(views.DeviceBulkAddPowerPortView.as_view()), name='device_bulk_add_powerport'), + url(r'^devices/(?P\d+)/power-ports/add/$', cached(views.PowerPortCreateView.as_view()), name='powerport_add'), url(r'^devices/(?P\d+)/power-ports/delete/$', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'), url(r'^power-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='powerport_connect', kwargs={'termination_a_type': PowerPort}), url(r'^power-ports/(?P\d+)/edit/$', views.PowerPortEditView.as_view(), name='powerport_edit'), url(r'^power-ports/(?P\d+)/delete/$', views.PowerPortDeleteView.as_view(), name='powerport_delete'), - url(r'^power-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='powerport_trace', kwargs={'model': PowerPort}), + url(r'^power-ports/(?P\d+)/trace/$', cached(views.CableTraceView.as_view()), name='powerport_trace', kwargs={'model': PowerPort}), # Power outlets - url(r'^devices/power-outlets/add/$', views.DeviceBulkAddPowerOutletView.as_view(), name='device_bulk_add_poweroutlet'), - url(r'^devices/(?P\d+)/power-outlets/add/$', views.PowerOutletCreateView.as_view(), name='poweroutlet_add'), + url(r'^devices/power-outlets/add/$', cached(views.DeviceBulkAddPowerOutletView.as_view()), name='device_bulk_add_poweroutlet'), + url(r'^devices/(?P\d+)/power-outlets/add/$', cached(views.PowerOutletCreateView.as_view()), name='poweroutlet_add'), url(r'^devices/(?P\d+)/power-outlets/delete/$', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'), url(r'^power-outlets/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'termination_a_type': PowerOutlet}), url(r'^power-outlets/(?P\d+)/edit/$', views.PowerOutletEditView.as_view(), name='poweroutlet_edit'), url(r'^power-outlets/(?P\d+)/delete/$', views.PowerOutletDeleteView.as_view(), name='poweroutlet_delete'), - url(r'^power-outlets/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='poweroutlet_trace', kwargs={'model': PowerOutlet}), - url(r'^power-outlets/rename/$', views.PowerOutletBulkRenameView.as_view(), name='poweroutlet_bulk_rename'), + url(r'^power-outlets/(?P\d+)/trace/$', cached(views.CableTraceView.as_view()), name='poweroutlet_trace', kwargs={'model': PowerOutlet}), + url(r'^power-outlets/rename/$', cached(views.PowerOutletBulkRenameView.as_view()), name='poweroutlet_bulk_rename'), url(r'^power-outlets/disconnect/$', views.PowerOutletBulkDisconnectView.as_view(), name='poweroutlet_bulk_disconnect'), # Interfaces - url(r'^devices/interfaces/add/$', views.DeviceBulkAddInterfaceView.as_view(), name='device_bulk_add_interface'), - url(r'^devices/(?P\d+)/interfaces/add/$', views.InterfaceCreateView.as_view(), name='interface_add'), + url(r'^devices/interfaces/add/$', cached(views.DeviceBulkAddInterfaceView.as_view()), name='device_bulk_add_interface'), + url(r'^devices/(?P\d+)/interfaces/add/$', cached(views.InterfaceCreateView.as_view()), name='interface_add'), url(r'^devices/(?P\d+)/interfaces/edit/$', views.InterfaceBulkEditView.as_view(), name='interface_bulk_edit'), url(r'^devices/(?P\d+)/interfaces/delete/$', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'), url(r'^interfaces/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='interface_connect', kwargs={'termination_a_type': Interface}), - url(r'^interfaces/(?P\d+)/$', views.InterfaceView.as_view(), name='interface'), + url(r'^interfaces/(?P\d+)/$', cached(views.InterfaceView.as_view()), name='interface'), url(r'^interfaces/(?P\d+)/edit/$', views.InterfaceEditView.as_view(), name='interface_edit'), - url(r'^interfaces/(?P\d+)/assign-vlans/$', views.InterfaceAssignVLANsView.as_view(), name='interface_assign_vlans'), + url(r'^interfaces/(?P\d+)/assign-vlans/$', cached(views.InterfaceAssignVLANsView.as_view()), name='interface_assign_vlans'), url(r'^interfaces/(?P\d+)/delete/$', views.InterfaceDeleteView.as_view(), name='interface_delete'), - url(r'^interfaces/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='interface_changelog', kwargs={'model': Interface}), - url(r'^interfaces/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='interface_trace', kwargs={'model': Interface}), - url(r'^interfaces/rename/$', views.InterfaceBulkRenameView.as_view(), name='interface_bulk_rename'), + url(r'^interfaces/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='interface_changelog', kwargs={'model': Interface}), + url(r'^interfaces/(?P\d+)/trace/$', cached(views.CableTraceView.as_view()), name='interface_trace', kwargs={'model': Interface}), + url(r'^interfaces/rename/$', cached(views.InterfaceBulkRenameView.as_view()), name='interface_bulk_rename'), url(r'^interfaces/disconnect/$', views.InterfaceBulkDisconnectView.as_view(), name='interface_bulk_disconnect'), # Front ports # url(r'^devices/front-ports/add/$', views.DeviceBulkAddFrontPortView.as_view(), name='device_bulk_add_frontport'), - url(r'^devices/(?P\d+)/front-ports/add/$', views.FrontPortCreateView.as_view(), name='frontport_add'), + url(r'^devices/(?P\d+)/front-ports/add/$', cached(views.FrontPortCreateView.as_view()), name='frontport_add'), url(r'^devices/(?P\d+)/front-ports/edit/$', views.FrontPortBulkEditView.as_view(), name='frontport_bulk_edit'), url(r'^devices/(?P\d+)/front-ports/delete/$', views.FrontPortBulkDeleteView.as_view(), name='frontport_bulk_delete'), url(r'^front-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='frontport_connect', kwargs={'termination_a_type': FrontPort}), url(r'^front-ports/(?P\d+)/edit/$', views.FrontPortEditView.as_view(), name='frontport_edit'), url(r'^front-ports/(?P\d+)/delete/$', views.FrontPortDeleteView.as_view(), name='frontport_delete'), - url(r'^front-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='frontport_trace', kwargs={'model': FrontPort}), - url(r'^front-ports/rename/$', views.FrontPortBulkRenameView.as_view(), name='frontport_bulk_rename'), + url(r'^front-ports/(?P\d+)/trace/$', cached(views.CableTraceView.as_view()), name='frontport_trace', kwargs={'model': FrontPort}), + url(r'^front-ports/rename/$', cached(views.FrontPortBulkRenameView.as_view()), name='frontport_bulk_rename'), url(r'^front-ports/disconnect/$', views.FrontPortBulkDisconnectView.as_view(), name='frontport_bulk_disconnect'), # Rear ports # url(r'^devices/rear-ports/add/$', views.DeviceBulkAddRearPortView.as_view(), name='device_bulk_add_rearport'), - url(r'^devices/(?P\d+)/rear-ports/add/$', views.RearPortCreateView.as_view(), name='rearport_add'), + url(r'^devices/(?P\d+)/rear-ports/add/$', cached(views.RearPortCreateView.as_view()), name='rearport_add'), url(r'^devices/(?P\d+)/rear-ports/edit/$', views.RearPortBulkEditView.as_view(), name='rearport_bulk_edit'), url(r'^devices/(?P\d+)/rear-ports/delete/$', views.RearPortBulkDeleteView.as_view(), name='rearport_bulk_delete'), url(r'^rear-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='rearport_connect', kwargs={'termination_a_type': RearPort}), url(r'^rear-ports/(?P\d+)/edit/$', views.RearPortEditView.as_view(), name='rearport_edit'), url(r'^rear-ports/(?P\d+)/delete/$', views.RearPortDeleteView.as_view(), name='rearport_delete'), - url(r'^rear-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='rearport_trace', kwargs={'model': RearPort}), - url(r'^rear-ports/rename/$', views.RearPortBulkRenameView.as_view(), name='rearport_bulk_rename'), + url(r'^rear-ports/(?P\d+)/trace/$',cached( views.CableTraceView.as_view()), name='rearport_trace', kwargs={'model': RearPort}), + url(r'^rear-ports/rename/$', cached(views.RearPortBulkRenameView.as_view()), name='rearport_bulk_rename'), url(r'^rear-ports/disconnect/$', views.RearPortBulkDisconnectView.as_view(), name='rearport_bulk_disconnect'), # Device bays - url(r'^devices/device-bays/add/$', views.DeviceBulkAddDeviceBayView.as_view(), name='device_bulk_add_devicebay'), - url(r'^devices/(?P\d+)/bays/add/$', views.DeviceBayCreateView.as_view(), name='devicebay_add'), + url(r'^devices/device-bays/add/$', cached(views.DeviceBulkAddDeviceBayView.as_view()), name='device_bulk_add_devicebay'), + url(r'^devices/(?P\d+)/bays/add/$', cached(views.DeviceBayCreateView.as_view()), name='devicebay_add'), url(r'^devices/(?P\d+)/bays/delete/$', views.DeviceBayBulkDeleteView.as_view(), name='devicebay_bulk_delete'), url(r'^device-bays/(?P\d+)/edit/$', views.DeviceBayEditView.as_view(), name='devicebay_edit'), url(r'^device-bays/(?P\d+)/delete/$', views.DeviceBayDeleteView.as_view(), name='devicebay_delete'), url(r'^device-bays/(?P\d+)/populate/$', views.DeviceBayPopulateView.as_view(), name='devicebay_populate'), url(r'^device-bays/(?P\d+)/depopulate/$', views.DeviceBayDepopulateView.as_view(), name='devicebay_depopulate'), - url(r'^device-bays/rename/$', views.DeviceBayBulkRenameView.as_view(), name='devicebay_bulk_rename'), + url(r'^device-bays/rename/$', cached(views.DeviceBayBulkRenameView.as_view()), name='devicebay_bulk_rename'), # Inventory items - url(r'^inventory-items/$', views.InventoryItemListView.as_view(), name='inventoryitem_list'), + url(r'^inventory-items/$', cached(views.InventoryItemListView.as_view()), name='inventoryitem_list'), url(r'^inventory-items/import/$', views.InventoryItemBulkImportView.as_view(), name='inventoryitem_import'), url(r'^inventory-items/edit/$', views.InventoryItemBulkEditView.as_view(), name='inventoryitem_bulk_edit'), url(r'^inventory-items/delete/$', views.InventoryItemBulkDeleteView.as_view(), name='inventoryitem_bulk_delete'), url(r'^inventory-items/(?P\d+)/edit/$', views.InventoryItemEditView.as_view(), name='inventoryitem_edit'), url(r'^inventory-items/(?P\d+)/delete/$', views.InventoryItemDeleteView.as_view(), name='inventoryitem_delete'), - url(r'^devices/(?P\d+)/inventory-items/add/$', views.InventoryItemEditView.as_view(), name='inventoryitem_add'), + url(r'^devices/(?P\d+)/inventory-items/add/$', cached(views.InventoryItemEditView.as_view()), name='inventoryitem_add'), # Cables - url(r'^cables/$', views.CableListView.as_view(), name='cable_list'), + url(r'^cables/$', cached(views.CableListView.as_view()), name='cable_list'), url(r'^cables/import/$', views.CableBulkImportView.as_view(), name='cable_import'), url(r'^cables/edit/$', views.CableBulkEditView.as_view(), name='cable_bulk_edit'), url(r'^cables/delete/$', views.CableBulkDeleteView.as_view(), name='cable_bulk_delete'), - url(r'^cables/(?P\d+)/$', views.CableView.as_view(), name='cable'), + url(r'^cables/(?P\d+)/$', cached(views.CableView.as_view()), name='cable'), url(r'^cables/(?P\d+)/edit/$', views.CableEditView.as_view(), name='cable_edit'), url(r'^cables/(?P\d+)/delete/$', views.CableDeleteView.as_view(), name='cable_delete'), - url(r'^cables/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='cable_changelog', kwargs={'model': Cable}), + url(r'^cables/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='cable_changelog', kwargs={'model': Cable}), # Console/power/interface connections (read-only) - url(r'^console-connections/$', views.ConsoleConnectionsListView.as_view(), name='console_connections_list'), - url(r'^power-connections/$', views.PowerConnectionsListView.as_view(), name='power_connections_list'), - url(r'^interface-connections/$', views.InterfaceConnectionsListView.as_view(), name='interface_connections_list'), + url(r'^console-connections/$', cached(views.ConsoleConnectionsListView.as_view()), name='console_connections_list'), + url(r'^power-connections/$', cached(views.PowerConnectionsListView.as_view()), name='power_connections_list'), + url(r'^interface-connections/$', cached(views.InterfaceConnectionsListView.as_view()), name='interface_connections_list'), # Virtual chassis - url(r'^virtual-chassis/$', views.VirtualChassisListView.as_view(), name='virtualchassis_list'), - url(r'^virtual-chassis/add/$', views.VirtualChassisCreateView.as_view(), name='virtualchassis_add'), + url(r'^virtual-chassis/$', cached(views.VirtualChassisListView.as_view()), name='virtualchassis_list'), + url(r'^virtual-chassis/add/$', cached(views.VirtualChassisCreateView.as_view()), name='virtualchassis_add'), url(r'^virtual-chassis/(?P\d+)/edit/$', views.VirtualChassisEditView.as_view(), name='virtualchassis_edit'), url(r'^virtual-chassis/(?P\d+)/delete/$', views.VirtualChassisDeleteView.as_view(), name='virtualchassis_delete'), - url(r'^virtual-chassis/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='virtualchassis_changelog', kwargs={'model': VirtualChassis}), + url(r'^virtual-chassis/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='virtualchassis_changelog', kwargs={'model': VirtualChassis}), url(r'^virtual-chassis/(?P\d+)/add-member/$', views.VirtualChassisAddMemberView.as_view(), name='virtualchassis_add_member'), url(r'^virtual-chassis-members/(?P\d+)/delete/$', views.VirtualChassisRemoveMemberView.as_view(), name='virtualchassis_remove_member'), # Power panels - url(r'^power-panels/$', views.PowerPanelListView.as_view(), name='powerpanel_list'), - url(r'^power-panels/add/$', views.PowerPanelCreateView.as_view(), name='powerpanel_add'), + url(r'^power-panels/$', cached(views.PowerPanelListView.as_view()), name='powerpanel_list'), + url(r'^power-panels/add/$', cached(views.PowerPanelCreateView.as_view()), name='powerpanel_add'), url(r'^power-panels/import/$', views.PowerPanelBulkImportView.as_view(), name='powerpanel_import'), url(r'^power-panels/delete/$', views.PowerPanelBulkDeleteView.as_view(), name='powerpanel_bulk_delete'), - url(r'^power-panels/(?P\d+)/$', views.PowerPanelView.as_view(), name='powerpanel'), + url(r'^power-panels/(?P\d+)/$', cached(views.PowerPanelView.as_view()), name='powerpanel'), url(r'^power-panels/(?P\d+)/edit/$', views.PowerPanelEditView.as_view(), name='powerpanel_edit'), url(r'^power-panels/(?P\d+)/delete/$', views.PowerPanelDeleteView.as_view(), name='powerpanel_delete'), - url(r'^power-panels/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='powerpanel_changelog', kwargs={'model': PowerPanel}), + url(r'^power-panels/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='powerpanel_changelog', kwargs={'model': PowerPanel}), # Power feeds - url(r'^power-feeds/$', views.PowerFeedListView.as_view(), name='powerfeed_list'), - url(r'^power-feeds/add/$', views.PowerFeedEditView.as_view(), name='powerfeed_add'), + url(r'^power-feeds/$', cached(views.PowerFeedListView.as_view()), name='powerfeed_list'), + url(r'^power-feeds/add/$', cached(views.PowerFeedEditView.as_view()), name='powerfeed_add'), url(r'^power-feeds/import/$', views.PowerFeedBulkImportView.as_view(), name='powerfeed_import'), url(r'^power-feeds/edit/$', views.PowerFeedBulkEditView.as_view(), name='powerfeed_bulk_edit'), url(r'^power-feeds/delete/$', views.PowerFeedBulkDeleteView.as_view(), name='powerfeed_bulk_delete'), - url(r'^power-feeds/(?P\d+)/$', views.PowerFeedView.as_view(), name='powerfeed'), + url(r'^power-feeds/(?P\d+)/$', cached(views.PowerFeedView.as_view()), name='powerfeed'), url(r'^power-feeds/(?P\d+)/edit/$', views.PowerFeedEditView.as_view(), name='powerfeed_edit'), url(r'^power-feeds/(?P\d+)/delete/$', views.PowerFeedDeleteView.as_view(), name='powerfeed_delete'), - url(r'^power-feeds/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='powerfeed_changelog', kwargs={'model': PowerFeed}), + url(r'^power-feeds/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='powerfeed_changelog', kwargs={'model': PowerFeed}), ] diff --git a/netbox/extras/urls.py b/netbox/extras/urls.py index d475ab5a3..63e060616 100644 --- a/netbox/extras/urls.py +++ b/netbox/extras/urls.py @@ -2,25 +2,26 @@ from django.conf.urls import url from extras import views from extras.models import Tag +from utilities.urls import cached app_name = 'extras' urlpatterns = [ # Tags - url(r'^tags/$', views.TagListView.as_view(), name='tag_list'), + url(r'^tags/$', cached(views.TagListView.as_view()), name='tag_list'), url(r'^tags/delete/$', views.TagBulkDeleteView.as_view(), name='tag_bulk_delete'), - url(r'^tags/(?P[\w-]+)/$', views.TagView.as_view(), name='tag'), + url(r'^tags/(?P[\w-]+)/$', cached(views.TagView.as_view()), name='tag'), url(r'^tags/(?P[\w-]+)/edit/$', views.TagEditView.as_view(), name='tag_edit'), url(r'^tags/(?P[\w-]+)/delete/$', views.TagDeleteView.as_view(), name='tag_delete'), - url(r'^tags/(?P[\w-]+)/changelog/$', views.ObjectChangeLogView.as_view(), name='tag_changelog', kwargs={'model': Tag}), + url(r'^tags/(?P[\w-]+)/changelog/$', cached(views.ObjectChangeLogView.as_view()), name='tag_changelog', kwargs={'model': Tag}), # Config contexts - url(r'^config-contexts/$', views.ConfigContextListView.as_view(), name='configcontext_list'), - url(r'^config-contexts/add/$', views.ConfigContextCreateView.as_view(), name='configcontext_add'), + url(r'^config-contexts/$', cached(views.ConfigContextListView.as_view()), name='configcontext_list'), + url(r'^config-contexts/add/$', cached(views.ConfigContextCreateView.as_view()), name='configcontext_add'), url(r'^config-contexts/edit/$', views.ConfigContextBulkEditView.as_view(), name='configcontext_bulk_edit'), url(r'^config-contexts/delete/$', views.ConfigContextBulkDeleteView.as_view(), name='configcontext_bulk_delete'), - url(r'^config-contexts/(?P\d+)/$', views.ConfigContextView.as_view(), name='configcontext'), + url(r'^config-contexts/(?P\d+)/$', cached(views.ConfigContextView.as_view()), name='configcontext'), url(r'^config-contexts/(?P\d+)/edit/$', views.ConfigContextEditView.as_view(), name='configcontext_edit'), url(r'^config-contexts/(?P\d+)/delete/$', views.ConfigContextDeleteView.as_view(), name='configcontext_delete'), @@ -29,12 +30,12 @@ urlpatterns = [ url(r'^image-attachments/(?P\d+)/delete/$', views.ImageAttachmentDeleteView.as_view(), name='imageattachment_delete'), # Reports - url(r'^reports/$', views.ReportListView.as_view(), name='report_list'), - url(r'^reports/(?P[^/]+\.[^/]+)/$', views.ReportView.as_view(), name='report'), + url(r'^reports/$', cached(views.ReportListView.as_view()), name='report_list'), + url(r'^reports/(?P[^/]+\.[^/]+)/$', cached(views.ReportView.as_view()), name='report'), url(r'^reports/(?P[^/]+\.[^/]+)/run/$', views.ReportRunView.as_view(), name='report_run'), # Change logging - url(r'^changelog/$', views.ObjectChangeListView.as_view(), name='objectchange_list'), - url(r'^changelog/(?P\d+)/$', views.ObjectChangeView.as_view(), name='objectchange'), + url(r'^changelog/$', cached(views.ObjectChangeListView.as_view()), name='objectchange_list'), + url(r'^changelog/(?P\d+)/$', cached(views.ObjectChangeView.as_view()), name='objectchange'), ] diff --git a/netbox/ipam/urls.py b/netbox/ipam/urls.py index c2f7badd3..563177700 100644 --- a/netbox/ipam/urls.py +++ b/netbox/ipam/urls.py @@ -1,6 +1,7 @@ from django.conf.urls import url from extras.views import ObjectChangeLogView +from utilities.urls import cached from . import views from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF @@ -8,97 +9,97 @@ app_name = 'ipam' urlpatterns = [ # VRFs - url(r'^vrfs/$', views.VRFListView.as_view(), name='vrf_list'), - url(r'^vrfs/add/$', views.VRFCreateView.as_view(), name='vrf_add'), + url(r'^vrfs/$', cached(views.VRFListView.as_view()), name='vrf_list'), + url(r'^vrfs/add/$', cached(views.VRFCreateView.as_view()), name='vrf_add'), url(r'^vrfs/import/$', views.VRFBulkImportView.as_view(), name='vrf_import'), url(r'^vrfs/edit/$', views.VRFBulkEditView.as_view(), name='vrf_bulk_edit'), url(r'^vrfs/delete/$', views.VRFBulkDeleteView.as_view(), name='vrf_bulk_delete'), - url(r'^vrfs/(?P\d+)/$', views.VRFView.as_view(), name='vrf'), + url(r'^vrfs/(?P\d+)/$', cached(views.VRFView.as_view()), name='vrf'), url(r'^vrfs/(?P\d+)/edit/$', views.VRFEditView.as_view(), name='vrf_edit'), url(r'^vrfs/(?P\d+)/delete/$', views.VRFDeleteView.as_view(), name='vrf_delete'), - url(r'^vrfs/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='vrf_changelog', kwargs={'model': VRF}), + url(r'^vrfs/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='vrf_changelog', kwargs={'model': VRF}), # RIRs - url(r'^rirs/$', views.RIRListView.as_view(), name='rir_list'), - url(r'^rirs/add/$', views.RIRCreateView.as_view(), name='rir_add'), + url(r'^rirs/$', cached(views.RIRListView.as_view()), name='rir_list'), + url(r'^rirs/add/$', cached(views.RIRCreateView.as_view()), name='rir_add'), url(r'^rirs/import/$', views.RIRBulkImportView.as_view(), name='rir_import'), url(r'^rirs/delete/$', views.RIRBulkDeleteView.as_view(), name='rir_bulk_delete'), url(r'^rirs/(?P[\w-]+)/edit/$', views.RIREditView.as_view(), name='rir_edit'), - url(r'^vrfs/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='rir_changelog', kwargs={'model': RIR}), + url(r'^vrfs/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='rir_changelog', kwargs={'model': RIR}), # Aggregates - url(r'^aggregates/$', views.AggregateListView.as_view(), name='aggregate_list'), - url(r'^aggregates/add/$', views.AggregateCreateView.as_view(), name='aggregate_add'), + url(r'^aggregates/$', cached(views.AggregateListView.as_view()), name='aggregate_list'), + url(r'^aggregates/add/$', cached(views.AggregateCreateView.as_view()), name='aggregate_add'), url(r'^aggregates/import/$', views.AggregateBulkImportView.as_view(), name='aggregate_import'), url(r'^aggregates/edit/$', views.AggregateBulkEditView.as_view(), name='aggregate_bulk_edit'), url(r'^aggregates/delete/$', views.AggregateBulkDeleteView.as_view(), name='aggregate_bulk_delete'), - url(r'^aggregates/(?P\d+)/$', views.AggregateView.as_view(), name='aggregate'), + url(r'^aggregates/(?P\d+)/$', cached(views.AggregateView.as_view()), name='aggregate'), url(r'^aggregates/(?P\d+)/edit/$', views.AggregateEditView.as_view(), name='aggregate_edit'), url(r'^aggregates/(?P\d+)/delete/$', views.AggregateDeleteView.as_view(), name='aggregate_delete'), - url(r'^aggregates/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='aggregate_changelog', kwargs={'model': Aggregate}), + url(r'^aggregates/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='aggregate_changelog', kwargs={'model': Aggregate}), # Roles - url(r'^roles/$', views.RoleListView.as_view(), name='role_list'), - url(r'^roles/add/$', views.RoleCreateView.as_view(), name='role_add'), + url(r'^roles/$', cached(views.RoleListView.as_view()), name='role_list'), + url(r'^roles/add/$', cached(views.RoleCreateView.as_view()), name='role_add'), url(r'^roles/import/$', views.RoleBulkImportView.as_view(), name='role_import'), url(r'^roles/delete/$', views.RoleBulkDeleteView.as_view(), name='role_bulk_delete'), url(r'^roles/(?P[\w-]+)/edit/$', views.RoleEditView.as_view(), name='role_edit'), - url(r'^roles/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='role_changelog', kwargs={'model': Role}), + url(r'^roles/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='role_changelog', kwargs={'model': Role}), # Prefixes - url(r'^prefixes/$', views.PrefixListView.as_view(), name='prefix_list'), - url(r'^prefixes/add/$', views.PrefixCreateView.as_view(), name='prefix_add'), + url(r'^prefixes/$', cached(views.PrefixListView.as_view()), name='prefix_list'), + url(r'^prefixes/add/$', cached(views.PrefixCreateView.as_view()), name='prefix_add'), url(r'^prefixes/import/$', views.PrefixBulkImportView.as_view(), name='prefix_import'), url(r'^prefixes/edit/$', views.PrefixBulkEditView.as_view(), name='prefix_bulk_edit'), url(r'^prefixes/delete/$', views.PrefixBulkDeleteView.as_view(), name='prefix_bulk_delete'), - url(r'^prefixes/(?P\d+)/$', views.PrefixView.as_view(), name='prefix'), + url(r'^prefixes/(?P\d+)/$', cached(views.PrefixView.as_view()), name='prefix'), url(r'^prefixes/(?P\d+)/edit/$', views.PrefixEditView.as_view(), name='prefix_edit'), url(r'^prefixes/(?P\d+)/delete/$', views.PrefixDeleteView.as_view(), name='prefix_delete'), - url(r'^prefixes/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='prefix_changelog', kwargs={'model': Prefix}), - url(r'^prefixes/(?P\d+)/prefixes/$', views.PrefixPrefixesView.as_view(), name='prefix_prefixes'), - url(r'^prefixes/(?P\d+)/ip-addresses/$', views.PrefixIPAddressesView.as_view(), name='prefix_ipaddresses'), + url(r'^prefixes/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='prefix_changelog', kwargs={'model': Prefix}), + url(r'^prefixes/(?P\d+)/prefixes/$', cached(views.PrefixPrefixesView.as_view()), name='prefix_prefixes'), + url(r'^prefixes/(?P\d+)/ip-addresses/$', cached(views.PrefixIPAddressesView.as_view()), name='prefix_ipaddresses'), # IP addresses - url(r'^ip-addresses/$', views.IPAddressListView.as_view(), name='ipaddress_list'), - url(r'^ip-addresses/add/$', views.IPAddressCreateView.as_view(), name='ipaddress_add'), - url(r'^ip-addresses/bulk-add/$', views.IPAddressBulkCreateView.as_view(), name='ipaddress_bulk_add'), + url(r'^ip-addresses/$', cached(views.IPAddressListView.as_view()), name='ipaddress_list'), + url(r'^ip-addresses/add/$', cached(views.IPAddressCreateView.as_view()), name='ipaddress_add'), + url(r'^ip-addresses/bulk-add/$', cached(views.IPAddressBulkCreateView.as_view()), name='ipaddress_bulk_add'), url(r'^ip-addresses/import/$', views.IPAddressBulkImportView.as_view(), name='ipaddress_import'), url(r'^ip-addresses/edit/$', views.IPAddressBulkEditView.as_view(), name='ipaddress_bulk_edit'), url(r'^ip-addresses/delete/$', views.IPAddressBulkDeleteView.as_view(), name='ipaddress_bulk_delete'), - url(r'^ip-addresses/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='ipaddress_changelog', kwargs={'model': IPAddress}), + url(r'^ip-addresses/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='ipaddress_changelog', kwargs={'model': IPAddress}), url(r'^ip-addresses/assign/$', views.IPAddressAssignView.as_view(), name='ipaddress_assign'), - url(r'^ip-addresses/(?P\d+)/$', views.IPAddressView.as_view(), name='ipaddress'), + url(r'^ip-addresses/(?P\d+)/$', cached(views.IPAddressView.as_view()), name='ipaddress'), url(r'^ip-addresses/(?P\d+)/edit/$', views.IPAddressEditView.as_view(), name='ipaddress_edit'), url(r'^ip-addresses/(?P\d+)/delete/$', views.IPAddressDeleteView.as_view(), name='ipaddress_delete'), # VLAN groups - url(r'^vlan-groups/$', views.VLANGroupListView.as_view(), name='vlangroup_list'), - url(r'^vlan-groups/add/$', views.VLANGroupCreateView.as_view(), name='vlangroup_add'), + url(r'^vlan-groups/$', cached(views.VLANGroupListView.as_view()), name='vlangroup_list'), + url(r'^vlan-groups/add/$', cached(views.VLANGroupCreateView.as_view()), name='vlangroup_add'), url(r'^vlan-groups/import/$', views.VLANGroupBulkImportView.as_view(), name='vlangroup_import'), url(r'^vlan-groups/delete/$', views.VLANGroupBulkDeleteView.as_view(), name='vlangroup_bulk_delete'), url(r'^vlan-groups/(?P\d+)/edit/$', views.VLANGroupEditView.as_view(), name='vlangroup_edit'), - url(r'^vlan-groups/(?P\d+)/vlans/$', views.VLANGroupVLANsView.as_view(), name='vlangroup_vlans'), - url(r'^vlan-groups/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='vlangroup_changelog', kwargs={'model': VLANGroup}), + url(r'^vlan-groups/(?P\d+)/vlans/$', cached(views.VLANGroupVLANsView.as_view()), name='vlangroup_vlans'), + url(r'^vlan-groups/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='vlangroup_changelog', kwargs={'model': VLANGroup}), # VLANs - url(r'^vlans/$', views.VLANListView.as_view(), name='vlan_list'), - url(r'^vlans/add/$', views.VLANCreateView.as_view(), name='vlan_add'), + url(r'^vlans/$', cached(views.VLANListView.as_view()), name='vlan_list'), + url(r'^vlans/add/$', cached(views.VLANCreateView.as_view()), name='vlan_add'), url(r'^vlans/import/$', views.VLANBulkImportView.as_view(), name='vlan_import'), url(r'^vlans/edit/$', views.VLANBulkEditView.as_view(), name='vlan_bulk_edit'), url(r'^vlans/delete/$', views.VLANBulkDeleteView.as_view(), name='vlan_bulk_delete'), - url(r'^vlans/(?P\d+)/$', views.VLANView.as_view(), name='vlan'), - url(r'^vlans/(?P\d+)/members/$', views.VLANMembersView.as_view(), name='vlan_members'), + url(r'^vlans/(?P\d+)/$', cached(views.VLANView.as_view()), name='vlan'), + url(r'^vlans/(?P\d+)/members/$', cached(views.VLANMembersView.as_view()), name='vlan_members'), url(r'^vlans/(?P\d+)/edit/$', views.VLANEditView.as_view(), name='vlan_edit'), url(r'^vlans/(?P\d+)/delete/$', views.VLANDeleteView.as_view(), name='vlan_delete'), - url(r'^vlans/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='vlan_changelog', kwargs={'model': VLAN}), + url(r'^vlans/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='vlan_changelog', kwargs={'model': VLAN}), # Services - url(r'^services/$', views.ServiceListView.as_view(), name='service_list'), + url(r'^services/$', cached(views.ServiceListView.as_view()), name='service_list'), url(r'^services/edit/$', views.ServiceBulkEditView.as_view(), name='service_bulk_edit'), url(r'^services/delete/$', views.ServiceBulkDeleteView.as_view(), name='service_bulk_delete'), - url(r'^services/(?P\d+)/$', views.ServiceView.as_view(), name='service'), + url(r'^services/(?P\d+)/$', cached(views.ServiceView.as_view()), name='service'), url(r'^services/(?P\d+)/edit/$', views.ServiceEditView.as_view(), name='service_edit'), url(r'^services/(?P\d+)/delete/$', views.ServiceDeleteView.as_view(), name='service_delete'), - url(r'^services/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='service_changelog', kwargs={'model': Service}), + url(r'^services/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='service_changelog', kwargs={'model': Service}), ] diff --git a/netbox/netbox/configuration.example.py b/netbox/netbox/configuration.example.py index 6efecdf35..ee55ade40 100644 --- a/netbox/netbox/configuration.example.py +++ b/netbox/netbox/configuration.example.py @@ -25,6 +25,16 @@ DATABASE = { # https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-SECRET_KEY SECRET_KEY = '' +# Redis database settings. The Redis database is used for caching and background processing such as webhooks +REDIS = { + 'HOST': 'localhost', + 'PORT': 6379, + 'PASSWORD': '', + 'DATABASE': 0, + 'DEFAULT_TIMEOUT': 300, + 'SSL': False, +} + ######################### # # @@ -50,6 +60,18 @@ BANNER_LOGIN = '' # BASE_PATH = 'netbox/' BASE_PATH = '' +# Cache timeout in seconds. Set to `None` to enforce an infinate timeout. Set to 0 to dissable caching by immediatly +# expiring keys. Defaults to 900 (15 minutes) +CACHE_TIMEOUT = 900 + +# Max number of entries (unique pages) to store in the cache at a time. +CACHE_MAX_ENTRIES = 300 + +# The fraction of entries that are culled when CACHE_MAX_ENTRIES is reached. The actual ratio is 1 / CACHE_CULL_FREQUENCY, +# so set CACHE_CULL_FREQUENCY to 2 to cull half the entries when CACHE_MAX_ENTRIES is reached. This setting should be an +# integer and defaults to 3 +CACHE_CULL_FREQUENCY = 3 + # Maximum number of days to retain logged changes. Set to 0 to retain changes indefinitely. (Default: 90) CHANGELOG_RETENTION = 90 @@ -133,16 +155,6 @@ PAGINATE_COUNT = 50 # prefer IPv4 instead. PREFER_IPV4 = False -# Redis database settings (optional). A Redis database is required only if the webhooks backend is enabled. -REDIS = { - 'HOST': 'localhost', - 'PORT': 6379, - 'PASSWORD': '', - 'DATABASE': 0, - 'DEFAULT_TIMEOUT': 300, - 'SSL': False, -} - # The file path where custom reports will be stored. A trailing slash is not needed. Note that the default value of # this setting is derived from the installed location. # REPORTS_ROOT = '/opt/netbox/netbox/reports' @@ -159,6 +171,9 @@ TIME_ZONE = 'UTC' # database be configured and accessible by NetBox. WEBHOOKS_ENABLED = False +# Expose Prometheus monitoring metrics at `/metrics` +PROMETHEUS_ENABLE = False + # Date/time formatting. See the following link for supported formats: # https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'N j, Y' diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 69a9c13f7..805113a1e 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -28,7 +28,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Import required configuration parameters ALLOWED_HOSTS = DATABASE = SECRET_KEY = None -for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: +for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY', 'REDIS']: try: globals()[setting] = getattr(configuration, setting) except AttributeError: @@ -44,6 +44,9 @@ BANNER_TOP = getattr(configuration, 'BANNER_TOP', '') BASE_PATH = getattr(configuration, 'BASE_PATH', '') if BASE_PATH: BASE_PATH = BASE_PATH.strip('/') + '/' # Enforce trailing slash only +CACHE_TIMEOUT = getattr(configuration, 'CACHE_TIMEOUT', 900) +CACHE_MAX_ENTRIES = getattr(configuration, 'CACHE_MAX_ENTRIES', 300) +CACHE_CULL_FREQUENCY = getattr(configuration, 'CACHE_CULL_FREQUENCY', 3) CHANGELOG_RETENTION = getattr(configuration, 'CHANGELOG_RETENTION', 90) CORS_ORIGIN_ALLOW_ALL = getattr(configuration, 'CORS_ORIGIN_ALLOW_ALL', False) CORS_ORIGIN_REGEX_WHITELIST = getattr(configuration, 'CORS_ORIGIN_REGEX_WHITELIST', []) @@ -65,6 +68,7 @@ NAPALM_PASSWORD = getattr(configuration, 'NAPALM_PASSWORD', '') NAPALM_TIMEOUT = getattr(configuration, 'NAPALM_TIMEOUT', 30) NAPALM_ARGS = getattr(configuration, 'NAPALM_ARGS', {}) PAGINATE_COUNT = getattr(configuration, 'PAGINATE_COUNT', 50) +PROMETHEUS_ENABLE = getattr(configuration, 'PROMETHEUS_ENABLE', False) PREFER_IPV4 = getattr(configuration, 'PREFER_IPV4', False) REPORTS_ROOT = getattr(configuration, 'REPORTS_ROOT', os.path.join(BASE_DIR, 'reports')).rstrip('/') REDIS = getattr(configuration, 'REDIS', {}) @@ -157,6 +161,8 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'django.contrib.humanize', 'corsheaders', + 'django_prometheus', + 'django_redis', 'debug_toolbar', 'django_filters', 'django_tables2', @@ -184,6 +190,7 @@ if WEBHOOKS_ENABLED: # Middleware MIDDLEWARE = ( 'debug_toolbar.middleware.DebugToolbarMiddleware', + 'django_prometheus.middleware.PrometheusBeforeMiddleware', 'corsheaders.middleware.CorsMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', @@ -196,6 +203,7 @@ MIDDLEWARE = ( 'utilities.middleware.LoginRequiredMiddleware', 'utilities.middleware.APIVersionMiddleware', 'extras.middleware.ObjectChangeMiddleware', + 'django_prometheus.middleware.PrometheusAfterMiddleware', ) ROOT_URLCONF = 'netbox.urls' @@ -218,6 +226,35 @@ TEMPLATES = [ }, ] +# Caching +if REDIS_SSL: + REDIS_CACHE_CON_STRING = 'rediss://' +else: + REDIS_CACHE_CON_STRING = 'redis://' + +if REDIS_PASSWORD: + REDIS_CACHE_CON_STRING = '{}@{}'.format(REDIS_PASSWORD, REDIS_CACHE_CON_STRING) + +REDIS_CACHE_CON_STRING = '{}{}:{}/{}'.format(REDIS_CACHE_CON_STRING, REDIS_HOST, REDIS_PORT, REDIS_DATABASE) + +if PROMETHEUS_ENABLE: + CACHE_BACKEND = 'django_prometheus.cache.backends.redis.RedisCache' +else: + CACHE_BACKEND = 'django_redis.cache.RedisCache' + +CACHES = { + "default": { + "BACKEND": CACHE_BACKEND, + "LOCATION": REDIS_CACHE_CON_STRING, + 'TIMEOUT': CACHE_TIMEOUT, + "OPTIONS": { + "CLIENT_CLASS": "django_redis.client.DefaultClient", + "MAX_ENTRIES": CACHE_MAX_ENTRIES, + "CULL_FREQUENCY": CACHE_CULL_FREQUENCY + } + } +} + # WSGI WSGI_APPLICATION = 'netbox.wsgi.application' SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py index 45c99beb9..dd7aa7f8f 100644 --- a/netbox/netbox/urls.py +++ b/netbox/netbox/urls.py @@ -6,6 +6,7 @@ from drf_yasg.views import get_schema_view from netbox.views import APIRootView, HomeView, SearchView from users.views import LoginView, LogoutView +from utilities.urls import cached from .admin import admin_site schema_view = get_schema_view( @@ -24,11 +25,11 @@ schema_view = get_schema_view( _patterns = [ # Base views - url(r'^$', HomeView.as_view(), name='home'), - url(r'^search/$', SearchView.as_view(), name='search'), + url(r'^$', cached(HomeView.as_view()), name='home'), + url(r'^search/$', cached(SearchView.as_view()), name='search'), # Login/logout - url(r'^login/$', LoginView.as_view(), name='login'), + url(r'^login/$', cached(LoginView.as_view()), name='login'), url(r'^logout/$', LogoutView.as_view(), name='logout'), # Apps @@ -42,7 +43,7 @@ _patterns = [ url(r'^virtualization/', include('virtualization.urls')), # API - url(r'^api/$', APIRootView.as_view(), name='api-root'), + url(r'^api/$', cached(APIRootView.as_view()), name='api-root'), url(r'^api/circuits/', include('circuits.api.urls')), url(r'^api/dcim/', include('dcim.api.urls')), url(r'^api/extras/', include('extras.api.urls')), @@ -67,6 +68,11 @@ if settings.WEBHOOKS_ENABLED: url(r'^admin/webhook-backend-status/', include('django_rq.urls')), ] +if settings.PROMETHEUS_ENABLE: + _patterns += [ + url('', include('django_prometheus.urls')), + ] + if settings.DEBUG: import debug_toolbar _patterns += [ diff --git a/netbox/secrets/urls.py b/netbox/secrets/urls.py index e1ce2b8f2..1b73a2ca8 100644 --- a/netbox/secrets/urls.py +++ b/netbox/secrets/urls.py @@ -1,6 +1,7 @@ from django.conf.urls import url from extras.views import ObjectChangeLogView +from utilities.urls import cached from . import views from .models import Secret, SecretRole @@ -8,21 +9,21 @@ app_name = 'secrets' urlpatterns = [ # Secret roles - url(r'^secret-roles/$', views.SecretRoleListView.as_view(), name='secretrole_list'), - url(r'^secret-roles/add/$', views.SecretRoleCreateView.as_view(), name='secretrole_add'), + url(r'^secret-roles/$', cached(views.SecretRoleListView.as_view()), name='secretrole_list'), + url(r'^secret-roles/add/$', cached(views.SecretRoleCreateView.as_view()), name='secretrole_add'), url(r'^secret-roles/import/$', views.SecretRoleBulkImportView.as_view(), name='secretrole_import'), url(r'^secret-roles/delete/$', views.SecretRoleBulkDeleteView.as_view(), name='secretrole_bulk_delete'), url(r'^secret-roles/(?P[\w-]+)/edit/$', views.SecretRoleEditView.as_view(), name='secretrole_edit'), - url(r'^secret-roles/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='secretrole_changelog', kwargs={'model': SecretRole}), + url(r'^secret-roles/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='secretrole_changelog', kwargs={'model': SecretRole}), # Secrets - url(r'^secrets/$', views.SecretListView.as_view(), name='secret_list'), + url(r'^secrets/$', cached(views.SecretListView.as_view()), name='secret_list'), url(r'^secrets/import/$', views.SecretBulkImportView.as_view(), name='secret_import'), url(r'^secrets/edit/$', views.SecretBulkEditView.as_view(), name='secret_bulk_edit'), url(r'^secrets/delete/$', views.SecretBulkDeleteView.as_view(), name='secret_bulk_delete'), - url(r'^secrets/(?P\d+)/$', views.SecretView.as_view(), name='secret'), + url(r'^secrets/(?P\d+)/$', cached(views.SecretView.as_view()), name='secret'), url(r'^secrets/(?P\d+)/edit/$', views.secret_edit, name='secret_edit'), url(r'^secrets/(?P\d+)/delete/$', views.SecretDeleteView.as_view(), name='secret_delete'), - url(r'^secrets/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='secret_changelog', kwargs={'model': Secret}), + url(r'^secrets/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='secret_changelog', kwargs={'model': Secret}), ] diff --git a/netbox/tenancy/urls.py b/netbox/tenancy/urls.py index 19522e6c7..ab3a020e0 100644 --- a/netbox/tenancy/urls.py +++ b/netbox/tenancy/urls.py @@ -1,6 +1,7 @@ from django.conf.urls import url from extras.views import ObjectChangeLogView +from utilities.urls import cached from . import views from .models import Tenant, TenantGroup @@ -8,22 +9,22 @@ app_name = 'tenancy' urlpatterns = [ # Tenant groups - url(r'^tenant-groups/$', views.TenantGroupListView.as_view(), name='tenantgroup_list'), - url(r'^tenant-groups/add/$', views.TenantGroupCreateView.as_view(), name='tenantgroup_add'), + url(r'^tenant-groups/$', cached(views.TenantGroupListView.as_view()), name='tenantgroup_list'), + url(r'^tenant-groups/add/$', cached(views.TenantGroupCreateView.as_view()), name='tenantgroup_add'), url(r'^tenant-groups/import/$', views.TenantGroupBulkImportView.as_view(), name='tenantgroup_import'), url(r'^tenant-groups/delete/$', views.TenantGroupBulkDeleteView.as_view(), name='tenantgroup_bulk_delete'), url(r'^tenant-groups/(?P[\w-]+)/edit/$', views.TenantGroupEditView.as_view(), name='tenantgroup_edit'), - url(r'^tenant-groups/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='tenantgroup_changelog', kwargs={'model': TenantGroup}), + url(r'^tenant-groups/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='tenantgroup_changelog', kwargs={'model': TenantGroup}), # Tenants - url(r'^tenants/$', views.TenantListView.as_view(), name='tenant_list'), - url(r'^tenants/add/$', views.TenantCreateView.as_view(), name='tenant_add'), + url(r'^tenants/$', cached(views.TenantListView.as_view()), name='tenant_list'), + url(r'^tenants/add/$', cached(views.TenantCreateView.as_view()), name='tenant_add'), url(r'^tenants/import/$', views.TenantBulkImportView.as_view(), name='tenant_import'), url(r'^tenants/edit/$', views.TenantBulkEditView.as_view(), name='tenant_bulk_edit'), url(r'^tenants/delete/$', views.TenantBulkDeleteView.as_view(), name='tenant_bulk_delete'), - url(r'^tenants/(?P[\w-]+)/$', views.TenantView.as_view(), name='tenant'), + url(r'^tenants/(?P[\w-]+)/$', cached(views.TenantView.as_view()), name='tenant'), url(r'^tenants/(?P[\w-]+)/edit/$', views.TenantEditView.as_view(), name='tenant_edit'), url(r'^tenants/(?P[\w-]+)/delete/$', views.TenantDeleteView.as_view(), name='tenant_delete'), - url(r'^tenants/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='tenant_changelog', kwargs={'model': Tenant}), + url(r'^tenants/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='tenant_changelog', kwargs={'model': Tenant}), ] diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py index fbebd09ff..d259343ae 100644 --- a/netbox/utilities/api.py +++ b/netbox/utilities/api.py @@ -6,6 +6,8 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist from django.db.models import ManyToManyField from django.http import Http404 +from django.utils.decorators import method_decorator +from django.views.decorators.cache import cache_page from rest_framework.exceptions import APIException from rest_framework.permissions import BasePermission from rest_framework.relations import PrimaryKeyRelatedField, RelatedField @@ -249,6 +251,21 @@ class ModelViewSet(_ModelViewSet): return self.serializer_class + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) + def list(self, *args, **kwargs): + """ + Call to super to allow for caching + """ + return super().list(*args, **kwargs) + + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) + def retrieve(self, *args, **kwargs): + """ + Call to super to allow for caching + """ + return super().retrieve(*args, **kwargs) + + class FieldChoicesViewSet(ViewSet): """ Expose the built-in numeric values which represent static choices for a model's field. @@ -284,9 +301,11 @@ class FieldChoicesViewSet(ViewSet): }) self._fields[key] = choices + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def list(self, request): return Response(self._fields) + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def retrieve(self, request, pk): if pk not in self._fields: raise Http404 diff --git a/netbox/utilities/urls.py b/netbox/utilities/urls.py new file mode 100644 index 000000000..f81b02257 --- /dev/null +++ b/netbox/utilities/urls.py @@ -0,0 +1,9 @@ +from django.conf import settings +from django.views.decorators.cache import cache_page + + +def cached(view): + """ + Return a cache_page decorated view + """ + return cache_page(settings.CACHE_TIMEOUT)(view) diff --git a/requirements.txt b/requirements.txt index f65328ecd..abcd4eea7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,8 @@ django-cors-headers==2.4.0 django-debug-toolbar==1.11 django-filter==2.0.0 django-mptt==0.9.1 +django-prometheus==1.0.15 +django-redis==4.5.0 django-tables2==2.0.3 django-taggit==0.23.0 django-taggit-serializer==0.1.7 From c11abbe8ca1d0f848b90033cd82c673b4eed8349 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Mon, 15 Apr 2019 04:07:52 -0400 Subject: [PATCH 054/140] pep8 and postgres backend --- netbox/dcim/urls.py | 2 +- netbox/netbox/settings.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 95b539d8b..88ce12441 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -234,7 +234,7 @@ urlpatterns = [ url(r'^rear-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='rearport_connect', kwargs={'termination_a_type': RearPort}), url(r'^rear-ports/(?P\d+)/edit/$', views.RearPortEditView.as_view(), name='rearport_edit'), url(r'^rear-ports/(?P\d+)/delete/$', views.RearPortDeleteView.as_view(), name='rearport_delete'), - url(r'^rear-ports/(?P\d+)/trace/$',cached( views.CableTraceView.as_view()), name='rearport_trace', kwargs={'model': RearPort}), + url(r'^rear-ports/(?P\d+)/trace/$', cached(views.CableTraceView.as_view()), name='rearport_trace', kwargs={'model': RearPort}), url(r'^rear-ports/rename/$', cached(views.RearPortBulkRenameView.as_view()), name='rearport_bulk_rename'), url(r'^rear-ports/disconnect/$', views.RearPortBulkDisconnectView.as_view(), name='rearport_bulk_disconnect'), diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 805113a1e..dce7d9cf9 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -118,7 +118,10 @@ else: ] # Database -configuration.DATABASE.update({'ENGINE': 'django.db.backends.postgresql'}) +if PROMETHEUS_ENABLE: + configuration.DATABASE.update({'ENGINE': 'django_prometheus.db.backends.postgresql'}) +else: + configuration.DATABASE.update({'ENGINE': 'django.db.backends.postgresql'}) DATABASES = { 'default': configuration.DATABASE, } From cdff29c7d502d1ecb734dccc288e80b88467203e Mon Sep 17 00:00:00 2001 From: John Anderson Date: Mon, 15 Apr 2019 04:16:22 -0400 Subject: [PATCH 055/140] add redis to travis builds --- .travis.yml | 1 + netbox/utilities/api.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 13c6d406b..29fa87b64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ sudo: required services: - postgresql + - redis-server addons: postgresql: "9.4" language: python diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py index d259343ae..40f14eb1f 100644 --- a/netbox/utilities/api.py +++ b/netbox/utilities/api.py @@ -250,7 +250,6 @@ class ModelViewSet(_ModelViewSet): # Fall back to the hard-coded serializer class return self.serializer_class - @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def list(self, *args, **kwargs): """ From 20670c546dbd07b7bd711da7c2f369e1ffba209a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 15 Apr 2019 13:14:48 -0400 Subject: [PATCH 056/140] Updated dependencies for v2.6 --- requirements.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/requirements.txt b/requirements.txt index f65328ecd..29c094764 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,19 +1,19 @@ -Django>=2.1.5,<2.2 -django-cors-headers==2.4.0 +Django>=2.2,<2.3 +django-cors-headers==2.5.2 django-debug-toolbar==1.11 -django-filter==2.0.0 +django-filter==2.1.0 django-mptt==0.9.1 -django-tables2==2.0.3 -django-taggit==0.23.0 +django-tables2==2.0.6 +django-taggit==1.1.0 django-taggit-serializer==0.1.7 django-timezone-field==3.0 -djangorestframework==3.9.0 -drf-yasg[validation]==1.14.0 +djangorestframework==3.9.2 +drf-yasg[validation]==1.15.0 graphviz==0.10.1 -Jinja2==2.10 +Jinja2==2.10.1 Markdown==2.6.11 netaddr==0.7.19 -Pillow==5.3.0 -psycopg2-binary==2.7.6.1 +Pillow==6.0.0 +psycopg2-binary==2.8.2 py-gfm==0.1.4 -pycryptodome==3.7.2 +pycryptodome==3.8.2 From 4723ddb5ce68fd9f772fa95da2052b75e931c6ac Mon Sep 17 00:00:00 2001 From: John Anderson Date: Mon, 15 Apr 2019 14:41:04 -0400 Subject: [PATCH 057/140] move caching to views --- base_requirements.txt | 4 - netbox/circuits/urls.py | 21 ++- netbox/circuits/views.py | 5 + netbox/dcim/urls.py | 203 ++++++++++++------------- netbox/dcim/views.py | 22 +++ netbox/extras/urls.py | 21 ++- netbox/extras/views.py | 9 ++ netbox/ipam/urls.py | 75 +++++---- netbox/ipam/views.py | 13 ++ netbox/netbox/configuration.example.py | 17 +-- netbox/netbox/settings.py | 15 +- netbox/netbox/urls.py | 14 +- netbox/netbox/views.py | 6 + netbox/secrets/urls.py | 13 +- netbox/secrets/views.py | 3 + netbox/tenancy/urls.py | 15 +- netbox/tenancy/views.py | 4 + netbox/utilities/urls.py | 9 -- netbox/utilities/views.py | 4 + netbox/virtualization/views.py | 6 + requirements.txt | 1 - 21 files changed, 256 insertions(+), 224 deletions(-) delete mode 100644 netbox/utilities/urls.py diff --git a/base_requirements.txt b/base_requirements.txt index cd7d9ef45..2aa97f708 100644 --- a/base_requirements.txt +++ b/base_requirements.txt @@ -18,10 +18,6 @@ django-filter # https://github.com/django-mptt/django-mptt django-mptt -# Prometheus metrics client implementation for Django -# https://github.com/korfuri/django-prometheus -django-prometheus - # Django caching using Redis # https://github.com/niwinz/django-redis django-redis diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py index 8fe4f4803..5b818a945 100644 --- a/netbox/circuits/urls.py +++ b/netbox/circuits/urls.py @@ -2,7 +2,6 @@ from django.conf.urls import url from dcim.views import CableCreateView, CableTraceView from extras.views import ObjectChangeLogView -from utilities.urls import cached from . import views from .models import Circuit, CircuitTermination, CircuitType, Provider @@ -10,41 +9,41 @@ app_name = 'circuits' urlpatterns = [ # Providers - url(r'^providers/$', cached(views.ProviderListView.as_view()), name='provider_list'), + url(r'^providers/$', views.ProviderListView.as_view(), name='provider_list'), url(r'^providers/add/$', views.ProviderCreateView.as_view(), name='provider_add'), url(r'^providers/import/$', views.ProviderBulkImportView.as_view(), name='provider_import'), url(r'^providers/edit/$', views.ProviderBulkEditView.as_view(), name='provider_bulk_edit'), url(r'^providers/delete/$', views.ProviderBulkDeleteView.as_view(), name='provider_bulk_delete'), - url(r'^providers/(?P[\w-]+)/$', cached(views.ProviderView.as_view()), name='provider'), + url(r'^providers/(?P[\w-]+)/$', views.ProviderView.as_view(), name='provider'), url(r'^providers/(?P[\w-]+)/edit/$', views.ProviderEditView.as_view(), name='provider_edit'), url(r'^providers/(?P[\w-]+)/delete/$', views.ProviderDeleteView.as_view(), name='provider_delete'), - url(r'^providers/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='provider_changelog', kwargs={'model': Provider}), + url(r'^providers/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='provider_changelog', kwargs={'model': Provider}), # Circuit types - url(r'^circuit-types/$', cached(views.CircuitTypeListView.as_view()), name='circuittype_list'), + url(r'^circuit-types/$', views.CircuitTypeListView.as_view(), name='circuittype_list'), url(r'^circuit-types/add/$', views.CircuitTypeCreateView.as_view(), name='circuittype_add'), url(r'^circuit-types/import/$', views.CircuitTypeBulkImportView.as_view(), name='circuittype_import'), url(r'^circuit-types/delete/$', views.CircuitTypeBulkDeleteView.as_view(), name='circuittype_bulk_delete'), url(r'^circuit-types/(?P[\w-]+)/edit/$', views.CircuitTypeEditView.as_view(), name='circuittype_edit'), - url(r'^circuit-types/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='circuittype_changelog', kwargs={'model': CircuitType}), + url(r'^circuit-types/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='circuittype_changelog', kwargs={'model': CircuitType}), # Circuits - url(r'^circuits/$', cached(views.CircuitListView.as_view()), name='circuit_list'), + url(r'^circuits/$', views.CircuitListView.as_view(), name='circuit_list'), url(r'^circuits/add/$', views.CircuitCreateView.as_view(), name='circuit_add'), url(r'^circuits/import/$', views.CircuitBulkImportView.as_view(), name='circuit_import'), url(r'^circuits/edit/$', views.CircuitBulkEditView.as_view(), name='circuit_bulk_edit'), url(r'^circuits/delete/$', views.CircuitBulkDeleteView.as_view(), name='circuit_bulk_delete'), - url(r'^circuits/(?P\d+)/$', cached(views.CircuitView.as_view()), name='circuit'), + url(r'^circuits/(?P\d+)/$', views.CircuitView.as_view(), name='circuit'), url(r'^circuits/(?P\d+)/edit/$', views.CircuitEditView.as_view(), name='circuit_edit'), url(r'^circuits/(?P\d+)/delete/$', views.CircuitDeleteView.as_view(), name='circuit_delete'), - url(r'^circuits/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='circuit_changelog', kwargs={'model': Circuit}), - url(r'^circuits/(?P\d+)/terminations/swap/$', cached(views.circuit_terminations_swap), name='circuit_terminations_swap'), + url(r'^circuits/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='circuit_changelog', kwargs={'model': Circuit}), + url(r'^circuits/(?P\d+)/terminations/swap/$', views.circuit_terminations_swap, name='circuit_terminations_swap'), # Circuit terminations url(r'^circuits/(?P\d+)/terminations/add/$', views.CircuitTerminationCreateView.as_view(), name='circuittermination_add'), url(r'^circuit-terminations/(?P\d+)/edit/$', views.CircuitTerminationEditView.as_view(), name='circuittermination_edit'), url(r'^circuit-terminations/(?P\d+)/delete/$', views.CircuitTerminationDeleteView.as_view(), name='circuittermination_delete'), url(r'^circuit-terminations/(?P\d+)/connect/(?P[\w-]+)/$', CableCreateView.as_view(), name='circuittermination_connect', kwargs={'termination_a_type': CircuitTermination}), - url(r'^circuit-terminations/(?P\d+)/trace/$', cached(CableTraceView.as_view()), name='circuittermination_trace', kwargs={'model': CircuitTermination}), + url(r'^circuit-terminations/(?P\d+)/trace/$', CableTraceView.as_view(), name='circuittermination_trace', kwargs={'model': CircuitTermination}), ] diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index 24b4259f4..3aa99c133 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -1,9 +1,12 @@ +from django.conf import settings from django.contrib import messages from django.contrib.auth.decorators import permission_required from django.contrib.auth.mixins import PermissionRequiredMixin from django.db import transaction from django.db.models import Count from django.shortcuts import get_object_or_404, redirect, render +from django.utils.decorators import method_decorator +from django.views.decorators.cache import cache_page from django.views.generic import View from extras.models import Graph, GRAPH_TYPE_PROVIDER @@ -32,6 +35,7 @@ class ProviderListView(PermissionRequiredMixin, ObjectListView): class ProviderView(PermissionRequiredMixin, View): permission_required = 'circuits.view_provider' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, slug): provider = get_object_or_404(Provider, slug=slug) @@ -147,6 +151,7 @@ class CircuitListView(PermissionRequiredMixin, ObjectListView): class CircuitView(PermissionRequiredMixin, View): permission_required = 'circuits.view_circuit' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): circuit = get_object_or_404(Circuit.objects.select_related('provider', 'type', 'tenant__group'), pk=pk) diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 88ce12441..220f4b405 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -3,7 +3,6 @@ from django.conf.urls import url from extras.views import ObjectChangeLogView, ImageAttachmentEditView from ipam.views import ServiceCreateView from secrets.views import secret_add -from utilities.urls import cached from . import views from .models import ( Cable, ConsolePort, ConsoleServerPort, Device, DeviceRole, DeviceType, FrontPort, Interface, Manufacturer, Platform, @@ -15,291 +14,291 @@ app_name = 'dcim' urlpatterns = [ # Regions - url(r'^regions/$', cached(views.RegionListView.as_view()), name='region_list'), - url(r'^regions/add/$', cached(views.RegionCreateView.as_view()), name='region_add'), + url(r'^regions/$', views.RegionListView.as_view(), name='region_list'), + url(r'^regions/add/$', views.RegionCreateView.as_view(), name='region_add'), url(r'^regions/import/$', views.RegionBulkImportView.as_view(), name='region_import'), url(r'^regions/delete/$', views.RegionBulkDeleteView.as_view(), name='region_bulk_delete'), url(r'^regions/(?P\d+)/edit/$', views.RegionEditView.as_view(), name='region_edit'), - url(r'^regions/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='region_changelog', kwargs={'model': Region}), + url(r'^regions/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='region_changelog', kwargs={'model': Region}), # Sites - url(r'^sites/$', cached(views.SiteListView.as_view()), name='site_list'), - url(r'^sites/add/$', cached(views.SiteCreateView.as_view()), name='site_add'), + url(r'^sites/$', views.SiteListView.as_view(), name='site_list'), + url(r'^sites/add/$', views.SiteCreateView.as_view(), name='site_add'), url(r'^sites/import/$', views.SiteBulkImportView.as_view(), name='site_import'), url(r'^sites/edit/$', views.SiteBulkEditView.as_view(), name='site_bulk_edit'), - url(r'^sites/(?P[\w-]+)/$', cached(views.SiteView.as_view()), name='site'), + url(r'^sites/(?P[\w-]+)/$', views.SiteView.as_view(), name='site'), url(r'^sites/(?P[\w-]+)/edit/$', views.SiteEditView.as_view(), name='site_edit'), url(r'^sites/(?P[\w-]+)/delete/$', views.SiteDeleteView.as_view(), name='site_delete'), - url(r'^sites/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='site_changelog', kwargs={'model': Site}), - url(r'^sites/(?P\d+)/images/add/$', cached(ImageAttachmentEditView.as_view()), name='site_add_image', kwargs={'model': Site}), + url(r'^sites/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='site_changelog', kwargs={'model': Site}), + url(r'^sites/(?P\d+)/images/add/$', ImageAttachmentEditView.as_view(), name='site_add_image', kwargs={'model': Site}), # Rack groups - url(r'^rack-groups/$', cached(views.RackGroupListView.as_view()), name='rackgroup_list'), - url(r'^rack-groups/add/$', cached(views.RackGroupCreateView.as_view()), name='rackgroup_add'), + url(r'^rack-groups/$', views.RackGroupListView.as_view(), name='rackgroup_list'), + url(r'^rack-groups/add/$', views.RackGroupCreateView.as_view(), name='rackgroup_add'), url(r'^rack-groups/import/$', views.RackGroupBulkImportView.as_view(), name='rackgroup_import'), url(r'^rack-groups/delete/$', views.RackGroupBulkDeleteView.as_view(), name='rackgroup_bulk_delete'), url(r'^rack-groups/(?P\d+)/edit/$', views.RackGroupEditView.as_view(), name='rackgroup_edit'), - url(r'^rack-groups/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='rackgroup_changelog', kwargs={'model': RackGroup}), + url(r'^rack-groups/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='rackgroup_changelog', kwargs={'model': RackGroup}), # Rack roles - url(r'^rack-roles/$', cached(views.RackRoleListView.as_view()), name='rackrole_list'), - url(r'^rack-roles/add/$', cached(views.RackRoleCreateView.as_view()), name='rackrole_add'), + url(r'^rack-roles/$', views.RackRoleListView.as_view(), name='rackrole_list'), + url(r'^rack-roles/add/$', views.RackRoleCreateView.as_view(), name='rackrole_add'), url(r'^rack-roles/import/$', views.RackRoleBulkImportView.as_view(), name='rackrole_import'), url(r'^rack-roles/delete/$', views.RackRoleBulkDeleteView.as_view(), name='rackrole_bulk_delete'), url(r'^rack-roles/(?P\d+)/edit/$', views.RackRoleEditView.as_view(), name='rackrole_edit'), - url(r'^rack-roles/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='rackrole_changelog', kwargs={'model': RackRole}), + url(r'^rack-roles/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='rackrole_changelog', kwargs={'model': RackRole}), # Rack reservations - url(r'^rack-reservations/$', cached(views.RackReservationListView.as_view()), name='rackreservation_list'), + url(r'^rack-reservations/$', views.RackReservationListView.as_view(), name='rackreservation_list'), url(r'^rack-reservations/edit/$', views.RackReservationBulkEditView.as_view(), name='rackreservation_bulk_edit'), url(r'^rack-reservations/delete/$', views.RackReservationBulkDeleteView.as_view(), name='rackreservation_bulk_delete'), url(r'^rack-reservations/(?P\d+)/edit/$', views.RackReservationEditView.as_view(), name='rackreservation_edit'), url(r'^rack-reservations/(?P\d+)/delete/$', views.RackReservationDeleteView.as_view(), name='rackreservation_delete'), - url(r'^rack-reservations/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='rackreservation_changelog', kwargs={'model': RackReservation}), + url(r'^rack-reservations/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='rackreservation_changelog', kwargs={'model': RackReservation}), # Racks - url(r'^racks/$', cached(views.RackListView.as_view()), name='rack_list'), - url(r'^rack-elevations/$', cached(views.RackElevationListView.as_view()), name='rack_elevation_list'), - url(r'^racks/add/$', cached(views.RackEditView.as_view()), name='rack_add'), + url(r'^racks/$', views.RackListView.as_view(), name='rack_list'), + url(r'^rack-elevations/$', views.RackElevationListView.as_view(), name='rack_elevation_list'), + url(r'^racks/add/$', views.RackEditView.as_view(), name='rack_add'), url(r'^racks/import/$', views.RackBulkImportView.as_view(), name='rack_import'), url(r'^racks/edit/$', views.RackBulkEditView.as_view(), name='rack_bulk_edit'), url(r'^racks/delete/$', views.RackBulkDeleteView.as_view(), name='rack_bulk_delete'), - url(r'^racks/(?P\d+)/$', cached(views.RackView.as_view()), name='rack'), + url(r'^racks/(?P\d+)/$', views.RackView.as_view(), name='rack'), url(r'^racks/(?P\d+)/edit/$', views.RackEditView.as_view(), name='rack_edit'), url(r'^racks/(?P\d+)/delete/$', views.RackDeleteView.as_view(), name='rack_delete'), - url(r'^racks/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='rack_changelog', kwargs={'model': Rack}), - url(r'^racks/(?P\d+)/reservations/add/$', cached(views.RackReservationCreateView.as_view()), name='rack_add_reservation'), - url(r'^racks/(?P\d+)/images/add/$', cached(ImageAttachmentEditView.as_view()), name='rack_add_image', kwargs={'model': Rack}), + url(r'^racks/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='rack_changelog', kwargs={'model': Rack}), + url(r'^racks/(?P\d+)/reservations/add/$', views.RackReservationCreateView.as_view(), name='rack_add_reservation'), + url(r'^racks/(?P\d+)/images/add/$', ImageAttachmentEditView.as_view(), name='rack_add_image', kwargs={'model': Rack}), # Manufacturers - url(r'^manufacturers/$', cached(views.ManufacturerListView.as_view()), name='manufacturer_list'), - url(r'^manufacturers/add/$', cached(views.ManufacturerCreateView.as_view()), name='manufacturer_add'), + url(r'^manufacturers/$', views.ManufacturerListView.as_view(), name='manufacturer_list'), + url(r'^manufacturers/add/$', views.ManufacturerCreateView.as_view(), name='manufacturer_add'), url(r'^manufacturers/import/$', views.ManufacturerBulkImportView.as_view(), name='manufacturer_import'), url(r'^manufacturers/delete/$', views.ManufacturerBulkDeleteView.as_view(), name='manufacturer_bulk_delete'), url(r'^manufacturers/(?P[\w-]+)/edit/$', views.ManufacturerEditView.as_view(), name='manufacturer_edit'), - url(r'^manufacturers/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='manufacturer_changelog', kwargs={'model': Manufacturer}), + url(r'^manufacturers/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='manufacturer_changelog', kwargs={'model': Manufacturer}), # Device types - url(r'^device-types/$', cached(views.DeviceTypeListView.as_view()), name='devicetype_list'), - url(r'^device-types/add/$', cached(views.DeviceTypeCreateView.as_view()), name='devicetype_add'), + url(r'^device-types/$', views.DeviceTypeListView.as_view(), name='devicetype_list'), + url(r'^device-types/add/$', views.DeviceTypeCreateView.as_view(), name='devicetype_add'), url(r'^device-types/import/$', views.DeviceTypeBulkImportView.as_view(), name='devicetype_import'), 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\d+)/$', cached(views.DeviceTypeView.as_view()), name='devicetype'), + url(r'^device-types/(?P\d+)/$', views.DeviceTypeView.as_view(), name='devicetype'), url(r'^device-types/(?P\d+)/edit/$', views.DeviceTypeEditView.as_view(), name='devicetype_edit'), url(r'^device-types/(?P\d+)/delete/$', views.DeviceTypeDeleteView.as_view(), name='devicetype_delete'), - url(r'^device-types/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='devicetype_changelog', kwargs={'model': DeviceType}), + url(r'^device-types/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='devicetype_changelog', kwargs={'model': DeviceType}), # Console port templates - url(r'^device-types/(?P\d+)/console-ports/add/$', cached(views.ConsolePortTemplateCreateView.as_view()), name='devicetype_add_consoleport'), + url(r'^device-types/(?P\d+)/console-ports/add/$', views.ConsolePortTemplateCreateView.as_view(), name='devicetype_add_consoleport'), url(r'^device-types/(?P\d+)/console-ports/delete/$', views.ConsolePortTemplateBulkDeleteView.as_view(), name='devicetype_delete_consoleport'), # Console server port templates - url(r'^device-types/(?P\d+)/console-server-ports/add/$', cached(views.ConsoleServerPortTemplateCreateView.as_view()), name='devicetype_add_consoleserverport'), + url(r'^device-types/(?P\d+)/console-server-ports/add/$', views.ConsoleServerPortTemplateCreateView.as_view(), name='devicetype_add_consoleserverport'), url(r'^device-types/(?P\d+)/console-server-ports/delete/$', views.ConsoleServerPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_consoleserverport'), # Power port templates - url(r'^device-types/(?P\d+)/power-ports/add/$', cached(views.PowerPortTemplateCreateView.as_view()), name='devicetype_add_powerport'), + url(r'^device-types/(?P\d+)/power-ports/add/$', views.PowerPortTemplateCreateView.as_view(), name='devicetype_add_powerport'), url(r'^device-types/(?P\d+)/power-ports/delete/$', views.PowerPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_powerport'), # Power outlet templates - url(r'^device-types/(?P\d+)/power-outlets/add/$', cached(views.PowerOutletTemplateCreateView.as_view()), name='devicetype_add_poweroutlet'), + url(r'^device-types/(?P\d+)/power-outlets/add/$', views.PowerOutletTemplateCreateView.as_view(), name='devicetype_add_poweroutlet'), url(r'^device-types/(?P\d+)/power-outlets/delete/$', views.PowerOutletTemplateBulkDeleteView.as_view(), name='devicetype_delete_poweroutlet'), # Interface templates - url(r'^device-types/(?P\d+)/interfaces/add/$', cached(views.InterfaceTemplateCreateView.as_view()), name='devicetype_add_interface'), + url(r'^device-types/(?P\d+)/interfaces/add/$', views.InterfaceTemplateCreateView.as_view(), name='devicetype_add_interface'), url(r'^device-types/(?P\d+)/interfaces/edit/$', views.InterfaceTemplateBulkEditView.as_view(), name='devicetype_bulkedit_interface'), url(r'^device-types/(?P\d+)/interfaces/delete/$', views.InterfaceTemplateBulkDeleteView.as_view(), name='devicetype_delete_interface'), # Front port templates - url(r'^device-types/(?P\d+)/front-ports/add/$', cached(views.FrontPortTemplateCreateView.as_view()), name='devicetype_add_frontport'), + url(r'^device-types/(?P\d+)/front-ports/add/$', views.FrontPortTemplateCreateView.as_view(), name='devicetype_add_frontport'), url(r'^device-types/(?P\d+)/front-ports/delete/$', views.FrontPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_frontport'), # Rear port templates - url(r'^device-types/(?P\d+)/rear-ports/add/$', cached(views.RearPortTemplateCreateView.as_view()), name='devicetype_add_rearport'), + url(r'^device-types/(?P\d+)/rear-ports/add/$', views.RearPortTemplateCreateView.as_view(), name='devicetype_add_rearport'), url(r'^device-types/(?P\d+)/rear-ports/delete/$', views.RearPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_rearport'), # Device bay templates - url(r'^device-types/(?P\d+)/device-bays/add/$', cached(views.DeviceBayTemplateCreateView.as_view()), name='devicetype_add_devicebay'), + url(r'^device-types/(?P\d+)/device-bays/add/$', views.DeviceBayTemplateCreateView.as_view(), name='devicetype_add_devicebay'), url(r'^device-types/(?P\d+)/device-bays/delete/$', views.DeviceBayTemplateBulkDeleteView.as_view(), name='devicetype_delete_devicebay'), # Device roles - url(r'^device-roles/$', cached(views.DeviceRoleListView.as_view()), name='devicerole_list'), - url(r'^device-roles/add/$', cached(views.DeviceRoleCreateView.as_view()), name='devicerole_add'), + url(r'^device-roles/$', views.DeviceRoleListView.as_view(), name='devicerole_list'), + url(r'^device-roles/add/$', views.DeviceRoleCreateView.as_view(), name='devicerole_add'), url(r'^device-roles/import/$', views.DeviceRoleBulkImportView.as_view(), name='devicerole_import'), url(r'^device-roles/delete/$', views.DeviceRoleBulkDeleteView.as_view(), name='devicerole_bulk_delete'), url(r'^device-roles/(?P[\w-]+)/edit/$', views.DeviceRoleEditView.as_view(), name='devicerole_edit'), - url(r'^device-roles/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='devicerole_changelog', kwargs={'model': DeviceRole}), + url(r'^device-roles/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='devicerole_changelog', kwargs={'model': DeviceRole}), # Platforms - url(r'^platforms/$', cached(views.PlatformListView.as_view()), name='platform_list'), - url(r'^platforms/add/$', cached(views.PlatformCreateView.as_view()), name='platform_add'), + url(r'^platforms/$', views.PlatformListView.as_view(), name='platform_list'), + url(r'^platforms/add/$', views.PlatformCreateView.as_view(), name='platform_add'), url(r'^platforms/import/$', views.PlatformBulkImportView.as_view(), name='platform_import'), url(r'^platforms/delete/$', views.PlatformBulkDeleteView.as_view(), name='platform_bulk_delete'), url(r'^platforms/(?P[\w-]+)/edit/$', views.PlatformEditView.as_view(), name='platform_edit'), - url(r'^platforms/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='platform_changelog', kwargs={'model': Platform}), + url(r'^platforms/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='platform_changelog', kwargs={'model': Platform}), # Devices - url(r'^devices/$', cached(views.DeviceListView.as_view()), name='device_list'), - url(r'^devices/add/$', cached(views.DeviceCreateView.as_view()), name='device_add'), + url(r'^devices/$', views.DeviceListView.as_view(), name='device_list'), + url(r'^devices/add/$', views.DeviceCreateView.as_view(), name='device_add'), url(r'^devices/import/$', views.DeviceBulkImportView.as_view(), name='device_import'), url(r'^devices/import/child-devices/$', views.ChildDeviceBulkImportView.as_view(), name='device_import_child'), url(r'^devices/edit/$', views.DeviceBulkEditView.as_view(), name='device_bulk_edit'), url(r'^devices/delete/$', views.DeviceBulkDeleteView.as_view(), name='device_bulk_delete'), - url(r'^devices/(?P\d+)/$', cached(views.DeviceView.as_view()), name='device'), + url(r'^devices/(?P\d+)/$', views.DeviceView.as_view(), name='device'), url(r'^devices/(?P\d+)/edit/$', views.DeviceEditView.as_view(), name='device_edit'), url(r'^devices/(?P\d+)/delete/$', views.DeviceDeleteView.as_view(), name='device_delete'), - url(r'^devices/(?P\d+)/config-context/$', cached(views.DeviceConfigContextView.as_view()), name='device_configcontext'), - url(r'^devices/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='device_changelog', kwargs={'model': Device}), - url(r'^devices/(?P\d+)/inventory/$', cached(views.DeviceInventoryView.as_view()), name='device_inventory'), + url(r'^devices/(?P\d+)/config-context/$', views.DeviceConfigContextView.as_view(), name='device_configcontext'), + url(r'^devices/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='device_changelog', kwargs={'model': Device}), + url(r'^devices/(?P\d+)/inventory/$', views.DeviceInventoryView.as_view(), name='device_inventory'), url(r'^devices/(?P\d+)/status/$', views.DeviceStatusView.as_view(), name='device_status'), url(r'^devices/(?P\d+)/lldp-neighbors/$', views.DeviceLLDPNeighborsView.as_view(), name='device_lldp_neighbors'), url(r'^devices/(?P\d+)/config/$', views.DeviceConfigView.as_view(), name='device_config'), url(r'^devices/(?P\d+)/add-secret/$', secret_add, name='device_addsecret'), - url(r'^devices/(?P\d+)/services/assign/$', cached(ServiceCreateView.as_view()), name='device_service_assign'), - url(r'^devices/(?P\d+)/images/add/$', cached(ImageAttachmentEditView.as_view()), name='device_add_image', kwargs={'model': Device}), + url(r'^devices/(?P\d+)/services/assign/$', ServiceCreateView.as_view(), name='device_service_assign'), + url(r'^devices/(?P\d+)/images/add/$', ImageAttachmentEditView.as_view(), name='device_add_image', kwargs={'model': Device}), # Console ports - url(r'^devices/console-ports/add/$', cached(views.DeviceBulkAddConsolePortView.as_view()), name='device_bulk_add_consoleport'), - url(r'^devices/(?P\d+)/console-ports/add/$', cached(views.ConsolePortCreateView.as_view()), name='consoleport_add'), + url(r'^devices/console-ports/add/$', views.DeviceBulkAddConsolePortView.as_view(), name='device_bulk_add_consoleport'), + url(r'^devices/(?P\d+)/console-ports/add/$', views.ConsolePortCreateView.as_view(), name='consoleport_add'), url(r'^devices/(?P\d+)/console-ports/delete/$', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'), url(r'^console-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='consoleport_connect', kwargs={'termination_a_type': ConsolePort}), url(r'^console-ports/(?P\d+)/edit/$', views.ConsolePortEditView.as_view(), name='consoleport_edit'), url(r'^console-ports/(?P\d+)/delete/$', views.ConsolePortDeleteView.as_view(), name='consoleport_delete'), - url(r'^console-ports/(?P\d+)/trace/$', cached(views.CableTraceView.as_view()), name='consoleport_trace', kwargs={'model': ConsolePort}), + url(r'^console-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='consoleport_trace', kwargs={'model': ConsolePort}), # Console server ports - url(r'^devices/console-server-ports/add/$', cached(views.DeviceBulkAddConsoleServerPortView.as_view()), name='device_bulk_add_consoleserverport'), - url(r'^devices/(?P\d+)/console-server-ports/add/$', cached(views.ConsoleServerPortCreateView.as_view()), name='consoleserverport_add'), + url(r'^devices/console-server-ports/add/$', views.DeviceBulkAddConsoleServerPortView.as_view(), name='device_bulk_add_consoleserverport'), + url(r'^devices/(?P\d+)/console-server-ports/add/$', views.ConsoleServerPortCreateView.as_view(), name='consoleserverport_add'), url(r'^devices/(?P\d+)/console-server-ports/delete/$', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'), url(r'^console-server-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'termination_a_type': ConsoleServerPort}), url(r'^console-server-ports/(?P\d+)/edit/$', views.ConsoleServerPortEditView.as_view(), name='consoleserverport_edit'), url(r'^console-server-ports/(?P\d+)/delete/$', views.ConsoleServerPortDeleteView.as_view(), name='consoleserverport_delete'), - url(r'^console-server-ports/(?P\d+)/trace/$', cached(views.CableTraceView.as_view()), name='consoleserverport_trace', kwargs={'model': ConsoleServerPort}), - url(r'^console-server-ports/rename/$', cached(views.ConsoleServerPortBulkRenameView.as_view()), name='consoleserverport_bulk_rename'), + url(r'^console-server-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='consoleserverport_trace', kwargs={'model': ConsoleServerPort}), + url(r'^console-server-ports/rename/$', views.ConsoleServerPortBulkRenameView.as_view(), name='consoleserverport_bulk_rename'), url(r'^console-server-ports/disconnect/$', views.ConsoleServerPortBulkDisconnectView.as_view(), name='consoleserverport_bulk_disconnect'), # Power ports - url(r'^devices/power-ports/add/$', cached(views.DeviceBulkAddPowerPortView.as_view()), name='device_bulk_add_powerport'), - url(r'^devices/(?P\d+)/power-ports/add/$', cached(views.PowerPortCreateView.as_view()), name='powerport_add'), + url(r'^devices/power-ports/add/$', views.DeviceBulkAddPowerPortView.as_view(), name='device_bulk_add_powerport'), + url(r'^devices/(?P\d+)/power-ports/add/$', views.PowerPortCreateView.as_view(), name='powerport_add'), url(r'^devices/(?P\d+)/power-ports/delete/$', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'), url(r'^power-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='powerport_connect', kwargs={'termination_a_type': PowerPort}), url(r'^power-ports/(?P\d+)/edit/$', views.PowerPortEditView.as_view(), name='powerport_edit'), url(r'^power-ports/(?P\d+)/delete/$', views.PowerPortDeleteView.as_view(), name='powerport_delete'), - url(r'^power-ports/(?P\d+)/trace/$', cached(views.CableTraceView.as_view()), name='powerport_trace', kwargs={'model': PowerPort}), + url(r'^power-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='powerport_trace', kwargs={'model': PowerPort}), # Power outlets - url(r'^devices/power-outlets/add/$', cached(views.DeviceBulkAddPowerOutletView.as_view()), name='device_bulk_add_poweroutlet'), - url(r'^devices/(?P\d+)/power-outlets/add/$', cached(views.PowerOutletCreateView.as_view()), name='poweroutlet_add'), + url(r'^devices/power-outlets/add/$', views.DeviceBulkAddPowerOutletView.as_view(), name='device_bulk_add_poweroutlet'), + url(r'^devices/(?P\d+)/power-outlets/add/$', views.PowerOutletCreateView.as_view(), name='poweroutlet_add'), url(r'^devices/(?P\d+)/power-outlets/delete/$', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'), url(r'^power-outlets/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'termination_a_type': PowerOutlet}), url(r'^power-outlets/(?P\d+)/edit/$', views.PowerOutletEditView.as_view(), name='poweroutlet_edit'), url(r'^power-outlets/(?P\d+)/delete/$', views.PowerOutletDeleteView.as_view(), name='poweroutlet_delete'), - url(r'^power-outlets/(?P\d+)/trace/$', cached(views.CableTraceView.as_view()), name='poweroutlet_trace', kwargs={'model': PowerOutlet}), - url(r'^power-outlets/rename/$', cached(views.PowerOutletBulkRenameView.as_view()), name='poweroutlet_bulk_rename'), + url(r'^power-outlets/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='poweroutlet_trace', kwargs={'model': PowerOutlet}), + url(r'^power-outlets/rename/$', views.PowerOutletBulkRenameView.as_view(), name='poweroutlet_bulk_rename'), url(r'^power-outlets/disconnect/$', views.PowerOutletBulkDisconnectView.as_view(), name='poweroutlet_bulk_disconnect'), # Interfaces - url(r'^devices/interfaces/add/$', cached(views.DeviceBulkAddInterfaceView.as_view()), name='device_bulk_add_interface'), - url(r'^devices/(?P\d+)/interfaces/add/$', cached(views.InterfaceCreateView.as_view()), name='interface_add'), + url(r'^devices/interfaces/add/$', views.DeviceBulkAddInterfaceView.as_view(), name='device_bulk_add_interface'), + url(r'^devices/(?P\d+)/interfaces/add/$', views.InterfaceCreateView.as_view(), name='interface_add'), url(r'^devices/(?P\d+)/interfaces/edit/$', views.InterfaceBulkEditView.as_view(), name='interface_bulk_edit'), url(r'^devices/(?P\d+)/interfaces/delete/$', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'), url(r'^interfaces/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='interface_connect', kwargs={'termination_a_type': Interface}), - url(r'^interfaces/(?P\d+)/$', cached(views.InterfaceView.as_view()), name='interface'), + url(r'^interfaces/(?P\d+)/$', views.InterfaceView.as_view(), name='interface'), url(r'^interfaces/(?P\d+)/edit/$', views.InterfaceEditView.as_view(), name='interface_edit'), - url(r'^interfaces/(?P\d+)/assign-vlans/$', cached(views.InterfaceAssignVLANsView.as_view()), name='interface_assign_vlans'), + url(r'^interfaces/(?P\d+)/assign-vlans/$', views.InterfaceAssignVLANsView.as_view(), name='interface_assign_vlans'), url(r'^interfaces/(?P\d+)/delete/$', views.InterfaceDeleteView.as_view(), name='interface_delete'), - url(r'^interfaces/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='interface_changelog', kwargs={'model': Interface}), - url(r'^interfaces/(?P\d+)/trace/$', cached(views.CableTraceView.as_view()), name='interface_trace', kwargs={'model': Interface}), - url(r'^interfaces/rename/$', cached(views.InterfaceBulkRenameView.as_view()), name='interface_bulk_rename'), + url(r'^interfaces/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='interface_changelog', kwargs={'model': Interface}), + url(r'^interfaces/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='interface_trace', kwargs={'model': Interface}), + url(r'^interfaces/rename/$', views.InterfaceBulkRenameView.as_view(), name='interface_bulk_rename'), url(r'^interfaces/disconnect/$', views.InterfaceBulkDisconnectView.as_view(), name='interface_bulk_disconnect'), # Front ports # url(r'^devices/front-ports/add/$', views.DeviceBulkAddFrontPortView.as_view(), name='device_bulk_add_frontport'), - url(r'^devices/(?P\d+)/front-ports/add/$', cached(views.FrontPortCreateView.as_view()), name='frontport_add'), + url(r'^devices/(?P\d+)/front-ports/add/$', views.FrontPortCreateView.as_view(), name='frontport_add'), url(r'^devices/(?P\d+)/front-ports/edit/$', views.FrontPortBulkEditView.as_view(), name='frontport_bulk_edit'), url(r'^devices/(?P\d+)/front-ports/delete/$', views.FrontPortBulkDeleteView.as_view(), name='frontport_bulk_delete'), url(r'^front-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='frontport_connect', kwargs={'termination_a_type': FrontPort}), url(r'^front-ports/(?P\d+)/edit/$', views.FrontPortEditView.as_view(), name='frontport_edit'), url(r'^front-ports/(?P\d+)/delete/$', views.FrontPortDeleteView.as_view(), name='frontport_delete'), - url(r'^front-ports/(?P\d+)/trace/$', cached(views.CableTraceView.as_view()), name='frontport_trace', kwargs={'model': FrontPort}), - url(r'^front-ports/rename/$', cached(views.FrontPortBulkRenameView.as_view()), name='frontport_bulk_rename'), + url(r'^front-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='frontport_trace', kwargs={'model': FrontPort}), + url(r'^front-ports/rename/$', views.FrontPortBulkRenameView.as_view(), name='frontport_bulk_rename'), url(r'^front-ports/disconnect/$', views.FrontPortBulkDisconnectView.as_view(), name='frontport_bulk_disconnect'), # Rear ports # url(r'^devices/rear-ports/add/$', views.DeviceBulkAddRearPortView.as_view(), name='device_bulk_add_rearport'), - url(r'^devices/(?P\d+)/rear-ports/add/$', cached(views.RearPortCreateView.as_view()), name='rearport_add'), + url(r'^devices/(?P\d+)/rear-ports/add/$', views.RearPortCreateView.as_view(), name='rearport_add'), url(r'^devices/(?P\d+)/rear-ports/edit/$', views.RearPortBulkEditView.as_view(), name='rearport_bulk_edit'), url(r'^devices/(?P\d+)/rear-ports/delete/$', views.RearPortBulkDeleteView.as_view(), name='rearport_bulk_delete'), url(r'^rear-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='rearport_connect', kwargs={'termination_a_type': RearPort}), url(r'^rear-ports/(?P\d+)/edit/$', views.RearPortEditView.as_view(), name='rearport_edit'), url(r'^rear-ports/(?P\d+)/delete/$', views.RearPortDeleteView.as_view(), name='rearport_delete'), - url(r'^rear-ports/(?P\d+)/trace/$', cached(views.CableTraceView.as_view()), name='rearport_trace', kwargs={'model': RearPort}), - url(r'^rear-ports/rename/$', cached(views.RearPortBulkRenameView.as_view()), name='rearport_bulk_rename'), + url(r'^rear-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='rearport_trace', kwargs={'model': RearPort}), + url(r'^rear-ports/rename/$', views.RearPortBulkRenameView.as_view(), name='rearport_bulk_rename'), url(r'^rear-ports/disconnect/$', views.RearPortBulkDisconnectView.as_view(), name='rearport_bulk_disconnect'), # Device bays - url(r'^devices/device-bays/add/$', cached(views.DeviceBulkAddDeviceBayView.as_view()), name='device_bulk_add_devicebay'), - url(r'^devices/(?P\d+)/bays/add/$', cached(views.DeviceBayCreateView.as_view()), name='devicebay_add'), + url(r'^devices/device-bays/add/$', views.DeviceBulkAddDeviceBayView.as_view(), name='device_bulk_add_devicebay'), + url(r'^devices/(?P\d+)/bays/add/$', views.DeviceBayCreateView.as_view(), name='devicebay_add'), url(r'^devices/(?P\d+)/bays/delete/$', views.DeviceBayBulkDeleteView.as_view(), name='devicebay_bulk_delete'), url(r'^device-bays/(?P\d+)/edit/$', views.DeviceBayEditView.as_view(), name='devicebay_edit'), url(r'^device-bays/(?P\d+)/delete/$', views.DeviceBayDeleteView.as_view(), name='devicebay_delete'), url(r'^device-bays/(?P\d+)/populate/$', views.DeviceBayPopulateView.as_view(), name='devicebay_populate'), url(r'^device-bays/(?P\d+)/depopulate/$', views.DeviceBayDepopulateView.as_view(), name='devicebay_depopulate'), - url(r'^device-bays/rename/$', cached(views.DeviceBayBulkRenameView.as_view()), name='devicebay_bulk_rename'), + url(r'^device-bays/rename/$', views.DeviceBayBulkRenameView.as_view(), name='devicebay_bulk_rename'), # Inventory items - url(r'^inventory-items/$', cached(views.InventoryItemListView.as_view()), name='inventoryitem_list'), + url(r'^inventory-items/$', views.InventoryItemListView.as_view(), name='inventoryitem_list'), url(r'^inventory-items/import/$', views.InventoryItemBulkImportView.as_view(), name='inventoryitem_import'), url(r'^inventory-items/edit/$', views.InventoryItemBulkEditView.as_view(), name='inventoryitem_bulk_edit'), url(r'^inventory-items/delete/$', views.InventoryItemBulkDeleteView.as_view(), name='inventoryitem_bulk_delete'), url(r'^inventory-items/(?P\d+)/edit/$', views.InventoryItemEditView.as_view(), name='inventoryitem_edit'), url(r'^inventory-items/(?P\d+)/delete/$', views.InventoryItemDeleteView.as_view(), name='inventoryitem_delete'), - url(r'^devices/(?P\d+)/inventory-items/add/$', cached(views.InventoryItemEditView.as_view()), name='inventoryitem_add'), + url(r'^devices/(?P\d+)/inventory-items/add/$', views.InventoryItemEditView.as_view(), name='inventoryitem_add'), # Cables - url(r'^cables/$', cached(views.CableListView.as_view()), name='cable_list'), + url(r'^cables/$', views.CableListView.as_view(), name='cable_list'), url(r'^cables/import/$', views.CableBulkImportView.as_view(), name='cable_import'), url(r'^cables/edit/$', views.CableBulkEditView.as_view(), name='cable_bulk_edit'), url(r'^cables/delete/$', views.CableBulkDeleteView.as_view(), name='cable_bulk_delete'), - url(r'^cables/(?P\d+)/$', cached(views.CableView.as_view()), name='cable'), + url(r'^cables/(?P\d+)/$', views.CableView.as_view(), name='cable'), url(r'^cables/(?P\d+)/edit/$', views.CableEditView.as_view(), name='cable_edit'), url(r'^cables/(?P\d+)/delete/$', views.CableDeleteView.as_view(), name='cable_delete'), - url(r'^cables/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='cable_changelog', kwargs={'model': Cable}), + url(r'^cables/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='cable_changelog', kwargs={'model': Cable}), # Console/power/interface connections (read-only) - url(r'^console-connections/$', cached(views.ConsoleConnectionsListView.as_view()), name='console_connections_list'), - url(r'^power-connections/$', cached(views.PowerConnectionsListView.as_view()), name='power_connections_list'), - url(r'^interface-connections/$', cached(views.InterfaceConnectionsListView.as_view()), name='interface_connections_list'), + url(r'^console-connections/$', views.ConsoleConnectionsListView.as_view(), name='console_connections_list'), + url(r'^power-connections/$', views.PowerConnectionsListView.as_view(), name='power_connections_list'), + url(r'^interface-connections/$', views.InterfaceConnectionsListView.as_view(), name='interface_connections_list'), # Virtual chassis - url(r'^virtual-chassis/$', cached(views.VirtualChassisListView.as_view()), name='virtualchassis_list'), - url(r'^virtual-chassis/add/$', cached(views.VirtualChassisCreateView.as_view()), name='virtualchassis_add'), + url(r'^virtual-chassis/$', views.VirtualChassisListView.as_view(), name='virtualchassis_list'), + url(r'^virtual-chassis/add/$', views.VirtualChassisCreateView.as_view(), name='virtualchassis_add'), url(r'^virtual-chassis/(?P\d+)/edit/$', views.VirtualChassisEditView.as_view(), name='virtualchassis_edit'), url(r'^virtual-chassis/(?P\d+)/delete/$', views.VirtualChassisDeleteView.as_view(), name='virtualchassis_delete'), - url(r'^virtual-chassis/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='virtualchassis_changelog', kwargs={'model': VirtualChassis}), + url(r'^virtual-chassis/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='virtualchassis_changelog', kwargs={'model': VirtualChassis}), url(r'^virtual-chassis/(?P\d+)/add-member/$', views.VirtualChassisAddMemberView.as_view(), name='virtualchassis_add_member'), url(r'^virtual-chassis-members/(?P\d+)/delete/$', views.VirtualChassisRemoveMemberView.as_view(), name='virtualchassis_remove_member'), # Power panels - url(r'^power-panels/$', cached(views.PowerPanelListView.as_view()), name='powerpanel_list'), - url(r'^power-panels/add/$', cached(views.PowerPanelCreateView.as_view()), name='powerpanel_add'), + url(r'^power-panels/$', views.PowerPanelListView.as_view(), name='powerpanel_list'), + url(r'^power-panels/add/$', views.PowerPanelCreateView.as_view(), name='powerpanel_add'), url(r'^power-panels/import/$', views.PowerPanelBulkImportView.as_view(), name='powerpanel_import'), url(r'^power-panels/delete/$', views.PowerPanelBulkDeleteView.as_view(), name='powerpanel_bulk_delete'), - url(r'^power-panels/(?P\d+)/$', cached(views.PowerPanelView.as_view()), name='powerpanel'), + url(r'^power-panels/(?P\d+)/$', views.PowerPanelView.as_view(), name='powerpanel'), url(r'^power-panels/(?P\d+)/edit/$', views.PowerPanelEditView.as_view(), name='powerpanel_edit'), url(r'^power-panels/(?P\d+)/delete/$', views.PowerPanelDeleteView.as_view(), name='powerpanel_delete'), - url(r'^power-panels/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='powerpanel_changelog', kwargs={'model': PowerPanel}), + url(r'^power-panels/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='powerpanel_changelog', kwargs={'model': PowerPanel}), # Power feeds - url(r'^power-feeds/$', cached(views.PowerFeedListView.as_view()), name='powerfeed_list'), - url(r'^power-feeds/add/$', cached(views.PowerFeedEditView.as_view()), name='powerfeed_add'), + url(r'^power-feeds/$', views.PowerFeedListView.as_view(), name='powerfeed_list'), + url(r'^power-feeds/add/$', views.PowerFeedEditView.as_view(), name='powerfeed_add'), url(r'^power-feeds/import/$', views.PowerFeedBulkImportView.as_view(), name='powerfeed_import'), url(r'^power-feeds/edit/$', views.PowerFeedBulkEditView.as_view(), name='powerfeed_bulk_edit'), url(r'^power-feeds/delete/$', views.PowerFeedBulkDeleteView.as_view(), name='powerfeed_bulk_delete'), - url(r'^power-feeds/(?P\d+)/$', cached(views.PowerFeedView.as_view()), name='powerfeed'), + url(r'^power-feeds/(?P\d+)/$', views.PowerFeedView.as_view(), name='powerfeed'), url(r'^power-feeds/(?P\d+)/edit/$', views.PowerFeedEditView.as_view(), name='powerfeed_edit'), url(r'^power-feeds/(?P\d+)/delete/$', views.PowerFeedDeleteView.as_view(), name='powerfeed_delete'), - url(r'^power-feeds/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='powerfeed_changelog', kwargs={'model': PowerFeed}), + url(r'^power-feeds/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='powerfeed_changelog', kwargs={'model': PowerFeed}), ] diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index c82f795b5..952c5a778 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -13,6 +13,8 @@ from django.urls import reverse from django.utils.html import escape from django.utils.http import is_safe_url from django.utils.safestring import mark_safe +from django.utils.decorators import method_decorator +from django.views.decorators.cache import cache_page from django.views.generic import View from circuits.models import Circuit @@ -195,6 +197,7 @@ class SiteListView(PermissionRequiredMixin, ObjectListView): class SiteView(PermissionRequiredMixin, View): permission_required = 'dcim.view_site' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, slug): site = get_object_or_404(Site.objects.select_related('region', 'tenant__group'), slug=slug) @@ -353,6 +356,7 @@ class RackElevationListView(PermissionRequiredMixin, View): """ permission_required = 'dcim.view_rack' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request): racks = Rack.objects.select_related( @@ -392,6 +396,7 @@ class RackElevationListView(PermissionRequiredMixin, View): class RackView(PermissionRequiredMixin, View): permission_required = 'dcim.view_rack' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): rack = get_object_or_404(Rack.objects.select_related('site__region', 'tenant__group', 'group', 'role'), pk=pk) @@ -570,6 +575,7 @@ class DeviceTypeListView(PermissionRequiredMixin, ObjectListView): class DeviceTypeView(PermissionRequiredMixin, View): permission_required = 'dcim.view_devicetype' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): devicetype = get_object_or_404(DeviceType, pk=pk) @@ -910,6 +916,7 @@ class DeviceListView(PermissionRequiredMixin, ObjectListView): class DeviceView(PermissionRequiredMixin, View): permission_required = 'dcim.view_device' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): device = get_object_or_404(Device.objects.select_related( @@ -991,6 +998,7 @@ class DeviceView(PermissionRequiredMixin, View): class DeviceInventoryView(PermissionRequiredMixin, View): permission_required = 'dcim.view_device' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): device = get_object_or_404(Device, pk=pk) @@ -1012,6 +1020,7 @@ class DeviceInventoryView(PermissionRequiredMixin, View): class DeviceStatusView(PermissionRequiredMixin, View): permission_required = ('dcim.view_device', 'dcim.napalm_read') + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): device = get_object_or_404(Device, pk=pk) @@ -1025,6 +1034,7 @@ class DeviceStatusView(PermissionRequiredMixin, View): class DeviceLLDPNeighborsView(PermissionRequiredMixin, View): permission_required = ('dcim.view_device', 'dcim.napalm_read') + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): device = get_object_or_404(Device, pk=pk) @@ -1042,6 +1052,7 @@ class DeviceLLDPNeighborsView(PermissionRequiredMixin, View): class DeviceConfigView(PermissionRequiredMixin, View): permission_required = ('dcim.view_device', 'dcim.napalm_read') + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): device = get_object_or_404(Device, pk=pk) @@ -1279,6 +1290,7 @@ class PowerOutletBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class InterfaceView(PermissionRequiredMixin, View): permission_required = 'dcim.view_interface' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): interface = get_object_or_404(Interface, pk=pk) @@ -1499,6 +1511,7 @@ class DeviceBayDeleteView(PermissionRequiredMixin, ObjectDeleteView): class DeviceBayPopulateView(PermissionRequiredMixin, View): permission_required = 'dcim.change_devicebay' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): device_bay = get_object_or_404(DeviceBay, pk=pk) @@ -1533,6 +1546,7 @@ class DeviceBayPopulateView(PermissionRequiredMixin, View): class DeviceBayDepopulateView(PermissionRequiredMixin, View): permission_required = 'dcim.change_devicebay' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): device_bay = get_object_or_404(DeviceBay, pk=pk) @@ -1672,6 +1686,7 @@ class CableListView(PermissionRequiredMixin, ObjectListView): class CableView(PermissionRequiredMixin, View): permission_required = 'dcim.view_cable' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): cable = get_object_or_404(Cable, pk=pk) @@ -1687,6 +1702,7 @@ class CableTraceView(PermissionRequiredMixin, View): """ permission_required = 'dcim.view_cable' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, model, pk): obj = get_object_or_404(model, pk=pk) @@ -1726,6 +1742,7 @@ class CableCreateView(PermissionRequiredMixin, GetReturnURLMixin, View): return super().dispatch(request, *args, **kwargs) + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, *args, **kwargs): # Parse initial data manually to avoid setting field values as lists @@ -2042,6 +2059,7 @@ class VirtualChassisCreateView(PermissionRequiredMixin, View): class VirtualChassisEditView(PermissionRequiredMixin, GetReturnURLMixin, View): permission_required = 'dcim.change_virtualchassis' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): virtual_chassis = get_object_or_404(VirtualChassis, pk=pk) @@ -2110,6 +2128,7 @@ class VirtualChassisDeleteView(PermissionRequiredMixin, ObjectDeleteView): class VirtualChassisAddMemberView(PermissionRequiredMixin, GetReturnURLMixin, View): permission_required = 'dcim.change_virtualchassis' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): virtual_chassis = get_object_or_404(VirtualChassis, pk=pk) @@ -2164,6 +2183,7 @@ class VirtualChassisAddMemberView(PermissionRequiredMixin, GetReturnURLMixin, Vi class VirtualChassisRemoveMemberView(PermissionRequiredMixin, GetReturnURLMixin, View): permission_required = 'dcim.change_virtualchassis' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): device = get_object_or_404(Device, pk=pk, virtual_chassis__isnull=False) @@ -2227,6 +2247,7 @@ class PowerPanelListView(PermissionRequiredMixin, ObjectListView): class PowerPanelView(PermissionRequiredMixin, View): permission_required = 'dcim.view_powerpanel' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): powerpanel = get_object_or_404(PowerPanel.objects.select_related('site', 'rack_group'), pk=pk) @@ -2296,6 +2317,7 @@ class PowerFeedListView(PermissionRequiredMixin, ObjectListView): class PowerFeedView(PermissionRequiredMixin, View): permission_required = 'dcim.view_powerfeed' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): powerfeed = get_object_or_404(PowerFeed.objects.select_related('power_panel', 'rack'), pk=pk) diff --git a/netbox/extras/urls.py b/netbox/extras/urls.py index 63e060616..d475ab5a3 100644 --- a/netbox/extras/urls.py +++ b/netbox/extras/urls.py @@ -2,26 +2,25 @@ from django.conf.urls import url from extras import views from extras.models import Tag -from utilities.urls import cached app_name = 'extras' urlpatterns = [ # Tags - url(r'^tags/$', cached(views.TagListView.as_view()), name='tag_list'), + url(r'^tags/$', views.TagListView.as_view(), name='tag_list'), url(r'^tags/delete/$', views.TagBulkDeleteView.as_view(), name='tag_bulk_delete'), - url(r'^tags/(?P[\w-]+)/$', cached(views.TagView.as_view()), name='tag'), + url(r'^tags/(?P[\w-]+)/$', views.TagView.as_view(), name='tag'), url(r'^tags/(?P[\w-]+)/edit/$', views.TagEditView.as_view(), name='tag_edit'), url(r'^tags/(?P[\w-]+)/delete/$', views.TagDeleteView.as_view(), name='tag_delete'), - url(r'^tags/(?P[\w-]+)/changelog/$', cached(views.ObjectChangeLogView.as_view()), name='tag_changelog', kwargs={'model': Tag}), + url(r'^tags/(?P[\w-]+)/changelog/$', views.ObjectChangeLogView.as_view(), name='tag_changelog', kwargs={'model': Tag}), # Config contexts - url(r'^config-contexts/$', cached(views.ConfigContextListView.as_view()), name='configcontext_list'), - url(r'^config-contexts/add/$', cached(views.ConfigContextCreateView.as_view()), name='configcontext_add'), + url(r'^config-contexts/$', views.ConfigContextListView.as_view(), name='configcontext_list'), + url(r'^config-contexts/add/$', views.ConfigContextCreateView.as_view(), name='configcontext_add'), url(r'^config-contexts/edit/$', views.ConfigContextBulkEditView.as_view(), name='configcontext_bulk_edit'), url(r'^config-contexts/delete/$', views.ConfigContextBulkDeleteView.as_view(), name='configcontext_bulk_delete'), - url(r'^config-contexts/(?P\d+)/$', cached(views.ConfigContextView.as_view()), name='configcontext'), + url(r'^config-contexts/(?P\d+)/$', views.ConfigContextView.as_view(), name='configcontext'), url(r'^config-contexts/(?P\d+)/edit/$', views.ConfigContextEditView.as_view(), name='configcontext_edit'), url(r'^config-contexts/(?P\d+)/delete/$', views.ConfigContextDeleteView.as_view(), name='configcontext_delete'), @@ -30,12 +29,12 @@ urlpatterns = [ url(r'^image-attachments/(?P\d+)/delete/$', views.ImageAttachmentDeleteView.as_view(), name='imageattachment_delete'), # Reports - url(r'^reports/$', cached(views.ReportListView.as_view()), name='report_list'), - url(r'^reports/(?P[^/]+\.[^/]+)/$', cached(views.ReportView.as_view()), name='report'), + url(r'^reports/$', views.ReportListView.as_view(), name='report_list'), + url(r'^reports/(?P[^/]+\.[^/]+)/$', views.ReportView.as_view(), name='report'), url(r'^reports/(?P[^/]+\.[^/]+)/run/$', views.ReportRunView.as_view(), name='report_run'), # Change logging - url(r'^changelog/$', cached(views.ObjectChangeListView.as_view()), name='objectchange_list'), - url(r'^changelog/(?P\d+)/$', cached(views.ObjectChangeView.as_view()), name='objectchange'), + url(r'^changelog/$', views.ObjectChangeListView.as_view(), name='objectchange_list'), + url(r'^changelog/(?P\d+)/$', views.ObjectChangeView.as_view(), name='objectchange'), ] diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 21ea4f1c9..cb9b40cdd 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -7,6 +7,8 @@ from django.db.models import Count, Q from django.http import Http404 from django.shortcuts import get_object_or_404, redirect, render from django.utils.safestring import mark_safe +from django.utils.decorators import method_decorator +from django.views.decorators.cache import cache_page from django.views.generic import View from django_tables2 import RequestConfig @@ -41,6 +43,7 @@ class TagListView(ObjectListView): class TagView(View): + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, slug): tag = get_object_or_404(Tag, slug=slug) @@ -108,6 +111,7 @@ class ConfigContextListView(PermissionRequiredMixin, ObjectListView): class ConfigContextView(PermissionRequiredMixin, View): permission_required = 'extras.view_configcontext' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): configcontext = get_object_or_404(ConfigContext, pk=pk) @@ -155,6 +159,7 @@ class ObjectConfigContextView(View): object_class = None base_template = None + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): obj = get_object_or_404(self.object_class, pk=pk) @@ -187,6 +192,7 @@ class ObjectChangeListView(PermissionRequiredMixin, ObjectListView): class ObjectChangeView(PermissionRequiredMixin, View): permission_required = 'extras.view_objectchange' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): objectchange = get_object_or_404(ObjectChange, pk=pk) @@ -209,6 +215,7 @@ class ObjectChangeLogView(View): Present a history of changes made to a particular object. """ + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, model, **kwargs): # Get object my model and kwargs (e.g. slug='foo') @@ -282,6 +289,7 @@ class ReportListView(PermissionRequiredMixin, View): """ permission_required = 'extras.view_reportresult' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request): reports = get_reports() @@ -306,6 +314,7 @@ class ReportView(PermissionRequiredMixin, View): """ permission_required = 'extras.view_reportresult' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, name): # Retrieve the Report by "." diff --git a/netbox/ipam/urls.py b/netbox/ipam/urls.py index 563177700..c2f7badd3 100644 --- a/netbox/ipam/urls.py +++ b/netbox/ipam/urls.py @@ -1,7 +1,6 @@ from django.conf.urls import url from extras.views import ObjectChangeLogView -from utilities.urls import cached from . import views from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF @@ -9,97 +8,97 @@ app_name = 'ipam' urlpatterns = [ # VRFs - url(r'^vrfs/$', cached(views.VRFListView.as_view()), name='vrf_list'), - url(r'^vrfs/add/$', cached(views.VRFCreateView.as_view()), name='vrf_add'), + url(r'^vrfs/$', views.VRFListView.as_view(), name='vrf_list'), + url(r'^vrfs/add/$', views.VRFCreateView.as_view(), name='vrf_add'), url(r'^vrfs/import/$', views.VRFBulkImportView.as_view(), name='vrf_import'), url(r'^vrfs/edit/$', views.VRFBulkEditView.as_view(), name='vrf_bulk_edit'), url(r'^vrfs/delete/$', views.VRFBulkDeleteView.as_view(), name='vrf_bulk_delete'), - url(r'^vrfs/(?P\d+)/$', cached(views.VRFView.as_view()), name='vrf'), + url(r'^vrfs/(?P\d+)/$', views.VRFView.as_view(), name='vrf'), url(r'^vrfs/(?P\d+)/edit/$', views.VRFEditView.as_view(), name='vrf_edit'), url(r'^vrfs/(?P\d+)/delete/$', views.VRFDeleteView.as_view(), name='vrf_delete'), - url(r'^vrfs/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='vrf_changelog', kwargs={'model': VRF}), + url(r'^vrfs/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='vrf_changelog', kwargs={'model': VRF}), # RIRs - url(r'^rirs/$', cached(views.RIRListView.as_view()), name='rir_list'), - url(r'^rirs/add/$', cached(views.RIRCreateView.as_view()), name='rir_add'), + url(r'^rirs/$', views.RIRListView.as_view(), name='rir_list'), + url(r'^rirs/add/$', views.RIRCreateView.as_view(), name='rir_add'), url(r'^rirs/import/$', views.RIRBulkImportView.as_view(), name='rir_import'), url(r'^rirs/delete/$', views.RIRBulkDeleteView.as_view(), name='rir_bulk_delete'), url(r'^rirs/(?P[\w-]+)/edit/$', views.RIREditView.as_view(), name='rir_edit'), - url(r'^vrfs/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='rir_changelog', kwargs={'model': RIR}), + url(r'^vrfs/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='rir_changelog', kwargs={'model': RIR}), # Aggregates - url(r'^aggregates/$', cached(views.AggregateListView.as_view()), name='aggregate_list'), - url(r'^aggregates/add/$', cached(views.AggregateCreateView.as_view()), name='aggregate_add'), + url(r'^aggregates/$', views.AggregateListView.as_view(), name='aggregate_list'), + url(r'^aggregates/add/$', views.AggregateCreateView.as_view(), name='aggregate_add'), url(r'^aggregates/import/$', views.AggregateBulkImportView.as_view(), name='aggregate_import'), url(r'^aggregates/edit/$', views.AggregateBulkEditView.as_view(), name='aggregate_bulk_edit'), url(r'^aggregates/delete/$', views.AggregateBulkDeleteView.as_view(), name='aggregate_bulk_delete'), - url(r'^aggregates/(?P\d+)/$', cached(views.AggregateView.as_view()), name='aggregate'), + url(r'^aggregates/(?P\d+)/$', views.AggregateView.as_view(), name='aggregate'), url(r'^aggregates/(?P\d+)/edit/$', views.AggregateEditView.as_view(), name='aggregate_edit'), url(r'^aggregates/(?P\d+)/delete/$', views.AggregateDeleteView.as_view(), name='aggregate_delete'), - url(r'^aggregates/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='aggregate_changelog', kwargs={'model': Aggregate}), + url(r'^aggregates/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='aggregate_changelog', kwargs={'model': Aggregate}), # Roles - url(r'^roles/$', cached(views.RoleListView.as_view()), name='role_list'), - url(r'^roles/add/$', cached(views.RoleCreateView.as_view()), name='role_add'), + url(r'^roles/$', views.RoleListView.as_view(), name='role_list'), + url(r'^roles/add/$', views.RoleCreateView.as_view(), name='role_add'), url(r'^roles/import/$', views.RoleBulkImportView.as_view(), name='role_import'), url(r'^roles/delete/$', views.RoleBulkDeleteView.as_view(), name='role_bulk_delete'), url(r'^roles/(?P[\w-]+)/edit/$', views.RoleEditView.as_view(), name='role_edit'), - url(r'^roles/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='role_changelog', kwargs={'model': Role}), + url(r'^roles/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='role_changelog', kwargs={'model': Role}), # Prefixes - url(r'^prefixes/$', cached(views.PrefixListView.as_view()), name='prefix_list'), - url(r'^prefixes/add/$', cached(views.PrefixCreateView.as_view()), name='prefix_add'), + url(r'^prefixes/$', views.PrefixListView.as_view(), name='prefix_list'), + url(r'^prefixes/add/$', views.PrefixCreateView.as_view(), name='prefix_add'), url(r'^prefixes/import/$', views.PrefixBulkImportView.as_view(), name='prefix_import'), url(r'^prefixes/edit/$', views.PrefixBulkEditView.as_view(), name='prefix_bulk_edit'), url(r'^prefixes/delete/$', views.PrefixBulkDeleteView.as_view(), name='prefix_bulk_delete'), - url(r'^prefixes/(?P\d+)/$', cached(views.PrefixView.as_view()), name='prefix'), + url(r'^prefixes/(?P\d+)/$', views.PrefixView.as_view(), name='prefix'), url(r'^prefixes/(?P\d+)/edit/$', views.PrefixEditView.as_view(), name='prefix_edit'), url(r'^prefixes/(?P\d+)/delete/$', views.PrefixDeleteView.as_view(), name='prefix_delete'), - url(r'^prefixes/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='prefix_changelog', kwargs={'model': Prefix}), - url(r'^prefixes/(?P\d+)/prefixes/$', cached(views.PrefixPrefixesView.as_view()), name='prefix_prefixes'), - url(r'^prefixes/(?P\d+)/ip-addresses/$', cached(views.PrefixIPAddressesView.as_view()), name='prefix_ipaddresses'), + url(r'^prefixes/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='prefix_changelog', kwargs={'model': Prefix}), + url(r'^prefixes/(?P\d+)/prefixes/$', views.PrefixPrefixesView.as_view(), name='prefix_prefixes'), + url(r'^prefixes/(?P\d+)/ip-addresses/$', views.PrefixIPAddressesView.as_view(), name='prefix_ipaddresses'), # IP addresses - url(r'^ip-addresses/$', cached(views.IPAddressListView.as_view()), name='ipaddress_list'), - url(r'^ip-addresses/add/$', cached(views.IPAddressCreateView.as_view()), name='ipaddress_add'), - url(r'^ip-addresses/bulk-add/$', cached(views.IPAddressBulkCreateView.as_view()), name='ipaddress_bulk_add'), + url(r'^ip-addresses/$', views.IPAddressListView.as_view(), name='ipaddress_list'), + url(r'^ip-addresses/add/$', views.IPAddressCreateView.as_view(), name='ipaddress_add'), + url(r'^ip-addresses/bulk-add/$', views.IPAddressBulkCreateView.as_view(), name='ipaddress_bulk_add'), url(r'^ip-addresses/import/$', views.IPAddressBulkImportView.as_view(), name='ipaddress_import'), url(r'^ip-addresses/edit/$', views.IPAddressBulkEditView.as_view(), name='ipaddress_bulk_edit'), url(r'^ip-addresses/delete/$', views.IPAddressBulkDeleteView.as_view(), name='ipaddress_bulk_delete'), - url(r'^ip-addresses/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='ipaddress_changelog', kwargs={'model': IPAddress}), + url(r'^ip-addresses/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='ipaddress_changelog', kwargs={'model': IPAddress}), url(r'^ip-addresses/assign/$', views.IPAddressAssignView.as_view(), name='ipaddress_assign'), - url(r'^ip-addresses/(?P\d+)/$', cached(views.IPAddressView.as_view()), name='ipaddress'), + url(r'^ip-addresses/(?P\d+)/$', views.IPAddressView.as_view(), name='ipaddress'), url(r'^ip-addresses/(?P\d+)/edit/$', views.IPAddressEditView.as_view(), name='ipaddress_edit'), url(r'^ip-addresses/(?P\d+)/delete/$', views.IPAddressDeleteView.as_view(), name='ipaddress_delete'), # VLAN groups - url(r'^vlan-groups/$', cached(views.VLANGroupListView.as_view()), name='vlangroup_list'), - url(r'^vlan-groups/add/$', cached(views.VLANGroupCreateView.as_view()), name='vlangroup_add'), + url(r'^vlan-groups/$', views.VLANGroupListView.as_view(), name='vlangroup_list'), + url(r'^vlan-groups/add/$', views.VLANGroupCreateView.as_view(), name='vlangroup_add'), url(r'^vlan-groups/import/$', views.VLANGroupBulkImportView.as_view(), name='vlangroup_import'), url(r'^vlan-groups/delete/$', views.VLANGroupBulkDeleteView.as_view(), name='vlangroup_bulk_delete'), url(r'^vlan-groups/(?P\d+)/edit/$', views.VLANGroupEditView.as_view(), name='vlangroup_edit'), - url(r'^vlan-groups/(?P\d+)/vlans/$', cached(views.VLANGroupVLANsView.as_view()), name='vlangroup_vlans'), - url(r'^vlan-groups/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='vlangroup_changelog', kwargs={'model': VLANGroup}), + url(r'^vlan-groups/(?P\d+)/vlans/$', views.VLANGroupVLANsView.as_view(), name='vlangroup_vlans'), + url(r'^vlan-groups/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='vlangroup_changelog', kwargs={'model': VLANGroup}), # VLANs - url(r'^vlans/$', cached(views.VLANListView.as_view()), name='vlan_list'), - url(r'^vlans/add/$', cached(views.VLANCreateView.as_view()), name='vlan_add'), + url(r'^vlans/$', views.VLANListView.as_view(), name='vlan_list'), + url(r'^vlans/add/$', views.VLANCreateView.as_view(), name='vlan_add'), url(r'^vlans/import/$', views.VLANBulkImportView.as_view(), name='vlan_import'), url(r'^vlans/edit/$', views.VLANBulkEditView.as_view(), name='vlan_bulk_edit'), url(r'^vlans/delete/$', views.VLANBulkDeleteView.as_view(), name='vlan_bulk_delete'), - url(r'^vlans/(?P\d+)/$', cached(views.VLANView.as_view()), name='vlan'), - url(r'^vlans/(?P\d+)/members/$', cached(views.VLANMembersView.as_view()), name='vlan_members'), + url(r'^vlans/(?P\d+)/$', views.VLANView.as_view(), name='vlan'), + url(r'^vlans/(?P\d+)/members/$', views.VLANMembersView.as_view(), name='vlan_members'), url(r'^vlans/(?P\d+)/edit/$', views.VLANEditView.as_view(), name='vlan_edit'), url(r'^vlans/(?P\d+)/delete/$', views.VLANDeleteView.as_view(), name='vlan_delete'), - url(r'^vlans/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='vlan_changelog', kwargs={'model': VLAN}), + url(r'^vlans/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='vlan_changelog', kwargs={'model': VLAN}), # Services - url(r'^services/$', cached(views.ServiceListView.as_view()), name='service_list'), + url(r'^services/$', views.ServiceListView.as_view(), name='service_list'), url(r'^services/edit/$', views.ServiceBulkEditView.as_view(), name='service_bulk_edit'), url(r'^services/delete/$', views.ServiceBulkDeleteView.as_view(), name='service_bulk_delete'), - url(r'^services/(?P\d+)/$', cached(views.ServiceView.as_view()), name='service'), + url(r'^services/(?P\d+)/$', views.ServiceView.as_view(), name='service'), url(r'^services/(?P\d+)/edit/$', views.ServiceEditView.as_view(), name='service_edit'), url(r'^services/(?P\d+)/delete/$', views.ServiceDeleteView.as_view(), name='service_delete'), - url(r'^services/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='service_changelog', kwargs={'model': Service}), + url(r'^services/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='service_changelog', kwargs={'model': Service}), ] diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index d80646bb0..c2ab13301 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -3,6 +3,8 @@ from django.conf import settings from django.contrib.auth.mixins import PermissionRequiredMixin from django.db.models import Count, Q from django.shortcuts import get_object_or_404, redirect, render +from django.utils.decorators import method_decorator +from django.views.decorators.cache import cache_page from django.views.generic import View from django_tables2 import RequestConfig @@ -125,6 +127,7 @@ class VRFListView(PermissionRequiredMixin, ObjectListView): class VRFView(PermissionRequiredMixin, View): permission_required = 'ipam.view_vrf' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): vrf = get_object_or_404(VRF.objects.all(), pk=pk) @@ -319,6 +322,7 @@ class AggregateListView(PermissionRequiredMixin, ObjectListView): class AggregateView(PermissionRequiredMixin, View): permission_required = 'ipam.view_aggregate' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): aggregate = get_object_or_404(Aggregate, pk=pk) @@ -456,6 +460,7 @@ class PrefixListView(PermissionRequiredMixin, ObjectListView): class PrefixView(PermissionRequiredMixin, View): permission_required = 'ipam.view_prefix' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): prefix = get_object_or_404(Prefix.objects.select_related( @@ -500,6 +505,7 @@ class PrefixView(PermissionRequiredMixin, View): class PrefixPrefixesView(PermissionRequiredMixin, View): permission_required = 'ipam.view_prefix' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): prefix = get_object_or_404(Prefix.objects.all(), pk=pk) @@ -543,6 +549,7 @@ class PrefixPrefixesView(PermissionRequiredMixin, View): class PrefixIPAddressesView(PermissionRequiredMixin, View): permission_required = 'ipam.view_prefix' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): prefix = get_object_or_404(Prefix.objects.all(), pk=pk) @@ -643,6 +650,7 @@ class IPAddressListView(PermissionRequiredMixin, ObjectListView): class IPAddressView(PermissionRequiredMixin, View): permission_required = 'ipam.view_ipaddress' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): ipaddress = get_object_or_404(IPAddress.objects.select_related('vrf__tenant', 'tenant'), pk=pk) @@ -726,6 +734,7 @@ class IPAddressAssignView(PermissionRequiredMixin, View): return super().dispatch(request, *args, **kwargs) + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request): form = forms.IPAddressAssignForm() @@ -838,6 +847,7 @@ class VLANGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class VLANGroupVLANsView(PermissionRequiredMixin, View): permission_required = 'ipam.view_vlangroup' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): vlan_group = get_object_or_404(VLANGroup.objects.all(), pk=pk) @@ -888,6 +898,7 @@ class VLANListView(PermissionRequiredMixin, ObjectListView): class VLANView(PermissionRequiredMixin, View): permission_required = 'ipam.view_vlan' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): vlan = get_object_or_404(VLAN.objects.select_related( @@ -906,6 +917,7 @@ class VLANView(PermissionRequiredMixin, View): class VLANMembersView(PermissionRequiredMixin, View): permission_required = 'ipam.view_vlan' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): vlan = get_object_or_404(VLAN.objects.all(), pk=pk) @@ -984,6 +996,7 @@ class ServiceListView(PermissionRequiredMixin, ObjectListView): class ServiceView(PermissionRequiredMixin, View): permission_required = 'ipam.view_service' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): service = get_object_or_404(Service, pk=pk) diff --git a/netbox/netbox/configuration.example.py b/netbox/netbox/configuration.example.py index ee55ade40..df8e1afd0 100644 --- a/netbox/netbox/configuration.example.py +++ b/netbox/netbox/configuration.example.py @@ -60,18 +60,18 @@ BANNER_LOGIN = '' # BASE_PATH = 'netbox/' BASE_PATH = '' -# Cache timeout in seconds. Set to `None` to enforce an infinate timeout. Set to 0 to dissable caching by immediatly -# expiring keys. Defaults to 900 (15 minutes) -CACHE_TIMEOUT = 900 - -# Max number of entries (unique pages) to store in the cache at a time. -CACHE_MAX_ENTRIES = 300 - # The fraction of entries that are culled when CACHE_MAX_ENTRIES is reached. The actual ratio is 1 / CACHE_CULL_FREQUENCY, # so set CACHE_CULL_FREQUENCY to 2 to cull half the entries when CACHE_MAX_ENTRIES is reached. This setting should be an # integer and defaults to 3 CACHE_CULL_FREQUENCY = 3 +# Max number of entries (unique pages) to store in the cache at a time. +CACHE_MAX_ENTRIES = 300 + +# Cache timeout in seconds. Set to `None` to enforce an infinate timeout. Set to 0 to dissable caching by immediatly +# expiring keys. Defaults to 900 (15 minutes) +CACHE_TIMEOUT = 900 + # Maximum number of days to retain logged changes. Set to 0 to retain changes indefinitely. (Default: 90) CHANGELOG_RETENTION = 90 @@ -171,9 +171,6 @@ TIME_ZONE = 'UTC' # database be configured and accessible by NetBox. WEBHOOKS_ENABLED = False -# Expose Prometheus monitoring metrics at `/metrics` -PROMETHEUS_ENABLE = False - # Date/time formatting. See the following link for supported formats: # https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'N j, Y' diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index dce7d9cf9..58bd209e0 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -68,7 +68,6 @@ NAPALM_PASSWORD = getattr(configuration, 'NAPALM_PASSWORD', '') NAPALM_TIMEOUT = getattr(configuration, 'NAPALM_TIMEOUT', 30) NAPALM_ARGS = getattr(configuration, 'NAPALM_ARGS', {}) PAGINATE_COUNT = getattr(configuration, 'PAGINATE_COUNT', 50) -PROMETHEUS_ENABLE = getattr(configuration, 'PROMETHEUS_ENABLE', False) PREFER_IPV4 = getattr(configuration, 'PREFER_IPV4', False) REPORTS_ROOT = getattr(configuration, 'REPORTS_ROOT', os.path.join(BASE_DIR, 'reports')).rstrip('/') REDIS = getattr(configuration, 'REDIS', {}) @@ -118,10 +117,7 @@ else: ] # Database -if PROMETHEUS_ENABLE: - configuration.DATABASE.update({'ENGINE': 'django_prometheus.db.backends.postgresql'}) -else: - configuration.DATABASE.update({'ENGINE': 'django.db.backends.postgresql'}) +configuration.DATABASE.update({'ENGINE': 'django.db.backends.postgresql'}) DATABASES = { 'default': configuration.DATABASE, } @@ -164,7 +160,6 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'django.contrib.humanize', 'corsheaders', - 'django_prometheus', 'django_redis', 'debug_toolbar', 'django_filters', @@ -193,7 +188,6 @@ if WEBHOOKS_ENABLED: # Middleware MIDDLEWARE = ( 'debug_toolbar.middleware.DebugToolbarMiddleware', - 'django_prometheus.middleware.PrometheusBeforeMiddleware', 'corsheaders.middleware.CorsMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', @@ -206,7 +200,6 @@ MIDDLEWARE = ( 'utilities.middleware.LoginRequiredMiddleware', 'utilities.middleware.APIVersionMiddleware', 'extras.middleware.ObjectChangeMiddleware', - 'django_prometheus.middleware.PrometheusAfterMiddleware', ) ROOT_URLCONF = 'netbox.urls' @@ -239,11 +232,7 @@ if REDIS_PASSWORD: REDIS_CACHE_CON_STRING = '{}@{}'.format(REDIS_PASSWORD, REDIS_CACHE_CON_STRING) REDIS_CACHE_CON_STRING = '{}{}:{}/{}'.format(REDIS_CACHE_CON_STRING, REDIS_HOST, REDIS_PORT, REDIS_DATABASE) - -if PROMETHEUS_ENABLE: - CACHE_BACKEND = 'django_prometheus.cache.backends.redis.RedisCache' -else: - CACHE_BACKEND = 'django_redis.cache.RedisCache' +CACHE_BACKEND = 'django_redis.cache.RedisCache' CACHES = { "default": { diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py index dd7aa7f8f..45c99beb9 100644 --- a/netbox/netbox/urls.py +++ b/netbox/netbox/urls.py @@ -6,7 +6,6 @@ from drf_yasg.views import get_schema_view from netbox.views import APIRootView, HomeView, SearchView from users.views import LoginView, LogoutView -from utilities.urls import cached from .admin import admin_site schema_view = get_schema_view( @@ -25,11 +24,11 @@ schema_view = get_schema_view( _patterns = [ # Base views - url(r'^$', cached(HomeView.as_view()), name='home'), - url(r'^search/$', cached(SearchView.as_view()), name='search'), + url(r'^$', HomeView.as_view(), name='home'), + url(r'^search/$', SearchView.as_view(), name='search'), # Login/logout - url(r'^login/$', cached(LoginView.as_view()), name='login'), + url(r'^login/$', LoginView.as_view(), name='login'), url(r'^logout/$', LogoutView.as_view(), name='logout'), # Apps @@ -43,7 +42,7 @@ _patterns = [ url(r'^virtualization/', include('virtualization.urls')), # API - url(r'^api/$', cached(APIRootView.as_view()), name='api-root'), + url(r'^api/$', APIRootView.as_view(), name='api-root'), url(r'^api/circuits/', include('circuits.api.urls')), url(r'^api/dcim/', include('dcim.api.urls')), url(r'^api/extras/', include('extras.api.urls')), @@ -68,11 +67,6 @@ if settings.WEBHOOKS_ENABLED: url(r'^admin/webhook-backend-status/', include('django_rq.urls')), ] -if settings.PROMETHEUS_ENABLE: - _patterns += [ - url('', include('django_prometheus.urls')), - ] - if settings.DEBUG: import debug_toolbar _patterns += [ diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index a0e8d6a7e..cdd34f12b 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -1,7 +1,10 @@ from collections import OrderedDict +from django.conf import settings from django.db.models import Count, F from django.shortcuts import render +from django.utils.decorators import method_decorator +from django.views.decorators.cache import cache_page from django.views.generic import View from rest_framework.response import Response from rest_framework.reverse import reverse @@ -160,6 +163,7 @@ SEARCH_TYPES = OrderedDict(( class HomeView(View): template_name = 'home.html' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request): connected_consoleports = ConsolePort.objects.filter( @@ -219,6 +223,7 @@ class HomeView(View): class SearchView(View): + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request): # No query @@ -272,6 +277,7 @@ class APIRootView(APIView): def get_view_name(self): return "API Root" + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, format=None): return Response(OrderedDict(( diff --git a/netbox/secrets/urls.py b/netbox/secrets/urls.py index 1b73a2ca8..e1ce2b8f2 100644 --- a/netbox/secrets/urls.py +++ b/netbox/secrets/urls.py @@ -1,7 +1,6 @@ from django.conf.urls import url from extras.views import ObjectChangeLogView -from utilities.urls import cached from . import views from .models import Secret, SecretRole @@ -9,21 +8,21 @@ app_name = 'secrets' urlpatterns = [ # Secret roles - url(r'^secret-roles/$', cached(views.SecretRoleListView.as_view()), name='secretrole_list'), - url(r'^secret-roles/add/$', cached(views.SecretRoleCreateView.as_view()), name='secretrole_add'), + url(r'^secret-roles/$', views.SecretRoleListView.as_view(), name='secretrole_list'), + url(r'^secret-roles/add/$', views.SecretRoleCreateView.as_view(), name='secretrole_add'), url(r'^secret-roles/import/$', views.SecretRoleBulkImportView.as_view(), name='secretrole_import'), url(r'^secret-roles/delete/$', views.SecretRoleBulkDeleteView.as_view(), name='secretrole_bulk_delete'), url(r'^secret-roles/(?P[\w-]+)/edit/$', views.SecretRoleEditView.as_view(), name='secretrole_edit'), - url(r'^secret-roles/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='secretrole_changelog', kwargs={'model': SecretRole}), + url(r'^secret-roles/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='secretrole_changelog', kwargs={'model': SecretRole}), # Secrets - url(r'^secrets/$', cached(views.SecretListView.as_view()), name='secret_list'), + url(r'^secrets/$', views.SecretListView.as_view(), name='secret_list'), url(r'^secrets/import/$', views.SecretBulkImportView.as_view(), name='secret_import'), url(r'^secrets/edit/$', views.SecretBulkEditView.as_view(), name='secret_bulk_edit'), url(r'^secrets/delete/$', views.SecretBulkDeleteView.as_view(), name='secret_bulk_delete'), - url(r'^secrets/(?P\d+)/$', cached(views.SecretView.as_view()), name='secret'), + url(r'^secrets/(?P\d+)/$', views.SecretView.as_view(), name='secret'), url(r'^secrets/(?P\d+)/edit/$', views.secret_edit, name='secret_edit'), url(r'^secrets/(?P\d+)/delete/$', views.SecretDeleteView.as_view(), name='secret_delete'), - url(r'^secrets/(?P\d+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='secret_changelog', kwargs={'model': Secret}), + url(r'^secrets/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='secret_changelog', kwargs={'model': Secret}), ] diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py index 74772beb0..aeab49c8b 100644 --- a/netbox/secrets/views.py +++ b/netbox/secrets/views.py @@ -1,5 +1,6 @@ import base64 +from django.conf import settings from django.contrib import messages from django.contrib.auth.decorators import permission_required, login_required from django.contrib.auth.mixins import PermissionRequiredMixin @@ -7,6 +8,7 @@ from django.db.models import Count from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse from django.utils.decorators import method_decorator +from django.views.decorators.cache import cache_page from django.views.generic import View from dcim.models import Device @@ -80,6 +82,7 @@ class SecretListView(PermissionRequiredMixin, ObjectListView): class SecretView(PermissionRequiredMixin, View): permission_required = 'secrets.view_secret' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): secret = get_object_or_404(Secret, pk=pk) diff --git a/netbox/tenancy/urls.py b/netbox/tenancy/urls.py index ab3a020e0..19522e6c7 100644 --- a/netbox/tenancy/urls.py +++ b/netbox/tenancy/urls.py @@ -1,7 +1,6 @@ from django.conf.urls import url from extras.views import ObjectChangeLogView -from utilities.urls import cached from . import views from .models import Tenant, TenantGroup @@ -9,22 +8,22 @@ app_name = 'tenancy' urlpatterns = [ # Tenant groups - url(r'^tenant-groups/$', cached(views.TenantGroupListView.as_view()), name='tenantgroup_list'), - url(r'^tenant-groups/add/$', cached(views.TenantGroupCreateView.as_view()), name='tenantgroup_add'), + url(r'^tenant-groups/$', views.TenantGroupListView.as_view(), name='tenantgroup_list'), + url(r'^tenant-groups/add/$', views.TenantGroupCreateView.as_view(), name='tenantgroup_add'), url(r'^tenant-groups/import/$', views.TenantGroupBulkImportView.as_view(), name='tenantgroup_import'), url(r'^tenant-groups/delete/$', views.TenantGroupBulkDeleteView.as_view(), name='tenantgroup_bulk_delete'), url(r'^tenant-groups/(?P[\w-]+)/edit/$', views.TenantGroupEditView.as_view(), name='tenantgroup_edit'), - url(r'^tenant-groups/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='tenantgroup_changelog', kwargs={'model': TenantGroup}), + url(r'^tenant-groups/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='tenantgroup_changelog', kwargs={'model': TenantGroup}), # Tenants - url(r'^tenants/$', cached(views.TenantListView.as_view()), name='tenant_list'), - url(r'^tenants/add/$', cached(views.TenantCreateView.as_view()), name='tenant_add'), + url(r'^tenants/$', views.TenantListView.as_view(), name='tenant_list'), + url(r'^tenants/add/$', views.TenantCreateView.as_view(), name='tenant_add'), url(r'^tenants/import/$', views.TenantBulkImportView.as_view(), name='tenant_import'), url(r'^tenants/edit/$', views.TenantBulkEditView.as_view(), name='tenant_bulk_edit'), url(r'^tenants/delete/$', views.TenantBulkDeleteView.as_view(), name='tenant_bulk_delete'), - url(r'^tenants/(?P[\w-]+)/$', cached(views.TenantView.as_view()), name='tenant'), + url(r'^tenants/(?P[\w-]+)/$', views.TenantView.as_view(), name='tenant'), url(r'^tenants/(?P[\w-]+)/edit/$', views.TenantEditView.as_view(), name='tenant_edit'), url(r'^tenants/(?P[\w-]+)/delete/$', views.TenantDeleteView.as_view(), name='tenant_delete'), - url(r'^tenants/(?P[\w-]+)/changelog/$', cached(ObjectChangeLogView.as_view()), name='tenant_changelog', kwargs={'model': Tenant}), + url(r'^tenants/(?P[\w-]+)/changelog/$', ObjectChangeLogView.as_view(), name='tenant_changelog', kwargs={'model': Tenant}), ] diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py index 5d43309de..627f32855 100644 --- a/netbox/tenancy/views.py +++ b/netbox/tenancy/views.py @@ -1,6 +1,9 @@ +from django.conf import settings from django.contrib.auth.mixins import PermissionRequiredMixin from django.db.models import Count from django.shortcuts import get_object_or_404, render +from django.utils.decorators import method_decorator +from django.views.decorators.cache import cache_page from django.views.generic import View from circuits.models import Circuit @@ -66,6 +69,7 @@ class TenantListView(PermissionRequiredMixin, ObjectListView): class TenantView(PermissionRequiredMixin, View): permission_required = 'tenancy.view_tenant' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, slug): tenant = get_object_or_404(Tenant, slug=slug) diff --git a/netbox/utilities/urls.py b/netbox/utilities/urls.py deleted file mode 100644 index f81b02257..000000000 --- a/netbox/utilities/urls.py +++ /dev/null @@ -1,9 +0,0 @@ -from django.conf import settings -from django.views.decorators.cache import cache_page - - -def cached(view): - """ - Return a cache_page decorated view - """ - return cache_page(settings.CACHE_TIMEOUT)(view) diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index 02441549f..59a6fcafd 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -17,6 +17,8 @@ from django.urls import reverse from django.utils.html import escape from django.utils.http import is_safe_url from django.utils.safestring import mark_safe +from django.utils.decorators import method_decorator +from django.views.decorators.cache import cache_page from django.views.decorators.csrf import requires_csrf_token from django.views.defaults import ERROR_500_TEMPLATE_NAME from django.views.generic import View @@ -106,6 +108,7 @@ class ObjectListView(View): return csv_data + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request): model = self.queryset.model @@ -713,6 +716,7 @@ class ComponentCreateView(View): model_form = None template_name = None + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): parent = get_object_or_404(self.parent_model, pk=pk) diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 712c7acb5..fdb4bbc10 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -1,9 +1,12 @@ +from django.conf import settings from django.contrib import messages from django.contrib.auth.mixins import PermissionRequiredMixin from django.db import transaction from django.db.models import Count from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse +from django.utils.decorators import method_decorator +from django.views.decorators.cache import cache_page from django.views.generic import View from dcim.models import Device, Interface @@ -106,6 +109,7 @@ class ClusterListView(PermissionRequiredMixin, ObjectListView): class ClusterView(PermissionRequiredMixin, View): permission_required = 'virtualization.view_cluster' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): cluster = get_object_or_404(Cluster, pk=pk) @@ -168,6 +172,7 @@ class ClusterAddDevicesView(PermissionRequiredMixin, View): form = forms.ClusterAddDevicesForm template_name = 'virtualization/cluster_add_devices.html' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): cluster = get_object_or_404(Cluster, pk=pk) @@ -263,6 +268,7 @@ class VirtualMachineListView(PermissionRequiredMixin, ObjectListView): class VirtualMachineView(PermissionRequiredMixin, View): permission_required = 'virtualization.view_virtualmachine' + @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): virtualmachine = get_object_or_404(VirtualMachine.objects.select_related('tenant__group'), pk=pk) diff --git a/requirements.txt b/requirements.txt index abcd4eea7..a46158413 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,6 @@ django-cors-headers==2.4.0 django-debug-toolbar==1.11 django-filter==2.0.0 django-mptt==0.9.1 -django-prometheus==1.0.15 django-redis==4.5.0 django-tables2==2.0.3 django-taggit==0.23.0 From 4536754b209d89487f0f7dbc4785237861bd1ffd Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 15 Apr 2019 17:12:41 -0400 Subject: [PATCH 058/140] Initial work on #969: Custom links --- netbox/extras/admin.py | 11 ++- netbox/extras/constants.py | 18 +++++ netbox/extras/migrations/0022_custom_links.py | 32 +++++++++ netbox/extras/models.py | 47 +++++++++++++ netbox/extras/templatetags/__init__.py | 0 netbox/extras/templatetags/custom_links.py | 68 +++++++++++++++++++ netbox/templates/dcim/device.html | 4 ++ 7 files changed, 179 insertions(+), 1 deletion(-) create mode 100644 netbox/extras/migrations/0022_custom_links.py create mode 100644 netbox/extras/templatetags/__init__.py create mode 100644 netbox/extras/templatetags/custom_links.py diff --git a/netbox/extras/admin.py b/netbox/extras/admin.py index b4962dfd7..db193a150 100644 --- a/netbox/extras/admin.py +++ b/netbox/extras/admin.py @@ -3,7 +3,7 @@ from django.contrib import admin from netbox.admin import admin_site from utilities.forms import LaxURLField -from .models import CustomField, CustomFieldChoice, Graph, ExportTemplate, TopologyMap, Webhook +from .models import CustomField, CustomFieldChoice, CustomLink, Graph, ExportTemplate, TopologyMap, Webhook def order_content_types(field): @@ -77,6 +77,15 @@ class CustomFieldAdmin(admin.ModelAdmin): return ', '.join([ct.name for ct in obj.obj_type.all()]) +# +# Custom links +# + +@admin.register(CustomLink, site=admin_site) +class CustomLinkAdmin(admin.ModelAdmin): + list_display = ['name', 'content_type', 'group_name', 'weight'] + + # # Graphs # diff --git a/netbox/extras/constants.py b/netbox/extras/constants.py index 13c15cbba..3710b3b8d 100644 --- a/netbox/extras/constants.py +++ b/netbox/extras/constants.py @@ -35,6 +35,24 @@ CF_FILTER_CHOICES = ( (CF_FILTER_EXACT, 'Exact'), ) +# Custom links +BUTTON_CLASS_DEFAULT = 'default' +BUTTON_CLASS_PRIMARY = 'primary' +BUTTON_CLASS_SUCCESS = 'success' +BUTTON_CLASS_INFO = 'info' +BUTTON_CLASS_WARNING = 'warning' +BUTTON_CLASS_DANGER = 'danger' +BUTTON_CLASS_LINK = 'link' +BUTTON_CLASS_CHOICES = ( + (BUTTON_CLASS_DEFAULT, 'Default'), + (BUTTON_CLASS_PRIMARY, 'Primary (blue)'), + (BUTTON_CLASS_SUCCESS, 'Success (green)'), + (BUTTON_CLASS_INFO, 'Info (aqua)'), + (BUTTON_CLASS_WARNING, 'Warning (orange)'), + (BUTTON_CLASS_DANGER, 'Danger (red)'), + (BUTTON_CLASS_LINK, 'None'), +) + # Graph types GRAPH_TYPE_INTERFACE = 100 GRAPH_TYPE_PROVIDER = 200 diff --git a/netbox/extras/migrations/0022_custom_links.py b/netbox/extras/migrations/0022_custom_links.py new file mode 100644 index 000000000..24552a2d0 --- /dev/null +++ b/netbox/extras/migrations/0022_custom_links.py @@ -0,0 +1,32 @@ +# Generated by Django 2.2 on 2019-04-15 19:28 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('extras', '0021_add_color_comments_changelog_to_tag'), + ] + + operations = [ + migrations.CreateModel( + name='CustomLink', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), + ('name', models.CharField(max_length=100, unique=True)), + ('text', models.CharField(max_length=200)), + ('url', models.CharField(max_length=200)), + ('weight', models.PositiveSmallIntegerField(default=100)), + ('group_name', models.CharField(blank=True, max_length=50)), + ('button_class', models.CharField(max_length=30)), + ('new_window', models.BooleanField()), + ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), + ], + options={ + 'ordering': ['group_name', 'weight', 'name'], + }, + ), + ] diff --git a/netbox/extras/models.py b/netbox/extras/models.py index 042ba6e60..0681b882a 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -300,6 +300,53 @@ class CustomFieldChoice(models.Model): CustomFieldValue.objects.filter(field__type=CF_TYPE_SELECT, serialized_value=str(pk)).delete() +# +# Custom links +# + +class CustomLink(models.Model): + """ + A custom link to an external representation of a NetBox object. The link text and URL fields accept Jinja2 template + code to be rendered with an object as context. + """ + content_type = models.ForeignKey( + to=ContentType, + on_delete=models.CASCADE + ) + name = models.CharField( + max_length=100, + unique=True + ) + text = models.CharField( + max_length=200, + help_text="Template code for link text" + ) + url = models.CharField( + max_length=200, + help_text="Template code for link URL" + ) + weight = models.PositiveSmallIntegerField( + default=100 + ) + group_name = models.CharField( + max_length=50, + blank=True + ) + button_class = models.CharField( + max_length=30, + choices=BUTTON_CLASS_CHOICES + ) + new_window = models.BooleanField( + help_text="Force link to open in a new window" + ) + + class Meta: + ordering = ['group_name', 'weight', 'name'] + + def __str__(self): + return self.name + + # # Graphs # diff --git a/netbox/extras/templatetags/__init__.py b/netbox/extras/templatetags/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/netbox/extras/templatetags/custom_links.py b/netbox/extras/templatetags/custom_links.py new file mode 100644 index 000000000..193c465a5 --- /dev/null +++ b/netbox/extras/templatetags/custom_links.py @@ -0,0 +1,68 @@ +from collections import OrderedDict + +from django import template +from django.contrib.contenttypes.models import ContentType +from django.utils.safestring import mark_safe +from jinja2 import Environment + +from extras.models import CustomLink + + +register = template.Library() + +LINK_BUTTON = '{}\n' +GROUP_BUTTON = '
      \n' \ + '\n' \ + '
        \n' +GROUP_LINK = '
      • {}
        • \n' + + +@register.simple_tag() +def custom_links(obj): + """ + Render all applicable links for the given object. + """ + content_type = ContentType.objects.get_for_model(obj) + custom_links = CustomLink.objects.filter(content_type=content_type) + if not custom_links: + return '' + + context = { + 'obj': obj, + } + template_code = '' + group_names = OrderedDict() + + # Organize custom links by group + for cl in custom_links: + if cl.group_name and cl.group_name in group_names: + group_names[cl.group_name].append(cl) + elif cl.group_name: + group_names[cl.group_name] = [cl] + + # Add non-grouped links + for cl in custom_links: + if not cl.group_name: + link_target = ' target="_blank"' if cl.new_window else '' + template_code += LINK_BUTTON.format( + cl.url, link_target, cl.button_class, cl.text + ) + + # Add grouped links to template + for group, links in group_names.items(): + template_code += GROUP_BUTTON.format( + links[0].button_class, group + ) + for cl in links: + link_target = ' target="_blank"' if cl.new_window else '' + template_code += GROUP_LINK.format( + cl.url, link_target, cl.text + ) + template_code += '
      \n
      \n' + + # Render template + rendered = Environment().from_string(source=template_code).render(**context) + + return mark_safe(rendered) diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index dc39959a5..72b5f6b02 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -1,6 +1,7 @@ {% extends '_base.html' %} {% load static %} {% load helpers %} +{% load custom_links %} {% block title %}{{ device }}{% endblock %} @@ -64,6 +65,9 @@

      {{ device }}

      {% include 'inc/created_updated.html' with obj=device %} +
      + {% custom_links device %} +