{% block title %}Console Server Ports{% endblock %}
-
-
- {% include 'utilities/obj_table.html' with bulk_edit_url='dcim:consoleserverport_bulk_edit' bulk_delete_url='dcim:consoleserverport_bulk_delete' %}
-
- {% include 'utilities/obj_table.html' with bulk_edit_url='virtualization:cluster_bulk_edit' bulk_delete_url='virtualization:cluster_bulk_delete' %}
-
- {% include 'virtualization/inc/virtualmachine_table.html' with bulk_edit_url='virtualization:virtualmachine_bulk_edit' bulk_delete_url='virtualization:virtualmachine_bulk_delete' %}
-
-
- {% include 'inc/search_panel.html' %}
-
-
{% endblock %}
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index a53458694c7..0319a20b037 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -22,7 +22,6 @@ class TenantGroupListView(PermissionRequiredMixin, ObjectListView):
permission_required = 'tenancy.view_tenantgroup'
queryset = TenantGroup.objects.annotate(tenant_count=Count('tenants'))
table = tables.TenantGroupTable
- template_name = 'tenancy/tenantgroup_list.html'
class TenantGroupCreateView(PermissionRequiredMixin, ObjectEditView):
@@ -60,7 +59,6 @@ class TenantListView(PermissionRequiredMixin, ObjectListView):
filterset = filters.TenantFilterSet
filterset_form = forms.TenantFilterForm
table = tables.TenantTable
- template_name = 'tenancy/tenant_list.html'
class TenantView(PermissionRequiredMixin, View):
diff --git a/netbox/utilities/constants.py b/netbox/utilities/constants.py
index 1f8e135534d..1665b45c2b0 100644
--- a/netbox/utilities/constants.py
+++ b/netbox/utilities/constants.py
@@ -69,3 +69,16 @@ FILTER_LOOKUP_HELP_TEXT_MAP = dict(
gte='greater than or equal',
n='negated'
)
+
+
+# Keys for PostgreSQL advisory locks. These are arbitrary bigints used by
+# the advisory_lock contextmanager. When a lock is acquired,
+# one of these keys will be used to identify said lock.
+#
+# When adding a new key, pick something arbitrary and unique so
+# that it is easily searchable in query logs.
+
+ADVISORY_LOCK_KEYS = {
+ 'available-prefixes': 100100,
+ 'available-ips': 100200,
+}
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index c9a857ad0cc..c629d70a2f2 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -309,12 +309,17 @@ class APISelect(SelectWithDisabled):
def add_additional_query_param(self, name, value):
"""
- Add details for an additional query param in the form of a data-* attribute.
+ Add details for an additional query param in the form of a data-* JSON-encoded list attribute.
:param name: The name of the query param
:param value: The value of the query param
"""
- self.attrs['data-additional-query-param-{}'.format(name)] = value
+ key = 'data-additional-query-param-{}'.format(name)
+
+ values = json.loads(self.attrs.get(key, '[]'))
+ values.append(value)
+
+ self.attrs[key] = json.dumps(values)
def add_conditional_query_param(self, condition, value):
"""
diff --git a/netbox/utilities/ordering.py b/netbox/utilities/ordering.py
index a560e776e8a..39e21733a98 100644
--- a/netbox/utilities/ordering.py
+++ b/netbox/utilities/ordering.py
@@ -10,7 +10,7 @@ INTERFACE_NAME_REGEX = r'(^(?P[^\d\.:]+)?)' \
r'(.(?P\d+)$)?'
-def naturalize(value, max_length=None, integer_places=8):
+def naturalize(value, max_length, integer_places=8):
"""
Take an alphanumeric string and prepend all integers to `integer_places` places to ensure the strings
are ordered naturally. For example:
@@ -39,10 +39,10 @@ def naturalize(value, max_length=None, integer_places=8):
output.append(segment)
ret = ''.join(output)
- return ret[:max_length] if max_length else ret
+ return ret[:max_length]
-def naturalize_interface(value, max_length=None):
+def naturalize_interface(value, max_length):
"""
Similar in nature to naturalize(), but takes into account a particular naming format adapted from the old
InterfaceManager.
@@ -77,4 +77,4 @@ def naturalize_interface(value, max_length=None):
output.append('000000')
ret = ''.join(output)
- return ret[:max_length] if max_length else ret
+ return ret[:max_length]
diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index ae679c91a86..dfeddd31ae4 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -1,9 +1,10 @@
import datetime
import json
import re
-import yaml
+import yaml
from django import template
+from django.urls import NoReverseMatch, reverse
from django.utils.html import strip_tags
from django.utils.safestring import mark_safe
from markdown import markdown
@@ -11,7 +12,6 @@ from markdown import markdown
from utilities.choices import unpack_grouped_choices
from utilities.utils import foreground_color
-
register = template.Library()
@@ -101,6 +101,21 @@ def model_name_plural(obj):
return obj._meta.verbose_name_plural
+@register.filter()
+def url_name(model, action):
+ """
+ Return the URL name for the given model and action, or None if invalid.
+ """
+ url_name = '{}:{}_{}'.format(model._meta.app_label, model._meta.model_name, action)
+ try:
+ # Validate and return the URL name. We don't return the actual URL yet because many of the templates
+ # are written to pass a name to {% url %}.
+ reverse(url_name)
+ return url_name
+ except NoReverseMatch:
+ return None
+
+
@register.filter()
def contains(value, arg):
"""
diff --git a/netbox/utilities/tests/test_ordering.py b/netbox/utilities/tests/test_ordering.py
index a875c688cf8..958224c947f 100644
--- a/netbox/utilities/tests/test_ordering.py
+++ b/netbox/utilities/tests/test_ordering.py
@@ -21,7 +21,10 @@ class NaturalizationTestCase(TestCase):
)
for origin, naturalized in data:
- self.assertEqual(naturalize(origin), naturalized)
+ self.assertEqual(naturalize(origin, max_length=50), naturalized)
+
+ def test_naturalize_max_length(self):
+ self.assertEqual(naturalize('abc123def456', max_length=10), 'abc0000012')
def test_naturalize_interface(self):
@@ -40,4 +43,7 @@ class NaturalizationTestCase(TestCase):
)
for origin, naturalized in data:
- self.assertEqual(naturalize_interface(origin), naturalized)
+ self.assertEqual(naturalize_interface(origin, max_length=50), naturalized)
+
+ def test_naturalize_interface_max_length(self):
+ self.assertEqual(naturalize_interface('Gi1/2/3', max_length=20), '0001000299999999Gi00')
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 7c38aceee3f..d0257324ef8 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -71,7 +71,8 @@ class ObjectListView(View):
filterset = None
filterset_form = None
table = None
- template_name = None
+ template_name = 'utilities/obj_list.html'
+ action_buttons = ('add', 'import', 'export')
def queryset_to_yaml(self):
"""
@@ -156,9 +157,11 @@ class ObjectListView(View):
# Provide a hook to tweak the queryset based on the request immediately prior to rendering the object list
self.queryset = self.alter_queryset(request)
- # Compile user model permissions for access from within the template
- perm_base_name = '{}.{{}}_{}'.format(model._meta.app_label, model._meta.model_name)
- permissions = {p: request.user.has_perm(perm_base_name.format(p)) for p in ['add', 'change', 'delete']}
+ # Compile a dictionary indicating which permissions are available to the current user for this model
+ permissions = {}
+ for action in ('add', 'change', 'delete', 'view'):
+ perm_name = '{}.{}_{}'.format(model._meta.app_label, action, model._meta.model_name)
+ permissions[action] = request.user.has_perm(perm_name)
# Construct the table based on the user's permissions
table = self.table(self.queryset)
@@ -176,6 +179,7 @@ class ObjectListView(View):
'content_type': content_type,
'table': table,
'permissions': permissions,
+ 'action_buttons': self.action_buttons,
'filter_form': self.filterset_form(request.GET, label_suffix='') if self.filterset_form else None,
}
context.update(self.extra_context())
@@ -630,7 +634,7 @@ class BulkEditView(GetReturnURLMixin, View):
post_data['pk'] = [obj.pk for obj in self.filterset(request.GET, model.objects.only('pk')).qs]
if '_apply' in request.POST:
- form = self.form(model, request.POST, initial=request.GET)
+ form = self.form(model, request.POST)
if form.is_valid():
custom_fields = form.custom_fields if hasattr(form, 'custom_fields') else []
@@ -714,10 +718,6 @@ class BulkEditView(GetReturnURLMixin, View):
else:
# Pass the PK list as initial data to avoid binding the form
initial_data = querydict_to_dict(post_data)
-
- # Append any normal initial data (passed as GET parameters)
- initial_data.update(request.GET)
-
form = self.form(model, initial=initial_data)
# Retrieve objects being edited
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index 12393d40001..0dbe38324fb 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -351,6 +351,7 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
)
role = DynamicModelChoiceField(
queryset=DeviceRole.objects.all(),
+ required=False,
widget=APISelect(
api_url="/api/dcim/device-roles/",
additional_query_params={
@@ -658,7 +659,10 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm):
widget=APISelect(
api_url="/api/ipam/vlans/",
display_field='display_name',
- full=True
+ full=True,
+ additional_query_params={
+ 'site_id': 'null',
+ },
)
)
tagged_vlans = DynamicModelMultipleChoiceField(
@@ -667,7 +671,10 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm):
widget=APISelectMultiple(
api_url="/api/ipam/vlans/",
display_field='display_name',
- full=True
+ full=True,
+ additional_query_params={
+ 'site_id': 'null',
+ },
)
)
tags = TagField(
@@ -695,35 +702,12 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
- # Limit VLan choices to those in: global vlans, global groups, the current site's group, the current site
- vlan_choices = []
- global_vlans = VLAN.objects.filter(site=None, group=None)
- vlan_choices.append(
- ('Global', [(vlan.pk, vlan) for vlan in global_vlans])
- )
- for group in VLANGroup.objects.filter(site=None):
- global_group_vlans = VLAN.objects.filter(group=group)
- vlan_choices.append(
- (group.name, [(vlan.pk, vlan) for vlan in global_group_vlans])
- )
-
+ # Add current site to VLANs query params
site = getattr(self.instance.parent, 'site', None)
if site is not None:
-
- # Add non-grouped site VLANs
- site_vlans = VLAN.objects.filter(site=site, group=None)
- vlan_choices.append((site.name, [(vlan.pk, vlan) for vlan in site_vlans]))
-
- # Add grouped site VLANs
- for group in VLANGroup.objects.filter(site=site):
- site_group_vlans = VLAN.objects.filter(group=group)
- vlan_choices.append((
- '{} / {}'.format(group.site.name, group.name),
- [(vlan.pk, vlan) for vlan in site_group_vlans]
- ))
-
- self.fields['untagged_vlan'].choices = [(None, '---------')] + vlan_choices
- self.fields['tagged_vlans'].choices = vlan_choices
+ # Add current site to VLANs query params
+ self.fields['untagged_vlan'].widget.add_additional_query_param('site_id', site.pk)
+ self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', site.pk)
def clean(self):
super().clean()
@@ -784,7 +768,10 @@ class InterfaceCreateForm(BootstrapMixin, forms.Form):
widget=APISelect(
api_url="/api/ipam/vlans/",
display_field='display_name',
- full=True
+ full=True,
+ additional_query_params={
+ 'site_id': 'null',
+ },
)
)
tagged_vlans = DynamicModelMultipleChoiceField(
@@ -793,7 +780,10 @@ class InterfaceCreateForm(BootstrapMixin, forms.Form):
widget=APISelectMultiple(
api_url="/api/ipam/vlans/",
display_field='display_name',
- full=True
+ full=True,
+ additional_query_params={
+ 'site_id': 'null',
+ },
)
)
tags = TagField(
@@ -807,35 +797,11 @@ class InterfaceCreateForm(BootstrapMixin, forms.Form):
pk=self.initial.get('virtual_machine') or self.data.get('virtual_machine')
)
- # Limit VLAN choices to those in: global vlans, global groups, the current site's group, the current site
- vlan_choices = []
- global_vlans = VLAN.objects.filter(site=None, group=None)
- vlan_choices.append(
- ('Global', [(vlan.pk, vlan) for vlan in global_vlans])
- )
- for group in VLANGroup.objects.filter(site=None):
- global_group_vlans = VLAN.objects.filter(group=group)
- vlan_choices.append(
- (group.name, [(vlan.pk, vlan) for vlan in global_group_vlans])
- )
-
site = getattr(virtual_machine.cluster, 'site', None)
if site is not None:
-
- # Add non-grouped site VLANs
- site_vlans = VLAN.objects.filter(site=site, group=None)
- vlan_choices.append((site.name, [(vlan.pk, vlan) for vlan in site_vlans]))
-
- # Add grouped site VLANs
- for group in VLANGroup.objects.filter(site=site):
- site_group_vlans = VLAN.objects.filter(group=group)
- vlan_choices.append((
- '{} / {}'.format(group.site.name, group.name),
- [(vlan.pk, vlan) for vlan in site_group_vlans]
- ))
-
- self.fields['untagged_vlan'].choices = [(None, '---------')] + vlan_choices
- self.fields['tagged_vlans'].choices = vlan_choices
+ # Add current site to VLANs query params
+ self.fields['untagged_vlan'].widget.add_additional_query_param('site_id', site.pk)
+ self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', site.pk)
class InterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
@@ -872,7 +838,10 @@ class InterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
widget=APISelect(
api_url="/api/ipam/vlans/",
display_field='display_name',
- full=True
+ full=True,
+ additional_query_params={
+ 'site_id': 'null',
+ },
)
)
tagged_vlans = DynamicModelMultipleChoiceField(
@@ -881,7 +850,10 @@ class InterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
widget=APISelectMultiple(
api_url="/api/ipam/vlans/",
display_field='display_name',
- full=True
+ full=True,
+ additional_query_params={
+ 'site_id': 'null',
+ },
)
)
@@ -897,35 +869,11 @@ class InterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
if 'virtual_machine' in self.initial:
parent_obj = VirtualMachine.objects.filter(pk=self.initial['virtual_machine']).first()
- # Limit VLAN choices to global VLANs, VLANs in global groups, the current site's group, the current site
- vlan_choices = []
- global_vlans = VLAN.objects.filter(site=None, group=None)
- vlan_choices.append(
- ('Global', [(vlan.pk, vlan) for vlan in global_vlans])
- )
- for group in VLANGroup.objects.filter(site=None):
- global_group_vlans = VLAN.objects.filter(group=group)
- vlan_choices.append(
- (group.name, [(vlan.pk, vlan) for vlan in global_group_vlans])
- )
- if parent_obj.cluster is not None:
- site = getattr(parent_obj.cluster, 'site', None)
- if site is not None:
-
- # Add non-grouped site VLANs
- site_vlans = VLAN.objects.filter(site=site, group=None)
- vlan_choices.append((site.name, [(vlan.pk, vlan) for vlan in site_vlans]))
-
- # Add grouped site VLANs
- for group in VLANGroup.objects.filter(site=site):
- site_group_vlans = VLAN.objects.filter(group=group)
- vlan_choices.append((
- '{} / {}'.format(group.site.name, group.name),
- [(vlan.pk, vlan) for vlan in site_group_vlans]
- ))
-
- self.fields['untagged_vlan'].choices = [(None, '---------')] + vlan_choices
- self.fields['tagged_vlans'].choices = vlan_choices
+ site = getattr(parent_obj.cluster, 'site', None)
+ if site is not None:
+ # Add current site to VLANs query params
+ self.fields['untagged_vlan'].widget.add_additional_query_param('site_id', site.pk)
+ self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', site.pk)
#
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index b961d65e5cd..291392eb48d 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -26,7 +26,6 @@ class ClusterTypeListView(PermissionRequiredMixin, ObjectListView):
permission_required = 'virtualization.view_clustertype'
queryset = ClusterType.objects.annotate(cluster_count=Count('clusters'))
table = tables.ClusterTypeTable
- template_name = 'virtualization/clustertype_list.html'
class ClusterTypeCreateView(PermissionRequiredMixin, ObjectEditView):
@@ -62,7 +61,6 @@ class ClusterGroupListView(PermissionRequiredMixin, ObjectListView):
permission_required = 'virtualization.view_clustergroup'
queryset = ClusterGroup.objects.annotate(cluster_count=Count('clusters'))
table = tables.ClusterGroupTable
- template_name = 'virtualization/clustergroup_list.html'
class ClusterGroupCreateView(PermissionRequiredMixin, ObjectEditView):
@@ -100,7 +98,6 @@ class ClusterListView(PermissionRequiredMixin, ObjectListView):
table = tables.ClusterTable
filterset = filters.ClusterFilterSet
filterset_form = forms.ClusterFilterForm
- template_name = 'virtualization/cluster_list.html'
class ClusterView(PermissionRequiredMixin, View):
diff --git a/requirements.txt b/requirements.txt
index 9c5f624f943..b0b1b971dfe 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,7 @@ django-cors-headers==3.2.1
django-debug-toolbar==2.1
django-filter==2.2.0
django-mptt==0.9.1
+django-pglocks==1.0.4
django-prometheus==1.1.0
django-rq==2.2.0
django-tables2==2.2.1