- {% if power_ports and poweroutlets %}
+ {% if object.powerports.exists and object.poweroutlets.exists %}
Power Utilization
@@ -217,10 +217,10 @@
Available |
Utilization |
- {% for pp in power_ports %}
- {% with utilization=pp.get_power_draw powerfeed=pp.connected_endpoint %}
+ {% for powerport in object.powerports.all %}
+ {% with utilization=powerport.get_power_draw powerfeed=powerport.connected_endpoint %}
- | {{ pp }} |
+ {{ powerport }} |
{{ utilization.outlet_count }} |
{{ utilization.allocated }}VA |
{% if powerfeed.available_power %}
diff --git a/netbox/templates/dcim/device/base.html b/netbox/templates/dcim/device/base.html
index 631abde89..8f488b284 100644
--- a/netbox/templates/dcim/device/base.html
+++ b/netbox/templates/dcim/device/base.html
@@ -90,7 +90,7 @@
Device
- {% with interface_count=object.interfaces.count %}
+ {% with interface_count=object.vc_interfaces.count %}
{% if interface_count %}
Interfaces {% badge interface_count %}
diff --git a/netbox/templates/dcim/device_component.html b/netbox/templates/dcim/device_component.html
index c0ce453b3..234d10fdd 100644
--- a/netbox/templates/dcim/device_component.html
+++ b/netbox/templates/dcim/device_component.html
@@ -1,6 +1,7 @@
{% extends 'base.html' %}
{% load helpers %}
{% load perms %}
+{% load custom_links %}
{% load plugins %}
{% block header %}
@@ -30,6 +31,9 @@
{% endif %}
{% block title %}{{ object.device }} / {{ object }}{% endblock %}
+
+ {% custom_links object %}
+
-
{{ object|meta:"verbose_name"|bettertitle }}
diff --git a/netbox/templates/dcim/inc/cable_toggle_buttons.html b/netbox/templates/dcim/inc/cable_toggle_buttons.html
index 98e4efd94..e3eb318ac 100644
--- a/netbox/templates/dcim/inc/cable_toggle_buttons.html
+++ b/netbox/templates/dcim/inc/cable_toggle_buttons.html
@@ -9,8 +9,3 @@
{% endif %}
{% endif %}
-{% if perms.dcim.delete_cable %}
-
-
-
-{% endif %}
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 3ae0733a1..2c0f6e01f 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -1,6 +1,7 @@
{% extends 'dcim/device_component.html' %}
{% load helpers %}
{% load plugins %}
+{% load render_table from django_tables2 %}
{% block content %}
@@ -226,7 +227,23 @@
- {% include 'panel_table.html' with table=ipaddress_table heading="IP Addresses" %}
+
+
+ IP Addresses
+
+ {% if ipaddress_table.rows %}
+ {% render_table ipaddress_table 'inc/table.html' %}
+ {% else %}
+
None
+ {% endif %}
+ {% if perms.ipam.add_ipaddress %}
+
+ {% endif %}
+
diff --git a/netbox/templates/dcim/rackreservation.html b/netbox/templates/dcim/rackreservation.html
index 8e05484d4..5273b2a39 100644
--- a/netbox/templates/dcim/rackreservation.html
+++ b/netbox/templates/dcim/rackreservation.html
@@ -127,22 +127,20 @@
{% plugin_left_page object %}
- {% with rack=object.rack %}
-
-
-
- {% include 'dcim/inc/rack_elevation.html' with face='front' %}
-
-
-
- {% include 'dcim/inc/rack_elevation.html' with face='rear' %}
+
+
+
+ {% include 'dcim/inc/rack_elevation.html' with object=object.rack face='front' %}
- {% endwith %}
+
+
+ {% include 'dcim/inc/rack_elevation.html' with object=object.rack face='rear' %}
+
+
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/trace/cable.html b/netbox/templates/dcim/trace/cable.html
index 4235768a6..7a7fbcf55 100644
--- a/netbox/templates/dcim/trace/cable.html
+++ b/netbox/templates/dcim/trace/cable.html
@@ -1,6 +1,6 @@
{% load helpers %}
-
+
+ | IP Addresses |
+
+ {{ ipaddress_count }}
+ |
diff --git a/netbox/templates/virtualization/virtualmachine_list.html b/netbox/templates/virtualization/virtualmachine_list.html
index 9d8c1720f..245e55092 100644
--- a/netbox/templates/virtualization/virtualmachine_list.html
+++ b/netbox/templates/virtualization/virtualmachine_list.html
@@ -7,7 +7,7 @@
Add Components
{% endif %}
diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html
index 7263fd9ae..fb1190d72 100644
--- a/netbox/templates/virtualization/vminterface.html
+++ b/netbox/templates/virtualization/vminterface.html
@@ -1,6 +1,7 @@
{% extends 'base.html' %}
{% load helpers %}
{% load plugins %}
+{% load render_table from django_tables2 %}
{% block header %}
@@ -93,7 +94,23 @@
- {% include 'panel_table.html' with table=ipaddress_table heading="IP Addresses" %}
+
+
+ IP Addresses
+
+ {% if ipaddress_table.rows %}
+ {% render_table ipaddress_table 'inc/table.html' %}
+ {% else %}
+
None
+ {% endif %}
+ {% if perms.ipam.add_ipaddress %}
+
+ {% endif %}
+
diff --git a/netbox/tenancy/api/serializers.py b/netbox/tenancy/api/serializers.py
index 05e83853e..4c2f9faee 100644
--- a/netbox/tenancy/api/serializers.py
+++ b/netbox/tenancy/api/serializers.py
@@ -24,7 +24,7 @@ class TenantGroupSerializer(ValidatedModelSerializer):
class TenantSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:tenant-detail')
- group = NestedTenantGroupSerializer(required=False)
+ group = NestedTenantGroupSerializer(required=False, allow_null=True)
circuit_count = serializers.IntegerField(read_only=True)
device_count = serializers.IntegerField(read_only=True)
ipaddress_count = serializers.IntegerField(read_only=True)
diff --git a/netbox/tenancy/tests/test_api.py b/netbox/tenancy/tests/test_api.py
index 7af3c8d79..c512ff688 100644
--- a/netbox/tenancy/tests/test_api.py
+++ b/netbox/tenancy/tests/test_api.py
@@ -56,6 +56,7 @@ class TenantTest(APIViewTestCases.APIViewTestCase):
model = Tenant
brief_fields = ['id', 'name', 'slug', 'url']
bulk_update_data = {
+ 'group': None,
'description': 'New description',
}
diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index f2fe4a0b4..e1625e1ed 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -223,7 +223,7 @@ class ObjectTypeListFilter(admin.SimpleListFilter):
parameter_name = 'object_type'
def lookups(self, request, model_admin):
- object_types = ObjectPermission.objects.values_list('id', flat=True).distinct()
+ object_types = ObjectPermission.objects.values_list('object_types__pk', flat=True).distinct()
content_types = ContentType.objects.filter(pk__in=object_types).order_by('app_label', 'model')
return [
(ct.pk, ct) for ct in content_types
diff --git a/netbox/utilities/custom_inspectors.py b/netbox/utilities/custom_inspectors.py
index 95c647fb8..b110a9123 100644
--- a/netbox/utilities/custom_inspectors.py
+++ b/netbox/utilities/custom_inspectors.py
@@ -28,29 +28,38 @@ class NetBoxSwaggerAutoSchema(SwaggerAutoSchema):
serializer = super().get_request_serializer()
if serializer is not None and self.method in self.implicit_body_methods:
- properties = {}
- for child_name, child in serializer.fields.items():
- if isinstance(child, (ChoiceField, WritableNestedSerializer)):
- properties[child_name] = None
- elif isinstance(child, ManyRelatedField) and isinstance(child.child_relation, SerializedPKRelatedField):
- properties[child_name] = None
-
- if properties:
- if type(serializer) not in self.writable_serializers:
- writable_name = 'Writable' + type(serializer).__name__
- meta_class = getattr(type(serializer), 'Meta', None)
- if meta_class:
- ref_name = 'Writable' + get_serializer_ref_name(serializer)
- writable_meta = type('Meta', (meta_class,), {'ref_name': ref_name})
- properties['Meta'] = writable_meta
-
- self.writable_serializers[type(serializer)] = type(writable_name, (type(serializer),), properties)
-
- writable_class = self.writable_serializers[type(serializer)]
- serializer = writable_class()
-
+ writable_class = self.get_writable_class(serializer)
+ if writable_class is not None:
+ if hasattr(serializer, 'child'):
+ child_serializer = self.get_writable_class(serializer.child)
+ serializer = writable_class(child=child_serializer)
+ else:
+ serializer = writable_class()
return serializer
+ def get_writable_class(self, serializer):
+ properties = {}
+ fields = {} if hasattr(serializer, 'child') else serializer.fields
+ for child_name, child in fields.items():
+ if isinstance(child, (ChoiceField, WritableNestedSerializer)):
+ properties[child_name] = None
+ elif isinstance(child, ManyRelatedField) and isinstance(child.child_relation, SerializedPKRelatedField):
+ properties[child_name] = None
+
+ if properties:
+ if type(serializer) not in self.writable_serializers:
+ writable_name = 'Writable' + type(serializer).__name__
+ meta_class = getattr(type(serializer), 'Meta', None)
+ if meta_class:
+ ref_name = 'Writable' + get_serializer_ref_name(serializer)
+ writable_meta = type('Meta', (meta_class,), {'ref_name': ref_name})
+ properties['Meta'] = writable_meta
+
+ self.writable_serializers[type(serializer)] = type(writable_name, (type(serializer),), properties)
+
+ writable_class = self.writable_serializers[type(serializer)]
+ return writable_class
+
class SerializedPKRelatedFieldInspector(FieldInspector):
def field_to_swagger_object(self, field, swagger_object_type, use_references, **kwargs):
diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py
index a5b76fd8d..5f1e06c3b 100644
--- a/netbox/utilities/forms/fields.py
+++ b/netbox/utilities/forms/fields.py
@@ -5,6 +5,7 @@ from io import StringIO
import django_filters
from django import forms
+from django.conf import settings
from django.forms.fields import JSONField as _JSONField, InvalidJSONInput
from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
from django.db.models import Count
@@ -355,7 +356,15 @@ class DynamicModelChoiceField(DynamicModelChoiceMixin, forms.ModelChoiceField):
Override get_bound_field() to avoid pre-populating field choices with a SQL query. The field will be
rendered only with choices set via bound data. Choices are populated on-demand via the APISelect widget.
"""
- pass
+
+ def clean(self, value):
+ """
+ When null option is enabled and "None" is sent as part of a form to be submitted, it is sent as the
+ string 'null'. This will check for that condition and gracefully handle the conversion to a NoneType.
+ """
+ if self.null_option is not None and value == settings.FILTERS_NULL_CHOICE_VALUE:
+ return None
+ return super().clean(value)
class DynamicModelMultipleChoiceField(DynamicModelChoiceMixin, forms.ModelMultipleChoiceField):
diff --git a/netbox/utilities/forms/widgets.py b/netbox/utilities/forms/widgets.py
index cd6fb0fbb..1c456c74c 100644
--- a/netbox/utilities/forms/widgets.py
+++ b/netbox/utilities/forms/widgets.py
@@ -114,7 +114,10 @@ class ContentTypeSelect(StaticSelect2):
class NumericArrayField(SimpleArrayField):
def to_python(self, value):
- value = ','.join([str(n) for n in parse_numeric_range(value)])
+ if not value:
+ return []
+ if isinstance(value, str):
+ value = ','.join([str(n) for n in parse_numeric_range(value)])
return super().to_python(value)
diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index 29c920d4f..01dce8479 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -220,6 +220,14 @@ def as_range(n):
return range(n)
+@register.filter()
+def meters_to_feet(n):
+ """
+ Convert a length from meters to feet.
+ """
+ return float(n) * 3.28084
+
+
#
# Tags
#
diff --git a/netbox/vapor/api/serializers.py b/netbox/vapor/api/serializers.py
index 262156a3b..523a71eb3 100644
--- a/netbox/vapor/api/serializers.py
+++ b/netbox/vapor/api/serializers.py
@@ -68,7 +68,6 @@ class NestedVaporVLANSerializer(WritableNestedSerializer):
)
virtual_circuit = SerializedPKRelatedField(
- source='vlan_of',
queryset=VirtualCircuitVLAN.objects.all(),
serializer=NestedVirtualCircuitSerializer,
pk_field='vlan',
diff --git a/netbox/vapor/api/views.py b/netbox/vapor/api/views.py
index 0426d2e73..8a0458675 100644
--- a/netbox/vapor/api/views.py
+++ b/netbox/vapor/api/views.py
@@ -4,7 +4,6 @@ from rest_framework.decorators import action
from dcim.api.views import PathEndpointMixin
from dcim.models import Interface
-from dcim.filters import InterfaceFilterSet
from extras.api.views import CustomFieldModelViewSet
from tenancy.models import Tenant as Customer
from netbox.api.views import ModelViewSet
@@ -26,5 +25,5 @@ class InterfaceViewSet(PathEndpointMixin, ModelViewSet):
'device', '_path__destination', 'cable', '_cable_peer', 'ip_addresses', 'tags'
)
serializer_class = serializers.InterfaceSerializer
- filterset_class = InterfaceFilterSet
+ filterset_class = filters.InterfaceFilter
brief_prefetch_fields = ['device']
diff --git a/netbox/vapor/filters.py b/netbox/vapor/filters.py
index 887d94dd6..ff5f50c72 100644
--- a/netbox/vapor/filters.py
+++ b/netbox/vapor/filters.py
@@ -127,21 +127,21 @@ class InterfaceFilter(django_filters.FilterSet):
)
vc_context = django_filters.ModelMultipleChoiceFilter(
- field_name='tagged_vlans__vlan_of__virtual_circuit__context',
+ field_name='tagged_vlans__virtual_circuit__virtual_circuit__context',
queryset=VirtualCircuit.objects.all(),
to_field_name='context',
label='Virtual Circuit (context)',
)
vc_name = django_filters.ModelMultipleChoiceFilter(
- field_name='tagged_vlans__vlan_of__virtual_circuit__name',
+ field_name='tagged_vlans__virtual_circuit__virtual_circuit__name',
queryset=VirtualCircuit.objects.all(),
to_field_name='name',
label='Virtual Circuit (name)',
)
vc_id = django_filters.ModelMultipleChoiceFilter(
- field_name='tagged_vlans__vlan_of__virtual_circuit__vcid',
+ field_name='tagged_vlans__virtual_circuit__virtual_circuit__vcid',
queryset=VirtualCircuit.objects.all(),
to_field_name='vcid',
label='Virtual Circuit (vcid)',
diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py
index 34a070623..e183765f1 100644
--- a/netbox/virtualization/tables.py
+++ b/netbox/virtualization/tables.py
@@ -1,5 +1,5 @@
import django_tables2 as tables
-
+from django.conf import settings
from dcim.tables.devices import BaseInterfaceTable
from tenancy.tables import COL_TENANT
from utilities.tables import (
@@ -125,10 +125,18 @@ class VirtualMachineDetailTable(VirtualMachineTable):
linkify=True,
verbose_name='IPv6 Address'
)
- primary_ip = tables.Column(
- linkify=True,
- verbose_name='IP Address'
- )
+ if settings.PREFER_IPV4:
+ primary_ip = tables.Column(
+ linkify=True,
+ order_by=('primary_ip4', 'primary_ip6'),
+ verbose_name='IP Address'
+ )
+ else:
+ primary_ip = tables.Column(
+ linkify=True,
+ order_by=('primary_ip6', 'primary_ip4'),
+ verbose_name='IP Address'
+ )
tags = TagColumn(
url_name='virtualization:virtualmachine_list'
)
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 9ef4a0863..dcf9ebcda 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -396,3 +396,6 @@ class VirtualMachineBulkAddInterfaceView(generic.BulkComponentCreateView):
model_form = forms.VMInterfaceForm
filterset = filters.VirtualMachineFilterSet
table = tables.VirtualMachineTable
+
+ def get_required_permission(self):
+ return f'virtualization.add_vminterface'
diff --git a/requirements.txt b/requirements.txt
index 18ce530fd..ae16926b7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,23 +1,23 @@
-Django==3.1.3
+Django==3.1.7
django-cacheops==5.1
-django-cors-headers==3.5.0
-django-debug-toolbar==3.1.1
+django-cors-headers==3.7.0
+django-debug-toolbar==3.2
django-filter==2.4.0
-django-mptt==0.11.0
+django-mptt==0.12.0
django-pglocks==1.0.4
django-prometheus==2.1.0
django-rq==2.4.0
-django-tables2==2.3.3
+django-tables2==2.3.4
django-taggit==1.3.0
-django-timezone-field==4.0
+django-timezone-field==4.1.1
djangorestframework==3.12.2
drf-yasg[validation]==1.20.0
gunicorn==20.0.4
-Jinja2==2.11.2
-Markdown==3.3.3
+Jinja2==2.11.3
+Markdown==3.3.4
netaddr==0.8.0
-Pillow==8.0.1
+Pillow==8.1.2
psycopg2-binary==2.8.6
-pycryptodome==3.9.9
-PyYAML==5.3.1
-svgwrite==1.4
+pycryptodome==3.10.1
+PyYAML==5.4.1
+svgwrite==1.4.1
diff --git a/upgrade.sh b/upgrade.sh
index 2e35a02f9..648f825a0 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -29,19 +29,25 @@ eval $COMMAND || {
# Activate the virtual environment
source "${VIRTUALENV}/bin/activate"
+# Upgrade pip
+COMMAND="pip install --upgrade pip"
+echo "Updating pip ($COMMAND)..."
+eval $COMMAND || exit 1
+pip -V
+
# Install necessary system packages
-COMMAND="pip3 install wheel"
+COMMAND="pip install wheel"
echo "Installing Python system packages ($COMMAND)..."
eval $COMMAND || exit 1
# Install required Python packages
-COMMAND="pip3 install -r requirements.txt"
+COMMAND="pip install -r requirements.txt"
echo "Installing core dependencies ($COMMAND)..."
eval $COMMAND || exit 1
# Install optional packages (if any)
if [ -s "local_requirements.txt" ]; then
- COMMAND="pip3 install -r local_requirements.txt"
+ COMMAND="pip install -r local_requirements.txt"
echo "Installing local dependencies ($COMMAND)..."
eval $COMMAND || exit 1
elif [ -f "local_requirements.txt" ]; then