diff --git a/docs/installation/ldap.md b/docs/installation/ldap.md index 3cbc0d32c..bd6bcc81f 100644 --- a/docs/installation/ldap.md +++ b/docs/installation/ldap.md @@ -24,7 +24,7 @@ sudo pip install django-auth-ldap # Configuration -Create a file in the same directory as `configuration.py` (typically `netbox/netbox/`) named `ldap_config.py`. Define all of the parameters required below in `ldap_config.py`. +Create a file in the same directory as `configuration.py` (typically `netbox/netbox/`) named `ldap_config.py`. Define all of the parameters required below in `ldap_config.py`. Complete documentation of all `django-auth-ldap` configuration options is included in the project's [official documentation](http://django-auth-ldap.readthedocs.io/). ## General Server Configuration @@ -52,6 +52,8 @@ AUTH_LDAP_BIND_PASSWORD = "demo" LDAP_IGNORE_CERT_ERRORS = True ``` +STARTTLS can be configured by setting `AUTH_LDAP_START_TLS = True` and using the `ldap://` URI scheme. + ## User Authentication !!! info @@ -78,7 +80,7 @@ AUTH_LDAP_USER_ATTR_MAP = { ``` # User Groups for Permissions -!!! Info +!!! info When using Microsoft Active Directory, Support for nested Groups can be activated by using `GroupOfNamesType()` instead of `NestedGroupOfNamesType()` for `AUTH_LDAP_GROUP_TYPE`. ```python diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index e466723bd..e56a12ac0 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -163,7 +163,7 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): class Meta: model = Rack - fields = ['serial', 'type', 'width', 'u_height', 'desc_units'] + fields = ['name', 'serial', 'type', 'width', 'u_height', 'desc_units'] def search(self, queryset, name, value): if not value.strip(): @@ -330,7 +330,7 @@ class DeviceRoleFilter(django_filters.FilterSet): class Meta: model = DeviceRole - fields = ['name', 'slug', 'color'] + fields = ['name', 'slug', 'color', 'vm_role'] class PlatformFilter(django_filters.FilterSet): @@ -455,7 +455,7 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): class Meta: model = Device - fields = ['serial'] + fields = ['serial', 'position'] def search(self, queryset, name, value): if not value.strip(): diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 0ce0afbdf..bdaec4fd8 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -281,12 +281,28 @@ class Prefix(CreatedUpdatedModel, CustomFieldModel): def get_duplicates(self): return Prefix.objects.filter(vrf=self.vrf, prefix=str(self.prefix)).exclude(pk=self.pk) + def get_child_prefixes(self): + """ + Return all Prefixes within this Prefix and VRF. + """ + return Prefix.objects.filter(prefix__net_contained=str(self.prefix), vrf=self.vrf) + def get_child_ips(self): """ - Return all IPAddresses within this Prefix. + Return all IPAddresses within this Prefix and VRF. """ return IPAddress.objects.filter(address__net_host_contained=str(self.prefix), vrf=self.vrf) + def get_available_prefixes(self): + """ + Return all available Prefixes within this prefix as an IPSet. + """ + prefix = netaddr.IPSet(self.prefix) + child_prefixes = netaddr.IPSet([child.prefix for child in self.get_child_prefixes()]) + available_prefixes = prefix - child_prefixes + + return available_prefixes + def get_available_ips(self): """ Return all available IPs within this prefix as an IPSet. @@ -304,15 +320,23 @@ class Prefix(CreatedUpdatedModel, CustomFieldModel): return available_ips + def get_first_available_prefix(self): + """ + Return the first available child prefix within the prefix (or None). + """ + available_prefixes = self.get_available_prefixes() + if not available_prefixes: + return None + return available_prefixes.iter_cidrs()[0] + def get_first_available_ip(self): """ Return the first available IP within the prefix (or None). """ available_ips = self.get_available_ips() - if available_ips: - return '{}/{}'.format(next(available_ips.__iter__()), self.prefix.prefixlen) - else: + if not available_ips: return None + return '{}/{}'.format(next(available_ips.__iter__()), self.prefix.prefixlen) def get_utilization(self): """ @@ -330,17 +354,6 @@ class Prefix(CreatedUpdatedModel, CustomFieldModel): prefix_size -= 2 return int(float(child_count) / prefix_size * 100) - @property - def new_subnet(self): - if self.family == 4: - if self.prefix.prefixlen <= 30: - return netaddr.IPNetwork('{}/{}'.format(self.prefix.network, self.prefix.prefixlen + 1)) - return None - if self.family == 6: - if self.prefix.prefixlen <= 126: - return netaddr.IPNetwork('{}/{}'.format(self.prefix.network, self.prefix.prefixlen + 1)) - return None - class IPAddressManager(models.Manager): diff --git a/netbox/ipam/urls.py b/netbox/ipam/urls.py index a67e9e865..383b13d8f 100644 --- a/netbox/ipam/urls.py +++ b/netbox/ipam/urls.py @@ -51,6 +51,7 @@ urlpatterns = [ url(r'^prefixes/(?P\d+)/$', views.PrefixView.as_view(), name='prefix'), url(r'^prefixes/(?P\d+)/edit/$', views.PrefixEditView.as_view(), name='prefix_edit'), url(r'^prefixes/(?P\d+)/delete/$', views.PrefixDeleteView.as_view(), name='prefix_delete'), + url(r'^prefixes/(?P\d+)/prefixes/$', views.PrefixPrefixesView.as_view(), name='prefix_prefixes'), url(r'^prefixes/(?P\d+)/ip-addresses/$', views.PrefixIPAddressesView.as_view(), name='prefix_ipaddresses'), # IP addresses diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index e36162938..25475eec8 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -476,6 +476,20 @@ class PrefixView(View): duplicate_prefix_table = tables.PrefixTable(list(duplicate_prefixes), orderable=False) duplicate_prefix_table.exclude = ('vrf',) + return render(request, 'ipam/prefix.html', { + 'prefix': prefix, + 'aggregate': aggregate, + 'parent_prefix_table': parent_prefix_table, + 'duplicate_prefix_table': duplicate_prefix_table, + }) + + +class PrefixPrefixesView(View): + + def get(self, request, pk): + + prefix = get_object_or_404(Prefix.objects.all(), pk=pk) + # Child prefixes table child_prefixes = Prefix.objects.filter( vrf=prefix.vrf, prefix__net_contained=str(prefix.prefix) @@ -484,15 +498,16 @@ class PrefixView(View): ).annotate_depth(limit=0) if child_prefixes: child_prefixes = add_available_prefixes(prefix.prefix, child_prefixes) - child_prefix_table = tables.PrefixDetailTable(child_prefixes) + + prefix_table = tables.PrefixDetailTable(child_prefixes) if request.user.has_perm('ipam.change_prefix') or request.user.has_perm('ipam.delete_prefix'): - child_prefix_table.columns.show('pk') + prefix_table.columns.show('pk') paginate = { 'klass': EnhancedPaginator, 'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT) } - RequestConfig(request, paginate).configure(child_prefix_table) + RequestConfig(request, paginate).configure(prefix_table) # Compile permissions list for rendering the object table permissions = { @@ -501,15 +516,12 @@ class PrefixView(View): 'delete': request.user.has_perm('ipam.delete_prefix'), } - return render(request, 'ipam/prefix.html', { + return render(request, 'ipam/prefix_prefixes.html', { 'prefix': prefix, - 'aggregate': aggregate, - 'parent_prefix_table': parent_prefix_table, - 'child_prefix_table': child_prefix_table, - 'duplicate_prefix_table': duplicate_prefix_table, - 'bulk_querystring': 'vrf_id={}&within={}'.format(prefix.vrf or '0', prefix.prefix), + 'first_available_prefix': prefix.get_first_available_prefix(), + 'prefix_table': prefix_table, 'permissions': permissions, - 'return_url': prefix.get_absolute_url(), + 'bulk_querystring': 'vrf_id={}&within={}'.format(prefix.vrf.pk if prefix.vrf else '0', prefix.prefix), }) @@ -544,6 +556,7 @@ class PrefixIPAddressesView(View): return render(request, 'ipam/prefix_ipaddresses.html', { 'prefix': prefix, + 'first_available_ip': prefix.get_first_available_ip(), 'ip_table': ip_table, 'permissions': permissions, 'bulk_querystring': 'vrf_id={}&parent={}'.format(prefix.vrf.pk if prefix.vrf else '0', prefix.prefix), diff --git a/netbox/netbox/api.py b/netbox/netbox/api.py index 0bac06977..28a0d7685 100644 --- a/netbox/netbox/api.py +++ b/netbox/netbox/api.py @@ -20,6 +20,9 @@ class FormlessBrowsableAPIRenderer(BrowsableAPIRenderer): def show_form_for_method(self, *args, **kwargs): return False + def get_filter_form(self, data, view, request): + return None + # # Authentication diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 2ec58502d..e3c3025f9 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -13,7 +13,7 @@ except ImportError: ) -VERSION = '2.2.7' +VERSION = '2.2.8' BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 549b93465..349a3c96d 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -535,7 +535,7 @@
Power Outlets
- {% if perms.dcim.change_poweroutlet and cs_ports|length > 1 %} + {% if perms.dcim.change_poweroutlet and power_outlets|length > 1 %} diff --git a/netbox/templates/dcim/devicetype_list.html b/netbox/templates/dcim/devicetype_list.html index f246f60b5..69807fcff 100644 --- a/netbox/templates/dcim/devicetype_list.html +++ b/netbox/templates/dcim/devicetype_list.html @@ -13,7 +13,7 @@ Import device types {% endif %} - {% include 'inc/export_button.html' with obj_type='devicetypes' %} + {% include 'inc/export_button.html' with obj_type='device types' %}

{% block title %}Device Types{% endblock %}

diff --git a/netbox/templates/dcim/rackgroup_list.html b/netbox/templates/dcim/rackgroup_list.html index f8b53df57..d5853f11c 100644 --- a/netbox/templates/dcim/rackgroup_list.html +++ b/netbox/templates/dcim/rackgroup_list.html @@ -13,7 +13,7 @@ Import rack groups {% endif %} - {% include 'inc/export_button.html' with obj_type='rackgroups' %} + {% include 'inc/export_button.html' with obj_type='rack groups' %}

{% block title %}Rack Groups{% endblock %}

diff --git a/netbox/templates/ipam/inc/prefix_header.html b/netbox/templates/ipam/inc/prefix_header.html index 553af1a66..f3c694c64 100644 --- a/netbox/templates/ipam/inc/prefix_header.html +++ b/netbox/templates/ipam/inc/prefix_header.html @@ -22,8 +22,13 @@
- {% if perms.ipam.add_ipaddress %} - + {% if perms.ipam.add_prefix and active_tab == 'prefixes' and first_available_prefix %} + + Add Child Prefix + + {% endif %} + {% if perms.ipam.add_ipaddress and active_tab == 'ip-addresses' and first_available_ip %} + Add an IP Address @@ -45,5 +50,6 @@ {% include 'inc/created_updated.html' with obj=prefix %} diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index 3447f2ad9..5c168e247 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -139,15 +139,4 @@ {% include 'panel_table.html' with table=parent_prefix_table heading='Parent Prefixes' %}
-
-
- {% if child_prefix_table.rows %} - {% include 'utilities/obj_table.html' with table=child_prefix_table table_template='panel_table.html' heading='Child Prefixes' parent=prefix bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %} - {% elif prefix.new_subnet %} - - Add Child Prefix - - {% endif %} -
-
{% endblock %} diff --git a/netbox/templates/ipam/prefix_ipaddresses.html b/netbox/templates/ipam/prefix_ipaddresses.html index 1b777417d..02e90569d 100644 --- a/netbox/templates/ipam/prefix_ipaddresses.html +++ b/netbox/templates/ipam/prefix_ipaddresses.html @@ -3,10 +3,10 @@ {% block title %}{{ prefix }} - IP Addresses{% endblock %} {% block content %} -{% include 'ipam/inc/prefix_header.html' with active_tab='ip-addresses' %} -
-
- {% include 'utilities/obj_table.html' with table=ip_table table_template='panel_table.html' heading='IP Addresses' bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %} + {% include 'ipam/inc/prefix_header.html' with active_tab='ip-addresses' %} +
+
+ {% include 'utilities/obj_table.html' with table=ip_table table_template='panel_table.html' heading='IP Addresses' bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %} +
-
{% endblock %} diff --git a/netbox/templates/ipam/prefix_prefixes.html b/netbox/templates/ipam/prefix_prefixes.html new file mode 100644 index 000000000..4951942c3 --- /dev/null +++ b/netbox/templates/ipam/prefix_prefixes.html @@ -0,0 +1,12 @@ +{% extends '_base.html' %} + +{% block title %}{{ prefix }} - Prefixes{% endblock %} + +{% block content %} + {% include 'ipam/inc/prefix_header.html' with active_tab='prefixes' %} +
+
+ {% include 'utilities/obj_table.html' with table=prefix_table table_template='panel_table.html' heading='Child Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %} +
+
+{% endblock %} diff --git a/netbox/templates/search.html b/netbox/templates/search.html index afd4293ca..36c0fb5ad 100644 --- a/netbox/templates/search.html +++ b/netbox/templates/search.html @@ -13,12 +13,14 @@ {% for obj_type in results %}

{{ obj_type.name|bettertitle }}

{% include 'panel_table.html' with table=obj_type.table hide_paginator=True %} - {% if obj_type.table.page.has_next %} - - + + + {% if obj_type.table.page.has_next %} See all {{ obj_type.table.page.paginator.count }} results - - {% endif %} + {% else %} + Refine search + {% endif %} +
{% endfor %}
diff --git a/netbox/utilities/middleware.py b/netbox/utilities/middleware.py index b9c95fc5e..64fb70a07 100644 --- a/netbox/utilities/middleware.py +++ b/netbox/utilities/middleware.py @@ -4,7 +4,7 @@ import sys from django.conf import settings from django.db import ProgrammingError -from django.http import HttpResponseRedirect +from django.http import Http404, HttpResponseRedirect from django.shortcuts import render from django.urls import reverse @@ -61,6 +61,10 @@ class ExceptionHandlingMiddleware(object): if settings.DEBUG: return + # Ignore Http404s (defer to Django's built-in 404 handling) + if isinstance(exception, Http404): + return + # Determine the type of exception if isinstance(exception, ProgrammingError): template_name = 'exceptions/programming_error.html' diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index d8ba3712a..d37332bef 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -308,8 +308,14 @@ class BulkCreateView(View): def get(self, request): + # Set initial values for visible form fields from query args + initial = {} + for field in getattr(self.model_form._meta, 'fields', []): + if request.GET.get(field): + initial[field] = request.GET[field] + form = self.form() - model_form = self.model_form() + model_form = self.model_form(initial=initial) return render(request, self.template_name, { 'obj_type': self.model_form._meta.model._meta.verbose_name, diff --git a/netbox/virtualization/filters.py b/netbox/virtualization/filters.py index 1563e57a8..bd3e19400 100644 --- a/netbox/virtualization/filters.py +++ b/netbox/virtualization/filters.py @@ -84,6 +84,17 @@ class VirtualMachineFilter(CustomFieldFilterSet): to_field_name='slug', label='Cluster group (slug)', ) + cluster_type_id = django_filters.ModelMultipleChoiceFilter( + name='cluster__type', + queryset=ClusterType.objects.all(), + label='Cluster type (ID)', + ) + cluster_type = django_filters.ModelMultipleChoiceFilter( + name='cluster__type__slug', + queryset=ClusterType.objects.all(), + to_field_name='slug', + label='Cluster type (slug)', + ) cluster_id = django_filters.ModelMultipleChoiceFilter( queryset=Cluster.objects.all(), label='Cluster (ID)', diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py index 50e2816f1..16b33962c 100644 --- a/netbox/virtualization/forms.py +++ b/netbox/virtualization/forms.py @@ -340,6 +340,11 @@ class VirtualMachineFilterForm(BootstrapMixin, CustomFieldFilterForm): to_field_name='slug', null_option=(0, 'None') ) + cluster_type = FilterChoiceField( + queryset=ClusterType.objects.all(), + to_field_name='slug', + null_option=(0, 'None') + ) cluster_id = FilterChoiceField( queryset=Cluster.objects.annotate(filter_count=Count('virtual_machines')), label='Cluster' diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py index edb35f4cb..8152c5d57 100644 --- a/netbox/virtualization/models.py +++ b/netbox/virtualization/models.py @@ -139,6 +139,7 @@ class Cluster(CreatedUpdatedModel, CustomFieldModel): self.name, self.type.name, self.group.name if self.group else None, + self.site.name if self.site else None, self.comments, ])