From 826a1714c37b94ca26f23936f120cb19981815b7 Mon Sep 17 00:00:00 2001 From: Arthur Date: Thu, 1 Dec 2022 08:52:16 -0800 Subject: [PATCH 1/9] 11041 return power percentage with 1 decimal place --- netbox/utilities/templatetags/helpers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py index 139562355..18abe86b1 100644 --- a/netbox/utilities/templatetags/helpers.py +++ b/netbox/utilities/templatetags/helpers.py @@ -138,7 +138,8 @@ def percentage(x, y): """ if x is None or y is None: return None - return round(x / y * 100) + + return round(x / y * 100, 1) @register.filter() From ee03f3d5846f9342782553245a6750e50eab33e4 Mon Sep 17 00:00:00 2001 From: PieterL75 <74899468+PieterL75@users.noreply.github.com> Date: Fri, 2 Dec 2022 15:27:47 +0100 Subject: [PATCH 2/9] 10748 Add 'Provider' to the circuit termination edit/view (#10939) * Show the Provider of the NetworkProvider * Clean up form fields Co-authored-by: Pieter Lambrecht Co-authored-by: jeremystretch --- netbox/circuits/forms/models.py | 16 ++++++++++++++-- .../circuits/circuittermination_edit.html | 1 + .../circuits/inc/circuit_termination.html | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/netbox/circuits/forms/models.py b/netbox/circuits/forms/models.py index aebdce10e..7dd85aef9 100644 --- a/netbox/circuits/forms/models.py +++ b/netbox/circuits/forms/models.py @@ -158,16 +158,28 @@ class CircuitTerminationForm(NetBoxModelForm): }, required=False ) + provider_network_provider = DynamicModelChoiceField( + queryset=Provider.objects.all(), + required=False, + label='Provider', + initial_params={ + 'networks': 'provider_network' + } + ) provider_network = DynamicModelChoiceField( queryset=ProviderNetwork.objects.all(), + query_params={ + 'provider_id': '$provider_network_provider', + }, required=False ) class Meta: model = CircuitTermination fields = [ - 'provider', 'circuit', 'term_side', 'region', 'site_group', 'site', 'provider_network', 'mark_connected', - 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'description', 'tags', + 'provider', 'circuit', 'term_side', 'region', 'site_group', 'site', 'provider_network_provider', + 'provider_network', 'mark_connected', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', + 'description', 'tags', ] help_texts = { 'port_speed': "Physical circuit speed", diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html index 5196eddf2..f171ecc1b 100644 --- a/netbox/templates/circuits/circuittermination_edit.html +++ b/netbox/templates/circuits/circuittermination_edit.html @@ -32,6 +32,7 @@ {% render_field form.site %}
+ {% render_field form.provider_network_provider %} {% render_field form.provider_network %}
diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html index f4e0ea6ca..160ff940f 100644 --- a/netbox/templates/circuits/inc/circuit_termination.html +++ b/netbox/templates/circuits/inc/circuit_termination.html @@ -81,7 +81,7 @@ {% else %} Provider Network - {{ termination.provider_network|linkify }} + {{ termination.provider_network.provider|linkify }} / {{ termination.provider_network|linkify }} {% endif %} From db7590df1a797de143e9128d880df1a3553c255d Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Fri, 2 Dec 2022 09:30:44 -0500 Subject: [PATCH 3/9] Changelog for #10748, #11041 --- docs/release-notes/version-3.3.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/release-notes/version-3.3.md b/docs/release-notes/version-3.3.md index 2d62fb5bd..c35ac2a64 100644 --- a/docs/release-notes/version-3.3.md +++ b/docs/release-notes/version-3.3.md @@ -2,6 +2,14 @@ ## v3.3.10 (FUTURE) +### Enhancements + +* [#10748](https://github.com/netbox-community/netbox/issues/10748) - Add provider selection field for provider networks to circuit termination edit view + +### Bug Fixes + +* [#11041](https://github.com/netbox-community/netbox/issues/11041) - Correct power utilization percentage precision + --- ## v3.3.9 (2022-11-30) From d4d8d00d01d422adaa13cd1fbd0384ee39ea1d9f Mon Sep 17 00:00:00 2001 From: Renato Almeida de Oliveira Date: Sat, 3 Dec 2022 20:02:51 +0000 Subject: [PATCH 4/9] add distinct method to circuit_count --- netbox/dcim/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index e8a7c66bd..edc9a5ce8 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -335,7 +335,7 @@ class SiteView(generic.ObjectView): scope_id=instance.pk ).count(), 'vlan_count': VLAN.objects.restrict(request.user, 'view').filter(site=instance).count(), - 'circuit_count': Circuit.objects.restrict(request.user, 'view').filter(terminations__site=instance).count(), + 'circuit_count': Circuit.objects.restrict(request.user, 'view').filter(terminations__site=instance).distinct().count(), 'vm_count': VirtualMachine.objects.restrict(request.user, 'view').filter(cluster__site=instance).count(), } locations = Location.objects.add_related_count( From d2d60c06075bae3188bd6a6a28cc1aa15ff18c55 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Dec 2022 15:40:59 -0500 Subject: [PATCH 5/9] Fixes #11087: Fix background color of bottom banner content --- docs/release-notes/version-3.3.md | 2 ++ netbox/templates/base/layout.html | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/release-notes/version-3.3.md b/docs/release-notes/version-3.3.md index c35ac2a64..321cb28b9 100644 --- a/docs/release-notes/version-3.3.md +++ b/docs/release-notes/version-3.3.md @@ -9,6 +9,8 @@ ### Bug Fixes * [#11041](https://github.com/netbox-community/netbox/issues/11041) - Correct power utilization percentage precision +* [#11087](https://github.com/netbox-community/netbox/issues/11087) - Fix background color of bottom banner content +* [#11101](https://github.com/netbox-community/netbox/issues/11101) - Correct circuits count under site view --- diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html index dd0412eac..e4db1a1f5 100644 --- a/netbox/templates/base/layout.html +++ b/netbox/templates/base/layout.html @@ -103,14 +103,14 @@ Blocks: {% block content %}{% endblock %} {% endblock %} + {# Bottom banner #} + {% if config.BANNER_BOTTOM %} +
+ {{ config.BANNER_BOTTOM|safe }} +
+ {% endif %} - {% if config.BANNER_BOTTOM %} -
- {{ config.BANNER_BOTTOM|safe }} -
- {% endif %} - {# BS5 pop-up modals #} {% block modals %}{% endblock %} From 780997a568e79a3b86aa0ad19ef40bde370ee42f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Dec 2022 15:48:22 -0500 Subject: [PATCH 6/9] Closes #11119: Enable filtering L2VPNs by slug --- docs/release-notes/version-3.3.md | 1 + netbox/ipam/filtersets.py | 2 +- netbox/ipam/tests/test_filtersets.py | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-3.3.md b/docs/release-notes/version-3.3.md index 321cb28b9..f5bd53b80 100644 --- a/docs/release-notes/version-3.3.md +++ b/docs/release-notes/version-3.3.md @@ -5,6 +5,7 @@ ### Enhancements * [#10748](https://github.com/netbox-community/netbox/issues/10748) - Add provider selection field for provider networks to circuit termination edit view +* [#11119](https://github.com/netbox-community/netbox/issues/11119) - Enable filtering L2VPNs by slug ### Bug Fixes diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index 3c0ab1ac8..2634dd725 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -960,7 +960,7 @@ class L2VPNFilterSet(NetBoxModelFilterSet, TenancyFilterSet): class Meta: model = L2VPN - fields = ['id', 'identifier', 'name', 'type', 'description'] + fields = ['id', 'identifier', 'name', 'slug', 'type', 'description'] def search(self, queryset, name, value): if not value.strip(): diff --git a/netbox/ipam/tests/test_filtersets.py b/netbox/ipam/tests/test_filtersets.py index 5c4113786..d67994fc1 100644 --- a/netbox/ipam/tests/test_filtersets.py +++ b/netbox/ipam/tests/test_filtersets.py @@ -1501,6 +1501,10 @@ class L2VPNTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'name': ['L2VPN 1', 'L2VPN 2']} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + def test_slug(self): + params = {'slug': ['l2vpn-1', 'l2vpn-2']} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + def test_identifier(self): params = {'identifier': ['65001', '65002']} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) From 0cacac82ee4cb9fb51eb52c931f77b16efc5a7ef Mon Sep 17 00:00:00 2001 From: kkthxbye-code Date: Thu, 8 Dec 2022 12:02:10 +0100 Subject: [PATCH 7/9] Disable sorting by object_repr on ObjectChangeTable --- netbox/extras/tables/tables.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py index 1df5c9487..22da5f52a 100644 --- a/netbox/extras/tables/tables.py +++ b/netbox/extras/tables/tables.py @@ -195,7 +195,8 @@ class ObjectChangeTable(NetBoxTable): object_repr = tables.TemplateColumn( accessor=tables.A('changed_object'), template_code=OBJECTCHANGE_OBJECT, - verbose_name='Object' + verbose_name='Object', + orderable=False ) request_id = tables.TemplateColumn( template_code=OBJECTCHANGE_REQUEST_ID, From 35596ddcbcce6b7287114b6e326d4c50be90151b Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 8 Dec 2022 08:56:57 -0500 Subject: [PATCH 8/9] Closes #10806: Add warning to run deactivate prior to upgrade script --- docs/installation/3-netbox.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/installation/3-netbox.md b/docs/installation/3-netbox.md index 72c054e5b..a2a2d9df3 100644 --- a/docs/installation/3-netbox.md +++ b/docs/installation/3-netbox.md @@ -225,6 +225,9 @@ Once NetBox has been configured, we're ready to proceed with the actual installa * Builds the documentation locally (for offline use) * Aggregate static resource files on disk +!!! warning + If you still have a Python virtual environment active from a previous installation step, disable it now by running the `deactivate` command. This will avoid errors on systems where `sudo` has been configured to preserve the user's current environment. + ```no-highlight sudo /opt/netbox/upgrade.sh ``` From ab9c253310dc36dca2aa685dc97cf9d43a518d5e Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 8 Dec 2022 08:59:26 -0500 Subject: [PATCH 9/9] Fixes #11128: Disable ordering changelog table by object to avoid exception --- docs/release-notes/version-3.3.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/version-3.3.md b/docs/release-notes/version-3.3.md index f5bd53b80..4dd717f9b 100644 --- a/docs/release-notes/version-3.3.md +++ b/docs/release-notes/version-3.3.md @@ -12,6 +12,7 @@ * [#11041](https://github.com/netbox-community/netbox/issues/11041) - Correct power utilization percentage precision * [#11087](https://github.com/netbox-community/netbox/issues/11087) - Fix background color of bottom banner content * [#11101](https://github.com/netbox-community/netbox/issues/11101) - Correct circuits count under site view +* [#11128](https://github.com/netbox-community/netbox/issues/11128) - Disable ordering changelog table by object to avoid exception ---