diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 66f675d7c..640a3fd39 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -17,7 +17,7 @@ body: What version of NetBox are you currently running? (If you don't have access to the most recent NetBox release, consider testing on our [demo instance](https://demo.netbox.dev/) before opening a bug report to see if your issue has already been addressed.) - placeholder: v2.11.7 + placeholder: v2.11.8 validations: required: true - type: dropdown diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index eaa9a1200..760d74298 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: v2.11.7 + placeholder: v2.11.8 validations: required: true - type: dropdown diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md index e1840319e..c5a500698 100644 --- a/docs/release-notes/version-2.11.md +++ b/docs/release-notes/version-2.11.md @@ -1,10 +1,16 @@ # NetBox v2.11 -## v2.11.8 (FUTURE) +## v2.11.8 (2021-07-06) ### Enhancements +* [#5503](https://github.com/netbox-community/netbox/issues/5503) - Annotate short date & time fields with their longer form +* [#6138](https://github.com/netbox-community/netbox/issues/6138) - Add an `empty` filter modifier for character fields +* [#6200](https://github.com/netbox-community/netbox/issues/6200) - Add rack reservations to global search +* [#6368](https://github.com/netbox-community/netbox/issues/6368) - Enable virtual chassis assignment during bulk import of devices * [#6620](https://github.com/netbox-community/netbox/issues/6620) - Show assigned VMs count under device role view +* [#6666](https://github.com/netbox-community/netbox/issues/6666) - Show management-only status under interface detail view +* [#6667](https://github.com/netbox-community/netbox/issues/6667) - Display VM memory as GB/TB as appropriate ### Bug Fixes @@ -12,6 +18,9 @@ * [#6637](https://github.com/netbox-community/netbox/issues/6637) - Fix group assignment in "available VLANs" link under VLAN group view * [#6640](https://github.com/netbox-community/netbox/issues/6640) - Disallow numeric values in custom text fields * [#6652](https://github.com/netbox-community/netbox/issues/6652) - Fix exception when adding components in bulk to multiple devices +* [#6676](https://github.com/netbox-community/netbox/issues/6676) - Fix device/VM counts per cluster under cluster type/group views +* [#6680](https://github.com/netbox-community/netbox/issues/6680) - Allow setting custom field values for VM interfaces on initial creation +* [#6695](https://github.com/netbox-community/netbox/issues/6695) - Fix exception when importing device type with invalid front port definition --- diff --git a/docs/rest-api/filtering.md b/docs/rest-api/filtering.md index b77513297..471beffee 100644 --- a/docs/rest-api/filtering.md +++ b/docs/rest-api/filtering.md @@ -61,25 +61,30 @@ These lookup expressions can be applied by adding a suffix to the desired field' Numeric based fields (ASN, VLAN ID, etc) support these lookup expressions: -- `n` - not equal to (negation) -- `lt` - less than -- `lte` - less than or equal -- `gt` - greater than -- `gte` - greater than or equal +| Filter | Description | +|--------|-------------| +| `n` | Not equal to | +| `lt` | Less than | +| `lte` | Less than or equal to | +| `gt` | Greater than | +| `gte` | Greater than or equal to | ### String Fields String based (char) fields (Name, Address, etc) support these lookup expressions: -- `n` - not equal to (negation) -- `ic` - case insensitive contains -- `nic` - negated case insensitive contains -- `isw` - case insensitive starts with -- `nisw` - negated case insensitive starts with -- `iew` - case insensitive ends with -- `niew` - negated case insensitive ends with -- `ie` - case insensitive exact match -- `nie` - negated case insensitive exact match +| Filter | Description | +|--------|-------------| +| `n` | Not equal to | +| `ic` | Contains (case-insensitive) | +| `nic` | Does not contain (case-insensitive) | +| `isw` | Starts with (case-insensitive) | +| `nisw` | Does not start with (case-insensitive) | +| `iew` | Ends with (case-insensitive) | +| `niew` | Does not end with (case-insensitive) | +| `ie` | Exact match (case-insensitive) | +| `nie` | Inverse exact match (case-insensitive) | +| `empty` | Is empty (boolean) | ### Foreign Keys & Other Fields diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 6f7cc686e..4fb2e71fb 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1887,8 +1887,7 @@ class FrontPortTemplateImportForm(ComponentTemplateImportForm): ) rear_port = forms.ModelChoiceField( queryset=RearPortTemplate.objects.all(), - to_field_name='name', - required=False + to_field_name='name' ) class Meta: @@ -2243,6 +2242,12 @@ class BaseDeviceCSVForm(CustomFieldModelCSVForm): choices=DeviceStatusChoices, help_text='Operational status' ) + virtual_chassis = CSVModelChoiceField( + queryset=VirtualChassis.objects.all(), + to_field_name='name', + required=False, + help_text='Virtual chassis' + ) cluster = CSVModelChoiceField( queryset=Cluster.objects.all(), to_field_name='name', @@ -2253,6 +2258,10 @@ class BaseDeviceCSVForm(CustomFieldModelCSVForm): class Meta: fields = [] model = Device + help_texts = { + 'vc_position': 'Virtual chassis position', + 'vc_priority': 'Virtual chassis priority', + } def __init__(self, data=None, *args, **kwargs): super().__init__(data, *args, **kwargs) @@ -2291,7 +2300,8 @@ class DeviceCSVForm(BaseDeviceCSVForm): class Meta(BaseDeviceCSVForm.Meta): fields = [ 'name', 'device_role', 'tenant', 'manufacturer', 'device_type', 'platform', 'serial', 'asset_tag', 'status', - 'site', 'location', 'rack', 'position', 'face', 'cluster', 'comments', + 'site', 'location', 'rack', 'position', 'face', 'virtual_chassis', 'vc_position', 'vc_priority', 'cluster', + 'comments', ] def __init__(self, data=None, *args, **kwargs): @@ -2326,7 +2336,7 @@ class ChildDeviceCSVForm(BaseDeviceCSVForm): class Meta(BaseDeviceCSVForm.Meta): fields = [ 'name', 'device_role', 'tenant', 'manufacturer', 'device_type', 'platform', 'serial', 'asset_tag', 'status', - 'parent', 'device_bay', 'cluster', 'comments', + 'parent', 'device_bay', 'virtual_chassis', 'vc_position', 'vc_priority', 'cluster', 'comments', ] def __init__(self, data=None, *args, **kwargs): diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py index 6cfe52fc3..e704f74a7 100644 --- a/netbox/dcim/models/device_component_templates.py +++ b/netbox/dcim/models/device_component_templates.py @@ -293,19 +293,24 @@ class FrontPortTemplate(ComponentTemplateModel): def clean(self): super().clean() - # Validate rear port assignment - if self.rear_port.device_type != self.device_type: - raise ValidationError( - "Rear port ({}) must belong to the same device type".format(self.rear_port) - ) + try: - # Validate rear port position assignment - if self.rear_port_position > self.rear_port.positions: - raise ValidationError( - "Invalid rear port position ({}); rear port {} has only {} positions".format( - self.rear_port_position, self.rear_port.name, self.rear_port.positions + # Validate rear port assignment + if self.rear_port.device_type != self.device_type: + raise ValidationError( + "Rear port ({}) must belong to the same device type".format(self.rear_port) ) - ) + + # Validate rear port position assignment + if self.rear_port_position > self.rear_port.positions: + raise ValidationError( + "Invalid rear port position ({}); rear port {} has only {} positions".format( + self.rear_port_position, self.rear_port.name, self.rear_port.positions + ) + ) + + except RearPortTemplate.DoesNotExist: + pass def instantiate(self, device): if self.rear_port: diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py index bbb153ee5..ca6418e58 100644 --- a/netbox/dcim/tests/test_views.py +++ b/netbox/dcim/tests/test_views.py @@ -1028,6 +1028,8 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase): tags = create_tags('Alpha', 'Bravo', 'Charlie') + VirtualChassis.objects.create(name='Virtual Chassis 1') + cls.form_data = { 'device_type': devicetypes[1].pk, 'device_role': deviceroles[1].pk, @@ -1053,10 +1055,10 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase): } cls.csv_data = ( - "device_role,manufacturer,device_type,status,name,site,location,rack,position,face", - "Device Role 1,Manufacturer 1,Device Type 1,active,Device 4,Site 1,Location 1,Rack 1,10,front", - "Device Role 1,Manufacturer 1,Device Type 1,active,Device 5,Site 1,Location 1,Rack 1,20,front", - "Device Role 1,Manufacturer 1,Device Type 1,active,Device 6,Site 1,Location 1,Rack 1,30,front", + "device_role,manufacturer,device_type,status,name,site,location,rack,position,face,virtual_chassis,vc_position,vc_priority", + "Device Role 1,Manufacturer 1,Device Type 1,active,Device 4,Site 1,Location 1,Rack 1,10,front,Virtual Chassis 1,1,10", + "Device Role 1,Manufacturer 1,Device Type 1,active,Device 5,Site 1,Location 1,Rack 1,20,front,Virtual Chassis 1,2,20", + "Device Role 1,Manufacturer 1,Device Type 1,active,Device 6,Site 1,Location 1,Rack 1,30,front,Virtual Chassis 1,3,30", ) cls.bulk_edit_data = { diff --git a/netbox/extras/apps.py b/netbox/extras/apps.py index 3201c3bb2..7500157c0 100644 --- a/netbox/extras/apps.py +++ b/netbox/extras/apps.py @@ -5,4 +5,5 @@ class ExtrasConfig(AppConfig): name = "extras" def ready(self): + import extras.lookups import extras.signals diff --git a/netbox/extras/lookups.py b/netbox/extras/lookups.py new file mode 100644 index 000000000..7197efcfc --- /dev/null +++ b/netbox/extras/lookups.py @@ -0,0 +1,17 @@ +from django.db.models import CharField, Lookup + + +class Empty(Lookup): + """ + Filter on whether a string is empty. + """ + lookup_name = 'empty' + + def as_sql(self, qn, connection): + lhs, lhs_params = self.process_lhs(qn, connection) + rhs, rhs_params = self.process_rhs(qn, connection) + params = lhs_params + rhs_params + return 'CAST(LENGTH(%s) AS BOOLEAN) != %s' % (lhs, rhs), params + + +CharField.register_lookup(Empty) diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py index 58d2d857e..e292f6077 100644 --- a/netbox/extras/models/models.py +++ b/netbox/extras/models/models.py @@ -442,9 +442,8 @@ class JournalEntry(ChangeLoggedModel): verbose_name_plural = 'journal entries' def __str__(self): - created_date = timezone.localdate(self.created) - created_time = timezone.localtime(self.created) - return f"{date_format(created_date)} - {time_format(created_time)} ({self.get_kind_display()})" + created = timezone.localtime(self.created) + return f"{date_format(created, format='SHORT_DATETIME_FORMAT')} ({self.get_kind_display()})" def get_absolute_url(self): return reverse('extras:journalentry', args=[self.pk]) diff --git a/netbox/netbox/constants.py b/netbox/netbox/constants.py index 1da51fe76..31e56fb1f 100644 --- a/netbox/netbox/constants.py +++ b/netbox/netbox/constants.py @@ -4,12 +4,12 @@ from circuits.filtersets import CircuitFilterSet, ProviderFilterSet, ProviderNet from circuits.models import Circuit, ProviderNetwork, Provider from circuits.tables import CircuitTable, ProviderNetworkTable, ProviderTable from dcim.filtersets import ( - CableFilterSet, DeviceFilterSet, DeviceTypeFilterSet, PowerFeedFilterSet, RackFilterSet, LocationFilterSet, - SiteFilterSet, VirtualChassisFilterSet, + CableFilterSet, DeviceFilterSet, DeviceTypeFilterSet, PowerFeedFilterSet, RackFilterSet, RackReservationFilterSet, + LocationFilterSet, SiteFilterSet, VirtualChassisFilterSet, ) -from dcim.models import Cable, Device, DeviceType, PowerFeed, Rack, Location, Site, VirtualChassis +from dcim.models import Cable, Device, DeviceType, Location, PowerFeed, Rack, RackReservation, Site, VirtualChassis from dcim.tables import ( - CableTable, DeviceTable, DeviceTypeTable, PowerFeedTable, RackTable, LocationTable, SiteTable, + CableTable, DeviceTable, DeviceTypeTable, PowerFeedTable, RackTable, RackReservationTable, LocationTable, SiteTable, VirtualChassisTable, ) from ipam.filtersets import AggregateFilterSet, IPAddressFilterSet, PrefixFilterSet, VLANFilterSet, VRFFilterSet @@ -61,6 +61,12 @@ SEARCH_TYPES = OrderedDict(( 'table': RackTable, 'url': 'dcim:rack_list', }), + ('rackreservation', { + 'queryset': RackReservation.objects.prefetch_related('site', 'rack', 'user'), + 'filterset': RackReservationFilterSet, + 'table': RackReservationTable, + 'url': 'dcim:rackreservation_list', + }), ('location', { 'queryset': Location.objects.add_related_count( Location.objects.all(), diff --git a/netbox/netbox/filtersets.py b/netbox/netbox/filtersets.py index aa9e15385..791c21d19 100644 --- a/netbox/netbox/filtersets.py +++ b/netbox/netbox/filtersets.py @@ -89,13 +89,13 @@ class BaseFilterSet(django_filters.FilterSet): filters.MultiValueNumberFilter, filters.MultiValueTimeFilter )): - lookup_map = FILTER_NUMERIC_BASED_LOOKUP_MAP + return FILTER_NUMERIC_BASED_LOOKUP_MAP elif isinstance(existing_filter, ( filters.TreeNodeMultipleChoiceFilter, )): # TreeNodeMultipleChoiceFilter only support negation but must maintain the `in` lookup expression - lookup_map = FILTER_TREENODE_NEGATION_LOOKUP_MAP + return FILTER_TREENODE_NEGATION_LOOKUP_MAP elif isinstance(existing_filter, ( django_filters.ModelChoiceFilter, @@ -103,7 +103,7 @@ class BaseFilterSet(django_filters.FilterSet): TagFilter )) or existing_filter.extra.get('choices'): # These filter types support only negation - lookup_map = FILTER_NEGATION_LOOKUP_MAP + return FILTER_NEGATION_LOOKUP_MAP elif isinstance(existing_filter, ( django_filters.filters.CharFilter, @@ -111,12 +111,9 @@ class BaseFilterSet(django_filters.FilterSet): filters.MultiValueCharFilter, filters.MultiValueMACAddressFilter )): - lookup_map = FILTER_CHAR_BASED_LOOKUP_MAP + return FILTER_CHAR_BASED_LOOKUP_MAP - else: - lookup_map = None - - return lookup_map + return None @classmethod def get_filters(cls): diff --git a/netbox/netbox/forms.py b/netbox/netbox/forms.py index a032229b2..b5d68c1fc 100644 --- a/netbox/netbox/forms.py +++ b/netbox/netbox/forms.py @@ -11,12 +11,13 @@ OBJ_TYPE_CHOICES = ( ('DCIM', ( ('site', 'Sites'), ('rack', 'Racks'), + ('rackreservation', 'Rack reservations'), ('location', 'Locations'), ('devicetype', 'Device Types'), ('device', 'Devices'), - ('virtualchassis', 'Virtual Chassis'), + ('virtualchassis', 'Virtual chassis'), ('cable', 'Cables'), - ('powerfeed', 'Power Feeds'), + ('powerfeed', 'Power feeds'), )), ('IPAM', ( ('vrf', 'VRFs'), diff --git a/netbox/netbox/views/generic.py b/netbox/netbox/views/generic.py index b00d07ec2..9a78062fb 100644 --- a/netbox/netbox/views/generic.py +++ b/netbox/netbox/views/generic.py @@ -18,7 +18,7 @@ from django_tables2.export import TableExport from extras.models import ExportTemplate from utilities.error_handlers import handle_protectederror -from utilities.exceptions import AbortTransaction +from utilities.exceptions import AbortTransaction, PermissionsViolation from utilities.forms import ( BootstrapMixin, BulkRenameForm, ConfirmationForm, CSVDataField, ImportForm, TableConfigForm, restrict_form_fields, ) @@ -267,7 +267,8 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): obj = form.save() # Check that the new object conforms with any assigned object-level permissions - self.queryset.get(pk=obj.pk) + if not self.queryset.filter(pk=obj.pk).first(): + raise PermissionsViolation() msg = '{} {}'.format( 'Created' if object_created else 'Modified', @@ -295,7 +296,7 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): else: return redirect(self.get_return_url(request, obj)) - except ObjectDoesNotExist: + except PermissionsViolation: msg = "Object save failed due to object-level permissions violation" logger.debug(msg) form.add_error(None, msg) @@ -457,7 +458,7 @@ class BulkCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): # Enforce object-level permissions if self.queryset.filter(pk__in=[obj.pk for obj in new_objs]).count() != len(new_objs): - raise ObjectDoesNotExist + raise PermissionsViolation # If we make it to this point, validation has succeeded on all new objects. msg = "Added {} {}".format(len(new_objs), model._meta.verbose_name_plural) @@ -471,7 +472,7 @@ class BulkCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): except IntegrityError: pass - except ObjectDoesNotExist: + except PermissionsViolation: msg = "Object creation failed due to object-level permissions violation" logger.debug(msg) form.add_error(None, msg) @@ -542,7 +543,8 @@ class ObjectImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): obj = model_form.save() # Enforce object-level permissions - self.queryset.get(pk=obj.pk) + if not self.queryset.filter(pk=obj.pk).first(): + raise PermissionsViolation() logger.debug(f"Created {obj} (PK: {obj.pk})") @@ -578,7 +580,7 @@ class ObjectImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): except AbortTransaction: pass - except ObjectDoesNotExist: + except PermissionsViolation: msg = "Object creation failed due to object-level permissions violation" logger.debug(msg) form.add_error(None, msg) @@ -689,7 +691,7 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): # Enforce object-level permissions if self.queryset.filter(pk__in=[obj.pk for obj in new_objs]).count() != len(new_objs): - raise ObjectDoesNotExist + raise PermissionsViolation # Compile a table containing the imported objects obj_table = self.table(new_objs) @@ -707,7 +709,7 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): except ValidationError: pass - except ObjectDoesNotExist: + except PermissionsViolation: msg = "Object import failed due to object-level permissions violation" logger.debug(msg) form.add_error(None, msg) @@ -822,7 +824,7 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): # Enforce object-level permissions if self.queryset.filter(pk__in=[obj.pk for obj in updated_objects]).count() != len(updated_objects): - raise ObjectDoesNotExist + raise PermissionsViolation if updated_objects: msg = 'Updated {} {}'.format(len(updated_objects), model._meta.verbose_name_plural) @@ -834,7 +836,7 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): except ValidationError as e: messages.error(self.request, "{} failed validation: {}".format(obj, e)) - except ObjectDoesNotExist: + except PermissionsViolation: msg = "Object update failed due to object-level permissions violation" logger.debug(msg) form.add_error(None, msg) @@ -929,7 +931,7 @@ class BulkRenameView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): # Enforce constrained permissions if self.queryset.filter(pk__in=renamed_pks).count() != len(selected_objects): - raise ObjectDoesNotExist + raise PermissionsViolation messages.success(request, "Renamed {} {}".format( len(selected_objects), @@ -937,7 +939,7 @@ class BulkRenameView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): )) return redirect(self.get_return_url(request)) - except ObjectDoesNotExist: + except PermissionsViolation: msg = "Object update failed due to object-level permissions violation" logger.debug(msg) form.add_error(None, msg) @@ -1142,7 +1144,7 @@ class ComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View # Enforce object-level permissions if self.queryset.filter(pk__in=[obj.pk for obj in new_objs]).count() != len(new_objs): - raise ObjectDoesNotExist + raise PermissionsViolation messages.success(request, "Added {} {}".format( len(new_components), self.queryset.model._meta.verbose_name_plural @@ -1150,7 +1152,7 @@ class ComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View # Return the newly created objects so overridden post methods can use the data as needed. return new_objs - except ObjectDoesNotExist: + except PermissionsViolation: msg = "Component creation failed due to object-level permissions violation" logger.debug(msg) form.add_error(None, msg) @@ -1227,12 +1229,12 @@ class BulkComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, # Enforce object-level permissions if self.queryset.filter(pk__in=[obj.pk for obj in new_components]).count() != len(new_components): - raise ObjectDoesNotExist + raise PermissionsViolation except IntegrityError: pass - except ObjectDoesNotExist: + except PermissionsViolation: msg = "Component creation failed due to object-level permissions violation" logger.debug(msg) form.add_error(None, msg) diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html index bcc3df141..506321fd5 100644 --- a/netbox/templates/base/layout.html +++ b/netbox/templates/base/layout.html @@ -1,5 +1,6 @@ {# Base layout for the core NetBox UI w/navbar and page content #} {% extends 'base/base.html' %} +{% load helpers %} {% load nav %} {% load search_options %} {% load static %} @@ -115,7 +116,7 @@
- {% now 'Y-m-d H:i:s T' %} + {% annotated_now %} {% now 'T' %} {{ settings.HOSTNAME }} (v{{ settings.VERSION }})
diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html index 44753917c..423920fcd 100644 --- a/netbox/templates/circuits/circuit.html +++ b/netbox/templates/circuits/circuit.html @@ -52,7 +52,7 @@ Install Date - {{ object.install_date|placeholder }} + {{ object.install_date|annotated_date|placeholder }} Commit Rate diff --git a/netbox/templates/dcim/device_component_add.html b/netbox/templates/dcim/device_component_add.html index d643ee145..c80357990 100644 --- a/netbox/templates/dcim/device_component_add.html +++ b/netbox/templates/dcim/device_component_add.html @@ -1,4 +1,5 @@ {% extends 'base/layout.html' %} +{% load helpers %} {% load form_helpers %} {% block title %}Create {{ component_type }}{% endblock %} @@ -12,7 +13,37 @@

{{ component_type|title }}

- {% render_form form %} + {% if form.non_field_errors %} +
+
Errors
+
+ {{ form.non_field_errors }} +
+
+ {% endif %} +
+
+ {{ component_type|bettertitle }} +
+
+ {% for field in form.hidden_fields %} + {{ field }} + {% endfor %} + {% for field in form.visible_fields %} + {% if field.name not in form.custom_fields %} + {% render_field field %} + {% endif %} + {% endfor %} +
+
+ {% if form.custom_fields %} +
+
Custom Fields
+
+ {% render_custom_fields form %} +
+
+ {% endif %}
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index eb3f61672..ba6ba6a13 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -35,6 +35,15 @@ {% endif %} + + + {% if object.mgmt_only %} + Management Only + {% else %} + Not Management Only + {% endif %} + + Device diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 0cc115ddd..a587bb86a 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -278,7 +278,7 @@ {{ resv.description }}
- {{ resv.user }} · {{ resv.created }} + {{ resv.user }} · {{ resv.created|annotated_date }} {% if perms.dcim.change_rackreservation %} diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index 97ac7293d..8f8ac1a7d 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -68,7 +68,7 @@ {% if object.time_zone %} {{ object.time_zone }} (UTC {{ object.time_zone|tzoffset }})
- Site time: {% timezone object.time_zone %}{% now "SHORT_DATETIME_FORMAT" %}{% endtimezone %} + Site time: {% timezone object.time_zone %}{% annotated_now %}{% endtimezone %} {% else %} — {% endif %} diff --git a/netbox/templates/extras/journalentry.html b/netbox/templates/extras/journalentry.html index 5ebddd59d..c5077bca7 100644 --- a/netbox/templates/extras/journalentry.html +++ b/netbox/templates/extras/journalentry.html @@ -26,7 +26,7 @@ Created - {{ object.created }} + {{ object.created|annotated_date }} diff --git a/netbox/templates/extras/objectchange.html b/netbox/templates/extras/objectchange.html index a8619e8fe..04eec17e4 100644 --- a/netbox/templates/extras/objectchange.html +++ b/netbox/templates/extras/objectchange.html @@ -44,7 +44,7 @@ Time - {{ object.time }} + {{ object.time|annotated_date }} diff --git a/netbox/templates/extras/report.html b/netbox/templates/extras/report.html index acbd08e77..1ca0294e6 100644 --- a/netbox/templates/extras/report.html +++ b/netbox/templates/extras/report.html @@ -31,7 +31,7 @@
{% if report.result %} Last run: - {{ report.result.created }} + {{ report.result.created|annotated_date }} {% endif %}
diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html index f21dd293f..762105359 100644 --- a/netbox/templates/extras/report_list.html +++ b/netbox/templates/extras/report_list.html @@ -35,7 +35,7 @@ {{ report.description|render_markdown|placeholder }} {% if report.result %} - {{ report.result.created }} + {{ report.result.created|annotated_date }} {% else %} Never {% endif %} diff --git a/netbox/templates/extras/report_result.html b/netbox/templates/extras/report_result.html index acd1e9f9f..1f757d4cb 100644 --- a/netbox/templates/extras/report_result.html +++ b/netbox/templates/extras/report_result.html @@ -13,7 +13,7 @@

- Run: {{ result.created }} + Run: {{ result.created|annotated_date }} {% if result.completed %} Duration: {{ result.duration }} {% else %} diff --git a/netbox/templates/extras/script_list.html b/netbox/templates/extras/script_list.html index d271723d5..b06520c94 100644 --- a/netbox/templates/extras/script_list.html +++ b/netbox/templates/extras/script_list.html @@ -30,7 +30,7 @@ {{ script.Meta.description|render_markdown }} {% if script.result %} - {{ script.result.created }} + {{ script.result.created|annotated_date }} {% else %} Never diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html index d8e25697d..78d67e6ac 100644 --- a/netbox/templates/extras/script_result.html +++ b/netbox/templates/extras/script_result.html @@ -19,7 +19,7 @@

  • Scripts
  • {{ script.module|bettertitle }}
  • {{ script }}
    • -
  • {{ result.created }}
    • +
  • {{ result.created|annotated_date }}
    • @@ -38,7 +38,7 @@

    - Run: {{ result.created }} + Run: {{ result.created|annotated_date }} {% if result.completed %} Duration: {{ result.duration }} {% else %} diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html index 442a4617f..d3d11c31f 100644 --- a/netbox/templates/generic/object.html +++ b/netbox/templates/generic/object.html @@ -72,8 +72,8 @@ {% block content %}

    - Created {{ object.created }} · - Updated {{ object.last_updated|timesince }} ago + Created {{ object.created|annotated_date }} · + Updated {{ object.last_updated|timesince }} ago {{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}:{{ object.pk }}

    diff --git a/netbox/templates/inc/image_attachments.html b/netbox/templates/inc/image_attachments.html index c148887a0..5ec47af7e 100644 --- a/netbox/templates/inc/image_attachments.html +++ b/netbox/templates/inc/image_attachments.html @@ -1,3 +1,4 @@ +{% load helpers %} {% if images %} @@ -14,7 +15,7 @@ {{ attachment }} - + - + diff --git a/netbox/templates/users/api_tokens.html b/netbox/templates/users/api_tokens.html index 3783656e4..b14b08928 100644 --- a/netbox/templates/users/api_tokens.html +++ b/netbox/templates/users/api_tokens.html @@ -24,12 +24,12 @@
    Created
    - {{ token.created|date }} + {{ token.created|annotated_date }}
    Expires
    {% if token.expires %} - {{ token.expires|date }} + {{ token.expires|annotated_date }} {% else %} Never {% endif %} diff --git a/netbox/templates/users/profile.html b/netbox/templates/users/profile.html index 0855798d4..683612870 100644 --- a/netbox/templates/users/profile.html +++ b/netbox/templates/users/profile.html @@ -21,7 +21,7 @@ Email
    {{ request.user.email }}
    Registered -
    {{ request.user.date_joined }}
    +
    {{ request.user.date_joined|annotated_date }}
    Groups
    {% if request.user.groups.all %} diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html index 6e8cd62ec..339a82e65 100644 --- a/netbox/templates/virtualization/virtualmachine.html +++ b/netbox/templates/virtualization/virtualmachine.html @@ -142,7 +142,7 @@
    {{ attachment.size|filesizeformat }}{{ attachment.created }}{{ attachment.created|annotated_date }} {% if perms.extras.change_imageattachment %} diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html index 609a450f0..d8fb04558 100644 --- a/netbox/templates/ipam/aggregate.html +++ b/netbox/templates/ipam/aggregate.html @@ -53,7 +53,7 @@
    Date Added{{ object.date_added|placeholder }}{{ object.date_added|annotated_date|placeholder }}
    Description Memory {% if object.memory %} - {{ object.memory }} MB + {{ object.memory|humanize_megabytes }} MB {% else %} — {% endif %} diff --git a/netbox/templates/virtualization/virtualmachine_component_add.html b/netbox/templates/virtualization/virtualmachine_component_add.html deleted file mode 100644 index 939acb1c4..000000000 --- a/netbox/templates/virtualization/virtualmachine_component_add.html +++ /dev/null @@ -1,28 +0,0 @@ -{% extends 'base/layout.html' %} -{% load helpers %} -{% load form_helpers %} - -{% block title %}Create {{ component_type }}{% endblock %} - -{% block content %} -
    - {% csrf_token %} -
    -
    -
    -

    {{ component_type|bettertitle }}

    - {% render_form form %} -
    -
    -
    -
    -
    -
    - Cancel - - -
    -
    -
    -
    -{% endblock %} diff --git a/netbox/utilities/constants.py b/netbox/utilities/constants.py index 8cf047c42..c3fbd0687 100644 --- a/netbox/utilities/constants.py +++ b/netbox/utilities/constants.py @@ -11,7 +11,8 @@ FILTER_CHAR_BASED_LOOKUP_MAP = dict( isw='istartswith', nisw='istartswith', ie='iexact', - nie='iexact' + nie='iexact', + empty='empty', ) FILTER_NUMERIC_BASED_LOOKUP_MAP = dict( diff --git a/netbox/utilities/exceptions.py b/netbox/utilities/exceptions.py index 77a915d9c..4ba62bc01 100644 --- a/netbox/utilities/exceptions.py +++ b/netbox/utilities/exceptions.py @@ -9,6 +9,14 @@ class AbortTransaction(Exception): pass +class PermissionsViolation(Exception): + """ + Raised when an operation was prevented because it would violate the + allowed permissions. + """ + pass + + class RQWorkerNotRunningException(APIException): """ Indicates the temporary inability to enqueue a new task (e.g. custom script execution) because no RQ worker diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py index 023baefd9..cb5646a59 100644 --- a/netbox/utilities/templatetags/helpers.py +++ b/netbox/utilities/templatetags/helpers.py @@ -6,7 +6,9 @@ from typing import Dict, Any import yaml from django import template from django.conf import settings +from django.template.defaultfilters import date from django.urls import NoReverseMatch, reverse +from django.utils import timezone from django.utils.html import strip_tags from django.utils.safestring import mark_safe from markdown import markdown @@ -130,6 +132,20 @@ def humanize_speed(speed): return '{} Kbps'.format(speed) +@register.filter() +def humanize_megabytes(mb): + """ + Express a number of megabytes in the most suitable unit (e.g. gigabytes or terabytes). + """ + if not mb: + return '' + if mb >= 1048576: + return f'{int(mb / 1048576)} TB' + if mb >= 1024: + return f'{int(mb / 1024)} GB' + return f'{mb} MB' + + @register.filter() def tzoffset(value): """ @@ -138,6 +154,36 @@ def tzoffset(value): return datetime.datetime.now(value).strftime('%z') +@register.filter(expects_localtime=True) +def annotated_date(date_value): + """ + Returns date as HTML span with short date format as the content and the + (long) date format as the title. + """ + if not date_value: + return '' + + if type(date_value) == datetime.date: + long_ts = date(date_value, 'DATE_FORMAT') + short_ts = date(date_value, 'SHORT_DATE_FORMAT') + else: + long_ts = date(date_value, 'DATETIME_FORMAT') + short_ts = date(date_value, 'SHORT_DATETIME_FORMAT') + + span = f'{short_ts}' + + return mark_safe(span) + + +@register.simple_tag +def annotated_now(): + """ + Returns the current date piped through the annotated_date filter. + """ + tzinfo = timezone.get_current_timezone() if settings.USE_TZ else None + return annotated_date(datetime.datetime.now(tz=tzinfo)) + + @register.filter() def fgcolor(value): """ diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py index 19fdb9f44..492e2105c 100644 --- a/netbox/virtualization/forms.py +++ b/netbox/virtualization/forms.py @@ -8,17 +8,18 @@ from dcim.constants import INTERFACE_MTU_MAX, INTERFACE_MTU_MIN from dcim.forms import InterfaceCommonForm, INTERFACE_MODE_HELP_TEXT from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site, SiteGroup from extras.forms import ( - AddRemoveTagsForm, CustomFieldModelBulkEditForm, CustomFieldModelCSVForm, CustomFieldModelForm, CustomFieldModelFilterForm, + AddRemoveTagsForm, CustomFieldModelBulkEditForm, CustomFieldModelCSVForm, CustomFieldModelForm, + CustomFieldModelFilterForm, CustomFieldsMixin, ) from extras.models import Tag from ipam.models import IPAddress, VLAN from tenancy.forms import TenancyFilterForm, TenancyForm from tenancy.models import Tenant from utilities.forms import ( - add_blank_choice, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect, BulkRenameForm, CommentField, - ConfirmationForm, CSVChoiceField, CSVModelChoiceField, CSVModelForm, DynamicModelChoiceField, - DynamicModelMultipleChoiceField, ExpandableNameField, form_from_model, JSONField, SlugField, SmallTextarea, - StaticSelect2, StaticSelect2Multiple, TagFilterField, BOOLEAN_WITH_BLANK_CHOICES, + add_blank_choice, BootstrapMixin, BulkEditNullBooleanSelect, BulkRenameForm, CommentField, ConfirmationForm, + CSVChoiceField, CSVModelChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, ExpandableNameField, + form_from_model, JSONField, SlugField, SmallTextarea, StaticSelect2, StaticSelect2Multiple, TagFilterField, + BOOLEAN_WITH_BLANK_CHOICES, ) from .choices import * from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface @@ -667,7 +668,8 @@ class VMInterfaceForm(BootstrapMixin, InterfaceCommonForm, CustomFieldModelForm) self.fields['tagged_vlans'].widget.add_query_param('available_on_virtualmachine', vm_id) -class VMInterfaceCreateForm(BootstrapMixin, InterfaceCommonForm): +class VMInterfaceCreateForm(BootstrapMixin, CustomFieldsMixin, InterfaceCommonForm): + model = VMInterface virtual_machine = DynamicModelChoiceField( queryset=VirtualMachine.objects.all() ) @@ -730,7 +732,7 @@ class VMInterfaceCreateForm(BootstrapMixin, InterfaceCommonForm): self.fields['tagged_vlans'].widget.add_query_param('available_on_virtualmachine', vm_id) -class VMInterfaceCSVForm(CSVModelForm): +class VMInterfaceCSVForm(CustomFieldModelCSVForm): virtual_machine = CSVModelChoiceField( queryset=VirtualMachine.objects.all(), to_field_name='name' @@ -755,7 +757,7 @@ class VMInterfaceCSVForm(CSVModelForm): return self.cleaned_data['enabled'] -class VMInterfaceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): +class VMInterfaceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModelBulkEditForm): pk = forms.ModelMultipleChoiceField( queryset=VMInterface.objects.all(), widget=forms.MultipleHiddenInput() diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 68eba0f07..7e3025aa7 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -33,6 +33,9 @@ class ClusterTypeView(generic.ObjectView): def get_extra_context(self, request, instance): clusters = Cluster.objects.restrict(request.user, 'view').filter( type=instance + ).annotate( + device_count=count_related(Device, 'cluster'), + vm_count=count_related(VirtualMachine, 'cluster') ) clusters_table = tables.ClusterTable(clusters) @@ -92,6 +95,9 @@ class ClusterGroupView(generic.ObjectView): def get_extra_context(self, request, instance): clusters = Cluster.objects.restrict(request.user, 'view').filter( group=instance + ).annotate( + device_count=count_related(Device, 'cluster'), + vm_count=count_related(VirtualMachine, 'cluster') ) clusters_table = tables.ClusterTable(clusters) @@ -450,7 +456,7 @@ class VMInterfaceCreateView(generic.ComponentCreateView): queryset = VMInterface.objects.all() form = forms.VMInterfaceCreateForm model_form = forms.VMInterfaceForm - template_name = 'virtualization/virtualmachine_component_add.html' + template_name = 'dcim/device_component_add.html' class VMInterfaceEditView(generic.ObjectEditView): diff --git a/requirements.txt b/requirements.txt index 48fe53543..1959e7c2e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==3.2.4 +Django==3.2.5 django-cacheops==6.0 django-cors-headers==3.7.0 django-debug-toolbar==3.2.1 @@ -9,7 +9,7 @@ django-pglocks==1.0.4 django-prometheus==2.1.0 django-rq==2.4.1 django-tables2==2.4.0 -django-taggit==1.4.0 +django-taggit==1.5.1 django-timezone-field==4.1.2 djangorestframework==3.12.4 drf-yasg[validation]==1.20.0 @@ -18,8 +18,8 @@ gunicorn==20.1.0 Jinja2==3.0.1 Markdown==3.3.4 netaddr==0.8.0 -Pillow==8.2.0 -psycopg2-binary==2.9 +Pillow==8.3.0 +psycopg2-binary==2.9.1 pycryptodome==3.10.1 PyYAML==5.4.1 svgwrite==1.4.1