From f86dda282389e808fe200b977151a71e8f58ecbd Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 17 Jan 2022 10:16:37 -0500 Subject: [PATCH 01/27] PRVB --- docs/release-notes/version-3.1.md | 4 ++++ netbox/netbox/settings.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index 88a6da77f..c42837b24 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -1,5 +1,9 @@ # NetBox v3.1 +## v3.1.7 (FUTURE) + +--- + ## v3.1.6 (2022-01-17) ### Enhancements diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index ff767b4d8..199df264c 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -19,7 +19,7 @@ from netbox.config import PARAMS # Environment setup # -VERSION = '3.1.6' +VERSION = '3.1.7-dev' # Hostname HOSTNAME = platform.node() From 0d90605bf06cc3b8adc4a508533e54b663d2091d Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 18 Jan 2022 11:09:12 -0500 Subject: [PATCH 02/27] Fixes #8377: Fix calculation of absolute cable lengths when specified in fractional units --- docs/release-notes/version-3.1.md | 4 +++ .../migrations/0144_fix_cable_abs_length.py | 31 +++++++++++++++++++ netbox/dcim/tables/cables.py | 2 +- netbox/dcim/tables/template_code.py | 3 +- netbox/utilities/utils.py | 21 ++++++------- 5 files changed, 48 insertions(+), 13 deletions(-) create mode 100644 netbox/dcim/migrations/0144_fix_cable_abs_length.py diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index c42837b24..89a68423f 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -2,6 +2,10 @@ ## v3.1.7 (FUTURE) +### Bug Fixes + +* [#8377](https://github.com/netbox-community/netbox/issues/8377) - Fix calculation of absolute cable lengths when specified in fractional units + --- ## v3.1.6 (2022-01-17) diff --git a/netbox/dcim/migrations/0144_fix_cable_abs_length.py b/netbox/dcim/migrations/0144_fix_cable_abs_length.py new file mode 100644 index 000000000..0da30ffb5 --- /dev/null +++ b/netbox/dcim/migrations/0144_fix_cable_abs_length.py @@ -0,0 +1,31 @@ +from django.db import migrations + +from utilities.utils import to_meters + + +def recalculate_abs_length(apps, schema_editor): + """ + Recalculate absolute lengths for all cables with a length and length unit defined. Fixes + incorrectly calculated values as reported under bug #8377. + """ + Cable = apps.get_model('dcim', 'Cable') + + cables = Cable.objects.filter(length__isnull=False).exclude(length_unit='') + for cable in cables: + cable._abs_length = to_meters(cable.length, cable.length_unit) + + Cable.objects.bulk_update(cables, ['_abs_length'], batch_size=100) + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0143_remove_primary_for_related_name'), + ] + + operations = [ + migrations.RunPython( + code=recalculate_abs_length, + reverse_code=migrations.RunPython.noop + ), + ] diff --git a/netbox/dcim/tables/cables.py b/netbox/dcim/tables/cables.py index bea2c0adf..9f2c08342 100644 --- a/netbox/dcim/tables/cables.py +++ b/netbox/dcim/tables/cables.py @@ -45,7 +45,7 @@ class CableTable(BaseTable): tenant = TenantColumn() length = TemplateColumn( template_code=CABLE_LENGTH, - order_by='_abs_length' + order_by=('_abs_length', 'length_unit') ) color = ColorColumn() tags = TagColumn( diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py index ccca32be8..233694a7a 100644 --- a/netbox/dcim/tables/template_code.py +++ b/netbox/dcim/tables/template_code.py @@ -9,7 +9,8 @@ LINKTERMINATION = """ """ CABLE_LENGTH = """ -{% if record.length %}{{ record.length }} {{ record.get_length_unit_display }}{% endif %} +{% load helpers %} +{% if record.length %}{{ record.length|simplify_decimal }} {{ record.length_unit }}{% endif %} """ CABLE_TERMINATION_PARENT = """ diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py index ce1f6a111..31e57cd69 100644 --- a/netbox/utilities/utils.py +++ b/netbox/utilities/utils.py @@ -1,9 +1,8 @@ import datetime import json -import urllib from collections import OrderedDict +from decimal import Decimal from itertools import count, groupby -from typing import Any, Dict, List, Tuple from django.core.serializers import serialize from django.db.models import Count, OuterRef, Subquery @@ -195,15 +194,15 @@ def to_meters(length, unit): """ Convert the given length to meters. """ - length = int(length) - if length < 0: - raise ValueError("Length must be a positive integer") + try: + if length < 0: + raise ValueError("Length must be a positive number") + except TypeError: + raise TypeError(f"Invalid value '{length}' for length (must be a number)") valid_units = CableLengthUnitChoices.values() if unit not in valid_units: - raise ValueError( - "Unknown unit {}. Must be one of the following: {}".format(unit, ', '.join(valid_units)) - ) + raise ValueError(f"Unknown unit {unit}. Must be one of the following: {', '.join(valid_units)}") if unit == CableLengthUnitChoices.UNIT_KILOMETER: return length * 1000 @@ -212,11 +211,11 @@ def to_meters(length, unit): if unit == CableLengthUnitChoices.UNIT_CENTIMETER: return length / 100 if unit == CableLengthUnitChoices.UNIT_MILE: - return length * 1609.344 + return length * Decimal(1609.344) if unit == CableLengthUnitChoices.UNIT_FOOT: - return length * 0.3048 + return length * Decimal(0.3048) if unit == CableLengthUnitChoices.UNIT_INCH: - return length * 0.3048 * 12 + return length * Decimal(0.3048) * 12 raise ValueError(f"Unknown unit {unit}. Must be 'km', 'm', 'cm', 'mi', 'ft', or 'in'.") From 7a5516f980ef1fd0a6fc662b1bf09a6de1c52a3d Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 18 Jan 2022 11:31:39 -0500 Subject: [PATCH 03/27] Closes #8376: Correct example condition defitinions; call out value vs label ealuation for choice fields --- docs/additional-features/webhooks.md | 17 +++++++++++++++++ docs/models/extras/webhook.md | 13 ------------- docs/reference/conditions.md | 7 +++++-- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/docs/additional-features/webhooks.md b/docs/additional-features/webhooks.md index 3f10cb9e6..5077f3a68 100644 --- a/docs/additional-features/webhooks.md +++ b/docs/additional-features/webhooks.md @@ -1,5 +1,22 @@ {!models/extras/webhook.md!} +## Conditional Webhooks + +A webhook may include a set of conditional logic expressed in JSON used to control whether a webhook triggers for a specific object. For example, you may wish to trigger a webhook for devices only when the `status` field of an object is "active": + +```json +{ + "and": [ + { + "attr": "status.value", + "value": "active" + } + ] +} +``` + +For more detail, see the reference documentation for NetBox's [conditional logic](../reference/conditions.md). + ## Webhook Processing When a change is detected, any resulting webhooks are placed into a Redis queue for processing. This allows the user's request to complete without needing to wait for the outgoing webhook(s) to be processed. The webhooks are then extracted from the queue by the `rqworker` process and HTTP requests are sent to their respective destinations. The current webhook queue and any failed webhooks can be inspected in the admin UI under System > Background Tasks. diff --git a/docs/models/extras/webhook.md b/docs/models/extras/webhook.md index c71657336..eb47dd332 100644 --- a/docs/models/extras/webhook.md +++ b/docs/models/extras/webhook.md @@ -81,16 +81,3 @@ If no body template is specified, the request body will be populated with a JSON } } ``` - -## Conditional Webhooks - -A webhook may include a set of conditional logic expressed in JSON used to control whether a webhook triggers for a specific object. For example, you may wish to trigger a webhook for devices only when the `status` field of an object is "active": - -```json -{ - "attr": "status", - "value": "active" -} -``` - -For more detail, see the reference documentation for NetBox's [conditional logic](../reference/conditions.md). diff --git a/docs/reference/conditions.md b/docs/reference/conditions.md index 40b2ccb4b..fb8b66139 100644 --- a/docs/reference/conditions.md +++ b/docs/reference/conditions.md @@ -81,13 +81,16 @@ The following condition will evaluate as true: ```json { - "attr": "status", + "attr": "status.value", "value": ["planned", "staging"], "op": "in", "negate": true } ``` +!!! note "Evaluating static choice fields" + Pay close attention when evaluating static choice fields, such as the `status` field above. These fields typically render as a dictionary specifying both the field's raw value (`value`) and its human-friendly label (`label`). be sure to specify on which of these you want to match. + ## Condition Sets Multiple conditions can be combined into nested sets using AND or OR logic. This is done by declaring a JSON object with a single key (`and` or `or`) containing a list of condition objects and/or child condition sets. @@ -102,7 +105,7 @@ Multiple conditions can be combined into nested sets using AND or OR logic. This { "and": [ { - "attr": "status", + "attr": "status.value", "value": "active" }, { From 0842336cff84d4a9d75fcfccfecaeb7e2c9f32dc Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Tue, 18 Jan 2022 11:23:52 -0600 Subject: [PATCH 04/27] Fixes #8375 - Change ASN display column from ASDOT to ASPLAIN. Add ASDOT display column. --- docs/release-notes/version-3.1.md | 4 ++++ netbox/ipam/tables/ip.py | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index 89a68423f..fdb7c18b5 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -2,6 +2,10 @@ ## v3.1.7 (FUTURE) +### Enhancements + +* [#8275](https://github.com/netbox-community/netbox/issues/8275) - Change ASN display column from ASDOT to ASPLAIN. Add ASDOT display column. + ### Bug Fixes * [#8377](https://github.com/netbox-community/netbox/issues/8377) - Fix calculation of absolute cable lengths when specified in fractional units diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py index f188a21c0..eca35de1a 100644 --- a/netbox/ipam/tables/ip.py +++ b/netbox/ipam/tables/ip.py @@ -107,9 +107,13 @@ class RIRTable(BaseTable): class ASNTable(BaseTable): pk = ToggleColumn() asn = tables.Column( - accessor=tables.A('asn_asdot'), linkify=True ) + asn_asdot = tables.Column( + accessor=tables.A('asn_asdot'), + linkify=True, + verbose_name='ASDOT' + ) site_count = LinkedCountColumn( viewname='dcim:site_list', @@ -120,7 +124,7 @@ class ASNTable(BaseTable): class Meta(BaseTable.Meta): model = ASN - fields = ('pk', 'asn', 'rir', 'site_count', 'tenant', 'description', 'actions', 'created', 'last_updated',) + fields = ('pk', 'asn', 'asn_asdot', 'rir', 'site_count', 'tenant', 'description', 'actions', 'created', 'last_updated',) default_columns = ('pk', 'asn', 'rir', 'site_count', 'sites', 'tenant', 'actions') From ac90304d1f9b33cf3ccf897fb74a2da368510970 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 18 Jan 2022 15:17:05 -0500 Subject: [PATCH 05/27] Correct FeatureQuery invocations --- netbox/extras/forms/bulk_edit.py | 4 ++-- netbox/extras/forms/filtersets.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/netbox/extras/forms/bulk_edit.py b/netbox/extras/forms/bulk_edit.py index 1b87256a5..45b48e9a2 100644 --- a/netbox/extras/forms/bulk_edit.py +++ b/netbox/extras/forms/bulk_edit.py @@ -44,7 +44,7 @@ class CustomLinkBulkEditForm(BulkEditForm): ) content_type = ContentTypeChoiceField( queryset=ContentType.objects.all(), - limit_choices_to=FeatureQuery('custom_fields'), + limit_choices_to=FeatureQuery('custom_links'), required=False ) new_window = forms.NullBooleanField( @@ -71,7 +71,7 @@ class ExportTemplateBulkEditForm(BulkEditForm): ) content_type = ContentTypeChoiceField( queryset=ContentType.objects.all(), - limit_choices_to=FeatureQuery('custom_fields'), + limit_choices_to=FeatureQuery('export_templates'), required=False ) description = forms.CharField( diff --git a/netbox/extras/forms/filtersets.py b/netbox/extras/forms/filtersets.py index 03cd170b8..3848dcb0d 100644 --- a/netbox/extras/forms/filtersets.py +++ b/netbox/extras/forms/filtersets.py @@ -62,7 +62,7 @@ class CustomLinkFilterForm(FilterForm): ] content_type = ContentTypeChoiceField( queryset=ContentType.objects.all(), - limit_choices_to=FeatureQuery('custom_fields'), + limit_choices_to=FeatureQuery('custom_links'), required=False ) weight = forms.IntegerField( @@ -83,7 +83,7 @@ class ExportTemplateFilterForm(FilterForm): ] content_type = ContentTypeChoiceField( queryset=ContentType.objects.all(), - limit_choices_to=FeatureQuery('custom_fields'), + limit_choices_to=FeatureQuery('export_templates'), required=False ) mime_type = forms.CharField( @@ -109,7 +109,7 @@ class WebhookFilterForm(FilterForm): ] content_types = ContentTypeMultipleChoiceField( queryset=ContentType.objects.all(), - limit_choices_to=FeatureQuery('custom_fields'), + limit_choices_to=FeatureQuery('webhooks'), required=False ) http_method = forms.MultipleChoiceField( From 66e1d25ec617baacceb082bb4327cd42c9ab2b34 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 18 Jan 2022 15:36:21 -0500 Subject: [PATCH 06/27] Closes #8367: Add ASNs to global search function --- docs/release-notes/version-3.1.md | 3 ++- netbox/ipam/filtersets.py | 4 ++++ netbox/ipam/tables/ip.py | 6 ++++-- netbox/netbox/constants.py | 14 +++++++++++--- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index fdb7c18b5..b985a5651 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -4,7 +4,8 @@ ### Enhancements -* [#8275](https://github.com/netbox-community/netbox/issues/8275) - Change ASN display column from ASDOT to ASPLAIN. Add ASDOT display column. +* [#8275](https://github.com/netbox-community/netbox/issues/8275) - Introduce alternative ASDOT-formatted column for ASNs +* [#8367](https://github.com/netbox-community/netbox/issues/8367) - Add ASNs to global search function ### Bug Fixes diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index df6ee1055..d7e1ee47e 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -209,6 +209,10 @@ class ASNFilterSet(OrganizationalModelFilterSet, TenancyFilterSet): if not value.strip(): return queryset qs_filter = Q(description__icontains=value) + try: + qs_filter |= Q(asn=int(value)) + except ValueError: + pass return queryset.filter(qs_filter) diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py index eca35de1a..49892f557 100644 --- a/netbox/ipam/tables/ip.py +++ b/netbox/ipam/tables/ip.py @@ -114,7 +114,6 @@ class ASNTable(BaseTable): linkify=True, verbose_name='ASDOT' ) - site_count = LinkedCountColumn( viewname='dcim:site_list', url_params={'asn_id': 'pk'}, @@ -124,7 +123,10 @@ class ASNTable(BaseTable): class Meta(BaseTable.Meta): model = ASN - fields = ('pk', 'asn', 'asn_asdot', 'rir', 'site_count', 'tenant', 'description', 'actions', 'created', 'last_updated',) + fields = ( + 'pk', 'asn', 'asn_asdot', 'rir', 'site_count', 'tenant', 'description', 'actions', 'created', + 'last_updated', + ) default_columns = ('pk', 'asn', 'rir', 'site_count', 'sites', 'tenant', 'actions') diff --git a/netbox/netbox/constants.py b/netbox/netbox/constants.py index 3e935e722..e087423bb 100644 --- a/netbox/netbox/constants.py +++ b/netbox/netbox/constants.py @@ -12,9 +12,11 @@ from dcim.tables import ( CableTable, DeviceTable, DeviceTypeTable, PowerFeedTable, RackTable, RackReservationTable, LocationTable, SiteTable, VirtualChassisTable, ) -from ipam.filtersets import AggregateFilterSet, IPAddressFilterSet, PrefixFilterSet, VLANFilterSet, VRFFilterSet -from ipam.models import Aggregate, IPAddress, Prefix, VLAN, VRF -from ipam.tables import AggregateTable, IPAddressTable, PrefixTable, VLANTable, VRFTable +from ipam.filtersets import ( + AggregateFilterSet, ASNFilterSet, IPAddressFilterSet, PrefixFilterSet, VLANFilterSet, VRFFilterSet, +) +from ipam.models import Aggregate, ASN, IPAddress, Prefix, VLAN, VRF +from ipam.tables import AggregateTable, ASNTable, IPAddressTable, PrefixTable, VLANTable, VRFTable from tenancy.filtersets import TenantFilterSet from tenancy.models import Tenant from tenancy.tables import TenantTable @@ -170,6 +172,12 @@ SEARCH_TYPES = OrderedDict(( 'table': VLANTable, 'url': 'ipam:vlan_list', }), + ('asn', { + 'queryset': ASN.objects.prefetch_related('rir', 'tenant'), + 'filterset': ASNFilterSet, + 'table': ASNTable, + 'url': 'ipam:asn_list', + }), # Tenancy ('tenant', { 'queryset': Tenant.objects.prefetch_related('group'), From a50abdff7cf3ad1aa05d633ba37ce407d688cdfb Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 18 Jan 2022 15:40:19 -0500 Subject: [PATCH 07/27] Closes #8381: Add contacts to global search function --- docs/release-notes/version-3.1.md | 1 + netbox/netbox/constants.py | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index b985a5651..9cfdcad23 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -6,6 +6,7 @@ * [#8275](https://github.com/netbox-community/netbox/issues/8275) - Introduce alternative ASDOT-formatted column for ASNs * [#8367](https://github.com/netbox-community/netbox/issues/8367) - Add ASNs to global search function +* [#8381](https://github.com/netbox-community/netbox/issues/8381) - Add contacts to global search function ### Bug Fixes diff --git a/netbox/netbox/constants.py b/netbox/netbox/constants.py index e087423bb..be5f12980 100644 --- a/netbox/netbox/constants.py +++ b/netbox/netbox/constants.py @@ -17,9 +17,9 @@ from ipam.filtersets import ( ) from ipam.models import Aggregate, ASN, IPAddress, Prefix, VLAN, VRF from ipam.tables import AggregateTable, ASNTable, IPAddressTable, PrefixTable, VLANTable, VRFTable -from tenancy.filtersets import TenantFilterSet -from tenancy.models import Tenant -from tenancy.tables import TenantTable +from tenancy.filtersets import ContactFilterSet, TenantFilterSet +from tenancy.models import Contact, Tenant +from tenancy.tables import ContactTable, TenantTable from utilities.utils import count_related from virtualization.filtersets import ClusterFilterSet, VirtualMachineFilterSet from virtualization.models import Cluster, VirtualMachine @@ -185,4 +185,10 @@ SEARCH_TYPES = OrderedDict(( 'table': TenantTable, 'url': 'tenancy:tenant_list', }), + ('contact', { + 'queryset': Contact.objects.prefetch_related('group', 'assignments'), + 'filterset': ContactFilterSet, + 'table': ContactTable, + 'url': 'tenancy:contact_list', + }), )) From 1b6314e1c4129415393edeac317dd31019358890 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 18 Jan 2022 16:01:40 -0500 Subject: [PATCH 08/27] Closes #8368: Enable controlling the order of custom script form fields with field_order --- docs/customization/custom-scripts.md | 4 ++++ docs/release-notes/version-3.1.md | 1 + netbox/extras/scripts.py | 13 +++++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/customization/custom-scripts.md b/docs/customization/custom-scripts.md index df436fe99..02af19726 100644 --- a/docs/customization/custom-scripts.md +++ b/docs/customization/custom-scripts.md @@ -77,6 +77,10 @@ This is the human-friendly names of your script. If omitted, the class name will A human-friendly description of what your script does. +### `field_order` + +By default, script variables will be ordered in the form as they are defined in the script. `field_order` may be defined as an iterable of field names to determine the order in which variables are rendered. Any fields not included in this iterable be listed last. + ### `commit_default` The checkbox to commit database changes when executing a script is checked by default. Set `commit_default` to False under the script's Meta class to leave this option unchecked by default. diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index 9cfdcad23..ee49a9b64 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -6,6 +6,7 @@ * [#8275](https://github.com/netbox-community/netbox/issues/8275) - Introduce alternative ASDOT-formatted column for ASNs * [#8367](https://github.com/netbox-community/netbox/issues/8367) - Add ASNs to global search function +* [#8368](https://github.com/netbox-community/netbox/issues/8368) - Enable controlling the order of custom script form fields with `field_order` * [#8381](https://github.com/netbox-community/netbox/issues/8381) - Add contacts to global search function ### Bug Fixes diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py index 3c7ad3c15..fb3c6558a 100644 --- a/netbox/extras/scripts.py +++ b/netbox/extras/scripts.py @@ -296,12 +296,21 @@ class BaseScript: @classmethod def _get_vars(cls): - vars = OrderedDict() + vars = {} for name, attr in cls.__dict__.items(): if name not in vars and issubclass(attr.__class__, ScriptVariable): vars[name] = attr - return vars + # Order variables according to field_order + field_order = getattr(cls.Meta, 'field_order', None) + if not field_order: + return vars + ordered_vars = { + field: vars.pop(field) for field in field_order if field in vars + } + ordered_vars.update(vars) + + return ordered_vars def run(self, data, commit): raise NotImplementedError("The script must define a run() method.") From 5e5d90314239b9bba244e2984afbdaeefa7a82f8 Mon Sep 17 00:00:00 2001 From: Johannes Erwerle Date: Fri, 28 Jan 2022 11:58:29 +0100 Subject: [PATCH 09/27] Fixes #8476: Bring the ASN Web UI up to the standard set by other objects --- docs/release-notes/version-3.1.md | 1 + netbox/ipam/tables/ip.py | 9 +++++++-- netbox/templates/tenancy/tenant.html | 4 ++++ netbox/tenancy/views.py | 3 ++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index ee49a9b64..fa590215e 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -8,6 +8,7 @@ * [#8367](https://github.com/netbox-community/netbox/issues/8367) - Add ASNs to global search function * [#8368](https://github.com/netbox-community/netbox/issues/8368) - Enable controlling the order of custom script form fields with `field_order` * [#8381](https://github.com/netbox-community/netbox/issues/8381) - Add contacts to global search function +* [#8476](https://github.com/netbox-community/netbox/issues/8476) - Bring the ASN Web UI up to the standard set by other objects ### Bug Fixes diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py index 49892f557..df2d97dac 100644 --- a/netbox/ipam/tables/ip.py +++ b/netbox/ipam/tables/ip.py @@ -119,15 +119,20 @@ class ASNTable(BaseTable): url_params={'asn_id': 'pk'}, verbose_name='Sites' ) + tenant = TenantColumn() + tags = TagColumn( + url_name='ipam:asn_list' + ) + actions = ButtonsColumn(ASN) class Meta(BaseTable.Meta): model = ASN fields = ( 'pk', 'asn', 'asn_asdot', 'rir', 'site_count', 'tenant', 'description', 'actions', 'created', - 'last_updated', + 'last_updated', 'tags', ) - default_columns = ('pk', 'asn', 'rir', 'site_count', 'sites', 'tenant', 'actions') + default_columns = ('pk', 'asn', 'rir', 'site_count', 'sites', 'description', 'tenant', 'actions') # diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html index 083cc4777..b64438866 100644 --- a/netbox/templates/tenancy/tenant.html +++ b/netbox/templates/tenancy/tenant.html @@ -71,6 +71,10 @@

{{ stats.aggregate_count }}

Aggregates

+
+

{{ stats.asn_count }}

+

ASNs

+

{{ stats.prefix_count }}

Prefixes

diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py index b0f550304..e219a5670 100644 --- a/netbox/tenancy/views.py +++ b/netbox/tenancy/views.py @@ -4,7 +4,7 @@ from django.shortcuts import get_object_or_404 from circuits.models import Circuit from dcim.models import Site, Rack, Device, RackReservation, Cable -from ipam.models import Aggregate, IPAddress, Prefix, VLAN, VRF +from ipam.models import Aggregate, IPAddress, Prefix, VLAN, VRF, ASN from netbox.views import generic from utilities.tables import paginate_table from utilities.utils import count_related @@ -113,6 +113,7 @@ class TenantView(generic.ObjectView): 'virtualmachine_count': VirtualMachine.objects.restrict(request.user, 'view').filter(tenant=instance).count(), 'cluster_count': Cluster.objects.restrict(request.user, 'view').filter(tenant=instance).count(), 'cable_count': Cable.objects.restrict(request.user, 'view').filter(tenant=instance).count(), + 'asn_count': ASN.objects.restrict(request.user, 'view').filter(tenant=instance).count(), } return { From a31379bf0cb9c94b5c1a8c4ffccb9229e498b07b Mon Sep 17 00:00:00 2001 From: Johannes Erwerle Date: Fri, 28 Jan 2022 17:54:37 +0100 Subject: [PATCH 10/27] Fixes #8477: The commands for running the tests in the development section are not working --- docs/development/getting-started.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/development/getting-started.md b/docs/development/getting-started.md index 742e93804..0e892bd4a 100644 --- a/docs/development/getting-started.md +++ b/docs/development/getting-started.md @@ -122,22 +122,22 @@ The demo data is provided in JSON format and loaded into an empty database using ## Running Tests -Prior to committing any substantial changes to the code base, be sure to run NetBox's test suite to catch any potential errors. Tests are run using the `test` management command. Remember to ensure the Python virtual environment is active before running this command. +Prior to committing any substantial changes to the code base, be sure to run NetBox's test suite to catch any potential errors. Tests are run using the `test` management command. Remember to ensure the Python virtual environment is active before running this command. Also keep in mind that these commands are executed in the `/netbox/` directory, not the root directory of the repository. ```no-highlight -$ python netbox/manage.py test +$ python manage.py test ``` In cases where you haven't made any changes to the database (which is most of the time), you can append the `--keepdb` argument to this command to reuse the test database between runs. This cuts down on the time it takes to run the test suite since the database doesn't have to be rebuilt each time. (Note that this argument will cause errors if you've modified any model fields since the previous test run.) ```no-highlight -$ python netbox/manage.py test --keepdb +$ python manage.py test --keepdb ``` You can also limit the command to running only a specific subset of tests. For example, to run only IPAM and DCIM view tests: ```no-highlight -$ python netbox/manage.py test dcim.tests.test_views ipam.tests.test_views +$ python manage.py test dcim.tests.test_views ipam.tests.test_views ``` ## Submitting Pull Requests From 00f2c652d13274546b00087954dd72c08d1d0a6c Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Fri, 28 Jan 2022 13:09:57 -0500 Subject: [PATCH 11/27] Closes #8462: Linkify manufacturer column in device type table --- docs/release-notes/version-3.1.md | 1 + netbox/dcim/tables/devicetypes.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index fa590215e..802804e0b 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -8,6 +8,7 @@ * [#8367](https://github.com/netbox-community/netbox/issues/8367) - Add ASNs to global search function * [#8368](https://github.com/netbox-community/netbox/issues/8368) - Enable controlling the order of custom script form fields with `field_order` * [#8381](https://github.com/netbox-community/netbox/issues/8381) - Add contacts to global search function +* [#8462](https://github.com/netbox-community/netbox/issues/8462) - Linkify manufacturer column in device type table * [#8476](https://github.com/netbox-community/netbox/issues/8476) - Bring the ASN Web UI up to the standard set by other objects ### Bug Fixes diff --git a/netbox/dcim/tables/devicetypes.py b/netbox/dcim/tables/devicetypes.py index dc437ee96..5643edc37 100644 --- a/netbox/dcim/tables/devicetypes.py +++ b/netbox/dcim/tables/devicetypes.py @@ -67,6 +67,9 @@ class DeviceTypeTable(BaseTable): linkify=True, verbose_name='Device Type' ) + manufacturer = tables.Column( + linkify=True + ) is_full_depth = BooleanColumn( verbose_name='Full Depth' ) From e5ca008e90bafc2ba274caaa2153b9ac9d8c745e Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Fri, 28 Jan 2022 13:19:23 -0500 Subject: [PATCH 12/27] Fixes #8456: Fix redundant display of VRF RD in prefix view --- docs/release-notes/version-3.1.md | 1 + netbox/templates/ipam/prefix.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index 802804e0b..3724ac3bd 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -14,6 +14,7 @@ ### Bug Fixes * [#8377](https://github.com/netbox-community/netbox/issues/8377) - Fix calculation of absolute cable lengths when specified in fractional units +* [#8456](https://github.com/netbox-community/netbox/issues/8456) - Fix redundant display of VRF RD in prefix view --- diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index cb62e56ae..045f4b9e0 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -18,7 +18,7 @@ VRF {% if object.vrf %} - {{ object.vrf }} ({{ object.vrf.rd }}) + {{ object.vrf }} {% else %} Global {% endif %} From d0d6ae5d61f4adde76c1fcb1f196848ee3fc297a Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Fri, 28 Jan 2022 14:03:36 -0500 Subject: [PATCH 13/27] Fixes #8465: Accept empty string values for Interface rf_channel in REST API --- docs/release-notes/version-3.1.md | 1 + netbox/dcim/api/serializers.py | 2 +- netbox/dcim/tests/test_api.py | 21 ++++++++++++++++----- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index 3724ac3bd..9554c1ddf 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -15,6 +15,7 @@ * [#8377](https://github.com/netbox-community/netbox/issues/8377) - Fix calculation of absolute cable lengths when specified in fractional units * [#8456](https://github.com/netbox-community/netbox/issues/8456) - Fix redundant display of VRF RD in prefix view +* [#8465](https://github.com/netbox-community/netbox/issues/8465) - Accept empty string values for Interface `rf_channel` in REST API --- diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 337fd35c6..6549e51a1 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -621,7 +621,7 @@ class InterfaceSerializer(PrimaryModelSerializer, LinkTerminationSerializer, Con lag = NestedInterfaceSerializer(required=False, allow_null=True) mode = ChoiceField(choices=InterfaceModeChoices, allow_blank=True, required=False) rf_role = ChoiceField(choices=WirelessRoleChoices, required=False, allow_null=True) - rf_channel = ChoiceField(choices=WirelessChannelChoices, required=False) + rf_channel = ChoiceField(choices=WirelessChannelChoices, required=False, allow_blank=True) untagged_vlan = NestedVLANSerializer(required=False, allow_null=True) tagged_vlans = SerializedPKRelatedField( queryset=VLAN.objects.all(), diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index bc6b18ead..f403fa3eb 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -9,6 +9,7 @@ from dcim.models import * from ipam.models import ASN, RIR, VLAN from utilities.testing import APITestCase, APIViewTestCases from virtualization.models import Cluster, ClusterType +from wireless.choices import WirelessChannelChoices from wireless.models import WirelessLAN @@ -1239,10 +1240,8 @@ class InterfaceTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase 'name': 'Interface 4', 'type': '1000base-t', 'mode': InterfaceModeChoices.MODE_TAGGED, - 'tx_power': 10, 'tagged_vlans': [vlans[0].pk, vlans[1].pk], 'untagged_vlan': vlans[2].pk, - 'wireless_lans': [wireless_lans[0].pk, wireless_lans[1].pk], }, { 'device': device.pk, @@ -1250,10 +1249,8 @@ class InterfaceTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase 'type': '1000base-t', 'mode': InterfaceModeChoices.MODE_TAGGED, 'bridge': interfaces[0].pk, - 'tx_power': 10, 'tagged_vlans': [vlans[0].pk, vlans[1].pk], 'untagged_vlan': vlans[2].pk, - 'wireless_lans': [wireless_lans[0].pk, wireless_lans[1].pk], }, { 'device': device.pk, @@ -1261,10 +1258,24 @@ class InterfaceTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase 'type': 'virtual', 'mode': InterfaceModeChoices.MODE_TAGGED, 'parent': interfaces[1].pk, - 'tx_power': 10, 'tagged_vlans': [vlans[0].pk, vlans[1].pk], 'untagged_vlan': vlans[2].pk, + }, + { + 'device': device.pk, + 'name': 'Interface 7', + 'type': InterfaceTypeChoices.TYPE_80211A, + 'tx_power': 10, 'wireless_lans': [wireless_lans[0].pk, wireless_lans[1].pk], + 'rf_channel': WirelessChannelChoices.CHANNEL_5G_32, + }, + { + 'device': device.pk, + 'name': 'Interface 8', + 'type': InterfaceTypeChoices.TYPE_80211A, + 'tx_power': 10, + 'wireless_lans': [wireless_lans[0].pk, wireless_lans[1].pk], + 'rf_channel': "", }, ] From af479c3d4de078a118907fa27c7435831178dc05 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 1 Feb 2022 15:14:13 -0500 Subject: [PATCH 14/27] Fixes #8499: Content types REST API endpoint should not require model permission --- docs/release-notes/version-3.1.md | 1 + netbox/extras/api/views.py | 2 ++ netbox/extras/tests/test_api.py | 2 -- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index 9554c1ddf..5369bb935 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -16,6 +16,7 @@ * [#8377](https://github.com/netbox-community/netbox/issues/8377) - Fix calculation of absolute cable lengths when specified in fractional units * [#8456](https://github.com/netbox-community/netbox/issues/8456) - Fix redundant display of VRF RD in prefix view * [#8465](https://github.com/netbox-community/netbox/issues/8465) - Accept empty string values for Interface `rf_channel` in REST API +* [#8499](https://github.com/netbox-community/netbox/issues/8499) - Content types REST API endpoint should not require model permission --- diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py index fbeba8328..074a33823 100644 --- a/netbox/extras/api/views.py +++ b/netbox/extras/api/views.py @@ -4,6 +4,7 @@ from django_rq.queues import get_connection from rest_framework import status from rest_framework.decorators import action from rest_framework.exceptions import PermissionDenied +from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response from rest_framework.routers import APIRootView from rest_framework.viewsets import ReadOnlyModelViewSet, ViewSet @@ -382,6 +383,7 @@ class ContentTypeViewSet(ReadOnlyModelViewSet): """ Read-only list of ContentTypes. Limit results to ContentTypes pertinent to NetBox objects. """ + permission_classes = (IsAuthenticated,) queryset = ContentType.objects.order_by('app_label', 'model') serializer_class = serializers.ContentTypeSerializer filterset_class = filtersets.ContentTypeFilterSet diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py index d15b57e43..8769a9015 100644 --- a/netbox/extras/tests/test_api.py +++ b/netbox/extras/tests/test_api.py @@ -608,7 +608,6 @@ class CreatedUpdatedFilterTest(APITestCase): class ContentTypeTest(APITestCase): - @override_settings(EXEMPT_VIEW_PERMISSIONS=['contenttypes.contenttype']) def test_list_objects(self): contenttype_count = ContentType.objects.count() @@ -616,7 +615,6 @@ class ContentTypeTest(APITestCase): self.assertHttpStatus(response, status.HTTP_200_OK) self.assertEqual(response.data['count'], contenttype_count) - @override_settings(EXEMPT_VIEW_PERMISSIONS=['contenttypes.contenttype']) def test_get_object(self): contenttype = ContentType.objects.first() From 3a2b246c0f04796932b5b598529538cb208624e5 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 1 Feb 2022 16:31:34 -0500 Subject: [PATCH 15/27] Closes #8494: Include locations count under tenant view --- docs/release-notes/version-3.1.md | 1 + netbox/templates/tenancy/tenant.html | 4 ++++ netbox/tenancy/views.py | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index 5369bb935..e827ea139 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -10,6 +10,7 @@ * [#8381](https://github.com/netbox-community/netbox/issues/8381) - Add contacts to global search function * [#8462](https://github.com/netbox-community/netbox/issues/8462) - Linkify manufacturer column in device type table * [#8476](https://github.com/netbox-community/netbox/issues/8476) - Bring the ASN Web UI up to the standard set by other objects +* [#8494](https://github.com/netbox-community/netbox/issues/8494) - Include locations count under tenant view ### Bug Fixes diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html index b64438866..fb83a346f 100644 --- a/netbox/templates/tenancy/tenant.html +++ b/netbox/templates/tenancy/tenant.html @@ -59,6 +59,10 @@

{{ stats.rackreservation_count }}

Rack reservations

+
+

{{ stats.location_count }}

+

Locations

+

{{ stats.device_count }}

Devices

diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py index e219a5670..4c9fffa1a 100644 --- a/netbox/tenancy/views.py +++ b/netbox/tenancy/views.py @@ -1,9 +1,8 @@ from django.contrib.contenttypes.models import ContentType -from django.http import Http404 from django.shortcuts import get_object_or_404 from circuits.models import Circuit -from dcim.models import Site, Rack, Device, RackReservation, Cable +from dcim.models import Cable, Device, Location, Rack, RackReservation, Site from ipam.models import Aggregate, IPAddress, Prefix, VLAN, VRF, ASN from netbox.views import generic from utilities.tables import paginate_table @@ -103,6 +102,7 @@ class TenantView(generic.ObjectView): 'site_count': Site.objects.restrict(request.user, 'view').filter(tenant=instance).count(), 'rack_count': Rack.objects.restrict(request.user, 'view').filter(tenant=instance).count(), 'rackreservation_count': RackReservation.objects.restrict(request.user, 'view').filter(tenant=instance).count(), + 'location_count': Location.objects.restrict(request.user, 'view').filter(tenant=instance).count(), 'device_count': Device.objects.restrict(request.user, 'view').filter(tenant=instance).count(), 'vrf_count': VRF.objects.restrict(request.user, 'view').filter(tenant=instance).count(), 'prefix_count': Prefix.objects.restrict(request.user, 'view').filter(tenant=instance).count(), From e4f18e352b7adb520de558771c02aa507c158550 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 1 Feb 2022 16:47:29 -0500 Subject: [PATCH 16/27] Closes #7504: Include IP range data under IPAM role views --- docs/release-notes/version-3.1.md | 1 + netbox/ipam/tables/ip.py | 11 ++++++++--- netbox/ipam/views.py | 1 + netbox/templates/ipam/role.html | 24 ++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index e827ea139..9c9ab0f5a 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -4,6 +4,7 @@ ### Enhancements +* [#7504](https://github.com/netbox-community/netbox/issues/7504) - Include IP range data under IPAM role views * [#8275](https://github.com/netbox-community/netbox/issues/8275) - Introduce alternative ASDOT-formatted column for ASNs * [#8367](https://github.com/netbox-community/netbox/issues/8367) - Add ASNs to global search function * [#8368](https://github.com/netbox-community/netbox/issues/8368) - Enable controlling the order of custom script form fields with `field_order` diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py index df2d97dac..9fdde2b8b 100644 --- a/netbox/ipam/tables/ip.py +++ b/netbox/ipam/tables/ip.py @@ -184,6 +184,11 @@ class RoleTable(BaseTable): url_params={'role_id': 'pk'}, verbose_name='Prefixes' ) + iprange_count = LinkedCountColumn( + viewname='ipam:iprange_list', + url_params={'role_id': 'pk'}, + verbose_name='IP Ranges' + ) vlan_count = LinkedCountColumn( viewname='ipam:vlan_list', url_params={'role_id': 'pk'}, @@ -197,10 +202,10 @@ class RoleTable(BaseTable): class Meta(BaseTable.Meta): model = Role fields = ( - 'pk', 'id', 'name', 'slug', 'prefix_count', 'vlan_count', 'description', 'weight', 'tags', 'actions', - 'created', 'last_updated', + 'pk', 'id', 'name', 'slug', 'prefix_count', 'iprange_count', 'vlan_count', 'description', 'weight', 'tags', + 'actions', 'created', 'last_updated', ) - default_columns = ('pk', 'name', 'prefix_count', 'vlan_count', 'description', 'actions') + default_columns = ('pk', 'name', 'prefix_count', 'iprange_count', 'vlan_count', 'description', 'actions') # diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 38b30e9cc..c9ac44f46 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -340,6 +340,7 @@ class AggregateBulkDeleteView(generic.BulkDeleteView): class RoleListView(generic.ObjectListView): queryset = Role.objects.annotate( prefix_count=count_related(Prefix, 'role'), + iprange_count=count_related(IPRange, 'role'), vlan_count=count_related(VLAN, 'role') ) filterset = filtersets.RoleFilterSet diff --git a/netbox/templates/ipam/role.html b/netbox/templates/ipam/role.html index 879dccdfd..49570099d 100644 --- a/netbox/templates/ipam/role.html +++ b/netbox/templates/ipam/role.html @@ -38,6 +38,30 @@ {{ prefixes_table.rows|length }} + + IP Ranges + + {% with ipranges_count=object.ip_ranges.count %} + {% if ipranges_count %} + {{ ipranges_count }} + {% else %} + — + {% endif %} + {% endwith %} + + + + VLANs + + {% with vlans_count=object.vlans.count %} + {% if vlans_count %} + {{ vlans_count }} + {% else %} + — + {% endif %} + {% endwith %} + +
From 1fcc218a38dbf59951d59bb4ef477cc1525f765d Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 1 Feb 2022 16:58:09 -0500 Subject: [PATCH 17/27] Fixes #8512: Correct file permissions to allow execution of housekeeping script --- contrib/netbox-housekeeping.sh | 0 docs/release-notes/version-3.1.md | 1 + 2 files changed, 1 insertion(+) mode change 100644 => 100755 contrib/netbox-housekeeping.sh diff --git a/contrib/netbox-housekeeping.sh b/contrib/netbox-housekeeping.sh old mode 100644 new mode 100755 diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index 9c9ab0f5a..4b8aa7d82 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -19,6 +19,7 @@ * [#8456](https://github.com/netbox-community/netbox/issues/8456) - Fix redundant display of VRF RD in prefix view * [#8465](https://github.com/netbox-community/netbox/issues/8465) - Accept empty string values for Interface `rf_channel` in REST API * [#8499](https://github.com/netbox-community/netbox/issues/8499) - Content types REST API endpoint should not require model permission +* [#8512](https://github.com/netbox-community/netbox/issues/8512) - Correct file permissions to allow execution of housekeeping script --- From c4cae35355275fefa466dd8d769435c722f27383 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 2 Feb 2022 09:18:50 -0500 Subject: [PATCH 18/27] Update table accessors to use dunders in path --- netbox/dcim/tables/devices.py | 4 ++-- netbox/dcim/tables/sites.py | 2 +- netbox/ipam/tables/fhrp.py | 2 +- netbox/ipam/tables/ip.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index 5f15d5fbf..3c2b3dace 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -261,7 +261,7 @@ class CableTerminationTable(BaseTable): linkify=True ) cable_color = ColorColumn( - accessor='cable.color', + accessor='cable__color', orderable=False, verbose_name='Cable Color' ) @@ -276,7 +276,7 @@ class CableTerminationTable(BaseTable): class PathEndpointTable(CableTerminationTable): connection = TemplateColumn( - accessor='_path.last_node', + accessor='_path__last_node', template_code=LINKTERMINATION, verbose_name='Connection', orderable=False diff --git a/netbox/dcim/tables/sites.py b/netbox/dcim/tables/sites.py index 83e5fa408..e658f1caa 100644 --- a/netbox/dcim/tables/sites.py +++ b/netbox/dcim/tables/sites.py @@ -82,7 +82,7 @@ class SiteTable(BaseTable): linkify=True ) asn_count = LinkedCountColumn( - accessor=tables.A('asns.count'), + accessor=tables.A('asns__count'), viewname='ipam:asn_list', url_params={'site_id': 'pk'}, verbose_name='ASNs' diff --git a/netbox/ipam/tables/fhrp.py b/netbox/ipam/tables/fhrp.py index a8a25f319..d615b6374 100644 --- a/netbox/ipam/tables/fhrp.py +++ b/netbox/ipam/tables/fhrp.py @@ -46,7 +46,7 @@ class FHRPGroupTable(BaseTable): class FHRPGroupAssignmentTable(BaseTable): pk = ToggleColumn() interface_parent = tables.Column( - accessor=tables.A('interface.parent_object'), + accessor=tables.A('interface__parent_object'), linkify=True, orderable=False, verbose_name='Parent' diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py index 9fdde2b8b..2cd2ab6ac 100644 --- a/netbox/ipam/tables/ip.py +++ b/netbox/ipam/tables/ip.py @@ -368,7 +368,7 @@ class IPAddressTable(BaseTable): verbose_name='Interface' ) assigned_object_parent = tables.Column( - accessor='assigned_object.parent_object', + accessor='assigned_object__parent_object', linkify=True, orderable=False, verbose_name='Device/VM' From 98413f0c09613aa6e6aa696d4464b2279e394af2 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 2 Feb 2022 09:27:29 -0500 Subject: [PATCH 19/27] Fixes #8514: Correct several links to config parameters --- docs/administration/housekeeping.md | 2 +- docs/customization/custom-validation.md | 2 +- docs/graphql-api/overview.md | 2 +- docs/release-notes/version-3.0.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/administration/housekeeping.md b/docs/administration/housekeeping.md index 6f231798d..bbb03dc27 100644 --- a/docs/administration/housekeeping.md +++ b/docs/administration/housekeeping.md @@ -3,7 +3,7 @@ NetBox includes a `housekeeping` management command that should be run nightly. This command handles: * Clearing expired authentication sessions from the database -* Deleting changelog records older than the configured [retention time](../configuration/optional-settings.md#changelog_retention) +* Deleting changelog records older than the configured [retention time](../configuration/dynamic-settings.md#changelog_retention) This command can be invoked directly, or by using the shell script provided at `/opt/netbox/contrib/netbox-housekeeping.sh`. This script can be linked from your cron scheduler's daily jobs directory (e.g. `/etc/cron.daily`) or referenced directly within the cron configuration file. diff --git a/docs/customization/custom-validation.md b/docs/customization/custom-validation.md index bfa1fc1b1..9e01f8bb6 100644 --- a/docs/customization/custom-validation.md +++ b/docs/customization/custom-validation.md @@ -50,7 +50,7 @@ The `fail()` method may optionally specify a field with which to associate the s ## Assigning Custom Validators -Custom validators are associated with specific NetBox models under the [CUSTOM_VALIDATORS](../configuration/optional-settings.md#custom_validators) configuration parameter. There are three manners by which custom validation rules can be defined: +Custom validators are associated with specific NetBox models under the [CUSTOM_VALIDATORS](../configuration/dynamic-settings.md#custom_validators) configuration parameter. There are three manners by which custom validation rules can be defined: 1. Plain JSON mapping (no custom logic) 2. Dotted path to a custom validator class diff --git a/docs/graphql-api/overview.md b/docs/graphql-api/overview.md index f4cdc5fba..57dfb22bd 100644 --- a/docs/graphql-api/overview.md +++ b/docs/graphql-api/overview.md @@ -67,4 +67,4 @@ Authorization: Token $TOKEN ## Disabling the GraphQL API -If not needed, the GraphQL API can be disabled by setting the [`GRAPHQL_ENABLED`](../configuration/optional-settings.md#graphql_enabled) configuration parameter to False and restarting NetBox. +If not needed, the GraphQL API can be disabled by setting the [`GRAPHQL_ENABLED`](../configuration/dynamic-settings.md#graphql_enabled) configuration parameter to False and restarting NetBox. diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index 51ad02395..7d6341f44 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -367,7 +367,7 @@ More information about IP ranges is available [in the documentation](../models/i #### Custom Model Validation ([#5963](https://github.com/netbox-community/netbox/issues/5963)) -This release introduces the [`CUSTOM_VALIDATORS`](../configuration/optional-settings.md#custom_validators) configuration parameter, which allows administrators to map NetBox models to custom validator classes to enforce custom validation logic. For example, the following configuration requires every site to have a name of at least ten characters and a description: +This release introduces the [`CUSTOM_VALIDATORS`](../configuration/dynamic-settings.md#custom_validators) configuration parameter, which allows administrators to map NetBox models to custom validator classes to enforce custom validation logic. For example, the following configuration requires every site to have a name of at least ten characters and a description: ```python from extras.validators import CustomValidator From 706f6a7525b29ce786b58ab156761733af9c11d8 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Wed, 2 Feb 2022 11:18:41 -0600 Subject: [PATCH 20/27] Fixes #8425 - Fix exception when viewing change list/records with removed plugins --- docs/release-notes/version-3.1.md | 1 + netbox/extras/tables.py | 2 +- netbox/templates/extras/objectchange.html | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index 4b8aa7d82..c7aac208c 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -16,6 +16,7 @@ ### Bug Fixes * [#8377](https://github.com/netbox-community/netbox/issues/8377) - Fix calculation of absolute cable lengths when specified in fractional units +* [#8425](https://github.com/netbox-community/netbox/issues/8425) - Fix exception when viewing change list/records with removed plugins * [#8456](https://github.com/netbox-community/netbox/issues/8456) - Fix redundant display of VRF RD in prefix view * [#8465](https://github.com/netbox-community/netbox/issues/8465) - Accept empty string values for Interface `rf_channel` in REST API * [#8499](https://github.com/netbox-community/netbox/issues/8499) - Content types REST API endpoint should not require model permission diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py index bee21f697..7cc29005f 100644 --- a/netbox/extras/tables.py +++ b/netbox/extras/tables.py @@ -30,7 +30,7 @@ CONFIGCONTEXT_ACTIONS = """ """ OBJECTCHANGE_OBJECT = """ -{% if record.changed_object.get_absolute_url %} +{% if record.changed_object and record.changed_object.get_absolute_url %} {{ record.object_repr }} {% else %} {{ record.object_repr }} diff --git a/netbox/templates/extras/objectchange.html b/netbox/templates/extras/objectchange.html index e8d72810e..501c9564f 100644 --- a/netbox/templates/extras/objectchange.html +++ b/netbox/templates/extras/objectchange.html @@ -5,12 +5,14 @@ {% block breadcrumbs %}
  • Change Log
    • - {% if object.related_object.get_absolute_url %} + {% if object.related_object and object.related_object.get_absolute_url %}
  • {{ object.related_object }}
    • - {% elif object.changed_object.get_absolute_url %} + {% elif object.changed_object and object.changed_object.get_absolute_url %}
  • {{ object.changed_object }}
    • - {% elif object.changed_object %} + {% elif object.changed_object and object.changed_object.get_display %}
  • {{ object.changed_object }}
    • + {% else %} +
  • {{ object.object_repr }}
    • {% endif %} {% endblock %} @@ -54,7 +56,7 @@ Object - {% if object.changed_object.get_absolute_url %} + {% if object.changed_object and object.changed_object.get_absolute_url %} {{ object.changed_object }} {% else %} {{ object.object_repr }} From 4386cc0ae95f2edc35b048353686d6aed9f29d95 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 2 Feb 2022 16:08:12 -0500 Subject: [PATCH 21/27] Fixes #8498: Fix display of selected content type filters in object list views --- docs/release-notes/version-3.1.md | 1 + netbox/utilities/forms/utils.py | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index c7aac208c..7cce525ed 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -19,6 +19,7 @@ * [#8425](https://github.com/netbox-community/netbox/issues/8425) - Fix exception when viewing change list/records with removed plugins * [#8456](https://github.com/netbox-community/netbox/issues/8456) - Fix redundant display of VRF RD in prefix view * [#8465](https://github.com/netbox-community/netbox/issues/8465) - Accept empty string values for Interface `rf_channel` in REST API +* [#8498](https://github.com/netbox-community/netbox/issues/8498) - Fix display of selected content type filters in object list views * [#8499](https://github.com/netbox-community/netbox/issues/8499) - Content types REST API endpoint should not require model permission * [#8512](https://github.com/netbox-community/netbox/issues/8512) - Correct file permissions to allow execution of housekeeping script diff --git a/netbox/utilities/forms/utils.py b/netbox/utilities/forms/utils.py index 343fdb8a3..6d45d524d 100644 --- a/netbox/utilities/forms/utils.py +++ b/netbox/utilities/forms/utils.py @@ -127,12 +127,13 @@ def get_selected_values(form, field_name): if not hasattr(field, 'choices'): return [str(filter_data)] - # Get choice labels + # Model choice field if type(field.choices) is forms.models.ModelChoiceIterator: - # Field uses dynamic choices: show all that have been populated on the widget - values = [ - subwidget.choice_label for subwidget in form[field_name].subwidgets - ] + # If this is a single-choice field, wrap its value in a list + if not hasattr(filter_data, '__iter__'): + values = [filter_data] + else: + values = filter_data else: # Static selection field From d7fc36a0ce718462ee26c2826732cfab3aec1a8c Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 2 Feb 2022 16:24:51 -0500 Subject: [PATCH 22/27] Closes #8517: Render boolean custom fields as icons in object tables --- docs/release-notes/version-3.1.md | 1 + netbox/utilities/tables.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index 7cce525ed..ce50026b8 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -12,6 +12,7 @@ * [#8462](https://github.com/netbox-community/netbox/issues/8462) - Linkify manufacturer column in device type table * [#8476](https://github.com/netbox-community/netbox/issues/8476) - Bring the ASN Web UI up to the standard set by other objects * [#8494](https://github.com/netbox-community/netbox/issues/8494) - Include locations count under tenant view +* [#8517](https://github.com/netbox-community/netbox/issues/8517) - Render boolean custom fields as icons in object tables ### Bug Fixes diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py index c640e0e85..0b67434b1 100644 --- a/netbox/utilities/tables.py +++ b/netbox/utilities/tables.py @@ -414,13 +414,23 @@ class CustomFieldColumn(tables.Column): def render(self, value): if isinstance(value, list): return ', '.join(v for v in value) + elif self.customfield.type == CustomFieldTypeChoices.TYPE_BOOLEAN and value is True: + return mark_safe('') + elif self.customfield.type == CustomFieldTypeChoices.TYPE_BOOLEAN and value is False: + return mark_safe('') elif self.customfield.type == CustomFieldTypeChoices.TYPE_URL: - # Linkify custom URLs return mark_safe(f'{value}') if value is not None: return value return self.default + def value(self, value): + if isinstance(value, list): + return ','.join(v for v in value) + if value is not None: + return value + return self.default + class CustomLinkColumn(tables.Column): """ From c38260cd791fd1d78cdfabdf3ec310fb75adcf9f Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 3 Feb 2022 09:48:21 -0500 Subject: [PATCH 23/27] Fixes #8527: Fix display of changelog retention period --- docs/release-notes/version-3.1.md | 1 + netbox/templates/extras/object_changelog.html | 2 +- netbox/templates/extras/objectchange_list.html | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index ce50026b8..46497bb03 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -23,6 +23,7 @@ * [#8498](https://github.com/netbox-community/netbox/issues/8498) - Fix display of selected content type filters in object list views * [#8499](https://github.com/netbox-community/netbox/issues/8499) - Content types REST API endpoint should not require model permission * [#8512](https://github.com/netbox-community/netbox/issues/8512) - Correct file permissions to allow execution of housekeeping script +* [#8527](https://github.com/netbox-community/netbox/issues/8527) - Fix display of changelog retention period --- diff --git a/netbox/templates/extras/object_changelog.html b/netbox/templates/extras/object_changelog.html index d84ba0b7a..d064ab435 100644 --- a/netbox/templates/extras/object_changelog.html +++ b/netbox/templates/extras/object_changelog.html @@ -11,7 +11,7 @@
    - Change log retention: {% if settings.CHANGELOG_RETENTION %}{{ settings.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %} + Change log retention: {% if config.CHANGELOG_RETENTION %}{{ config.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %}
    diff --git a/netbox/templates/extras/objectchange_list.html b/netbox/templates/extras/objectchange_list.html index efcac976d..4f4905e6e 100644 --- a/netbox/templates/extras/objectchange_list.html +++ b/netbox/templates/extras/objectchange_list.html @@ -2,8 +2,9 @@ {% block title %}Change Log{% endblock %} -{% block sidebar %} -
    - Change log retention: {% if settings.CHANGELOG_RETENTION %}{{ settings.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %} -
    +{% block content-wrapper %} + {{ block.super }} +
    + Change log retention: {% if config.CHANGELOG_RETENTION %}{{ config.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %} +
    {% endblock %} From 2d1bdefb4fa679d0cd592d7da8823790a02dfdde Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 3 Feb 2022 10:22:38 -0500 Subject: [PATCH 24/27] Closes #8530: Indicate CSV or YAML as format for "all data" export --- docs/release-notes/version-3.1.md | 1 + .../utilities/templates/buttons/export.html | 50 +++++++++---------- netbox/utilities/templatetags/buttons.py | 22 ++++---- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index 46497bb03..d2d1f4018 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -13,6 +13,7 @@ * [#8476](https://github.com/netbox-community/netbox/issues/8476) - Bring the ASN Web UI up to the standard set by other objects * [#8494](https://github.com/netbox-community/netbox/issues/8494) - Include locations count under tenant view * [#8517](https://github.com/netbox-community/netbox/issues/8517) - Render boolean custom fields as icons in object tables +* [#8530](https://github.com/netbox-community/netbox/issues/8530) - Indicate CSV or YAML as format for "all data" export ### Bug Fixes diff --git a/netbox/utilities/templates/buttons/export.html b/netbox/utilities/templates/buttons/export.html index 20ecc2dff..bb6e4379c 100644 --- a/netbox/utilities/templates/buttons/export.html +++ b/netbox/utilities/templates/buttons/export.html @@ -1,31 +1,31 @@
    - -
    diff --git a/netbox/utilities/templatetags/buttons.py b/netbox/utilities/templatetags/buttons.py index ecbcb1143..d8b4987ba 100644 --- a/netbox/utilities/templatetags/buttons.py +++ b/netbox/utilities/templatetags/buttons.py @@ -81,19 +81,19 @@ def import_button(url): @register.inclusion_tag('buttons/export.html', takes_context=True) -def export_button(context, content_type=None): - add_exporttemplate_link = None +def export_button(context, content_type): + user = context['request'].user - if content_type is not None: - user = context['request'].user - export_templates = ExportTemplate.objects.restrict(user, 'view').filter(content_type=content_type) - if user.is_staff and user.has_perm('extras.add_exporttemplate'): - add_exporttemplate_link = f"{reverse('extras:exporttemplate_add')}?content_type={content_type.pk}" - else: - export_templates = [] + # Determine if the "all data" export returns CSV or YAML + data_format = 'YAML' if hasattr(content_type.model_class(), 'to_yaml') else 'CSV' + + # Retrieve all export templates for this model + export_templates = ExportTemplate.objects.restrict(user, 'view').filter(content_type=content_type) return { - 'url_params': context['request'].GET, + 'perms': context['perms'], + 'content_type': content_type, + 'url_params': context['request'].GET.urlencode() if context['request'].GET else '', 'export_templates': export_templates, - 'add_exporttemplate_link': add_exporttemplate_link, + 'data_format': data_format, } From 8d21f80a71c58274459310d1ff8e33a360fdd098 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 3 Feb 2022 10:30:26 -0500 Subject: [PATCH 25/27] Fixes #8315: Fix display of NAT link for primary IPv4 address under device view --- docs/release-notes/version-3.1.md | 1 + netbox/templates/dcim/device.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index d2d1f4018..672d73d20 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -6,6 +6,7 @@ * [#7504](https://github.com/netbox-community/netbox/issues/7504) - Include IP range data under IPAM role views * [#8275](https://github.com/netbox-community/netbox/issues/8275) - Introduce alternative ASDOT-formatted column for ASNs +* [#8315](https://github.com/netbox-community/netbox/issues/8315) - Fix display of NAT link for primary IPv4 address under device view * [#8367](https://github.com/netbox-community/netbox/issues/8367) - Add ASNs to global search function * [#8368](https://github.com/netbox-community/netbox/issues/8368) - Enable controlling the order of custom script form fields with `field_order` * [#8381](https://github.com/netbox-community/netbox/issues/8381) - Add contacts to global search function diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 31f2a18bd..35224a1fc 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -188,7 +188,7 @@ {% if object.primary_ip4 %} {{ object.primary_ip4.address.ip }} {% if object.primary_ip4.nat_inside %} - (NAT for {{ object.primary_ip4.nat_inside.address.ip }}) + (NAT for {{ object.primary_ip4.nat_inside.address.ip }}) {% elif object.primary_ip4.nat_outside %} (NAT: {{ object.primary_ip4.nat_outside.address.ip }}) {% endif %} From c93f0be1b0c64ce87190bfe7816e7cf039c10bd0 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 3 Feb 2022 10:39:39 -0500 Subject: [PATCH 26/27] Closes #8502: Omit [all] from social-auth-core in base requirements --- base_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base_requirements.txt b/base_requirements.txt index aaa9c7f44..0b8365e0e 100644 --- a/base_requirements.txt +++ b/base_requirements.txt @@ -100,7 +100,7 @@ PyYAML # Social authentication framework # https://github.com/python-social-auth/social-core -social-auth-core[all] +social-auth-core # Django app for social-auth-core # https://github.com/python-social-auth/social-app-django From 0f5192f1caffc08119cdeba7acd47f69f2640adf Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 3 Feb 2022 10:51:41 -0500 Subject: [PATCH 27/27] Release v3.1.7 --- .github/ISSUE_TEMPLATE/bug_report.yaml | 2 +- .github/ISSUE_TEMPLATE/feature_request.yaml | 2 +- docs/release-notes/version-3.1.md | 4 ++-- netbox/netbox/settings.py | 2 +- requirements.txt | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 16182af64..1c330e8a8 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -14,7 +14,7 @@ body: attributes: label: NetBox version description: What version of NetBox are you currently running? - placeholder: v3.1.6 + placeholder: v3.1.7 validations: required: true - type: dropdown diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 0be999b16..eea258c09 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -14,7 +14,7 @@ body: attributes: label: NetBox version description: What version of NetBox are you currently running? - placeholder: v3.1.6 + placeholder: v3.1.7 validations: required: true - type: dropdown diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index 672d73d20..27aaa4b4c 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -1,12 +1,11 @@ # NetBox v3.1 -## v3.1.7 (FUTURE) +## v3.1.7 (2022-02-03) ### Enhancements * [#7504](https://github.com/netbox-community/netbox/issues/7504) - Include IP range data under IPAM role views * [#8275](https://github.com/netbox-community/netbox/issues/8275) - Introduce alternative ASDOT-formatted column for ASNs -* [#8315](https://github.com/netbox-community/netbox/issues/8315) - Fix display of NAT link for primary IPv4 address under device view * [#8367](https://github.com/netbox-community/netbox/issues/8367) - Add ASNs to global search function * [#8368](https://github.com/netbox-community/netbox/issues/8368) - Enable controlling the order of custom script form fields with `field_order` * [#8381](https://github.com/netbox-community/netbox/issues/8381) - Add contacts to global search function @@ -18,6 +17,7 @@ ### Bug Fixes +* [#8315](https://github.com/netbox-community/netbox/issues/8315) - Fix display of NAT link for primary IPv4 address under device view * [#8377](https://github.com/netbox-community/netbox/issues/8377) - Fix calculation of absolute cable lengths when specified in fractional units * [#8425](https://github.com/netbox-community/netbox/issues/8425) - Fix exception when viewing change list/records with removed plugins * [#8456](https://github.com/netbox-community/netbox/issues/8456) - Fix redundant display of VRF RD in prefix view diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 199df264c..d69c45fc9 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -19,7 +19,7 @@ from netbox.config import PARAMS # Environment setup # -VERSION = '3.1.7-dev' +VERSION = '3.1.7' # Hostname HOSTNAME = platform.node() diff --git a/requirements.txt b/requirements.txt index 83c1b9f2e..a281a5326 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==3.2.11 +Django==3.2.12 django-cors-headers==3.11.0 django-debug-toolbar==3.2.4 django-filter==21.1 @@ -18,15 +18,15 @@ gunicorn==20.1.0 Jinja2==3.0.3 Markdown==3.3.6 markdown-include==0.6.0 -mkdocs-material==8.1.7 +mkdocs-material==8.1.9 netaddr==0.8.0 Pillow==8.4.0 psycopg2-binary==2.9.3 PyYAML==6.0 social-auth-app-django==5.0.0 -social-auth-core==4.1.0 +social-auth-core==4.2.0 svgwrite==1.4.1 -tablib==3.1.0 +tablib==3.2.0 # Workaround for #7401 jsonschema==3.2.0