From 0c8d45f679806b21939f60700a8a70d47064ef0e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 4 Sep 2020 15:57:28 -0400 Subject: [PATCH 01/26] Post-release version bump --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index c48db1493..8a8c47c75 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -16,7 +16,7 @@ from django.core.validators import URLValidator # Environment setup # -VERSION = '2.9.3' +VERSION = '2.9.4-dev' # Hostname HOSTNAME = platform.node() From 695e9ec5d7ce3915cf6caf8f4131b5dc1d116747 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 9 Sep 2020 09:52:57 -0400 Subject: [PATCH 02/26] Fixes #5111: Allow use of tuples when specifying ObjectVar query_params --- docs/release-notes/version-2.9.md | 8 ++++++++ netbox/utilities/forms/widgets.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index a3d500094..3d68b10ba 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -1,5 +1,13 @@ # NetBox v2.9 +## v2.9.4 (FUTURE) + +### Bug Fixes + +* [#5111](https://github.com/netbox-community/netbox/issues/5111) - Allow use of tuples when specifying ObjectVar `query_params` + +--- + ## v2.9.3 (2020-09-04) ### Enhancements diff --git a/netbox/utilities/forms/widgets.py b/netbox/utilities/forms/widgets.py index 9996f7d11..cd6fb0fbb 100644 --- a/netbox/utilities/forms/widgets.py +++ b/netbox/utilities/forms/widgets.py @@ -141,7 +141,7 @@ class APISelect(SelectWithDisabled): key = f'data-query-param-{name}' values = json.loads(self.attrs.get(key, '[]')) - if type(value) is list: + if type(value) in (list, tuple): values.extend([str(v) for v in value]) else: values.append(str(value)) From 150965046269b5d0f2145f7bf8447ba2e35e6ed1 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 9 Sep 2020 10:00:50 -0400 Subject: [PATCH 03/26] Closes #5107: Add note about dropping backward compatibility for old REDIS configuration format --- docs/release-notes/version-2.9.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index 3d68b10ba..dbafa21ac 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -129,6 +129,7 @@ Two new REST API endpoints have been added to facilitate the retrieval and manip * If using NetBox's built-in remote authentication backend, update `REMOTE_AUTH_BACKEND` to `'netbox.authentication.RemoteUserBackend'`, as the authentication class has moved. * If using LDAP authentication, set `REMOTE_AUTH_BACKEND` to `'netbox.authentication.LDAPBackend'`. (LDAP configuration parameters in `ldap_config.py` remain unchanged.) * `REMOTE_AUTH_DEFAULT_PERMISSIONS` now takes a dictionary rather than a list. This is a mapping of permission names to a dictionary of constraining attributes, or `None`. For example, `['dcim.add_site', 'dcim.change_site']` would become `{'dcim.add_site': None, 'dcim.change_site': None}`. +* Backward compatibility for the old `webhooks` Redis queue name has been dropped. Ensure that your `REDIS` configuration parameter specifies both the `tasks` and `caching` databases. ### REST API Changes From c891f43b144c82e8d7891b57ca113d5f8f1f156a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 9 Sep 2020 10:29:17 -0400 Subject: [PATCH 04/26] Fixes #5050: Fix potential failure on 0016_replicate_interfaces schema migration from old release --- docs/release-notes/version-2.9.md | 1 + netbox/virtualization/migrations/0016_replicate_interfaces.py | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index dbafa21ac..a38e945f6 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -4,6 +4,7 @@ ### Bug Fixes +* [#5050](https://github.com/netbox-community/netbox/issues/5050) - Fix potential failure on `0016_replicate_interfaces` schema migration from old release * [#5111](https://github.com/netbox-community/netbox/issues/5111) - Allow use of tuples when specifying ObjectVar `query_params` --- diff --git a/netbox/virtualization/migrations/0016_replicate_interfaces.py b/netbox/virtualization/migrations/0016_replicate_interfaces.py index a9c474083..585f5b80c 100644 --- a/netbox/virtualization/migrations/0016_replicate_interfaces.py +++ b/netbox/virtualization/migrations/0016_replicate_interfaces.py @@ -83,6 +83,7 @@ def replicate_interfaces(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ + ('dcim', '0082_3569_interface_fields'), ('ipam', '0037_ipaddress_assignment'), ('virtualization', '0015_vminterface'), ] From 47a6fc19cab1a3f53f80855e1f6fa9288fc8cbaf Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 9 Sep 2020 11:47:21 -0400 Subject: [PATCH 05/26] Fixes #5109: Fix representation of custom choice field values for webhook data --- docs/release-notes/version-2.9.md | 1 + netbox/extras/api/customfields.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index a38e945f6..19789149b 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -5,6 +5,7 @@ ### Bug Fixes * [#5050](https://github.com/netbox-community/netbox/issues/5050) - Fix potential failure on `0016_replicate_interfaces` schema migration from old release +* [#5109](https://github.com/netbox-community/netbox/issues/5109) - Fix representation of custom choice field values for webhook data * [#5111](https://github.com/netbox-community/netbox/issues/5111) - Allow use of tuples when specifying ObjectVar `query_params` --- diff --git a/netbox/extras/api/customfields.py b/netbox/extras/api/customfields.py index f096fb4a6..ba59e529a 100644 --- a/netbox/extras/api/customfields.py +++ b/netbox/extras/api/customfields.py @@ -158,7 +158,7 @@ class CustomFieldModelSerializer(ValidatedModelSerializer): instance.custom_fields = {} for field in custom_fields: value = instance.cf.get(field.name) - if field.type == CustomFieldTypeChoices.TYPE_SELECT and value: + if field.type == CustomFieldTypeChoices.TYPE_SELECT and type(value) is CustomFieldChoice: instance.custom_fields[field.name] = CustomFieldChoiceSerializer(value).data else: instance.custom_fields[field.name] = value From 4466458076b4cfd1b3d97a234d7f34ef9e191e8c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 9 Sep 2020 13:43:10 -0400 Subject: [PATCH 06/26] Fixes #5118: Specifying an empty list of tags should clear assigned tags (REST API) --- docs/release-notes/version-2.9.md | 1 + netbox/extras/api/serializers.py | 16 +++++++++++----- netbox/extras/tests/test_tags.py | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index 19789149b..33f372f47 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -7,6 +7,7 @@ * [#5050](https://github.com/netbox-community/netbox/issues/5050) - Fix potential failure on `0016_replicate_interfaces` schema migration from old release * [#5109](https://github.com/netbox-community/netbox/issues/5109) - Fix representation of custom choice field values for webhook data * [#5111](https://github.com/netbox-community/netbox/issues/5111) - Allow use of tuples when specifying ObjectVar `query_params` +* [#5118](https://github.com/netbox-community/netbox/issues/5118) - Specifying an empty list of tags should clear assigned tags (REST API) --- diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py index aa8f6ba69..3cc2d1991 100644 --- a/netbox/extras/api/serializers.py +++ b/netbox/extras/api/serializers.py @@ -101,24 +101,30 @@ class TaggedObjectSerializer(serializers.Serializer): tags = NestedTagSerializer(many=True, required=False) def create(self, validated_data): - tags = validated_data.pop('tags', []) + tags = validated_data.pop('tags', None) instance = super().create(validated_data) - return self._save_tags(instance, tags) + if tags is not None: + return self._save_tags(instance, tags) + return instance def update(self, instance, validated_data): - tags = validated_data.pop('tags', []) + tags = validated_data.pop('tags', None) # Cache tags on instance for change logging - instance._tags = tags + instance._tags = tags or [] instance = super().update(instance, validated_data) - return self._save_tags(instance, tags) + if tags is not None: + return self._save_tags(instance, tags) + return instance def _save_tags(self, instance, tags): if tags: instance.tags.set(*[t.name for t in tags]) + else: + instance.tags.clear() return instance diff --git a/netbox/extras/tests/test_tags.py b/netbox/extras/tests/test_tags.py index 694cd77d9..39aae49dc 100644 --- a/netbox/extras/tests/test_tags.py +++ b/netbox/extras/tests/test_tags.py @@ -59,3 +59,21 @@ class TaggedItemTest(APITestCase): sorted([t.name for t in site.tags.all()]), sorted(["Foo", "Bar", "New Tag"]) ) + + def test_clear_tagged_item(self): + site = Site.objects.create( + name='Test Site', + slug='test-site' + ) + site.tags.add("Foo", "Bar", "Baz") + data = { + 'tags': [] + } + self.add_permissions('dcim.change_site') + url = reverse('dcim-api:site-detail', kwargs={'pk': site.pk}) + + response = self.client.patch(url, data, format='json', **self.header) + self.assertHttpStatus(response, status.HTTP_200_OK) + self.assertEqual(len(response.data['tags']), 0) + site = Site.objects.get(pk=response.data['id']) + self.assertEqual(len(site.tags.all()), 0) From c5e82a389545ae5516577e452ddd9cb32fc0a185 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Thu, 10 Sep 2020 17:43:41 -0400 Subject: [PATCH 07/26] fixes #5108 - correct the runreport management command to work with JobResults model --- .../extras/management/commands/runreport.py | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/netbox/extras/management/commands/runreport.py b/netbox/extras/management/commands/runreport.py index efc789021..b751118e0 100644 --- a/netbox/extras/management/commands/runreport.py +++ b/netbox/extras/management/commands/runreport.py @@ -1,7 +1,12 @@ +import time + +from django.contrib.contenttypes.models import ContentType from django.core.management.base import BaseCommand from django.utils import timezone -from extras.reports import get_reports +from extras.choices import JobResultStatusChoices +from extras.models import JobResult +from extras.reports import get_reports, run_report class Command(BaseCommand): @@ -24,11 +29,29 @@ class Command(BaseCommand): self.stdout.write( "[{:%H:%M:%S}] Running {}...".format(timezone.now(), report.full_name) ) - report.run() + + report_content_type = ContentType.objects.get(app_label='extras', model='report') + job_result = JobResult.enqueue_job( + run_report, + report.full_name, + report_content_type, + None + ) + + # Wait on the job to finish + while job_result.status not in JobResultStatusChoices.TERMINAL_STATE_CHOICES: + time.sleep(1) + job_result = JobResult.objects.get(pk=job_result.pk) # Report on success/failure - status = self.style.ERROR('FAILED') if report.failed else self.style.SUCCESS('SUCCESS') - for test_name, attrs in report.result.data.items(): + if job_result.status == JobResultStatusChoices.STATUS_FAILED: + status = self.style.ERROR('FAILED') + elif job_result == JobResultStatusChoices.STATUS_ERRORED: + status = self.style.ERROR('ERRORED') + else: + status = self.style.SUCCESS('SUCCESS') + + for test_name, attrs in job_result.data.items(): self.stdout.write( "\t{}: {} success, {} info, {} warning, {} failure".format( test_name, attrs['success'], attrs['info'], attrs['warning'], attrs['failure'] @@ -37,6 +60,9 @@ class Command(BaseCommand): self.stdout.write( "[{:%H:%M:%S}] {}: {}".format(timezone.now(), report.full_name, status) ) + self.stdout.write( + "[{:%H:%M:%S}] {}: Duration {}".format(timezone.now(), report.full_name, job_result.duration) + ) # Wrap things up self.stdout.write( From b1b63513e79d6b253492edbadab5e92c217f4e41 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 14 Sep 2020 10:41:04 -0400 Subject: [PATCH 08/26] Changelog for #5108 --- docs/release-notes/version-2.9.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index 33f372f47..d469e4c0f 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -6,6 +6,7 @@ * [#5050](https://github.com/netbox-community/netbox/issues/5050) - Fix potential failure on `0016_replicate_interfaces` schema migration from old release * [#5109](https://github.com/netbox-community/netbox/issues/5109) - Fix representation of custom choice field values for webhook data +* [#5108](https://github.com/netbox-community/netbox/issues/5108) - Fix execution of reports via CLI * [#5111](https://github.com/netbox-community/netbox/issues/5111) - Allow use of tuples when specifying ObjectVar `query_params` * [#5118](https://github.com/netbox-community/netbox/issues/5118) - Specifying an empty list of tags should clear assigned tags (REST API) From df6ad680ce300733157cb100f7627d45b1cb4db4 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 14 Sep 2020 14:22:21 -0400 Subject: [PATCH 09/26] Closes #1755: Toggle order in which rack elevations are displayed --- docs/release-notes/version-2.9.md | 4 ++++ netbox/dcim/views.py | 6 ++++++ netbox/templates/dcim/rack_elevation_list.html | 12 +++++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index d469e4c0f..093dc34a7 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -2,6 +2,10 @@ ## v2.9.4 (FUTURE) +### Enhancements + +* [#1755](https://github.com/netbox-community/netbox/issues/1755) - Toggle order in which rack elevations are displayed + ### Bug Fixes * [#5050](https://github.com/netbox-community/netbox/issues/5050) - Fix potential failure on `0016_replicate_interfaces` schema migration from old release diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 9f4dcc90e..ab84ba64b 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -310,6 +310,11 @@ class RackElevationListView(ObjectListView): racks = filters.RackFilterSet(request.GET, self.queryset).qs total_count = racks.count() + # Determine ordering + reverse = bool(request.GET.get('reverse', False)) + if reverse: + racks = racks.reverse() + # Pagination per_page = request.GET.get('per_page', settings.PAGINATE_COUNT) page_number = request.GET.get('page', 1) @@ -330,6 +335,7 @@ class RackElevationListView(ObjectListView): 'paginator': paginator, 'page': page, 'total_count': total_count, + 'reverse': reverse, 'rack_face': rack_face, 'filter_form': forms.RackElevationFilterForm(request.GET), }) diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html index e4949eb17..c39bcae75 100644 --- a/netbox/templates/dcim/rack_elevation_list.html +++ b/netbox/templates/dcim/rack_elevation_list.html @@ -3,12 +3,18 @@ {% load static %} {% block content %} -
+

{% block title %}Rack Elevations{% endblock %}

From 03b207d1542e8ede4fd29035bb41b640f4d018d9 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 16 Sep 2020 11:10:30 -0400 Subject: [PATCH 10/26] Fixes #5105: Validation should fail when reassigning a primary IP from device to VM --- docs/release-notes/version-2.9.md | 1 + netbox/ipam/forms.py | 13 ++++--------- netbox/ipam/models.py | 22 +++++----------------- 3 files changed, 10 insertions(+), 26 deletions(-) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index 093dc34a7..6d4f56ed8 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -9,6 +9,7 @@ ### Bug Fixes * [#5050](https://github.com/netbox-community/netbox/issues/5050) - Fix potential failure on `0016_replicate_interfaces` schema migration from old release +* [#5105](https://github.com/netbox-community/netbox/issues/5105) - Validation should fail when reassigning a primary IP from device to VM * [#5109](https://github.com/netbox-community/netbox/issues/5109) - Fix representation of custom choice field values for webhook data * [#5108](https://github.com/netbox-community/netbox/issues/5108) - Fix execution of reports via CLI * [#5111](https://github.com/netbox-community/netbox/issues/5111) - Allow use of tuples when specifying ObjectVar `query_params` diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index 1e8e9038a..75a4caf10 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -641,11 +641,11 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel self.initial['primary_for_parent'] = True def clean(self): - super().clean() # Cannot select both a device interface and a VM interface if self.cleaned_data.get('interface') and self.cleaned_data.get('vminterface'): raise forms.ValidationError("Cannot select both a device interface and a virtual machine interface") + self.instance.assigned_object = self.cleaned_data.get('interface') or self.cleaned_data.get('vminterface') # Primary IP assignment is only available if an interface has been assigned. interface = self.cleaned_data.get('interface') or self.cleaned_data.get('vminterface') @@ -655,26 +655,21 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel ) def save(self, *args, **kwargs): - - # Set assigned object - interface = self.cleaned_data.get('interface') or self.cleaned_data.get('vminterface') - if interface: - self.instance.assigned_object = interface - ipaddress = super().save(*args, **kwargs) # Assign/clear this IPAddress as the primary for the associated Device/VirtualMachine. + interface = self.instance.assigned_object if interface and self.cleaned_data['primary_for_parent']: if ipaddress.address.version == 4: interface.parent.primary_ip4 = ipaddress else: - interface.primary_ip6 = ipaddress + interface.parent.primary_ip6 = ipaddress interface.parent.save() elif interface and ipaddress.address.version == 4 and interface.parent.primary_ip4 == ipaddress: interface.parent.primary_ip4 = None interface.parent.save() elif interface and ipaddress.address.version == 6 and interface.parent.primary_ip6 == ipaddress: - interface.parent.primary_ip4 = None + interface.parent.primary_ip6 = None interface.parent.save() return ipaddress diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 832e09330..c7955bcfa 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -726,30 +726,18 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel): }) # Check for primary IP assignment that doesn't match the assigned device/VM - if self.pk and type(self.assigned_object) is Interface: + if self.pk: device = Device.objects.filter(Q(primary_ip4=self) | Q(primary_ip6=self)).first() if device: - if self.assigned_object is None: + if getattr(self.assigned_object, 'device', None) != device: raise ValidationError({ - 'interface': f"IP address is primary for device {device} but not assigned to an interface" + 'interface': f"IP address is primary for device {device} but not assigned to it!" }) - elif self.assigned_object.device != device: - raise ValidationError({ - 'interface': f"IP address is primary for device {device} but assigned to " - f"{self.assigned_object.device} ({self.assigned_object})" - }) - elif self.pk and type(self.assigned_object) is VMInterface: vm = VirtualMachine.objects.filter(Q(primary_ip4=self) | Q(primary_ip6=self)).first() if vm: - if self.assigned_object is None: + if getattr(self.assigned_object, 'virtual_machine', None) != vm: raise ValidationError({ - 'vminterface': f"IP address is primary for virtual machine {vm} but not assigned to an " - f"interface" - }) - elif self.assigned_object.virtual_machine != vm: - raise ValidationError({ - 'vminterface': f"IP address is primary for virtual machine {vm} but assigned to " - f"{self.assigned_object.virtual_machine} ({self.assigned_object})" + 'vminterface': f"IP address is primary for virtual machine {vm} but not assigned to it!" }) # Validate IP status selection From 9d30712fb26503092e2ecd261c348f908213580b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 16 Sep 2020 11:20:00 -0400 Subject: [PATCH 11/26] Changelog for #5133 (fixed in #5105) --- docs/release-notes/version-2.9.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index 6d4f56ed8..55c66cb6a 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -14,6 +14,7 @@ * [#5108](https://github.com/netbox-community/netbox/issues/5108) - Fix execution of reports via CLI * [#5111](https://github.com/netbox-community/netbox/issues/5111) - Allow use of tuples when specifying ObjectVar `query_params` * [#5118](https://github.com/netbox-community/netbox/issues/5118) - Specifying an empty list of tags should clear assigned tags (REST API) +* [#5133](https://github.com/netbox-community/netbox/issues/5133) - Fix disassociation of an IP address from a VM interface --- From 4d9da4a1f8c261e4aa6dae04a3cbcfb20a443c1f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 16 Sep 2020 12:44:49 -0400 Subject: [PATCH 12/26] Closes #5134: Display full hierarchy in breadcrumbs for sites/racks --- docs/release-notes/version-2.9.md | 1 + netbox/templates/dcim/device.html | 15 +++++++-------- netbox/templates/dcim/rack.html | 11 ++++++++++- netbox/templates/dcim/site.html | 4 ++-- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index 55c66cb6a..fd7a99ff0 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -5,6 +5,7 @@ ### Enhancements * [#1755](https://github.com/netbox-community/netbox/issues/1755) - Toggle order in which rack elevations are displayed +* [#5134](https://github.com/netbox-community/netbox/issues/5134) - Display full hierarchy in breadcrumbs for sites/racks ### Bug Fixes diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index e97893c30..34d28179b 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -11,11 +11,8 @@
    -
  1. {{ device.site }}
    2. - {% if device.rack %} -
  2. Racks
    3. -
  3. {{ device.rack }}
    4. - {% endif %} +
  4. Devices
    5. +
  5. {{ device.site }}
    6. {% if device.parent_bay %}
  6. {{ device.parent_bay.device }}
  7. {{ device.parent_bay }}
    8. @@ -101,7 +98,7 @@ {% if perms.dcim.napalm_read_device %} @@ -151,8 +148,10 @@ {% if device.rack %} {% if device.rack.group %} - {{ device.rack.group }} - + {% for group in device.rack.group.get_ancestors %} + {{ group }} + {% endfor %} + {{ device.rack.group }} {% endif %} {{ device.rack }} {% else %} diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 5ead0ac4f..4cf3b9018 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -11,6 +11,12 @@
    1. Racks
    2. {{ rack.site }}
      3. + {% if rack.group %} + {% for group in rack.group.get_ancestors %} +
    3. {{ group }}
      4. + {% endfor %} +
    4. {{ rack.group }}
      5. + {% endif %}
    5. {{ rack }}
@@ -87,7 +93,10 @@ Group {% if rack.group %} - {{ rack.group }} + {% for group in rack.group.get_ancestors %} + {{ group }} + {% endfor %} + {{ rack.group }} {% else %} None {% endif %} diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index d6c21bf92..f5823f721 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -12,7 +12,7 @@
  1. Sites
    2. {% if site.region %} - {% for region in site.region.get_ancestors.unrestricted %} + {% for region in site.region.get_ancestors %}
  2. {{ region }}
    3. {% endfor %}
  3. {{ site.region }}
    4. @@ -86,7 +86,7 @@ Region {% if site.region %} - {% for region in site.region.get_ancestors.unrestricted %} + {% for region in site.region.get_ancestors %} {{ region }} {% endfor %} From e983f44fd327961dbacbe183eacdcdf45a73521a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 16 Sep 2020 12:53:11 -0400 Subject: [PATCH 13/26] Closes #5128: Increase maximum rear port positions from 64 to 1024 --- docs/models/dcim/rearporttemplate.md | 2 +- docs/release-notes/version-2.9.md | 1 + netbox/dcim/constants.py | 2 +- .../migrations/0116_rearport_max_positions.py | 34 +++++++++++++++++++ .../dcim/models/device_component_templates.py | 10 ++++-- netbox/dcim/models/device_components.py | 10 ++++-- 6 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 netbox/dcim/migrations/0116_rearport_max_positions.py diff --git a/docs/models/dcim/rearporttemplate.md b/docs/models/dcim/rearporttemplate.md index 71d9a200b..01ba02ac0 100644 --- a/docs/models/dcim/rearporttemplate.md +++ b/docs/models/dcim/rearporttemplate.md @@ -1,3 +1,3 @@ ## Rear Port Templates -A template for a rear-facing pass-through port that will be created on all instantiations of the parent device type. Each rear port may have a physical type and one or more front port templates assigned to it. The number of positions associated with a rear port determines how many front ports can be assigned to it (the maximum is 64). +A template for a rear-facing pass-through port that will be created on all instantiations of the parent device type. Each rear port may have a physical type and one or more front port templates assigned to it. The number of positions associated with a rear port determines how many front ports can be assigned to it (the maximum is 1024). diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index fd7a99ff0..5472188ba 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -5,6 +5,7 @@ ### Enhancements * [#1755](https://github.com/netbox-community/netbox/issues/1755) - Toggle order in which rack elevations are displayed +* [#5128](https://github.com/netbox-community/netbox/issues/5128) - Increase maximum rear port positions from 64 to 1024 * [#5134](https://github.com/netbox-community/netbox/issues/5134) - Display full hierarchy in breadcrumbs for sites/racks ### Bug Fixes diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index 66768515c..961c458e0 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -18,7 +18,7 @@ RACK_ELEVATION_LEGEND_WIDTH_DEFAULT = 30 # REARPORT_POSITIONS_MIN = 1 -REARPORT_POSITIONS_MAX = 64 +REARPORT_POSITIONS_MAX = 1024 # diff --git a/netbox/dcim/migrations/0116_rearport_max_positions.py b/netbox/dcim/migrations/0116_rearport_max_positions.py new file mode 100644 index 000000000..a03f4e3d5 --- /dev/null +++ b/netbox/dcim/migrations/0116_rearport_max_positions.py @@ -0,0 +1,34 @@ +# Generated by Django 3.1 on 2020-09-16 16:51 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0115_rackreservation_order'), + ] + + operations = [ + migrations.AlterField( + model_name='frontport', + name='rear_port_position', + field=models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(1024)]), + ), + migrations.AlterField( + model_name='frontporttemplate', + name='rear_port_position', + field=models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(1024)]), + ), + migrations.AlterField( + model_name='rearport', + name='positions', + field=models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(1024)]), + ), + migrations.AlterField( + model_name='rearporttemplate', + name='positions', + field=models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(1024)]), + ), + ] diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py index 492fe3762..7a94b3e1b 100644 --- a/netbox/dcim/models/device_component_templates.py +++ b/netbox/dcim/models/device_component_templates.py @@ -264,7 +264,10 @@ class FrontPortTemplate(ComponentTemplateModel): ) rear_port_position = models.PositiveSmallIntegerField( default=1, - validators=[MinValueValidator(1), MaxValueValidator(64)] + validators=[ + MinValueValidator(REARPORT_POSITIONS_MIN), + MaxValueValidator(REARPORT_POSITIONS_MAX) + ] ) class Meta: @@ -315,7 +318,10 @@ class RearPortTemplate(ComponentTemplateModel): ) positions = models.PositiveSmallIntegerField( default=1, - validators=[MinValueValidator(1), MaxValueValidator(64)] + validators=[ + MinValueValidator(REARPORT_POSITIONS_MIN), + MaxValueValidator(REARPORT_POSITIONS_MAX) + ] ) class Meta: diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index d7e077a16..18ca5cf3e 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -809,7 +809,10 @@ class FrontPort(CableTermination, ComponentModel): ) rear_port_position = models.PositiveSmallIntegerField( default=1, - validators=[MinValueValidator(1), MaxValueValidator(64)] + validators=[ + MinValueValidator(REARPORT_POSITIONS_MIN), + MaxValueValidator(REARPORT_POSITIONS_MAX) + ] ) tags = TaggableManager(through=TaggedItem) @@ -864,7 +867,10 @@ class RearPort(CableTermination, ComponentModel): ) positions = models.PositiveSmallIntegerField( default=1, - validators=[MinValueValidator(1), MaxValueValidator(64)] + validators=[ + MinValueValidator(REARPORT_POSITIONS_MIN), + MaxValueValidator(REARPORT_POSITIONS_MAX) + ] ) tags = TaggableManager(through=TaggedItem) From 43f1fbf5b33035bf972cce5e011b1ac1ecc3ba72 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 16 Sep 2020 13:07:55 -0400 Subject: [PATCH 14/26] Fixes #5136: Fix exception when bulk editing interface 802.1Q mode --- docs/release-notes/version-2.9.md | 1 + netbox/utilities/views.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index 5472188ba..6e3919542 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -17,6 +17,7 @@ * [#5111](https://github.com/netbox-community/netbox/issues/5111) - Allow use of tuples when specifying ObjectVar `query_params` * [#5118](https://github.com/netbox-community/netbox/issues/5118) - Specifying an empty list of tags should clear assigned tags (REST API) * [#5133](https://github.com/netbox-community/netbox/issues/5133) - Fix disassociation of an IP address from a VM interface +* [#5136](https://github.com/netbox-community/netbox/issues/5136) - Fix exception when bulk editing interface 802.1Q mode --- diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index 079068648..5ae839eff 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -945,7 +945,7 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): # ManyToManyFields elif isinstance(model_field, ManyToManyField): - if form.cleaned_data[name].count() > 0: + if form.cleaned_data[name]: getattr(obj, name).set(form.cleaned_data[name]) # Normal fields elif form.cleaned_data[name] not in (None, ''): From 2bc524a2ee82355395d2768e1ba3def55d7d13b0 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 16 Sep 2020 14:25:07 -0400 Subject: [PATCH 15/26] Standardize usage of BooleanColumn --- netbox/ipam/tables.py | 2 +- netbox/utilities/tables.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index d7a64f7db..afdeb5515 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -415,7 +415,7 @@ class IPAddressDetailTable(IPAddressTable): tenant = tables.TemplateColumn( template_code=COL_TENANT ) - assigned = tables.BooleanColumn( + assigned = BooleanColumn( accessor='assigned_object_id', verbose_name='Assigned' ) diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py index 6df6b2e26..d1f17ff1e 100644 --- a/netbox/utilities/tables.py +++ b/netbox/utilities/tables.py @@ -114,12 +114,12 @@ class BooleanColumn(tables.Column): character. """ def render(self, value): - if value is True: + if value: rendered = '' - elif value is False: - rendered = '' - else: + elif value is None: rendered = '—' + else: + rendered = '' return mark_safe(rendered) From 12402f4c309c8385256fd0c148d074a2ef3c27a6 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 21 Sep 2020 15:14:44 -0400 Subject: [PATCH 16/26] Fixes #5156: Add missing "add" button to rack reservations list --- docs/release-notes/version-2.9.md | 1 + netbox/dcim/views.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index 6e3919542..e6f1e6d5f 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -18,6 +18,7 @@ * [#5118](https://github.com/netbox-community/netbox/issues/5118) - Specifying an empty list of tags should clear assigned tags (REST API) * [#5133](https://github.com/netbox-community/netbox/issues/5133) - Fix disassociation of an IP address from a VM interface * [#5136](https://github.com/netbox-community/netbox/issues/5136) - Fix exception when bulk editing interface 802.1Q mode +* [#5156](https://github.com/netbox-community/netbox/issues/5156) - Add missing "add" button to rack reservations list --- diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index ab84ba64b..77ca0b534 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -414,7 +414,6 @@ class RackReservationListView(ObjectListView): filterset = filters.RackReservationFilterSet filterset_form = forms.RackReservationFilterForm table = tables.RackReservationTable - action_buttons = ('export',) class RackReservationView(ObjectView): From d540728f50e583f3bbf52a21efcbcea94be9b8dd Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 21 Sep 2020 15:26:32 -0400 Subject: [PATCH 17/26] Closes #5149: Add rack group field to device edit form --- docs/release-notes/version-2.9.md | 1 + netbox/dcim/forms.py | 11 ++++++++++- netbox/templates/dcim/device_edit.html | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index e6f1e6d5f..7defe5317 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -7,6 +7,7 @@ * [#1755](https://github.com/netbox-community/netbox/issues/1755) - Toggle order in which rack elevations are displayed * [#5128](https://github.com/netbox-community/netbox/issues/5128) - Increase maximum rear port positions from 64 to 1024 * [#5134](https://github.com/netbox-community/netbox/issues/5134) - Display full hierarchy in breadcrumbs for sites/racks +* [#5149](https://github.com/netbox-community/netbox/issues/5149) - Add rack group field to device edit form ### Bug Fixes diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 43f77de51..d3c385121 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1680,12 +1680,21 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm): 'region_id': '$region' } ) + rack_group = DynamicModelChoiceField( + queryset=RackGroup.objects.all(), + required=False, + display_field='display_name', + query_params={ + 'site_id': '$site' + } + ) rack = DynamicModelChoiceField( queryset=Rack.objects.all(), required=False, display_field='display_name', query_params={ - 'site_id': '$site' + 'site_id': '$site', + 'group_id': '$rack_group', } ) position = forms.TypedChoiceField( diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html index 0f1ac2886..f1b68d063 100644 --- a/netbox/templates/dcim/device_edit.html +++ b/netbox/templates/dcim/device_edit.html @@ -23,6 +23,7 @@
    {% render_field form.region %} {% render_field form.site %} + {% render_field form.rack_group %} {% render_field form.rack %} {% if obj.device_type.is_child_device and obj.parent_bay %}
    From afa1449f89e88e56a8502684f30893bf3a3eec76 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 22 Sep 2020 16:17:39 -0400 Subject: [PATCH 18/26] Fixes #5167: Support filtering ObjectChanges by multiple users --- docs/release-notes/version-2.9.md | 1 + netbox/extras/filters.py | 14 ++++++++++++-- netbox/extras/forms.py | 3 ++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index 7defe5317..101788aff 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -20,6 +20,7 @@ * [#5133](https://github.com/netbox-community/netbox/issues/5133) - Fix disassociation of an IP address from a VM interface * [#5136](https://github.com/netbox-community/netbox/issues/5136) - Fix exception when bulk editing interface 802.1Q mode * [#5156](https://github.com/netbox-community/netbox/issues/5156) - Add missing "add" button to rack reservations list +* [#5167](https://github.com/netbox-community/netbox/issues/5167) - Support filtering ObjectChanges by multiple users --- diff --git a/netbox/extras/filters.py b/netbox/extras/filters.py index 1af98e885..865c693e7 100644 --- a/netbox/extras/filters.py +++ b/netbox/extras/filters.py @@ -1,4 +1,5 @@ import django_filters +from django.contrib.auth.models import User from django.contrib.contenttypes.models import ContentType from django.db.models import Q @@ -259,12 +260,21 @@ class ObjectChangeFilterSet(BaseFilterSet): label='Search', ) time = django_filters.DateTimeFromToRangeFilter() + user_id = django_filters.ModelMultipleChoiceFilter( + queryset=User.objects.all(), + label='User (ID)', + ) + user = django_filters.ModelMultipleChoiceFilter( + field_name='user__username', + queryset=User.objects.all(), + to_field_name='username', + label='User name', + ) class Meta: model = ObjectChange fields = [ - 'id', 'user', 'user_name', 'request_id', 'action', 'changed_object_type', 'changed_object_id', - 'object_repr', + 'id', 'user_name', 'request_id', 'action', 'changed_object_type', 'changed_object_id', 'object_repr', ] def search(self, queryset, name, value): diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py index 90ec828c7..c88e66262 100644 --- a/netbox/extras/forms.py +++ b/netbox/extras/forms.py @@ -397,10 +397,11 @@ class ObjectChangeFilterForm(BootstrapMixin, forms.Form): required=False, widget=StaticSelect2() ) - user = DynamicModelMultipleChoiceField( + user_id = DynamicModelMultipleChoiceField( queryset=User.objects.all(), required=False, display_field='username', + label='User', widget=APISelectMultiple( api_url='/api/users/users/', ) From e404f4efd236015245197f66e831e444e52af0e3 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 23 Sep 2020 09:46:52 -0400 Subject: [PATCH 19/26] Closes #5164: Show total rack count per rack group under site view --- docs/release-notes/version-2.9.md | 1 + netbox/dcim/views.py | 10 +++++++--- netbox/templates/dcim/site.html | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index 101788aff..769705358 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -8,6 +8,7 @@ * [#5128](https://github.com/netbox-community/netbox/issues/5128) - Increase maximum rear port positions from 64 to 1024 * [#5134](https://github.com/netbox-community/netbox/issues/5134) - Display full hierarchy in breadcrumbs for sites/racks * [#5149](https://github.com/netbox-community/netbox/issues/5149) - Add rack group field to device edit form +* [#5164](https://github.com/netbox-community/netbox/issues/5164) - Show total rack count per rack group under site view ### Bug Fixes diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 77ca0b534..dece687ee 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -169,9 +169,13 @@ class SiteView(ObjectView): 'circuit_count': Circuit.objects.restrict(request.user, 'view').filter(terminations__site=site).count(), 'vm_count': VirtualMachine.objects.restrict(request.user, 'view').filter(cluster__site=site).count(), } - rack_groups = RackGroup.objects.restrict(request.user, 'view').filter(site=site).annotate( - rack_count=Count('racks') - ) + rack_groups = RackGroup.objects.add_related_count( + RackGroup.objects.all(), + Rack, + 'group', + 'rack_count', + cumulative=True + ).restrict(request.user, 'view').filter(site=site) show_graphs = Graph.objects.filter(type__model='site').exists() return render(request, 'dcim/site.html', { diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index f5823f721..781ca9fab 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -255,7 +255,7 @@ {% for rg in rack_groups %} - +
    {{ rg }} {{ rg }} {{ rg.rack_count }} From c0b94e4e8e861c0287e1a45be95211d1ec50e78a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 23 Sep 2020 10:16:22 -0400 Subject: [PATCH 20/26] Fixes #5137: Correct permission for viewing report results is extras.view_reportresult --- docs/release-notes/version-2.9.md | 1 + netbox/extras/views.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index 769705358..8a65b5fb4 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -20,6 +20,7 @@ * [#5118](https://github.com/netbox-community/netbox/issues/5118) - Specifying an empty list of tags should clear assigned tags (REST API) * [#5133](https://github.com/netbox-community/netbox/issues/5133) - Fix disassociation of an IP address from a VM interface * [#5136](https://github.com/netbox-community/netbox/issues/5136) - Fix exception when bulk editing interface 802.1Q mode +* [#5137](https://github.com/netbox-community/netbox/issues/5137) - Correct permission for viewing report results is `extras.view_reportresult` (not `extras.view_report`) * [#5156](https://github.com/netbox-community/netbox/issues/5156) - Add missing "add" button to rack reservations list * [#5167](https://github.com/netbox-community/netbox/issues/5167) - Support filtering ObjectChanges by multiple users diff --git a/netbox/extras/views.py b/netbox/extras/views.py index cd813d280..1596a4cbb 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -401,7 +401,7 @@ class ReportResultView(ContentTypePermissionRequiredMixin, View): Display a JobResult pertaining to the execution of a Report. """ def get_required_permission(self): - return 'extras.view_report' + return 'extras.view_reportresult' def get(self, request, job_result_pk): report_content_type = ContentType.objects.get(app_label='extras', model='report') From 1f0a4cc548cdc010fb3e3468fa90a63a598a3382 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 23 Sep 2020 11:48:32 -0400 Subject: [PATCH 21/26] Closes #5075: Include a VLAN membership view for VM interfaces --- docs/release-notes/version-2.9.md | 1 + netbox/ipam/models.py | 11 +++++-- netbox/ipam/tables.py | 33 ++++++++++++++----- netbox/ipam/urls.py | 3 +- netbox/ipam/views.py | 33 +++++++++++++++---- netbox/templates/ipam/vlan.html | 7 ++-- ...vlan_members.html => vlan_interfaces.html} | 4 +-- netbox/templates/ipam/vlan_vminterfaces.html | 9 +++++ 8 files changed, 77 insertions(+), 24 deletions(-) rename netbox/templates/ipam/{vlan_members.html => vlan_interfaces.html} (59%) create mode 100644 netbox/templates/ipam/vlan_vminterfaces.html diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index 8a65b5fb4..fa672a51e 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -13,6 +13,7 @@ ### Bug Fixes * [#5050](https://github.com/netbox-community/netbox/issues/5050) - Fix potential failure on `0016_replicate_interfaces` schema migration from old release +* [#5075](https://github.com/netbox-community/netbox/issues/5075) - Include a VLAN membership view for VM interfaces * [#5105](https://github.com/netbox-community/netbox/issues/5105) - Validation should fail when reassigning a primary IP from device to VM * [#5109](https://github.com/netbox-community/netbox/issues/5109) - Fix representation of custom choice field values for webhook data * [#5108](https://github.com/netbox-community/netbox/issues/5108) - Fix execution of reports via CLI diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index c7955bcfa..a69d235be 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -985,13 +985,20 @@ class VLAN(ChangeLoggedModel, CustomFieldModel): def get_status_class(self): return self.STATUS_CLASS_MAP[self.status] - def get_members(self): - # Return all interfaces assigned to this VLAN + def get_interfaces(self): + # Return all device interfaces assigned to this VLAN return Interface.objects.filter( Q(untagged_vlan_id=self.pk) | Q(tagged_vlans=self.pk) ).distinct() + def get_vminterfaces(self): + # Return all VM interfaces assigned to this VLAN + return VMInterface.objects.filter( + Q(untagged_vlan_id=self.pk) | + Q(tagged_vlans=self.pk) + ).distinct() + @extras_features('custom_fields', 'custom_links', 'export_templates', 'webhooks') class Service(ChangeLoggedModel, CustomFieldModel): diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index afdeb5515..ba09475b0 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -4,6 +4,7 @@ from django_tables2.utils import Accessor from dcim.models import Interface from tenancy.tables import COL_TENANT from utilities.tables import BaseTable, BooleanColumn, ButtonsColumn, TagColumn, ToggleColumn +from virtualization.models import VMInterface from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF RIR_UTILIZATION = """ @@ -124,9 +125,11 @@ VLANGROUP_ADD_VLAN = """ {% endwith %} """ -VLAN_MEMBER_UNTAGGED = """ +VLAN_MEMBER_TAGGED = """ {% if record.untagged_vlan_id == vlan.pk %} - + +{% else %} + {% endif %} """ @@ -553,15 +556,15 @@ class VLANDetailTable(VLANTable): default_columns = ('pk', 'vid', 'site', 'group', 'name', 'prefixes', 'tenant', 'status', 'role', 'description') -class VLANMemberTable(BaseTable): - parent = tables.LinkColumn( - order_by=['device', 'virtual_machine'] - ) +class VLANMembersTable(BaseTable): + """ + Base table for Interface and VMInterface assignments + """ name = tables.LinkColumn( verbose_name='Interface' ) - untagged = tables.TemplateColumn( - template_code=VLAN_MEMBER_UNTAGGED, + tagged = tables.TemplateColumn( + template_code=VLAN_MEMBER_TAGGED, orderable=False ) actions = tables.TemplateColumn( @@ -570,9 +573,21 @@ class VLANMemberTable(BaseTable): verbose_name='' ) + +class VLANDevicesTable(VLANMembersTable): + device = tables.LinkColumn() + class Meta(BaseTable.Meta): model = Interface - fields = ('parent', 'name', 'untagged', 'actions') + fields = ('device', 'name', 'tagged', 'actions') + + +class VLANVirtualMachinesTable(VLANMembersTable): + virtual_machine = tables.LinkColumn() + + class Meta(BaseTable.Meta): + model = VMInterface + fields = ('virtual_machine', 'name', 'tagged', 'actions') class InterfaceVLANTable(BaseTable): diff --git a/netbox/ipam/urls.py b/netbox/ipam/urls.py index b2080c0a8..533335816 100644 --- a/netbox/ipam/urls.py +++ b/netbox/ipam/urls.py @@ -90,7 +90,8 @@ urlpatterns = [ path('vlans/edit/', views.VLANBulkEditView.as_view(), name='vlan_bulk_edit'), path('vlans/delete/', views.VLANBulkDeleteView.as_view(), name='vlan_bulk_delete'), path('vlans//', views.VLANView.as_view(), name='vlan'), - path('vlans//members/', views.VLANMembersView.as_view(), name='vlan_members'), + path('vlans//interfaces/', views.VLANInterfacesView.as_view(), name='vlan_interfaces'), + path('vlans//vm-interfaces/', views.VLANVMInterfacesView.as_view(), name='vlan_vminterfaces'), path('vlans//edit/', views.VLANEditView.as_view(), name='vlan_edit'), path('vlans//delete/', views.VLANDeleteView.as_view(), name='vlan_delete'), path('vlans//changelog/', ObjectChangeLogView.as_view(), name='vlan_changelog', kwargs={'model': VLAN}), diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 1f0e2607e..c3eac0fd7 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -749,15 +749,13 @@ class VLANView(ObjectView): }) -class VLANMembersView(ObjectView): +class VLANInterfacesView(ObjectView): queryset = VLAN.objects.all() def get(self, request, pk): - vlan = get_object_or_404(self.queryset, pk=pk) - members = vlan.get_members().restrict(request.user, 'view').prefetch_related('device', 'virtual_machine') - - members_table = tables.VLANMemberTable(members) + interfaces = vlan.get_interfaces().prefetch_related('device') + members_table = tables.VLANDevicesTable(interfaces) paginate = { 'paginator_class': EnhancedPaginator, @@ -765,10 +763,31 @@ class VLANMembersView(ObjectView): } RequestConfig(request, paginate).configure(members_table) - return render(request, 'ipam/vlan_members.html', { + return render(request, 'ipam/vlan_interfaces.html', { 'vlan': vlan, 'members_table': members_table, - 'active_tab': 'members', + 'active_tab': 'interfaces', + }) + + +class VLANVMInterfacesView(ObjectView): + queryset = VLAN.objects.all() + + def get(self, request, pk): + vlan = get_object_or_404(self.queryset, pk=pk) + interfaces = vlan.get_vminterfaces().prefetch_related('virtual_machine') + members_table = tables.VLANVirtualMachinesTable(interfaces) + + paginate = { + 'paginator_class': EnhancedPaginator, + 'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT) + } + RequestConfig(request, paginate).configure(members_table) + + return render(request, 'ipam/vlan_vminterfaces.html', { + 'vlan': vlan, + 'members_table': members_table, + 'active_tab': 'vminterfaces', }) diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index ec1f94b51..d9cb0c66c 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -52,8 +52,11 @@ - + {% if perms.extras.view_objectchange %} - + Reports From e2a840ff0b24e5f3811dac648970eae36727dd5e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 23 Sep 2020 15:19:42 -0400 Subject: [PATCH 25/26] Closes #5053: Mention local_requirements.txt when an ImportError occurs --- netbox/templates/exceptions/import_error.html | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/netbox/templates/exceptions/import_error.html b/netbox/templates/exceptions/import_error.html index 20dc3728b..78f4db9c0 100644 --- a/netbox/templates/exceptions/import_error.html +++ b/netbox/templates/exceptions/import_error.html @@ -5,14 +5,15 @@ A module import error occurred during this request. Common causes include the following:

    - Missing required packages - This installation of NetBox might be missing one or more required - Python packages. These packages are listed in requirements.txt and are normally installed as part - of the installation or upgrade process. To verify installed packages, run pip freeze from the - console and compare the output to the list of required packages. + Missing required packages - This installation of NetBox might be + missing one or more required Python packages. These packages are listed in requirements.txt and + local_requirements.txt, and are normally installed as part of the installation or upgrade process. + To verify installed packages, run pip freeze from the console and compare the output to the list of + required packages.

    - WSGI service not restarted after upgrade - If this installation has recently been upgraded, - check that the WSGI service (e.g. gunicorn or uWSGI) has been restarted. This ensures that the new code is - running. + WSGI service not restarted after upgrade - If this installation + has recently been upgraded, check that the WSGI service (e.g. gunicorn or uWSGI) has been restarted. This + ensures that the new code is running.

    {% endblock %} From 31fcad4dbb3a2570cdb4db203bd44e2adc359ce5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 23 Sep 2020 15:24:59 -0400 Subject: [PATCH 26/26] Release v2.9.4 --- docs/release-notes/version-2.9.md | 2 +- netbox/netbox/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index 485c5a131..d0d34e1cc 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -1,6 +1,6 @@ # NetBox v2.9 -## v2.9.4 (FUTURE) +## v2.9.4 (2020-09-23) **NOTE:** This release removes support for the `DEFAULT_TIMEOUT` parameter under `REDIS` database configuration. Set `RQ_DEFAULT_TIMEOUT` as a global configuration parameter instead. diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 3a859c58e..148bf8aeb 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -16,7 +16,7 @@ from django.core.validators import URLValidator # Environment setup # -VERSION = '2.9.4-dev' +VERSION = '2.9.4' # Hostname HOSTNAME = platform.node()