diff --git a/.github/stale.yaml b/.github/stale.yml
similarity index 100%
rename from .github/stale.yaml
rename to .github/stale.yml
diff --git a/README.md b/README.md
index 996f26332..38961c286 100644
--- a/README.md
+++ b/README.md
@@ -36,13 +36,6 @@ Please see [the documentation](http://netbox.readthedocs.io/en/stable/) for
instructions on installing NetBox. To upgrade NetBox, please download the [latest release](https://github.com/netbox-community/netbox/releases)
and run `upgrade.sh`.
-## Alternative Installations
-
-* [Docker container](https://github.com/netbox-community/netbox-docker) (via [@cimnine](https://github.com/cimnine))
-* [Vagrant deployment](https://github.com/ryanmerolle/netbox-vagrant) (via [@ryanmerolle](https://github.com/ryanmerolle))
-* [Ansible deployment](https://github.com/lae/ansible-role-netbox) (via [@lae](https://github.com/lae))
-* [Kubernetes deployment](https://github.com/CENGN/netbox-kubernetes) (via [@CENGN](https://github.com/CENGN))
-
# Providing Feedback
Feature requests and bug reports must be submitted as GiHub issues. (Please be
diff --git a/docs/additional-features/custom-scripts.md b/docs/additional-features/custom-scripts.md
index 8d453f668..cdb49c82a 100644
--- a/docs/additional-features/custom-scripts.md
+++ b/docs/additional-features/custom-scripts.md
@@ -182,7 +182,7 @@ class NewBranchScript(Script):
class Meta:
name = "New Branch"
description = "Provision a new branch site"
- fields = ['site_name', 'switch_count', 'switch_model']
+ field_order = ['site_name', 'switch_count', 'switch_model']
site_name = StringVar(
description="Name of the new site"
diff --git a/docs/installation/3-http-daemon.md b/docs/installation/3-http-daemon.md
index c1bcf7ca8..9c29fc979 100644
--- a/docs/installation/3-http-daemon.md
+++ b/docs/installation/3-http-daemon.md
@@ -32,7 +32,6 @@ server {
proxy_set_header X-Forwarded-Host $server_name;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
- add_header P3P 'CP="ALL DSP COR PSAa PSDa OUR NOR ONL UNI COM NAV"';
}
}
```
diff --git a/docs/release-notes/version-2.6.md b/docs/release-notes/version-2.6.md
index 181d448ff..afad93fde 100644
--- a/docs/release-notes/version-2.6.md
+++ b/docs/release-notes/version-2.6.md
@@ -1,3 +1,40 @@
+# v2.6.9 (2019-12-16)
+
+## Enhancements
+
+* [#3152](https://github.com/netbox-community/netbox/issues/3152) - Include direct link to rack elevations on site view
+* [#3441](https://github.com/netbox-community/netbox/issues/3441) - Move virtual machine results near devices in global search
+* [#3761](https://github.com/netbox-community/netbox/issues/3761) - Added copy button for API tokens
+
+## Bug Fixes
+
+* [#2170](https://github.com/netbox-community/netbox/issues/2170) - Prevent the deletion of a virtual chassis when a cross-member LAG is present
+* [#2358](https://github.com/netbox-community/netbox/issues/2358) - Respect custom field default values when creating objects via the REST API
+* [#3749](https://github.com/netbox-community/netbox/issues/3749) - Fix exception on password change page for local users
+* [#3757](https://github.com/netbox-community/netbox/issues/3757) - Fix unable to assign IP to interface
+
+# v2.6.8 (2019-12-10)
+
+## Enhancements
+
+* [#3139](https://github.com/netbox-community/netbox/issues/3139) - Disable password change form for LDAP-authenticated users
+* [#3457](https://github.com/netbox-community/netbox/issues/3457) - Display cable colors on device view
+* [#3329](https://github.com/netbox-community/netbox/issues/3329) - Remove obsolete P3P policy header
+* [#3663](https://github.com/netbox-community/netbox/issues/3663) - Add query filters for `created` and `last_updated` fields
+* [#3722](https://github.com/netbox-community/netbox/issues/3722) - Allow the underscore character in IPAddress DNS names
+
+## Bug Fixes
+
+* [#3312](https://github.com/netbox-community/netbox/issues/3312) - Fix validation error when editing power cables in bulk
+* [#3644](https://github.com/netbox-community/netbox/issues/3644) - Fix exception when connecting a cable to a RearPort with no corresponding FrontPort
+* [#3669](https://github.com/netbox-community/netbox/issues/3669) - Include `weight` field in prefix/VLAN role form
+* [#3674](https://github.com/netbox-community/netbox/issues/3674) - Include comments on PowerFeed view
+* [#3679](https://github.com/netbox-community/netbox/issues/3679) - Fix link for assigned ipaddress in interface page
+* [#3709](https://github.com/netbox-community/netbox/issues/3709) - Prevent exception when importing an invalid cable definition
+* [#3720](https://github.com/netbox-community/netbox/issues/3720) - Correctly indicate power feed terminations on cable list
+* [#3724](https://github.com/netbox-community/netbox/issues/3724) - Fix API filtering of interfaces by more than one device name
+* [#3725](https://github.com/netbox-community/netbox/issues/3725) - Enforce client validation for minimum service port number
+
# v2.6.7 (2019-11-01)
## Enhancements
diff --git a/mkdocs.yml b/mkdocs.yml
index b03f357fe..cc44921b6 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -31,6 +31,7 @@ pages:
- Change Logging: 'additional-features/change-logging.md'
- Context Data: 'additional-features/context-data.md'
- Custom Fields: 'additional-features/custom-fields.md'
+ - Custom Links: 'additional-features/custom-links.md'
- Custom Scripts: 'additional-features/custom-scripts.md'
- Export Templates: 'additional-features/export-templates.md'
- Graphs: 'additional-features/graphs.md'
diff --git a/netbox/circuits/filters.py b/netbox/circuits/filters.py
index 088ec144a..502d2d103 100644
--- a/netbox/circuits/filters.py
+++ b/netbox/circuits/filters.py
@@ -2,14 +2,14 @@ import django_filters
from django.db.models import Q
from dcim.models import Region, Site
-from extras.filters import CustomFieldFilterSet
+from extras.filters import CustomFieldFilterSet, CreatedUpdatedFilterSet
from tenancy.filtersets import TenancyFilterSet
from utilities.filters import NameSlugSearchFilterSet, NumericInFilter, TagFilter, TreeNodeMultipleChoiceFilter
from .constants import *
from .models import Circuit, CircuitTermination, CircuitType, Provider
-class ProviderFilter(CustomFieldFilterSet):
+class ProviderFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
@@ -54,7 +54,7 @@ class CircuitTypeFilter(NameSlugSearchFilterSet):
fields = ['id', 'name', 'slug']
-class CircuitFilter(CustomFieldFilterSet, TenancyFilterSet):
+class CircuitFilter(CustomFieldFilterSet, TenancyFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py
index 82233d821..a067bcf66 100644
--- a/netbox/dcim/constants.py
+++ b/netbox/dcim/constants.py
@@ -391,7 +391,8 @@ CONNECTION_STATUS_CHOICES = [
# Cable endpoint types
CABLE_TERMINATION_TYPES = [
- 'consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport', 'circuittermination',
+ 'consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport',
+ 'circuittermination', 'powerfeed',
]
# Cable types
diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index 09d112edd..e8152725d 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -2,13 +2,13 @@ import django_filters
from django.contrib.auth.models import User
from django.db.models import Q
-from extras.filters import CustomFieldFilterSet, LocalConfigContextFilter
+from extras.filters import CustomFieldFilterSet, LocalConfigContextFilter, CreatedUpdatedFilterSet
from tenancy.filtersets import TenancyFilterSet
from tenancy.models import Tenant
from utilities.constants import COLOR_CHOICES
from utilities.filters import (
- MultiValueMACAddressFilter, MultiValueNumberFilter, NameSlugSearchFilterSet, NumericInFilter, TagFilter,
- TreeNodeMultipleChoiceFilter,
+ MultiValueCharFilter, MultiValueMACAddressFilter, MultiValueNumberFilter, NameSlugSearchFilterSet, NumericInFilter,
+ TagFilter, TreeNodeMultipleChoiceFilter,
)
from virtualization.models import Cluster
from .constants import *
@@ -38,7 +38,7 @@ class RegionFilter(NameSlugSearchFilterSet, CustomFieldFilterSet):
fields = ['id', 'name', 'slug']
-class SiteFilter(TenancyFilterSet, CustomFieldFilterSet):
+class SiteFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
@@ -116,7 +116,7 @@ class RackRoleFilter(NameSlugSearchFilterSet):
fields = ['id', 'name', 'slug', 'color']
-class RackFilter(TenancyFilterSet, CustomFieldFilterSet):
+class RackFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
@@ -251,7 +251,7 @@ class ManufacturerFilter(NameSlugSearchFilterSet):
fields = ['id', 'name', 'slug']
-class DeviceTypeFilter(CustomFieldFilterSet):
+class DeviceTypeFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
@@ -423,7 +423,7 @@ class PlatformFilter(NameSlugSearchFilterSet):
fields = ['id', 'name', 'slug', 'napalm_driver']
-class DeviceFilter(LocalConfigContextFilter, TenancyFilterSet, CustomFieldFilterSet):
+class DeviceFilter(LocalConfigContextFilter, TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
@@ -696,7 +696,7 @@ class InterfaceFilter(django_filters.FilterSet):
method='search',
label='Search',
)
- device = django_filters.CharFilter(
+ device = MultiValueCharFilter(
method='filter_device',
field_name='name',
label='Device',
@@ -749,8 +749,10 @@ class InterfaceFilter(django_filters.FilterSet):
def filter_device(self, queryset, name, value):
try:
- device = Device.objects.get(**{name: value})
- vc_interface_ids = device.vc_interfaces.values_list('id', flat=True)
+ devices = Device.objects.filter(**{'{}__in'.format(name): value})
+ vc_interface_ids = []
+ for device in devices:
+ vc_interface_ids.extend(device.vc_interfaces.values_list('id', flat=True))
return queryset.filter(pk__in=vc_interface_ids)
except Device.DoesNotExist:
return queryset.none()
@@ -1096,7 +1098,7 @@ class PowerPanelFilter(django_filters.FilterSet):
return queryset.filter(qs_filter)
-class PowerFeedFilter(CustomFieldFilterSet):
+class PowerFeedFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py
index 096344a06..b30a2a8fa 100644
--- a/netbox/dcim/migrations/0066_cables.py
+++ b/netbox/dcim/migrations/0066_cables.py
@@ -174,8 +174,8 @@ class Migration(migrations.Migration):
('length', models.PositiveSmallIntegerField(blank=True, null=True)),
('length_unit', models.PositiveSmallIntegerField(blank=True, null=True)),
('_abs_length', models.DecimalField(blank=True, decimal_places=4, max_digits=10, null=True)),
- ('termination_a_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport', 'circuittermination']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')),
- ('termination_b_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport', 'circuittermination']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')),
+ ('termination_a_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport', 'circuittermination', 'powerfeed']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')),
+ ('termination_b_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport', 'circuittermination', 'powerfeed']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')),
],
),
migrations.AlterUniqueTogether(
diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index 1b08e501d..d523e8f68 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -9,7 +9,7 @@ from django.contrib.postgres.fields import ArrayField, JSONField
from django.core.exceptions import ObjectDoesNotExist, ValidationError
from django.core.validators import MaxValueValidator, MinValueValidator
from django.db import models
-from django.db.models import Count, Q, Sum
+from django.db.models import Count, F, ProtectedError, Q, Sum
from django.urls import reverse
from mptt.models import MPTTModel, TreeForeignKey
from taggit.managers import TaggableManager
@@ -98,6 +98,8 @@ class CableTermination(models.Model):
object_id_field='termination_b_id'
)
+ is_path_endpoint = True
+
class Meta:
abstract = True
@@ -2449,6 +2451,8 @@ class FrontPort(CableTermination, ComponentModel):
validators=[MinValueValidator(1), MaxValueValidator(64)]
)
+ is_path_endpoint = False
+
objects = NaturalOrderingManager()
tags = TaggableManager(through=TaggedItem)
@@ -2511,6 +2515,8 @@ class RearPort(CableTermination, ComponentModel):
validators=[MinValueValidator(1), MaxValueValidator(64)]
)
+ is_path_endpoint = False
+
objects = NaturalOrderingManager()
tags = TaggableManager(through=TaggedItem)
@@ -2729,6 +2735,24 @@ class VirtualChassis(ChangeLoggedModel):
'master': "The selected master is not assigned to this virtual chassis."
})
+ def delete(self, *args, **kwargs):
+
+ # Check for LAG interfaces split across member chassis
+ interfaces = Interface.objects.filter(
+ device__in=self.members.all(),
+ lag__isnull=False
+ ).exclude(
+ lag__device=F('device')
+ )
+ if interfaces:
+ raise ProtectedError(
+ "Unable to delete virtual chassis {}. There are member interfaces which form a cross-chassis "
+ "LAG".format(self),
+ interfaces
+ )
+
+ return super().delete(*args, **kwargs)
+
def to_csv(self):
return (
self.master,
@@ -2843,6 +2867,8 @@ class Cable(ChangeLoggedModel):
def clean(self):
# Validate that termination A exists
+ if not hasattr(self, 'termination_a_type'):
+ raise ValidationError('Termination A type has not been specified')
try:
self.termination_a_type.model_class().objects.get(pk=self.termination_a_id)
except ObjectDoesNotExist:
@@ -2851,6 +2877,8 @@ class Cable(ChangeLoggedModel):
})
# Validate that termination B exists
+ if not hasattr(self, 'termination_b_type'):
+ raise ValidationError('Termination B type has not been specified')
try:
self.termination_b_type.model_class().objects.get(pk=self.termination_b_id)
except ObjectDoesNotExist:
diff --git a/netbox/dcim/signals.py b/netbox/dcim/signals.py
index c1aabf64d..71ee7ec3c 100644
--- a/netbox/dcim/signals.py
+++ b/netbox/dcim/signals.py
@@ -45,7 +45,7 @@ def update_connected_endpoints(instance, **kwargs):
# Check if this Cable has formed a complete path. If so, update both endpoints.
endpoint_a, endpoint_b, path_status = instance.get_path_endpoints()
- if endpoint_a is not None and endpoint_b is not None:
+ if getattr(endpoint_a, 'is_path_endpoint', False) and getattr(endpoint_b, 'is_path_endpoint', False):
endpoint_a.connected_endpoint = endpoint_b
endpoint_a.connection_status = path_status
endpoint_a.save()
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 70a9aa5c8..9b3b405aa 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -181,8 +181,10 @@ VIRTUALCHASSIS_ACTIONS = """
CABLE_TERMINATION_PARENT = """
{% if value.device %}
{{ value.device }}
-{% else %}
+{% elif value.circuit %}
{{ value.circuit }}
+{% elif value.power_panel %}
+ {{ value.power_panel }}
{% endif %}
"""
@@ -718,7 +720,7 @@ class CableTable(BaseTable):
orderable=False,
verbose_name='Termination A'
)
- termination_a = tables.Column(
+ termination_a = tables.LinkColumn(
accessor=Accessor('termination_a'),
orderable=False,
verbose_name=''
@@ -729,7 +731,7 @@ class CableTable(BaseTable):
orderable=False,
verbose_name='Termination B'
)
- termination_b = tables.Column(
+ termination_b = tables.LinkColumn(
accessor=Accessor('termination_b'),
orderable=False,
verbose_name=''
diff --git a/netbox/extras/api/customfields.py b/netbox/extras/api/customfields.py
index 42dc486b8..2a13e5ce1 100644
--- a/netbox/extras/api/customfields.py
+++ b/netbox/extras/api/customfields.py
@@ -22,7 +22,9 @@ class CustomFieldsSerializer(serializers.BaseSerializer):
def to_internal_value(self, data):
content_type = ContentType.objects.get_for_model(self.parent.Meta.model)
- custom_fields = {field.name: field for field in CustomField.objects.filter(obj_type=content_type)}
+ custom_fields = {
+ field.name: field for field in CustomField.objects.filter(obj_type=content_type)
+ }
for field_name, value in data.items():
@@ -107,11 +109,11 @@ class CustomFieldModelSerializer(ValidatedModelSerializer):
super().__init__(*args, **kwargs)
- if self.instance is not None:
+ # Retrieve the set of CustomFields which apply to this type of object
+ content_type = ContentType.objects.get_for_model(self.Meta.model)
+ fields = CustomField.objects.filter(obj_type=content_type)
- # Retrieve the set of CustomFields which apply to this type of object
- content_type = ContentType.objects.get_for_model(self.Meta.model)
- fields = CustomField.objects.filter(obj_type=content_type)
+ if self.instance is not None:
# Populate CustomFieldValues for each instance from database
try:
@@ -120,6 +122,23 @@ class CustomFieldModelSerializer(ValidatedModelSerializer):
except TypeError:
_populate_custom_fields(self.instance, fields)
+ else:
+
+ # Populate default values
+ if fields and 'custom_fields' not in self.initial_data:
+ self.initial_data['custom_fields'] = {}
+
+ # Populate initial data using custom field default values
+ for field in fields:
+ if field.name not in self.initial_data['custom_fields'] and field.default:
+ if field.type == CF_TYPE_SELECT:
+ field_value = field.choices.get(value=field.default).pk
+ elif field.type == CF_TYPE_BOOLEAN:
+ field_value = bool(field.default)
+ else:
+ field_value = field.default
+ self.initial_data['custom_fields'][field.name] = field_value
+
def _save_custom_fields(self, instance, custom_fields):
content_type = ContentType.objects.get_for_model(self.Meta.model)
for field_name, value in custom_fields.items():
diff --git a/netbox/extras/api/urls.py b/netbox/extras/api/urls.py
index c135280ea..f4968d004 100644
--- a/netbox/extras/api/urls.py
+++ b/netbox/extras/api/urls.py
@@ -18,7 +18,7 @@ router.APIRootView = ExtrasRootView
router.register(r'_choices', views.ExtrasFieldChoicesViewSet, basename='field-choice')
# Custom field choices
-router.register(r'_custom_field_choices', views.CustomFieldChoicesViewSet, base_name='custom-field-choice')
+router.register(r'_custom_field_choices', views.CustomFieldChoicesViewSet, basename='custom-field-choice')
# Graphs
router.register(r'graphs', views.GraphViewSet)
diff --git a/netbox/extras/filters.py b/netbox/extras/filters.py
index a45202052..8c805ebdf 100644
--- a/netbox/extras/filters.py
+++ b/netbox/extras/filters.py
@@ -241,3 +241,24 @@ class ObjectChangeFilter(django_filters.FilterSet):
Q(user_name__icontains=value) |
Q(object_repr__icontains=value)
)
+
+
+class CreatedUpdatedFilterSet(django_filters.FilterSet):
+ created = django_filters.DateFilter()
+ created__gte = django_filters.DateFilter(
+ field_name='created',
+ lookup_expr='gte'
+ )
+ created__lte = django_filters.DateFilter(
+ field_name='created',
+ lookup_expr='lte'
+ )
+ last_updated = django_filters.DateTimeFilter()
+ last_updated__gte = django_filters.DateTimeFilter(
+ field_name='last_updated',
+ lookup_expr='gte'
+ )
+ last_updated__lte = django_filters.DateTimeFilter(
+ field_name='last_updated',
+ lookup_expr='lte'
+ )
diff --git a/netbox/extras/tests/test_customfields.py b/netbox/extras/tests/test_customfields.py
index 96f3483bc..7db4e26d9 100644
--- a/netbox/extras/tests/test_customfields.py
+++ b/netbox/extras/tests/test_customfields.py
@@ -301,6 +301,40 @@ class CustomFieldAPITest(APITestCase):
cfv = self.site.custom_field_values.get(field=self.cf_select)
self.assertEqual(cfv.value.pk, data['custom_fields']['magic_choice'])
+ def test_set_custom_field_defaults(self):
+ """
+ Create a new object with no custom field data. Custom field values should be created using the custom fields'
+ default values.
+ """
+ CUSTOM_FIELD_DEFAULTS = {
+ 'magic_word': 'foobar',
+ 'magic_number': '123',
+ 'is_magic': 'true',
+ 'magic_date': '2019-12-13',
+ 'magic_url': 'http://example.com/',
+ 'magic_choice': self.cf_select_choice1.value,
+ }
+
+ # Update CustomFields to set default values
+ for field_name, default_value in CUSTOM_FIELD_DEFAULTS.items():
+ CustomField.objects.filter(name=field_name).update(default=default_value)
+
+ data = {
+ 'name': 'Test Site X',
+ 'slug': 'test-site-x',
+ }
+
+ url = reverse('dcim-api:site-list')
+ response = self.client.post(url, data, format='json', **self.header)
+
+ self.assertHttpStatus(response, status.HTTP_201_CREATED)
+ self.assertEqual(response.data['custom_fields']['magic_word'], CUSTOM_FIELD_DEFAULTS['magic_word'])
+ self.assertEqual(response.data['custom_fields']['magic_number'], str(CUSTOM_FIELD_DEFAULTS['magic_number']))
+ self.assertEqual(response.data['custom_fields']['is_magic'], bool(CUSTOM_FIELD_DEFAULTS['is_magic']))
+ self.assertEqual(response.data['custom_fields']['magic_date'], CUSTOM_FIELD_DEFAULTS['magic_date'])
+ self.assertEqual(response.data['custom_fields']['magic_url'], CUSTOM_FIELD_DEFAULTS['magic_url'])
+ self.assertEqual(response.data['custom_fields']['magic_choice'], self.cf_select_choice1.pk)
+
class CustomFieldChoiceAPITest(APITestCase):
def setUp(self):
diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py
index c57006b27..c54ba2f62 100644
--- a/netbox/ipam/filters.py
+++ b/netbox/ipam/filters.py
@@ -5,7 +5,7 @@ from django.db.models import Q
from netaddr.core import AddrFormatError
from dcim.models import Site, Device, Interface
-from extras.filters import CustomFieldFilterSet
+from extras.filters import CustomFieldFilterSet, CreatedUpdatedFilterSet
from tenancy.filtersets import TenancyFilterSet
from utilities.filters import NameSlugSearchFilterSet, NumericInFilter, TagFilter
from virtualization.models import VirtualMachine
@@ -13,7 +13,7 @@ from .constants import *
from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
-class VRFFilter(TenancyFilterSet, CustomFieldFilterSet):
+class VRFFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
@@ -49,7 +49,7 @@ class RIRFilter(NameSlugSearchFilterSet):
fields = ['name', 'slug', 'is_private']
-class AggregateFilter(CustomFieldFilterSet):
+class AggregateFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
@@ -110,7 +110,7 @@ class RoleFilter(NameSlugSearchFilterSet):
fields = ['id', 'name', 'slug']
-class PrefixFilter(TenancyFilterSet, CustomFieldFilterSet):
+class PrefixFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
@@ -247,7 +247,7 @@ class PrefixFilter(TenancyFilterSet, CustomFieldFilterSet):
return queryset.filter(prefix__net_mask_length=value)
-class IPAddressFilter(TenancyFilterSet, CustomFieldFilterSet):
+class IPAddressFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
@@ -384,7 +384,7 @@ class VLANGroupFilter(NameSlugSearchFilterSet):
fields = ['id', 'name', 'slug']
-class VLANFilter(TenancyFilterSet, CustomFieldFilterSet):
+class VLANFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
@@ -444,7 +444,7 @@ class VLANFilter(TenancyFilterSet, CustomFieldFilterSet):
return queryset.filter(qs_filter)
-class ServiceFilter(django_filters.FilterSet):
+class ServiceFilter(CreatedUpdatedFilterSet):
q = django_filters.CharFilter(
method='search',
label='Search',
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index 002d2a72a..68529a7f0 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -240,7 +240,7 @@ class RoleForm(BootstrapMixin, forms.ModelForm):
class Meta:
model = Role
fields = [
- 'name', 'slug',
+ 'name', 'slug', 'weight',
]
@@ -1250,6 +1250,10 @@ class VLANFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
#
class ServiceForm(BootstrapMixin, CustomFieldForm):
+ port = forms.IntegerField(
+ min_value=1,
+ max_value=65535
+ )
tags = TagField(
required=False
)
diff --git a/netbox/ipam/migrations/0027_ipaddress_add_dns_name.py b/netbox/ipam/migrations/0027_ipaddress_add_dns_name.py
index 534957ce1..c93034f3d 100644
--- a/netbox/ipam/migrations/0027_ipaddress_add_dns_name.py
+++ b/netbox/ipam/migrations/0027_ipaddress_add_dns_name.py
@@ -14,6 +14,6 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='ipaddress',
name='dns_name',
- field=models.CharField(blank=True, max_length=255, validators=[django.core.validators.RegexValidator(code='invalid', message='Only alphanumeric characters, hyphens, and periods are allowed in DNS names', regex='^[0-9A-Za-z.-]+$')]),
+ field=models.CharField(blank=True, max_length=255, validators=[django.core.validators.RegexValidator(code='invalid', message='Only alphanumeric characters, hyphens, periods, and underscores are allowed in DNS names', regex='^[0-9A-Za-z._-]+$')]),
),
]
diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 3906f080f..e4d2bf8b4 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -85,7 +85,11 @@ IPADDRESS_LINK = """
"""
IPADDRESS_ASSIGN_LINK = """
-{{ record }}
+{% if request.GET %}
+ {{ record }}
+{% else %}
+ {{ record }}
+{% endif %}
"""
IPADDRESS_PARENT = """
@@ -292,7 +296,7 @@ class RoleTable(BaseTable):
class Meta(BaseTable.Meta):
model = Role
- fields = ('pk', 'name', 'prefix_count', 'vlan_count', 'slug', 'actions')
+ fields = ('pk', 'name', 'prefix_count', 'vlan_count', 'slug', 'weight', 'actions')
#
diff --git a/netbox/ipam/validators.py b/netbox/ipam/validators.py
index 6669b7ec5..960675643 100644
--- a/netbox/ipam/validators.py
+++ b/netbox/ipam/validators.py
@@ -2,7 +2,7 @@ from django.core.validators import RegexValidator
DNSValidator = RegexValidator(
- regex='^[0-9A-Za-z.-]+$',
- message='Only alphanumeric characters, hyphens, and periods are allowed in DNS names',
+ regex='^[0-9A-Za-z._-]+$',
+ message='Only alphanumeric characters, hyphens, periods, and underscores are allowed in DNS names',
code='invalid'
)
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index a150f51d1..534f95b2d 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -12,7 +12,7 @@ from django.core.exceptions import ImproperlyConfigured
# Environment setup
#
-VERSION = '2.6.7'
+VERSION = '2.6.9'
# Hostname
HOSTNAME = platform.node()
diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py
index 05036a37a..5dee6cade 100644
--- a/netbox/netbox/views.py
+++ b/netbox/netbox/views.py
@@ -116,6 +116,23 @@ SEARCH_TYPES = OrderedDict((
'table': PowerFeedTable,
'url': 'dcim:powerfeed_list',
}),
+ # Virtualization
+ ('cluster', {
+ 'permission': 'virtualization.view_cluster',
+ 'queryset': Cluster.objects.prefetch_related('type', 'group'),
+ 'filter': ClusterFilter,
+ 'table': ClusterTable,
+ 'url': 'virtualization:cluster_list',
+ }),
+ ('virtualmachine', {
+ 'permission': 'virtualization.view_virtualmachine',
+ 'queryset': VirtualMachine.objects.prefetch_related(
+ 'cluster', 'tenant', 'platform', 'primary_ip4', 'primary_ip6',
+ ),
+ 'filter': VirtualMachineFilter,
+ 'table': VirtualMachineDetailTable,
+ 'url': 'virtualization:virtualmachine_list',
+ }),
# IPAM
('vrf', {
'permission': 'ipam.view_vrf',
@@ -168,23 +185,6 @@ SEARCH_TYPES = OrderedDict((
'table': TenantTable,
'url': 'tenancy:tenant_list',
}),
- # Virtualization
- ('cluster', {
- 'permission': 'virtualization.view_cluster',
- 'queryset': Cluster.objects.prefetch_related('type', 'group'),
- 'filter': ClusterFilter,
- 'table': ClusterTable,
- 'url': 'virtualization:cluster_list',
- }),
- ('virtualmachine', {
- 'permission': 'virtualization.view_virtualmachine',
- 'queryset': VirtualMachine.objects.prefetch_related(
- 'cluster', 'tenant', 'platform', 'primary_ip4', 'primary_ip6',
- ),
- 'filter': VirtualMachineFilter,
- 'table': VirtualMachineDetailTable,
- 'url': 'virtualization:virtualmachine_list',
- }),
))
diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css
index 6ae37bdf1..9d4c099f4 100644
--- a/netbox/project-static/css/base.css
+++ b/netbox/project-static/css/base.css
@@ -457,6 +457,14 @@ table.report th a {
width: 80px;
border: 1px solid grey;
}
+.inline-color-block {
+ display: inline-block;
+ width: 1.5em;
+ height: 1.5em;
+ border: 1px solid grey;
+ border-radius: .25em;
+ vertical-align: middle;
+}
.text-nowrap {
white-space: nowrap;
}
diff --git a/netbox/secrets/filters.py b/netbox/secrets/filters.py
index 628d716db..bdc643e71 100644
--- a/netbox/secrets/filters.py
+++ b/netbox/secrets/filters.py
@@ -2,7 +2,7 @@ import django_filters
from django.db.models import Q
from dcim.models import Device
-from extras.filters import CustomFieldFilterSet
+from extras.filters import CustomFieldFilterSet, CreatedUpdatedFilterSet
from utilities.filters import NameSlugSearchFilterSet, NumericInFilter, TagFilter
from .models import Secret, SecretRole
@@ -14,7 +14,7 @@ class SecretRoleFilter(NameSlugSearchFilterSet):
fields = ['id', 'name', 'slug']
-class SecretFilter(CustomFieldFilterSet):
+class SecretFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index 424f487a8..6ec46824b 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -48,6 +48,9 @@
{% if iface.cable %}
{{ iface.cable }}
+ {% if iface.cable.color %}
+
+ {% endif %}
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html
index 8589524c9..a8ab302eb 100644
--- a/netbox/templates/dcim/powerfeed.html
+++ b/netbox/templates/dcim/powerfeed.html
@@ -121,6 +121,18 @@
+
+
+ Comments
+
+
+ {% if powerfeed.comments %}
+ {{ powerfeed.comments|gfm }}
+ {% else %}
+ None
+ {% endif %}
+
+
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index 0e38d2967..10e951efe 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -251,25 +251,28 @@
Rack Groups
- {% if rack_groups %}
-
- {% for rg in rack_groups %}
-
- | {{ rg }} |
- {{ rg.rack_count }} |
-
-
-
-
- |
-
- {% endfor %}
-
- {% else %}
-
- None
-
- {% endif %}
+
+ {% for rg in rack_groups %}
+
+ | {{ rg }} |
+ {{ rg.rack_count }} |
+
+
+
+
+ |
+
+ {% endfor %}
+
+ | All racks |
+ {{ stats.rack_count }} |
+
+
+
+
+ |
+
+
diff --git a/netbox/templates/users/_user.html b/netbox/templates/users/_user.html
index 40a019eab..55df34228 100644
--- a/netbox/templates/users/_user.html
+++ b/netbox/templates/users/_user.html
@@ -12,9 +12,11 @@
Profile
-
- Change Password
-
+ {% if not request.user.ldap_username %}
+
+ Change Password
+
+ {% endif %}
API Tokens
diff --git a/netbox/templates/users/api_tokens.html b/netbox/templates/users/api_tokens.html
index c6a219381..b775af73e 100644
--- a/netbox/templates/users/api_tokens.html
+++ b/netbox/templates/users/api_tokens.html
@@ -10,6 +10,7 @@
+ Copy
{% if perms.users.change_token %}
Edit
{% endif %}
@@ -17,7 +18,8 @@
Delete
{% endif %}
- {{ token.key }}
+
+ {{ token.key }}
{% if token.is_expired %}
Expired
{% endif %}
@@ -66,3 +68,9 @@
{% endblock %}
+
+{% block javascript %}
+
+{% endblock %}
diff --git a/netbox/tenancy/filters.py b/netbox/tenancy/filters.py
index acb0fa0cc..ac7e6fabb 100644
--- a/netbox/tenancy/filters.py
+++ b/netbox/tenancy/filters.py
@@ -1,7 +1,7 @@
import django_filters
from django.db.models import Q
-from extras.filters import CustomFieldFilterSet
+from extras.filters import CustomFieldFilterSet, CreatedUpdatedFilterSet
from utilities.filters import NameSlugSearchFilterSet, NumericInFilter, TagFilter
from .models import Tenant, TenantGroup
@@ -13,7 +13,7 @@ class TenantGroupFilter(NameSlugSearchFilterSet):
fields = ['id', 'name', 'slug']
-class TenantFilter(CustomFieldFilterSet):
+class TenantFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
diff --git a/netbox/users/views.py b/netbox/users/views.py
index 6abdd817d..6a2410274 100644
--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -95,6 +95,11 @@ class ChangePasswordView(LoginRequiredMixin, View):
template_name = 'users/change_password.html'
def get(self, request):
+ # LDAP users cannot change their password here
+ if getattr(request.user, 'ldap_username', None):
+ messages.warning(request, "LDAP-authenticated user credentials cannot be changed within NetBox.")
+ return redirect('user:profile')
+
form = PasswordChangeForm(user=request.user)
return render(request, self.template_name, {
diff --git a/netbox/virtualization/filters.py b/netbox/virtualization/filters.py
index 8365d6f91..4f4ae03ae 100644
--- a/netbox/virtualization/filters.py
+++ b/netbox/virtualization/filters.py
@@ -4,7 +4,7 @@ from netaddr import EUI
from netaddr.core import AddrFormatError
from dcim.models import DeviceRole, Interface, Platform, Region, Site
-from extras.filters import CustomFieldFilterSet
+from extras.filters import CustomFieldFilterSet, CreatedUpdatedFilterSet
from tenancy.filtersets import TenancyFilterSet
from utilities.filters import (
MultiValueMACAddressFilter, NameSlugSearchFilterSet, NumericInFilter, TagFilter, TreeNodeMultipleChoiceFilter,
@@ -27,7 +27,7 @@ class ClusterGroupFilter(NameSlugSearchFilterSet):
fields = ['id', 'name', 'slug']
-class ClusterFilter(CustomFieldFilterSet):
+class ClusterFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
@@ -81,7 +81,7 @@ class ClusterFilter(CustomFieldFilterSet):
)
-class VirtualMachineFilter(TenancyFilterSet, CustomFieldFilterSet):
+class VirtualMachineFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
diff --git a/scripts/git-hooks/pre-commit b/scripts/git-hooks/pre-commit
index 5974f91d8..7dfa5e8aa 100755
--- a/scripts/git-hooks/pre-commit
+++ b/scripts/git-hooks/pre-commit
@@ -9,6 +9,24 @@
exec 1>&2
+EXIT=0
+RED='\033[0;31m'
+NOCOLOR='\033[0m'
+
echo "Validating PEP8 compliance..."
pycodestyle --ignore=W504,E501 netbox/
+if [ $? != 0 ]; then
+ EXIT=1
+fi
+echo "Checking for missing migrations..."
+python netbox/manage.py makemigrations --dry-run --check
+if [ $? != 0 ]; then
+ EXIT=1
+fi
+
+if [ $EXIT != 0 ]; then
+ printf "${RED}COMMIT FAILED${NOCOLOR}\n"
+fi
+
+exit $EXIT
|