diff --git a/CHANGELOG.md b/CHANGELOG.md index cf28a4a6b..951d04fa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,76 @@ -v2.5.7 (FUTURE) +v2.5.9 (FUTURE) + +## Enhancements + +* [#3011](https://github.com/digitalocean/netbox/issues/3011) - Add SSL support for django-rq (requires django-rq v1.3.1+) + +## Bug Fixes + +* [#2207](https://github.com/digitalocean/netbox/issues/2207) - Fixes Deterministic Ordering of Interfaces +* [#2577](https://github.com/digitalocean/netbox/issues/2577) - Clarification of wording in API regarding filtering +* [#2924](https://github.com/digitalocean/netbox/issues/2924) - Add interface type for QSFP28 50GE +* [#2936](https://github.com/digitalocean/netbox/issues/2936) - Fix device role selection showing duplicate first entry +* [#2998](https://github.com/digitalocean/netbox/issues/2998) - Limit device query to non-racked devices if no rack selected when creating a cable +* [#3014](https://github.com/digitalocean/netbox/issues/3014) - Fixes VM Role filtering + +v2.5.8 (2019-03-11) + +## Enhancements + +* [#2435](https://github.com/digitalocean/netbox/issues/2435) - Printer friendly CSS + +## Bug Fixes + +* [#2065](https://github.com/digitalocean/netbox/issues/2065) - Correct documentation for VM interface serializer +* [#2705](https://github.com/digitalocean/netbox/issues/2705) - Fix endpoint grouping in API docs +* [#2781](https://github.com/digitalocean/netbox/issues/2781) - Fix filtering of sites/devices/VMs by multiple regions +* [#2923](https://github.com/digitalocean/netbox/issues/2923) - Provider filter form's site field should be blank by default +* [#2938](https://github.com/digitalocean/netbox/issues/2938) - Enforce deterministic ordering of device components returned by API +* [#2939](https://github.com/digitalocean/netbox/issues/2939) - Exclude circuit terminations from API interface connections endpoint +* [#2940](https://github.com/digitalocean/netbox/issues/2940) - Allow CSV import of prefixes/IPs to VRF without an RD assigned +* [#2944](https://github.com/digitalocean/netbox/issues/2944) - Record the deletion of an IP address in the changelog of its parent interface (if any) +* [#2952](https://github.com/digitalocean/netbox/issues/2952) - Added the `slug` field to the Tenant filter for use in the API and search function +* [#2954](https://github.com/digitalocean/netbox/issues/2954) - Remove trailing slashes to fix root/template paths on Windows +* [#2961](https://github.com/digitalocean/netbox/issues/2961) - Prevent exception when exporting inventory items belonging to unnamed devices +* [#2962](https://github.com/digitalocean/netbox/issues/2962) - Increase ExportTemplate `mime_type` field length +* [#2966](https://github.com/digitalocean/netbox/issues/2966) - Accept `null` cable length_unit via API +* [#2972](https://github.com/digitalocean/netbox/issues/2972) - Improve ContentTypeField serializer to elegantly handle invalid data +* [#2976](https://github.com/digitalocean/netbox/issues/2976) - Add delete button to tag view +* [#2980](https://github.com/digitalocean/netbox/issues/2980) - Improve rendering time for API docs +* [#2982](https://github.com/digitalocean/netbox/issues/2982) - Correct CSS class assignment on color picker +* [#2984](https://github.com/digitalocean/netbox/issues/2984) - Fix logging of unlabeled cable ID on cable deletion +* [#2985](https://github.com/digitalocean/netbox/issues/2985) - Fix pagination page length for rack elevations + +--- + +v2.5.7 (2019-02-21) ## Enhancements * [#2902](https://github.com/digitalocean/netbox/issues/2902) - Replace supervisord with systemd * [#2357](https://github.com/digitalocean/netbox/issues/2357) - Enable filtering of devices by rack face +* [#2638](https://github.com/digitalocean/netbox/issues/2638) - Add button to copy unlocked secret to clipboard +* [#2870](https://github.com/digitalocean/netbox/issues/2870) - Add Markdown rendering for provider NOC/admin contact fields +* [#2878](https://github.com/digitalocean/netbox/issues/2878) - Add cable types for OS1/OS2 singlemode fiber +* [#2890](https://github.com/digitalocean/netbox/issues/2890) - Add port types for APC fiber +* [#2898](https://github.com/digitalocean/netbox/issues/2898) - Enable filtering cables list by connection status * [#2903](https://github.com/digitalocean/netbox/issues/2903) - Clarify purpose of tags field on interface edit form ## Bug Fixes +* [#2852](https://github.com/digitalocean/netbox/issues/2852) - Allow filtering devices by null rack position * [#2884](https://github.com/digitalocean/netbox/issues/2884) - Don't display connect button for wireless interfaces * [#2888](https://github.com/digitalocean/netbox/issues/2888) - Correct foreground color of device roles in rack elevations * [#2893](https://github.com/digitalocean/netbox/issues/2893) - Remove duplicate display of VRF RD on IP address view * [#2895](https://github.com/digitalocean/netbox/issues/2895) - Fix filtering of nullable character fields * [#2901](https://github.com/digitalocean/netbox/issues/2901) - Fix ordering regions by site count +* [#2910](https://github.com/digitalocean/netbox/issues/2910) - Fix config context list and edit forms to use Select2 elements +* [#2912](https://github.com/digitalocean/netbox/issues/2912) - Cable type in filter form should be blank by default +* [#2913](https://github.com/digitalocean/netbox/issues/2913) - Fix assigned prefixes link on VRF view +* [#2914](https://github.com/digitalocean/netbox/issues/2914) - Fix empty connected circuit link on device interfaces list +* [#2915](https://github.com/digitalocean/netbox/issues/2915) - Fix bulk editing of pass-through ports + +--- v2.5.6 (2019-02-13) diff --git a/README.md b/README.md index 39ab1afc4..8b9df7f2c 100644 --- a/README.md +++ b/README.md @@ -45,13 +45,13 @@ and run `upgrade.sh`. ## Supported SDK -- [pynetbox](https://github.com/digitalocean/pynetbox) Python API client library for Netbox. +- [pynetbox](https://github.com/digitalocean/pynetbox) - A Python API client library for Netbox ## Community SDK -- [netbox-client-ruby](https://github.com/ninech/netbox-client-ruby) A ruby client library for Netbox v2. +- [netbox-client-ruby](https://github.com/ninech/netbox-client-ruby) - A Ruby client library for Netbox +- [powerbox](https://github.com/BatmanAMA/powerbox) - A PowerShell library for Netbox ## Ansible Inventory -- [netbox-as-ansible-inventory](https://github.com/AAbouZaid/netbox-as-ansible-inventory) Ansible dynamic inventory script for Netbox. - +- [netbox-as-ansible-inventory](https://github.com/AAbouZaid/netbox-as-ansible-inventory) - Ansible dynamic inventory script for Netbox diff --git a/docs/additional-features/reports.md b/docs/additional-features/reports.md index 2c73850eb..33c3d95ae 100644 --- a/docs/additional-features/reports.md +++ b/docs/additional-features/reports.md @@ -128,4 +128,4 @@ Reports can be run on the CLI by invoking the management command: python3 manage.py runreport ``` -One or more report modules may be specified. +where ```` is the name of the python file in the ``reports`` directory without the ``.py`` extension. One or more report modules may be specified. diff --git a/docs/api/overview.md b/docs/api/overview.md index 1115759d8..00ff9c27e 100644 --- a/docs/api/overview.md +++ b/docs/api/overview.md @@ -261,7 +261,7 @@ A list of objects retrieved via the API can be filtered by passing one or more q GET /api/ipam/prefixes/?status=1 ``` -The same filter can be incldued multiple times. These will effect a logical OR and return objects matching any of the given values. For example, the following will return all active and reserved prefixes: +Certain filters can be included multiple times within a single request. These will effect a logical OR and return objects matching any of the given values. For example, the following will return all active and reserved prefixes: ``` GET /api/ipam/prefixes/?status=1&status=2 diff --git a/docs/configuration/optional-settings.md b/docs/configuration/optional-settings.md index 65ac588b6..f8bd70e88 100644 --- a/docs/configuration/optional-settings.md +++ b/docs/configuration/optional-settings.md @@ -283,6 +283,7 @@ REDIS = { 'PASSWORD': '', 'DATABASE': 0, 'DEFAULT_TIMEOUT': 300, + 'SSL': False, } ``` @@ -315,3 +316,9 @@ The TCP port to use when connecting to the Redis server. Default: None The password to use when authenticating to the Redis server (optional). + +### SSL + +Default: False + +Use secure sockets layer to encrypt the connections to the Redis server. diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py index d481deb54..4deee57c9 100644 --- a/netbox/circuits/forms.py +++ b/netbox/circuits/forms.py @@ -107,7 +107,7 @@ class ProviderFilterForm(BootstrapMixin, CustomFieldFilterForm): site = FilterChoiceField( queryset=Site.objects.all(), to_field_name='slug', - widget=APISelect( + widget=APISelectMultiple( api_url="/api/dcim/sites/", value_field="slug", ) diff --git a/netbox/circuits/tables.py b/netbox/circuits/tables.py index c6a215db8..1cddeffb2 100644 --- a/netbox/circuits/tables.py +++ b/netbox/circuits/tables.py @@ -59,7 +59,7 @@ class CircuitTypeTable(BaseTable): name = tables.LinkColumn() circuit_count = tables.Column(verbose_name='Circuits') actions = tables.TemplateColumn( - template_code=CIRCUITTYPE_ACTIONS, attrs={'td': {'class': 'text-right'}}, verbose_name='' + template_code=CIRCUITTYPE_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) class Meta(BaseTable.Meta): diff --git a/netbox/circuits/tests/test_views.py b/netbox/circuits/tests/test_views.py new file mode 100644 index 000000000..65ae6d7db --- /dev/null +++ b/netbox/circuits/tests/test_views.py @@ -0,0 +1,91 @@ +import urllib.parse + +from django.test import Client, TestCase +from django.urls import reverse + +from circuits.models import Circuit, CircuitType, Provider + + +class ProviderTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + Provider.objects.bulk_create([ + Provider(name='Provider 1', slug='provider-1', asn=65001), + Provider(name='Provider 2', slug='provider-2', asn=65002), + Provider(name='Provider 3', slug='provider-3', asn=65003), + ]) + + def test_provider_list(self): + + url = reverse('circuits:provider_list') + params = { + "q": "test", + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + def test_provider(self): + + provider = Provider.objects.first() + response = self.client.get(provider.get_absolute_url()) + self.assertEqual(response.status_code, 200) + + +class CircuitTypeTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + CircuitType.objects.bulk_create([ + CircuitType(name='Circuit Type 1', slug='circuit-type-1'), + CircuitType(name='Circuit Type 2', slug='circuit-type-2'), + CircuitType(name='Circuit Type 3', slug='circuit-type-3'), + ]) + + def test_circuittype_list(self): + + url = reverse('circuits:circuittype_list') + + response = self.client.get(url) + self.assertEqual(response.status_code, 200) + + +class CircuitTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + provider = Provider(name='Provider 1', slug='provider-1', asn=65001) + provider.save() + + circuittype = CircuitType(name='Circuit Type 1', slug='circuit-type-1') + circuittype.save() + + Circuit.objects.bulk_create([ + Circuit(cid='Circuit 1', provider=provider, type=circuittype), + Circuit(cid='Circuit 2', provider=provider, type=circuittype), + Circuit(cid='Circuit 3', provider=provider, type=circuittype), + ]) + + def test_circuit_list(self): + + url = reverse('circuits:circuit_list') + params = { + "provider": Provider.objects.first().slug, + "type": CircuitType.objects.first().slug, + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + def test_provider(self): + + provider = Provider.objects.first() + response = self.client.get(provider.get_absolute_url()) + self.assertEqual(response.status_code, 200) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index c17400a35..4c65a3a19 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -507,7 +507,7 @@ class CableSerializer(ValidatedModelSerializer): termination_a = serializers.SerializerMethodField(read_only=True) termination_b = serializers.SerializerMethodField(read_only=True) status = ChoiceField(choices=CONNECTION_STATUS_CHOICES, required=False) - length_unit = ChoiceField(choices=CABLE_LENGTH_UNIT_CHOICES, required=False) + length_unit = ChoiceField(choices=CABLE_LENGTH_UNIT_CHOICES, required=False, allow_null=True) class Meta: model = Cable diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 4e14d8163..8fddc7129 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -496,11 +496,11 @@ class PowerConnectionViewSet(ListModelMixin, GenericViewSet): class InterfaceConnectionViewSet(ListModelMixin, GenericViewSet): queryset = Interface.objects.select_related( - 'device', '_connected_interface', '_connected_circuittermination' + 'device', '_connected_interface__device' ).filter( # Avoid duplicate connections by only selecting the lower PK in a connected pair - Q(_connected_interface__isnull=False, pk__lt=F('_connected_interface')) | - Q(_connected_circuittermination__isnull=False) + _connected_interface__isnull=False, + pk__lt=F('_connected_interface') ) serializer_class = serializers.InterfaceConnectionSerializer filterset_class = filters.InterfaceConnectionFilter diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index 22d4468fc..af2547bc4 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -43,6 +43,12 @@ RACK_STATUS_CHOICES = [ [RACK_STATUS_DEPRECATED, 'Deprecated'], ] +# Device rack position +DEVICE_POSITION_CHOICES = [ + # Rack.u_height is limited to 100 + (i, 'Unit {}'.format(i)) for i in range(1, 101) +] + # Parent/child device roles SUBDEVICE_ROLE_PARENT = True SUBDEVICE_ROLE_CHILD = False @@ -77,6 +83,7 @@ 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 @@ -158,6 +165,7 @@ IFACE_FF_CHOICES = [ [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)'], @@ -270,11 +278,14 @@ PORT_TYPE_8P8C = 1000 PORT_TYPE_110_PUNCH = 1100 PORT_TYPE_ST = 2000 PORT_TYPE_SC = 2100 +PORT_TYPE_SC_APC = 2110 PORT_TYPE_FC = 2200 PORT_TYPE_LC = 2300 +PORT_TYPE_LC_APC = 2310 PORT_TYPE_MTRJ = 2400 PORT_TYPE_MPO = 2500 PORT_TYPE_LSH = 2600 +PORT_TYPE_LSH_APC = 2610 PORT_TYPE_CHOICES = [ [ 'Copper', @@ -288,10 +299,13 @@ PORT_TYPE_CHOICES = [ [ [PORT_TYPE_FC, 'FC'], [PORT_TYPE_LC, 'LC'], + [PORT_TYPE_LC_APC, 'LC/APC'], [PORT_TYPE_LSH, 'LSH'], + [PORT_TYPE_LSH_APC, 'LSH/APC'], [PORT_TYPE_MPO, 'MPO'], [PORT_TYPE_MTRJ, 'MTRJ'], [PORT_TYPE_SC, 'SC'], + [PORT_TYPE_SC_APC, 'SC/APC'], [PORT_TYPE_ST, 'ST'], ] ] @@ -355,11 +369,14 @@ CABLE_TYPE_CAT6A = 1610 CABLE_TYPE_CAT7 = 1700 CABLE_TYPE_DAC_ACTIVE = 1800 CABLE_TYPE_DAC_PASSIVE = 1810 +CABLE_TYPE_MMF = 3000 CABLE_TYPE_MMF_OM1 = 3010 CABLE_TYPE_MMF_OM2 = 3020 CABLE_TYPE_MMF_OM3 = 3030 CABLE_TYPE_MMF_OM4 = 3040 CABLE_TYPE_SMF = 3500 +CABLE_TYPE_SMF_OS1 = 3510 +CABLE_TYPE_SMF_OS2 = 3520 CABLE_TYPE_AOC = 3800 CABLE_TYPE_POWER = 5000 CABLE_TYPE_CHOICES = ( @@ -377,11 +394,14 @@ CABLE_TYPE_CHOICES = ( ), ( 'Fiber', ( + (CABLE_TYPE_MMF, 'Multimode Fiber'), (CABLE_TYPE_MMF_OM1, 'Multimode Fiber (OM1)'), (CABLE_TYPE_MMF_OM2, 'Multimode Fiber (OM2)'), (CABLE_TYPE_MMF_OM3, 'Multimode Fiber (OM3)'), (CABLE_TYPE_MMF_OM4, 'Multimode Fiber (OM4)'), (CABLE_TYPE_SMF, 'Singlemode Fiber'), + (CABLE_TYPE_SMF_OS1, 'Singlemode Fiber (OS1)'), + (CABLE_TYPE_SMF_OS2, 'Singlemode Fiber (OS2)'), (CABLE_TYPE_AOC, 'Active Optical Cabling (AOC)'), ), ), diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 4974c3b4d..dda904f1c 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -1,6 +1,5 @@ import django_filters from django.contrib.auth.models import User -from django.core.exceptions import ObjectDoesNotExist from django.db.models import Q from netaddr import EUI from netaddr.core import AddrFormatError @@ -8,7 +7,9 @@ from netaddr.core import AddrFormatError from extras.filters import CustomFieldFilterSet from tenancy.models import Tenant from utilities.constants import COLOR_CHOICES -from utilities.filters import NameSlugSearchFilterSet, NullableCharFieldFilter, NumericInFilter, TagFilter +from utilities.filters import ( + NameSlugSearchFilterSet, NullableCharFieldFilter, NumericInFilter, TagFilter, TreeNodeMultipleChoiceFilter +) from virtualization.models import Cluster from .constants import * from .models import ( @@ -49,14 +50,15 @@ class SiteFilter(CustomFieldFilterSet, django_filters.FilterSet): choices=SITE_STATUS_CHOICES, null_value=None ) - region_id = django_filters.NumberFilter( - method='filter_region', - field_name='pk', + region_id = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='region__in', label='Region (ID)', ) - region = django_filters.CharFilter( - method='filter_region', - field_name='slug', + region = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='region__in', + to_field_name='slug', label='Region (slug)', ) tenant_id = django_filters.ModelMultipleChoiceFilter( @@ -95,16 +97,6 @@ class SiteFilter(CustomFieldFilterSet, django_filters.FilterSet): pass return queryset.filter(qs_filter) - def filter_region(self, queryset, name, value): - try: - region = Region.objects.get(**{name: value}) - except ObjectDoesNotExist: - return queryset.none() - return queryset.filter( - Q(region=region) | - Q(region__in=region.get_descendants()) - ) - class RackGroupFilter(NameSlugSearchFilterSet): site_id = django_filters.ModelMultipleChoiceFilter( @@ -513,14 +505,15 @@ class DeviceFilter(CustomFieldFilterSet): ) name = NullableCharFieldFilter() asset_tag = NullableCharFieldFilter() - region_id = django_filters.NumberFilter( - method='filter_region', - field_name='pk', + region_id = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='site__region__in', label='Region (ID)', ) - region = django_filters.CharFilter( - method='filter_region', - field_name='slug', + region = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='site__region__in', + to_field_name='slug', label='Region (slug)', ) site_id = django_filters.ModelMultipleChoiceFilter( @@ -543,6 +536,10 @@ class DeviceFilter(CustomFieldFilterSet): queryset=Rack.objects.all(), label='Rack (ID)', ) + position = django_filters.ChoiceFilter( + choices=DEVICE_POSITION_CHOICES, + null_label='Non-racked' + ) cluster_id = django_filters.ModelMultipleChoiceFilter( queryset=Cluster.objects.all(), label='VM cluster (ID)', @@ -602,7 +599,7 @@ class DeviceFilter(CustomFieldFilterSet): class Meta: model = Device - fields = ['serial', 'position', 'face'] + fields = ['serial', 'face'] def search(self, queryset, name, value): if not value.strip(): @@ -615,16 +612,6 @@ class DeviceFilter(CustomFieldFilterSet): Q(comments__icontains=value) ).distinct() - def filter_region(self, queryset, name, value): - try: - region = Region.objects.get(**{name: value}) - except ObjectDoesNotExist: - return queryset.none() - return queryset.filter( - Q(site__region=region) | - Q(site__region__in=region.get_descendants()) - ) - def _mac_address(self, queryset, name, value): value = value.strip() if not value: diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index bf774dfcb..06cc7ffe2 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1700,7 +1700,6 @@ class DeviceFilterForm(BootstrapMixin, CustomFieldFilterForm): widget=APISelectMultiple( api_url="/api/dcim/device-roles/", value_field="slug", - null_option=True, ) ) tenant = FilterChoiceField( @@ -2362,7 +2361,7 @@ class FrontPortCreateForm(ComponentForm): class FrontPortBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): pk = forms.ModelMultipleChoiceField( - queryset=Interface.objects.all(), + queryset=FrontPort.objects.all(), widget=forms.MultipleHiddenInput() ) type = forms.ChoiceField( @@ -2436,7 +2435,7 @@ class RearPortCreateForm(ComponentForm): class RearPortBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): pk = forms.ModelMultipleChoiceField( - queryset=Interface.objects.all(), + queryset=RearPort.objects.all(), widget=forms.MultipleHiddenInput() ) type = forms.ChoiceField( @@ -2753,10 +2752,15 @@ class CableFilterForm(BootstrapMixin, forms.Form): label='Search' ) type = forms.MultipleChoiceField( - choices=CABLE_TYPE_CHOICES, + choices=add_blank_choice(CABLE_TYPE_CHOICES), required=False, widget=StaticSelect2() ) + status = forms.ChoiceField( + required=False, + choices=add_blank_choice(CONNECTION_STATUS_CHOICES), + widget=StaticSelect2() + ) color = forms.CharField( max_length=6, required=False, diff --git a/netbox/dcim/managers.py b/netbox/dcim/managers.py index 52df1afe8..9e4e5fca2 100644 --- a/netbox/dcim/managers.py +++ b/netbox/dcim/managers.py @@ -27,7 +27,7 @@ class DeviceComponentManager(Manager): select={ 'name_padded': sql.format(table_name, table_name), } - ).order_by('name_padded') + ).order_by('name_padded', 'pk') class InterfaceQuerySet(QuerySet): @@ -64,11 +64,15 @@ class InterfaceManager(Manager): The original `name` field is considered in its entirety to serve as a fallback in the event interfaces do not match any of the prescribed fields. + + The `id` field is included to enforce deterministic ordering of interfaces in similar vein of other device + components. """ sql_col = '{}.name'.format(self.model._meta.db_table) ordering = [ - '_slot', '_subslot', '_position', '_subposition', '_type', '_id', '_channel', '_vc', 'name', + '_slot', '_subslot', '_position', '_subposition', '_type', '_id', '_channel', '_vc', 'name', 'pk' + ] fields = { diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index f7892b2af..004d7b1aa 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2423,7 +2423,7 @@ class InventoryItem(ComponentModel): def to_csv(self): return ( - self.device.name or '{' + self.device.pk + '}', + self.device.name or '{{{}}}'.format(self.device.pk), self.name, self.manufacturer.name if self.manufacturer else None, self.part_id, @@ -2557,16 +2557,15 @@ class Cable(ChangeLoggedModel): ('termination_b_type', 'termination_b_id'), ) - def __init__(self, *args, **kwargs): - - super().__init__(*args, **kwargs) - - # Create an ID string for use by __str__(). We have to save a copy of pk since it's nullified after .delete() - # is called. - self.id_string = '#{}'.format(self.pk) - def __str__(self): - return self.label or self.id_string + if self.label: + return self.label + + # Save a copy of the PK on the instance since it's nullified if .delete() is called + if not hasattr(self, 'id_string'): + self.id_string = '#{}'.format(self.pk) + + return self.id_string def get_absolute_url(self): return reverse('dcim:cable', args=[self.pk]) @@ -2651,6 +2650,9 @@ class Cable(ChangeLoggedModel): self.length_unit, ) + def get_status_class(self): + return 'success' if self.status else 'info' + 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 diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 3cbd9378d..436b9053d 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -196,7 +196,7 @@ class RegionTable(BaseTable): slug = tables.Column(verbose_name='Slug') actions = tables.TemplateColumn( template_code=REGION_ACTIONS, - attrs={'td': {'class': 'text-right'}}, + attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) @@ -239,7 +239,7 @@ class RackGroupTable(BaseTable): slug = tables.Column() actions = tables.TemplateColumn( template_code=RACKGROUP_ACTIONS, - attrs={'td': {'class': 'text-right'}}, + attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) @@ -258,7 +258,7 @@ class RackRoleTable(BaseTable): rack_count = tables.Column(verbose_name='Racks') color = tables.TemplateColumn(COLOR_LABEL, verbose_name='Color') slug = tables.Column(verbose_name='Slug') - actions = tables.TemplateColumn(template_code=RACKROLE_ACTIONS, attrs={'td': {'class': 'text-right'}}, + actions = tables.TemplateColumn(template_code=RACKROLE_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='') class Meta(BaseTable.Meta): @@ -309,7 +309,7 @@ class RackReservationTable(BaseTable): rack = tables.LinkColumn('dcim:rack', args=[Accessor('rack.pk')]) unit_list = tables.Column(orderable=False, verbose_name='Units') actions = tables.TemplateColumn( - template_code=RACKRESERVATION_ACTIONS, attrs={'td': {'class': 'text-right'}}, verbose_name='' + template_code=RACKRESERVATION_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) class Meta(BaseTable.Meta): @@ -327,7 +327,7 @@ class ManufacturerTable(BaseTable): devicetype_count = tables.Column(verbose_name='Device Types') platform_count = tables.Column(verbose_name='Platforms') slug = tables.Column(verbose_name='Slug') - actions = tables.TemplateColumn(template_code=MANUFACTURER_ACTIONS, attrs={'td': {'class': 'text-right'}}, + actions = tables.TemplateColumn(template_code=MANUFACTURER_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='') class Meta(BaseTable.Meta): @@ -463,7 +463,7 @@ class DeviceRoleTable(BaseTable): slug = tables.Column(verbose_name='Slug') actions = tables.TemplateColumn( template_code=DEVICEROLE_ACTIONS, - attrs={'td': {'class': 'text-right'}}, + attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) @@ -492,7 +492,7 @@ class PlatformTable(BaseTable): ) actions = tables.TemplateColumn( template_code=PLATFORM_ACTIONS, - attrs={'td': {'class': 'text-right'}}, + attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) @@ -647,6 +647,9 @@ class CableTable(BaseTable): orderable=False, verbose_name='' ) + status = tables.TemplateColumn( + template_code=STATUS_LABEL + ) length = tables.TemplateColumn( template_code=CABLE_LENGTH, order_by='_abs_length' @@ -776,7 +779,7 @@ class VirtualChassisTable(BaseTable): member_count = tables.Column(verbose_name='Members') actions = tables.TemplateColumn( template_code=VIRTUALCHASSIS_ACTIONS, - attrs={'td': {'class': 'text-right'}}, + attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py new file mode 100644 index 000000000..79f38a5c9 --- /dev/null +++ b/netbox/dcim/tests/test_views.py @@ -0,0 +1,458 @@ +import urllib.parse + +from django.contrib.auth import get_user_model +from django.test import Client, TestCase +from django.urls import reverse + +from dcim.constants import CABLE_TYPE_CAT6, IFACE_FF_1GE_FIXED +from dcim.models import ( + Cable, Device, DeviceRole, DeviceType, Interface, InventoryItem, Manufacturer, Platform, Rack, RackGroup, + RackReservation, RackRole, Site, Region, VirtualChassis, +) + + +class RegionTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + # Create three Regions + for i in range(1, 4): + Region(name='Region {}'.format(i), slug='region-{}'.format(i)).save() + + def test_region_list(self): + + url = reverse('dcim:region_list') + + response = self.client.get(url) + self.assertEqual(response.status_code, 200) + + +class SiteTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + region = Region(name='Region 1', slug='region-1') + region.save() + + Site.objects.bulk_create([ + Site(name='Site 1', slug='site-1', region=region), + Site(name='Site 2', slug='site-2', region=region), + Site(name='Site 3', slug='site-3', region=region), + ]) + + def test_site_list(self): + + url = reverse('dcim:site_list') + params = { + "region": Region.objects.first().slug, + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + def test_site(self): + + site = Site.objects.first() + response = self.client.get(site.get_absolute_url()) + self.assertEqual(response.status_code, 200) + + +class RackGroupTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + site = Site(name='Site 1', slug='site-1') + site.save() + + RackGroup.objects.bulk_create([ + RackGroup(name='Rack Group 1', slug='rack-group-1', site=site), + RackGroup(name='Rack Group 2', slug='rack-group-2', site=site), + RackGroup(name='Rack Group 3', slug='rack-group-3', site=site), + ]) + + def test_rackgroup_list(self): + + url = reverse('dcim:rackgroup_list') + + response = self.client.get(url) + self.assertEqual(response.status_code, 200) + + +class RackTypeTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + RackRole.objects.bulk_create([ + RackRole(name='Rack Role 1', slug='rack-role-1'), + RackRole(name='Rack Role 2', slug='rack-role-2'), + RackRole(name='Rack Role 3', slug='rack-role-3'), + ]) + + def test_rackrole_list(self): + + url = reverse('dcim:rackrole_list') + + response = self.client.get(url) + self.assertEqual(response.status_code, 200) + + +class RackReservationTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + User = get_user_model() + user = User(username='testuser', email='testuser@example.com') + user.save() + + site = Site(name='Site 1', slug='site-1') + site.save() + + rack = Rack(name='Rack 1', site=site) + rack.save() + + RackReservation.objects.bulk_create([ + RackReservation(rack=rack, user=user, units=[1, 2, 3], description='Reservation 1'), + RackReservation(rack=rack, user=user, units=[4, 5, 6], description='Reservation 2'), + RackReservation(rack=rack, user=user, units=[7, 8, 9], description='Reservation 3'), + ]) + + def test_rackreservation_list(self): + + url = reverse('dcim:rackreservation_list') + + response = self.client.get(url) + self.assertEqual(response.status_code, 200) + + +class RackTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + site = Site(name='Site 1', slug='site-1') + site.save() + + Rack.objects.bulk_create([ + Rack(name='Rack 1', site=site), + Rack(name='Rack 2', site=site), + Rack(name='Rack 3', site=site), + ]) + + def test_rack_list(self): + + url = reverse('dcim:rack_list') + params = { + "site": Site.objects.first().slug, + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + def test_rack(self): + + rack = Rack.objects.first() + response = self.client.get(rack.get_absolute_url()) + self.assertEqual(response.status_code, 200) + + +class ManufacturerTypeTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + Manufacturer.objects.bulk_create([ + Manufacturer(name='Manufacturer 1', slug='manufacturer-1'), + Manufacturer(name='Manufacturer 2', slug='manufacturer-2'), + Manufacturer(name='Manufacturer 3', slug='manufacturer-3'), + ]) + + def test_manufacturer_list(self): + + url = reverse('dcim:manufacturer_list') + + response = self.client.get(url) + self.assertEqual(response.status_code, 200) + + +class DeviceTypeTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + manufacturer = Manufacturer(name='Manufacturer 1', slug='manufacturer-1') + manufacturer.save() + + DeviceType.objects.bulk_create([ + DeviceType(model='Device Type 1', slug='device-type-1', manufacturer=manufacturer), + DeviceType(model='Device Type 2', slug='device-type-2', manufacturer=manufacturer), + DeviceType(model='Device Type 3', slug='device-type-3', manufacturer=manufacturer), + ]) + + def test_devicetype_list(self): + + url = reverse('dcim:devicetype_list') + params = { + "manufacturer": Manufacturer.objects.first().slug, + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + def test_devicetype(self): + + devicetype = DeviceType.objects.first() + response = self.client.get(devicetype.get_absolute_url()) + self.assertEqual(response.status_code, 200) + + +class DeviceRoleTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + DeviceRole.objects.bulk_create([ + DeviceRole(name='Device Role 1', slug='device-role-1'), + DeviceRole(name='Device Role 2', slug='device-role-2'), + DeviceRole(name='Device Role 3', slug='device-role-3'), + ]) + + def test_devicerole_list(self): + + url = reverse('dcim:devicerole_list') + + response = self.client.get(url) + self.assertEqual(response.status_code, 200) + + +class PlatformTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + Platform.objects.bulk_create([ + Platform(name='Platform 1', slug='platform-1'), + Platform(name='Platform 2', slug='platform-2'), + Platform(name='Platform 3', slug='platform-3'), + ]) + + def test_platform_list(self): + + url = reverse('dcim:platform_list') + + response = self.client.get(url) + self.assertEqual(response.status_code, 200) + + +class DeviceTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + site = Site(name='Site 1', slug='site-1') + site.save() + + manufacturer = Manufacturer(name='Manufacturer 1', slug='manufacturer-1') + manufacturer.save() + + devicetype = DeviceType(model='Device Type 1', manufacturer=manufacturer) + devicetype.save() + + devicerole = DeviceRole(name='Device Role 1', slug='device-role-1') + devicerole.save() + + Device.objects.bulk_create([ + Device(name='Device 1', site=site, device_type=devicetype, device_role=devicerole), + Device(name='Device 2', site=site, device_type=devicetype, device_role=devicerole), + Device(name='Device 3', site=site, device_type=devicetype, device_role=devicerole), + ]) + + def test_device_list(self): + + url = reverse('dcim:device_list') + params = { + "device_type_id": DeviceType.objects.first().pk, + "role": DeviceRole.objects.first().slug, + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + def test_device(self): + + device = Device.objects.first() + response = self.client.get(device.get_absolute_url()) + self.assertEqual(response.status_code, 200) + + +class InventoryItemTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + site = Site(name='Site 1', slug='site-1') + site.save() + + manufacturer = Manufacturer(name='Manufacturer 1', slug='manufacturer-1') + manufacturer.save() + + devicetype = DeviceType(model='Device Type 1', manufacturer=manufacturer) + devicetype.save() + + devicerole = DeviceRole(name='Device Role 1', slug='device-role-1') + devicerole.save() + + device = Device(name='Device 1', site=site, device_type=devicetype, device_role=devicerole) + device.save() + + InventoryItem.objects.bulk_create([ + InventoryItem(device=device, name='Inventory Item 1'), + InventoryItem(device=device, name='Inventory Item 2'), + InventoryItem(device=device, name='Inventory Item 3'), + ]) + + def test_inventoryitem_list(self): + + url = reverse('dcim:inventoryitem_list') + params = { + "device_id": Device.objects.first().pk, + } + + 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): + + self.client = Client() + + site = Site(name='Site 1', slug='site-1') + site.save() + + manufacturer = Manufacturer(name='Manufacturer 1', slug='manufacturer-1') + manufacturer.save() + + devicetype = DeviceType(model='Device Type 1', manufacturer=manufacturer) + devicetype.save() + + devicerole = DeviceRole(name='Device Role 1', slug='device-role-1') + devicerole.save() + + device1 = Device(name='Device 1', site=site, device_type=devicetype, device_role=devicerole) + device1.save() + 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.save() + iface2 = Interface(device=device1, name='Interface 2', form_factor=IFACE_FF_1GE_FIXED) + iface2.save() + iface3 = Interface(device=device1, name='Interface 3', form_factor=IFACE_FF_1GE_FIXED) + iface3.save() + iface4 = Interface(device=device2, name='Interface 1', form_factor=IFACE_FF_1GE_FIXED) + iface4.save() + iface5 = Interface(device=device2, name='Interface 2', form_factor=IFACE_FF_1GE_FIXED) + iface5.save() + iface6 = Interface(device=device2, name='Interface 3', form_factor=IFACE_FF_1GE_FIXED) + iface6.save() + + Cable(termination_a=iface1, termination_b=iface4, type=CABLE_TYPE_CAT6).save() + Cable(termination_a=iface2, termination_b=iface5, type=CABLE_TYPE_CAT6).save() + Cable(termination_a=iface3, termination_b=iface6, type=CABLE_TYPE_CAT6).save() + + def test_cable_list(self): + + url = reverse('dcim:cable_list') + params = { + "type": CABLE_TYPE_CAT6, + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + def test_cable(self): + + cable = Cable.objects.first() + response = self.client.get(cable.get_absolute_url()) + self.assertEqual(response.status_code, 200) + + +class VirtualMachineTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + site = Site.objects.create(name='Site 1', slug='site-1') + manufacturer = Manufacturer.objects.create(name='Manufacturer', slug='manufacturer-1') + device_type = DeviceType.objects.create( + manufacturer=manufacturer, model='Device Type 1', slug='device-type-1' + ) + device_role = DeviceRole.objects.create( + name='Device Role', slug='device-role-1' + ) + + # Create 9 member Devices + device1 = Device.objects.create( + device_type=device_type, device_role=device_role, name='Device 1', site=site + ) + device2 = Device.objects.create( + device_type=device_type, device_role=device_role, name='Device 2', site=site + ) + device3 = Device.objects.create( + device_type=device_type, device_role=device_role, name='Device 3', site=site + ) + device4 = Device.objects.create( + device_type=device_type, device_role=device_role, name='Device 4', site=site + ) + device5 = Device.objects.create( + device_type=device_type, device_role=device_role, name='Device 5', site=site + ) + device6 = Device.objects.create( + device_type=device_type, device_role=device_role, name='Device 6', site=site + ) + + # Create three VirtualChassis with two members each + vc1 = VirtualChassis.objects.create(master=device1, domain='test-domain-1') + Device.objects.filter(pk=device2.pk).update(virtual_chassis=vc1, vc_position=2) + vc2 = VirtualChassis.objects.create(master=device3, domain='test-domain-2') + Device.objects.filter(pk=device4.pk).update(virtual_chassis=vc2, vc_position=2) + vc3 = VirtualChassis.objects.create(master=device5, domain='test-domain-3') + Device.objects.filter(pk=device6.pk).update(virtual_chassis=vc3, vc_position=2) + + def test_virtualchassis_list(self): + + url = reverse('dcim:virtualchassis_list') + + 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 dfe94625e..27f90a3a2 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1,5 +1,6 @@ import re +from django.conf import settings from django.contrib import messages from django.contrib.auth.mixins import PermissionRequiredMixin from django.core.paginator import EmptyPage, PageNotAnInteger @@ -353,8 +354,9 @@ class RackElevationListView(View): total_count = racks.count() # Pagination - paginator = EnhancedPaginator(racks, 25) + per_page = request.GET.get('per_page', settings.PAGINATE_COUNT) page_number = request.GET.get('page', 1) + paginator = EnhancedPaginator(racks, per_page) try: page = paginator.page(page_number) except PageNotAnInteger: diff --git a/netbox/extras/apps.py b/netbox/extras/apps.py index 2d4517c26..6e6083691 100644 --- a/netbox/extras/apps.py +++ b/netbox/extras/apps.py @@ -22,6 +22,7 @@ class ExtrasConfig(AppConfig): port=settings.REDIS_PORT, db=settings.REDIS_DATABASE, password=settings.REDIS_PASSWORD or None, + ssl=settings.REDIS_SSL, ) rs.ping() except redis.exceptions.ConnectionError: diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py index 3b7b26b66..b48482c93 100644 --- a/netbox/extras/forms.py +++ b/netbox/extras/forms.py @@ -11,8 +11,8 @@ 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, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect, ContentTypeSelect, FilterChoiceField, - FilterTreeNodeMultipleChoiceField, LaxURLField, JSONField, SlugField, + add_blank_choice, APISelectMultiple, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect, ContentTypeSelect, + FilterChoiceField, FilterTreeNodeMultipleChoiceField, LaxURLField, JSONField, SlugField, ) from .constants import ( CF_FILTER_DISABLED, CF_TYPE_BOOLEAN, CF_TYPE_DATE, CF_TYPE_INTEGER, CF_TYPE_SELECT, CF_TYPE_URL, @@ -221,10 +221,6 @@ class TagFilterForm(BootstrapMixin, forms.Form): # class ConfigContextForm(BootstrapMixin, forms.ModelForm): - regions = TreeNodeMultipleChoiceField( - queryset=Region.objects.all(), - required=False - ) data = JSONField() class Meta: @@ -233,6 +229,26 @@ class ConfigContextForm(BootstrapMixin, forms.ModelForm): 'name', 'weight', 'description', 'is_active', 'regions', 'sites', 'roles', 'platforms', 'tenant_groups', 'tenants', 'data', ] + widgets = { + 'regions': APISelectMultiple( + api_url="/api/dcim/regions/" + ), + 'sites': APISelectMultiple( + api_url="/api/dcim/sites/" + ), + 'roles': APISelectMultiple( + api_url="/api/dcim/device-roles/" + ), + 'platforms': APISelectMultiple( + api_url="/api/dcim/platforms/" + ), + 'tenant_groups': APISelectMultiple( + api_url="/api/tenancy/tenant-groups/" + ), + 'tenants': APISelectMultiple( + api_url="/api/tenancy/tenants/" + ) + } class ConfigContextBulkEditForm(BootstrapMixin, BulkEditForm): @@ -264,29 +280,53 @@ class ConfigContextFilterForm(BootstrapMixin, forms.Form): required=False, label='Search' ) - region = FilterTreeNodeMultipleChoiceField( + region = FilterChoiceField( queryset=Region.objects.all(), - to_field_name='slug' + to_field_name='slug', + widget=APISelectMultiple( + api_url="/api/dcim/regions/", + value_field="slug", + ) ) site = FilterChoiceField( queryset=Site.objects.all(), - to_field_name='slug' + to_field_name='slug', + widget=APISelectMultiple( + api_url="/api/dcim/sites/", + value_field="slug", + ) ) role = FilterChoiceField( queryset=DeviceRole.objects.all(), - to_field_name='slug' + to_field_name='slug', + widget=APISelectMultiple( + api_url="/api/dcim/device-roles/", + value_field="slug", + ) ) platform = FilterChoiceField( queryset=Platform.objects.all(), - to_field_name='slug' + to_field_name='slug', + widget=APISelectMultiple( + api_url="/api/dcim/platforms/", + value_field="slug", + ) ) tenant_group = FilterChoiceField( queryset=TenantGroup.objects.all(), - to_field_name='slug' + to_field_name='slug', + widget=APISelectMultiple( + api_url="/api/tenancy/tenant-groups/", + value_field="slug", + ) ) tenant = FilterChoiceField( queryset=Tenant.objects.all(), - to_field_name='slug' + to_field_name='slug', + widget=APISelectMultiple( + api_url="/api/tenancy/tenants/", + value_field="slug", + ) ) diff --git a/netbox/extras/middleware.py b/netbox/extras/middleware.py index 16461c32a..38dde6275 100644 --- a/netbox/extras/middleware.py +++ b/netbox/extras/middleware.py @@ -29,7 +29,11 @@ def cache_changed_object(instance, **kwargs): def _record_object_deleted(request, instance, **kwargs): - # Record that the object was deleted. + # Force resolution of request.user in case it's still a SimpleLazyObject. This seems to happen + # occasionally during tests, but haven't been able to determine why. + assert request.user.is_authenticated + + # Record that the object was deleted if hasattr(instance, 'log_change'): instance.log_change(request.user, request.id, OBJECTCHANGE_ACTION_DELETE) diff --git a/netbox/extras/migrations/0017_exporttemplate_mime_type_length.py b/netbox/extras/migrations/0017_exporttemplate_mime_type_length.py new file mode 100644 index 000000000..29283e0d1 --- /dev/null +++ b/netbox/extras/migrations/0017_exporttemplate_mime_type_length.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.7 on 2019-03-05 18:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0016_exporttemplate_add_cable'), + ] + + operations = [ + migrations.AlterField( + model_name='exporttemplate', + name='mime_type', + field=models.CharField(blank=True, max_length=50), + ), + ] diff --git a/netbox/extras/models.py b/netbox/extras/models.py index d3b9f4eff..1b106a62a 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -357,7 +357,7 @@ class ExportTemplate(models.Model): ) template_code = models.TextField() mime_type = models.CharField( - max_length=15, + max_length=50, blank=True ) file_extension = models.CharField( diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py index 5fab8910f..f6933bf48 100644 --- a/netbox/extras/tables.py +++ b/netbox/extras/tables.py @@ -68,7 +68,7 @@ class TagTable(BaseTable): ) actions = tables.TemplateColumn( template_code=TAG_ACTIONS, - attrs={'td': {'class': 'text-right'}}, + attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) diff --git a/netbox/extras/tests/test_views.py b/netbox/extras/tests/test_views.py new file mode 100644 index 000000000..d478f069c --- /dev/null +++ b/netbox/extras/tests/test_views.py @@ -0,0 +1,105 @@ +import urllib.parse +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 + + +class TagTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + Tag.objects.bulk_create([ + Tag(name='Tag 1', slug='tag-1'), + Tag(name='Tag 2', slug='tag-2'), + Tag(name='Tag 3', slug='tag-3'), + ]) + + def test_tag_list(self): + + url = reverse('extras:tag_list') + params = { + "q": "tag", + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + +class ConfigContextTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + site = Site(name='Site 1', slug='site-1') + site.save() + + # Create three ConfigContexts + for i in range(1, 4): + configcontext = ConfigContext( + name='Config Context {}'.format(i), + data='{{"foo": {}}}'.format(i) + ) + configcontext.save() + configcontext.sites.add(site) + + def test_configcontext_list(self): + + url = reverse('extras:configcontext_list') + params = { + "q": "foo", + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + def test_configcontext(self): + + configcontext = ConfigContext.objects.first() + response = self.client.get(configcontext.get_absolute_url()) + self.assertEqual(response.status_code, 200) + + +class ObjectChangeTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + user = User(username='testuser', email='testuser@example.com') + user.save() + + site = Site(name='Site 1', slug='site-1') + site.save() + + # Create three ObjectChanges + for i in range(1, 4): + site.log_change( + user=user, + request_id=uuid.uuid4(), + action=2 + ) + + def test_objectchange_list(self): + + url = reverse('extras:objectchange_list') + params = { + "user": User.objects.first(), + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + def test_objectchange(self): + + objectchange = ObjectChange.objects.first() + response = self.client.get(objectchange.get_absolute_url()) + self.assertEqual(response.status_code, 200) diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index d0e25f580..1274164ca 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -349,11 +349,11 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldForm): class PrefixCSVForm(forms.ModelForm): - vrf = forms.ModelChoiceField( + vrf = FlexibleModelChoiceField( queryset=VRF.objects.all(), - required=False, to_field_name='rd', - help_text='Route distinguisher of parent VRF', + required=False, + help_text='Route distinguisher of parent VRF (or {ID})', error_messages={ 'invalid_choice': 'VRF not found.', } @@ -764,11 +764,11 @@ class IPAddressBulkAddForm(BootstrapMixin, TenancyForm, CustomFieldForm): class IPAddressCSVForm(forms.ModelForm): - vrf = forms.ModelChoiceField( + vrf = FlexibleModelChoiceField( queryset=VRF.objects.all(), - required=False, to_field_name='rd', - help_text='Route distinguisher of the assigned VRF', + required=False, + help_text='Route distinguisher of parent VRF (or {ID})', error_messages={ 'invalid_choice': 'VRF not found.', } diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 181852ad3..a2f7bbe07 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -1,7 +1,7 @@ import netaddr from django.conf import settings from django.contrib.contenttypes.fields import GenericRelation -from django.core.exceptions import ValidationError +from django.core.exceptions import ValidationError, ObjectDoesNotExist from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models from django.db.models import Q @@ -10,8 +10,9 @@ 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, ObjectChange from utilities.models import ChangeLoggedModel +from utilities.utils import serialize_object from .constants import * from .fields import IPNetworkField, IPAddressField from .querysets import PrefixQuerySet @@ -629,6 +630,27 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel): self.family = self.address.version super().save(*args, **kwargs) + def log_change(self, user, request_id, action): + """ + Include the connected Interface (if any). + """ + + # It's possible that an IPAddress can be deleted _after_ its parent Interface, in which case trying to resolve + # the interface will raise DoesNotExist. + try: + parent_obj = self.interface + except ObjectDoesNotExist: + parent_obj = None + + ObjectChange( + user=user, + request_id=request_id, + changed_object=self, + related_object=parent_obj, + action=action, + object_data=serialize_object(self) + ).save() + def to_csv(self): # Determine if this IP is primary for a Device diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index 026cbc980..3d46452b2 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -203,7 +203,7 @@ class RIRTable(BaseTable): name = tables.LinkColumn(verbose_name='Name') is_private = BooleanColumn(verbose_name='Private') aggregate_count = tables.Column(verbose_name='Aggregates') - actions = tables.TemplateColumn(template_code=RIR_ACTIONS, attrs={'td': {'class': 'text-right'}}, verbose_name='') + actions = tables.TemplateColumn(template_code=RIR_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='') class Meta(BaseTable.Meta): model = RIR @@ -288,7 +288,7 @@ class RoleTable(BaseTable): orderable=False, verbose_name='VLANs' ) - actions = tables.TemplateColumn(template_code=ROLE_ACTIONS, attrs={'td': {'class': 'text-right'}}, verbose_name='') + actions = tables.TemplateColumn(template_code=ROLE_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='') class Meta(BaseTable.Meta): model = Role @@ -392,7 +392,7 @@ class VLANGroupTable(BaseTable): site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')], verbose_name='Site') vlan_count = tables.Column(verbose_name='VLANs') slug = tables.Column(verbose_name='Slug') - actions = tables.TemplateColumn(template_code=VLANGROUP_ACTIONS, attrs={'td': {'class': 'text-right'}}, + actions = tables.TemplateColumn(template_code=VLANGROUP_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='') class Meta(BaseTable.Meta): @@ -437,7 +437,7 @@ class VLANMemberTable(BaseTable): ) actions = tables.TemplateColumn( template_code=VLAN_MEMBER_ACTIONS, - attrs={'td': {'class': 'text-right'}}, + attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py new file mode 100644 index 000000000..20c16df9b --- /dev/null +++ b/netbox/ipam/tests/test_views.py @@ -0,0 +1,282 @@ +from netaddr import IPNetwork +import urllib.parse + +from django.test import Client, TestCase +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 + + +class VRFTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + VRF.objects.bulk_create([ + VRF(name='VRF 1', rd='65000:1'), + VRF(name='VRF 2', rd='65000:2'), + VRF(name='VRF 3', rd='65000:3'), + ]) + + def test_vrf_list(self): + + url = reverse('ipam:vrf_list') + params = { + "q": "65000", + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + def test_configcontext(self): + + vrf = VRF.objects.first() + response = self.client.get(vrf.get_absolute_url()) + self.assertEqual(response.status_code, 200) + + +class RIRTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + RIR.objects.bulk_create([ + RIR(name='RIR 1', slug='rir-1'), + RIR(name='RIR 2', slug='rir-2'), + RIR(name='RIR 3', slug='rir-3'), + ]) + + def test_rir_list(self): + + url = reverse('ipam:rir_list') + + 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): + + self.client = Client() + + rir = RIR(name='RIR 1', slug='rir-1') + rir.save() + + Aggregate.objects.bulk_create([ + Aggregate(family=4, prefix=IPNetwork('10.1.0.0/16'), rir=rir), + Aggregate(family=4, prefix=IPNetwork('10.2.0.0/16'), rir=rir), + Aggregate(family=4, prefix=IPNetwork('10.3.0.0/16'), rir=rir), + ]) + + def test_aggregate_list(self): + + url = reverse('ipam:aggregate_list') + params = { + "rir": RIR.objects.first().slug, + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + def test_aggregate(self): + + aggregate = Aggregate.objects.first() + response = self.client.get(aggregate.get_absolute_url()) + self.assertEqual(response.status_code, 200) + + +class RoleTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + Role.objects.bulk_create([ + Role(name='Role 1', slug='role-1'), + Role(name='Role 2', slug='role-2'), + Role(name='Role 3', slug='role-3'), + ]) + + def test_role_list(self): + + url = reverse('ipam:role_list') + + response = self.client.get(url) + self.assertEqual(response.status_code, 200) + + +class PrefixTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + site = Site(name='Site 1', slug='site-1') + site.save() + + Prefix.objects.bulk_create([ + Prefix(family=4, prefix=IPNetwork('10.1.0.0/16'), site=site), + Prefix(family=4, prefix=IPNetwork('10.2.0.0/16'), site=site), + Prefix(family=4, prefix=IPNetwork('10.3.0.0/16'), site=site), + ]) + + def test_prefix_list(self): + + url = reverse('ipam:prefix_list') + params = { + "site": Site.objects.first().slug, + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + def test_prefix(self): + + prefix = Prefix.objects.first() + response = self.client.get(prefix.get_absolute_url()) + self.assertEqual(response.status_code, 200) + + +class IPAddressTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + vrf = VRF(name='VRF 1', rd='65000:1') + vrf.save() + + IPAddress.objects.bulk_create([ + IPAddress(family=4, address=IPNetwork('10.1.0.0/16'), vrf=vrf), + IPAddress(family=4, address=IPNetwork('10.2.0.0/16'), vrf=vrf), + IPAddress(family=4, address=IPNetwork('10.3.0.0/16'), vrf=vrf), + ]) + + def test_ipaddress_list(self): + + url = reverse('ipam:ipaddress_list') + params = { + "vrf": VRF.objects.first().rd, + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + def test_ipaddress(self): + + ipaddress = IPAddress.objects.first() + response = self.client.get(ipaddress.get_absolute_url()) + self.assertEqual(response.status_code, 200) + + +class VLANGroupTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + site = Site(name='Site 1', slug='site-1') + site.save() + + VLANGroup.objects.bulk_create([ + VLANGroup(name='VLAN Group 1', slug='vlan-group-1', site=site), + VLANGroup(name='VLAN Group 2', slug='vlan-group-2', site=site), + VLANGroup(name='VLAN Group 3', slug='vlan-group-3', site=site), + ]) + + def test_vlangroup_list(self): + + url = reverse('ipam:vlangroup_list') + params = { + "site": Site.objects.first().slug, + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + +class VLANTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + vlangroup = VLANGroup(name='VLAN Group 1', slug='vlan-group-1') + vlangroup.save() + + VLAN.objects.bulk_create([ + VLAN(group=vlangroup, vid=101, name='VLAN101'), + VLAN(group=vlangroup, vid=102, name='VLAN102'), + VLAN(group=vlangroup, vid=103, name='VLAN103'), + ]) + + def test_vlan_list(self): + + url = reverse('ipam:vlan_list') + params = { + "group": VLANGroup.objects.first().slug, + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + def test_vlan(self): + + vlan = VLAN.objects.first() + response = self.client.get(vlan.get_absolute_url()) + self.assertEqual(response.status_code, 200) + + +class ServiceTestCase(TestCase): + + def setUp(self): + + self.client = Client() + + site = Site(name='Site 1', slug='site-1') + site.save() + + manufacturer = Manufacturer(name='Manufacturer 1', slug='manufacturer-1') + manufacturer.save() + + devicetype = DeviceType(manufacturer=manufacturer, model='Device Type 1') + devicetype.save() + + devicerole = DeviceRole(name='Device Role 1', slug='device-role-1') + devicerole.save() + + device = Device(name='Device 1', site=site, device_type=devicetype, device_role=devicerole) + device.save() + + Service.objects.bulk_create([ + Service(device=device, name='Service 1', protocol=IP_PROTOCOL_TCP, port=101), + Service(device=device, name='Service 2', protocol=IP_PROTOCOL_TCP, port=102), + Service(device=device, name='Service 3', protocol=IP_PROTOCOL_TCP, port=103), + ]) + + def test_service_list(self): + + url = reverse('ipam:service_list') + params = { + "device_id": Device.objects.first(), + } + + response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params))) + self.assertEqual(response.status_code, 200) + + def test_service(self): + + service = Service.objects.first() + response = self.client.get(service.get_absolute_url()) + self.assertEqual(response.status_code, 200) diff --git a/netbox/netbox/configuration.example.py b/netbox/netbox/configuration.example.py index d7a9cf2ed..145ebf0e6 100644 --- a/netbox/netbox/configuration.example.py +++ b/netbox/netbox/configuration.example.py @@ -132,6 +132,7 @@ REDIS = { '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 diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 07d46bad3..389fead42 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -22,7 +22,7 @@ except ImportError: ) -VERSION = '2.5.7-dev' +VERSION = '2.5.9-dev' BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -131,6 +131,7 @@ REDIS_PORT = REDIS.get('PORT', 6379) REDIS_PASSWORD = REDIS.get('PASSWORD', '') REDIS_DATABASE = REDIS.get('DATABASE', 0) REDIS_DEFAULT_TIMEOUT = REDIS.get('DEFAULT_TIMEOUT', 300) +REDIS_SSL = REDIS.get('SSL', False) # Email EMAIL_HOST = EMAIL.get('SERVER') @@ -197,7 +198,7 @@ ROOT_URLCONF = 'netbox.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [BASE_DIR + '/templates/'], + 'DIRS': [BASE_DIR + '/templates'], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -223,7 +224,7 @@ USE_I18N = True USE_TZ = True # Static files (CSS, JavaScript, Images) -STATIC_ROOT = BASE_DIR + '/static/' +STATIC_ROOT = BASE_DIR + '/static' STATIC_URL = '/{}static/'.format(BASE_PATH) STATICFILES_DIRS = ( os.path.join(BASE_DIR, "project-static"), @@ -291,6 +292,7 @@ RQ_QUEUES = { 'DB': REDIS_DATABASE, 'PASSWORD': REDIS_PASSWORD, 'DEFAULT_TIMEOUT': REDIS_DEFAULT_TIMEOUT, + 'SSL': REDIS_SSL, } } @@ -315,6 +317,7 @@ SWAGGER_SETTINGS = { 'utilities.custom_inspectors.IdInFilterInspector', 'drf_yasg.inspectors.CoreAPICompatInspector', ], + 'DEFAULT_MODEL_DEPTH': 1, 'DEFAULT_PAGINATOR_INSPECTORS': [ 'utilities.custom_inspectors.NullablePaginatorInspector', 'drf_yasg.inspectors.DjangoRestResponsePagination', diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index ff11e3892..837d9473d 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -267,6 +267,7 @@ class SearchView(View): class APIRootView(APIView): _ignore_model_permissions = True exclude_from_schema = True + swagger_schema = None def get_view_name(self): return "API Root" diff --git a/netbox/project-static/clipboard-2.0.4.min.js b/netbox/project-static/clipboard-2.0.4.min.js new file mode 100755 index 000000000..02c549e35 --- /dev/null +++ b/netbox/project-static/clipboard-2.0.4.min.js @@ -0,0 +1,7 @@ +/*! + * clipboard.js v2.0.4 + * https://zenorocha.github.io/clipboard.js + * + * Licensed MIT © Zeno Rocha + */ +!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ClipboardJS=e():t.ClipboardJS=e()}(this,function(){return function(n){var o={};function r(t){if(o[t])return o[t].exports;var e=o[t]={i:t,l:!1,exports:{}};return n[t].call(e.exports,e,e.exports,r),e.l=!0,e.exports}return r.m=n,r.c=o,r.d=function(t,e,n){r.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},r.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return r.d(e,"a",e),e},r.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},r.p="",r(r.s=0)}([function(t,e,n){"use strict";var r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},i=function(){function o(t,e){for(var n=0;n

{% now 'Y-m-d H:i:s T' %}

-
+

Docs · API · @@ -69,6 +69,7 @@ +