From 106627da04c17788fb058a41b62b502707e8c4eb Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 18 Jul 2017 10:39:09 -0400
Subject: [PATCH 01/92] Fixes #1358: Correct VRF example values in IP/prefix
 import forms

---
 netbox/templates/utilities/obj_import.html |  2 +-
 netbox/utilities/templatetags/helpers.py   | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/netbox/templates/utilities/obj_import.html b/netbox/templates/utilities/obj_import.html
index 7c331a2ef..90cb81a61 100644
--- a/netbox/templates/utilities/obj_import.html
+++ b/netbox/templates/utilities/obj_import.html
@@ -44,7 +44,7 @@
                         <td>
                             {{ field.help_text|default:field.label }}
                             {% if field.choices %}
-                                <br /><small class="text-muted">Choices: {{ field.choices|example_choices }}</small>
+                                <br /><small class="text-muted">Choices: {{ field|example_choices }}</small>
                             {% elif field|widget_type == 'dateinput' %}
                                 <br /><small class="text-muted">Format: YYYY-MM-DD</small>
                             {% elif field|widget_type == 'checkboxinput' %}
diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index 42e8a277f..b7a40d018 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -63,19 +63,23 @@ def bettertitle(value):
 
 
 @register.filter()
-def example_choices(value, arg=3):
+def example_choices(field, arg=3):
     """
     Returns a number (default: 3) of example choices for a ChoiceFiled (useful for CSV import forms).
     """
-    choices = []
-    for id, label in value:
-        if len(choices) == arg:
-            choices.append('etc.')
+    examples = []
+    if hasattr(field, 'queryset'):
+        choices = [(obj.pk, getattr(obj, field.to_field_name)) for obj in field.queryset[:arg+1]]
+    else:
+        choices = field.choices
+    for id, label in choices:
+        if len(examples) == arg:
+            examples.append('etc.')
             break
         if not id:
             continue
-        choices.append(label)
-    return ', '.join(choices) or 'None'
+        examples.append(label)
+    return ', '.join(examples) or 'None'
 
 
 #

From 5885b833cdf27e3ad4866ccdfdbfed0fee40ef76 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 19 Jul 2017 11:03:13 -0400
Subject: [PATCH 02/92] Fixes #1362: Raise validation error when attempting to
 create an API key that's too short

---
 netbox/users/views.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/netbox/users/views.py b/netbox/users/views.py
index 88b6ebd32..5b12ad325 100644
--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -244,6 +244,7 @@ class TokenEditView(LoginRequiredMixin, View):
             token = get_object_or_404(Token.objects.filter(user=request.user), pk=pk)
             form = TokenForm(request.POST, instance=token)
         else:
+            token = Token()
             form = TokenForm(request.POST)
 
         if form.is_valid():
@@ -259,6 +260,13 @@ class TokenEditView(LoginRequiredMixin, View):
             else:
                 return redirect('user:token_list')
 
+        return render(request, 'utilities/obj_edit.html', {
+            'obj': token,
+            'obj_type': token._meta.verbose_name,
+            'form': form,
+            'return_url': reverse('user:token_list'),
+        })
+
 
 class TokenDeleteView(LoginRequiredMixin, View):
 

From 05aaafc1cf3865437b46d8a4b7f2d27f90478b99 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 24 Jul 2017 13:26:31 -0400
Subject: [PATCH 03/92] Added docs for using the NetBox shell

---
 docs/shell/intro.md | 194 ++++++++++++++++++++++++++++++++++++++++++++
 mkdocs.yml          |   2 +
 2 files changed, 196 insertions(+)
 create mode 100644 docs/shell/intro.md

diff --git a/docs/shell/intro.md b/docs/shell/intro.md
new file mode 100644
index 000000000..df92cb7cd
--- /dev/null
+++ b/docs/shell/intro.md
@@ -0,0 +1,194 @@
+NetBox includes a Python shell withing which objects can be directly queried, created, modified, and deleted. To enter the shell, run the following command:
+
+```
+./manage.py nbshell
+```
+
+This will launch a customized version of [the built-in Django shell](https://docs.djangoproject.com/en/dev/ref/django-admin/#shell) with all relevant NetBox models pre-loaded. (If desired, the stock Django shell is also available by executing `./manage.py shell`.)
+
+```
+$ ./manage.py nbshell
+### NetBox interactive shell (jstretch-laptop)
+### Python 2.7.6 | Django 1.11.3 | NetBox 2.1.0-dev
+### lsmodels() will show available models. Use help(<model>) for more info.
+```
+
+The function `lsmodels()` will print a list of all available NetBox models:
+
+```
+>>> lsmodels()
+DCIM:
+  ConsolePort
+  ConsolePortTemplate
+  ConsoleServerPort
+  ConsoleServerPortTemplate
+  Device
+  ...
+```
+
+## Querying Objects
+
+Objects are retrieved by forming a [Django queryset](https://docs.djangoproject.com/en/dev/topics/db/queries/#retrieving-objects). The base queryset for an object takes the form `<model>.objects.all()`, which will return a (truncated) list of all objects of that type.
+
+```
+>>> Device.objects.all()
+<QuerySet [<Device: TestDevice1>, <Device: TestDevice2>, <Device: TestDevice3>, <Device: TestDevice4>, <Device: TestDevice5>, '...(remaining elements truncated)...']>
+```
+
+Use a `for` loop to cycle through all objects in the list:
+
+```
+>>> for device in Device.objects.all():
+...   print(device.name, device.device_type)
+...
+(u'TestDevice1', <DeviceType: PacketThingy 9000>)
+(u'TestDevice2', <DeviceType: PacketThingy 9000>)
+(u'TestDevice3', <DeviceType: PacketThingy 9000>)
+(u'TestDevice4', <DeviceType: PacketThingy 9000>)
+(u'TestDevice5', <DeviceType: PacketThingy 9000>)
+...
+```
+
+To count all objects matching the query, replace `all()` with `count()`:
+
+```
+>>> Device.objects.count()
+1274
+```
+
+To retrieve a particular object (typically by its primary key or other unique field), use `get()`:
+
+```
+>>> Site.objects.get(pk=7)
+<Site: Test Lab>
+```
+
+### Filtering Querysets
+
+In most cases, you want to retrieve only a specific subset of objects. To filter a queryset, replace `all()` with `filter()` and pass one or more keyword arguments. For example:
+
+```
+>>> Device.objects.filter(status=STATUS_ACTIVE)
+<QuerySet [<Device: TestDevice1>, <Device: TestDevice2>, <Device: TestDevice3>, <Device: TestDevice8>, <Device: TestDevice9>, '...(remaining elements truncated)...']>
+```
+
+Querysets support slicing to return a specific range of objects.
+
+```
+>>> Device.objects.filter(status=STATUS_ACTIVE)[:3]
+<QuerySet [<Device: TestDevice1>, <Device: TestDevice2>, <Device: TestDevice3>]>
+```
+
+The `count()` method can be appended to the queryset to return a count of objects rather than the full list.
+
+```
+>>> Device.objects.filter(status=STATUS_ACTIVE).count()
+982
+```
+
+Relationships with other models can be traversed by concatenting field names with a double-underscore. For example, the following will return all devices assigned to the tenant named "Pied Piper."
+
+```
+>>> Device.objects.filter(tenant__name='Pied Piper')
+```
+
+This approach can span multiple levels of relations. For example, the following will return all IP addresses assigned to a device in North America:
+
+```
+>>> IPAddress.objects.filter(interface__device__site__region__slug='north-america')
+```
+
+!!! note
+    While the above query is functional, it is very inefficient. There are ways to optimize such requests, however they are out of the scope of this document. For more information, see the [Django queryset method reference](https://docs.djangoproject.com/en/dev/ref/models/querysets/) documentation.
+
+Reverse relationships can be traversed as well. For example, the following will find all devices with an interface named "em0":
+
+```
+>>> Device.objects.filter(interfaces__name='em0')
+```
+
+Character fields can be filtered against partial matches using the `contains` or `icontains` field lookup (the later of which is case-insensitive).
+
+```
+>>> Device.objects.filter(name__icontains='testdevice')
+```
+
+Similarly, numeric fields can be filtered by values less than, greater than, and/or equal to a given value.
+
+```
+>>> VLAN.objects.filter(vid__gt=2000)
+```
+
+Multiple filters can be combined to further refine a queryset.
+
+```
+>>> VLAN.objects.filter(vid__gt=2000, name__icontains='engineering')
+```
+
+To return the inverse of a filtered queryset, use `exclude()` instead of `filter()`.
+
+```
+>>> Device.objects.count()
+4479
+>>> Device.objects.filter(status=STATUS_ACTIVE).count()
+4133
+>>> Device.objects.exclude(status=STATUS_ACTIVE).count()
+346
+```
+
+!!! info
+    The examples above are intended only to provide a cursory introduction to queryset filtering. For an exhaustive list of the available filters, please consult the [Django queryset API docs](https://docs.djangoproject.com/en/dev/ref/models/querysets/).
+
+## Creating and Updating Objects
+
+New objects can be created by instantiating the desired model, defining values for all required attributes, and calling `save()` on the instance.
+
+```
+>>> lab1 = Site.objects.get(pk=7)
+>>> myvlan = VLAN(vid=123, name='MyNewVLAN', site=lab1)
+>>> myvlan.save()
+```
+
+Alternatively, the above can be performed as a single operation:
+
+```
+>>> VLAN(vid=123, name='MyNewVLAN', site=Site.objects.get(pk=7)).save()
+```
+
+To modify an object, retrieve it, update the desired field(s), and call `save()` again.
+
+```
+>>> vlan = VLAN.objects.get(pk=1280)
+>>> vlan.name
+u'MyNewVLAN'
+>>> vlan.name = 'BetterName'
+>>> vlan.save()
+>>> VLAN.objects.get(pk=1280).name
+u'BetterName'
+```
+
+!!! warning
+    The Django ORM provides methods to create/edit many objects at once, namely `bulk_create()` and `update()`. These are best avoided in most cases as they bypass a model's built-in validation and can easily lead to database corruption if not used carefully.
+
+## Deleting Objects
+
+To delete an object, simply call `delete()` on its instance. This will return a dictionary of all objects (including related objects) which have been deleted as a result of this operation.
+
+```
+>>> vlan
+<VLAN: 123 (BetterName)>
+>>> vlan.delete()
+(1, {u'extras.CustomFieldValue': 0, u'ipam.VLAN': 1})
+```
+
+To delete multiple objects at once, call `delete()` on a filtered queryset. It's a good idea to always sanity-check the count of selected objects _before_ deleting them.
+
+```
+>>> Device.objects.filter(name__icontains='test').count()
+27
+>>> Device.objects.filter(name__icontains='test').delete()
+(35, {u'extras.CustomFieldValue': 0, u'dcim.DeviceBay': 0, u'secrets.Secret': 0, u'dcim.InterfaceConnection': 4, u'extras.ImageAttachment': 0, u'dcim.Device': 27, u'dcim.Interface': 4, u'dcim.ConsolePort': 0, u'dcim.PowerPort': 0})
+```
+
+!!! warning
+    Deletions are immediate and irreversible. Always think very carefully before calling `delete()` on an instance or queryset.
diff --git a/mkdocs.yml b/mkdocs.yml
index 8b77b289d..a8be998e4 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -23,6 +23,8 @@ pages:
         - 'Authentication': 'api/authentication.md'
         - 'Working with Secrets': 'api/working-with-secrets.md'
         - 'Examples': 'api/examples.md'
+    - 'Shell':
+        - 'Introduction': 'shell/intro.md'
 
 markdown_extensions:
     - admonition:

From 091cf390d28ea6d1fbb59372f8ca5b34a1d84ef0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 24 Jul 2017 14:22:07 -0400
Subject: [PATCH 04/92] Import constants from each app

---
 netbox/extras/management/commands/nbshell.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/netbox/extras/management/commands/nbshell.py b/netbox/extras/management/commands/nbshell.py
index 48448c16f..918b97ef6 100644
--- a/netbox/extras/management/commands/nbshell.py
+++ b/netbox/extras/management/commands/nbshell.py
@@ -37,9 +37,11 @@ class Command(BaseCommand):
     def get_namespace(self):
         namespace = {}
 
-        # Gather Django models from each app
+        # Gather Django models and constants from each app
         for app in APPS:
             self.django_models[app] = []
+
+            # Models
             app_models = sys.modules['{}.models'.format(app)]
             for name in dir(app_models):
                 model = getattr(app_models, name)
@@ -50,6 +52,15 @@ class Command(BaseCommand):
                 except TypeError:
                     pass
 
+            # Constants
+            try:
+                app_constants = sys.modules['{}.constants'.format(app)]
+                for name in dir(app_constants):
+                    namespace[name] = getattr(app_constants, name)
+            except KeyError:
+                pass
+
+
         # Load convenience commands
         namespace.update({
             'lsmodels': self._lsmodels,

From 4047c1a4e4a4c167f1768c8c4bc099892ceb0831 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 24 Jul 2017 14:34:01 -0400
Subject: [PATCH 05/92] lsmodules() should only return native models

---
 netbox/extras/management/commands/nbshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/extras/management/commands/nbshell.py b/netbox/extras/management/commands/nbshell.py
index 918b97ef6..9762f0cbd 100644
--- a/netbox/extras/management/commands/nbshell.py
+++ b/netbox/extras/management/commands/nbshell.py
@@ -46,7 +46,7 @@ class Command(BaseCommand):
             for name in dir(app_models):
                 model = getattr(app_models, name)
                 try:
-                    if issubclass(model, Model):
+                    if issubclass(model, Model) and model._meta.app_label == app:
                         namespace[name] = model
                         self.django_models[app].append(name)
                 except TypeError:

From 336cdcddc55c8cc7d5635b8aaa7e23a15fb356c1 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 24 Jul 2017 14:51:00 -0400
Subject: [PATCH 06/92] PEP8 fix

---
 netbox/extras/management/commands/nbshell.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/netbox/extras/management/commands/nbshell.py b/netbox/extras/management/commands/nbshell.py
index 9762f0cbd..a50b1384d 100644
--- a/netbox/extras/management/commands/nbshell.py
+++ b/netbox/extras/management/commands/nbshell.py
@@ -60,7 +60,6 @@ class Command(BaseCommand):
             except KeyError:
                 pass
 
-
         # Load convenience commands
         namespace.update({
             'lsmodels': self._lsmodels,

From 0991f94d0604f9f6fe48a2420ccf675606856f05 Mon Sep 17 00:00:00 2001
From: vanderaaj <joshvanderaa@gmail.com>
Date: Tue, 25 Jul 2017 08:40:51 -0500
Subject: [PATCH 07/92] How to migrate from Py2 to Py3 (#1355)

* How to migrate from Py2 to Py3

The commands done to migrate Ubuntu from Py2 to Py3.

* Update Migrating-to-Python3
---
 docs/installation/Migrating-to-Python3 | 27 ++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 docs/installation/Migrating-to-Python3

diff --git a/docs/installation/Migrating-to-Python3 b/docs/installation/Migrating-to-Python3
new file mode 100644
index 000000000..09fe3657b
--- /dev/null
+++ b/docs/installation/Migrating-to-Python3
@@ -0,0 +1,27 @@
+# Migration
+Remove Python 2 packages
+```no-highlight
+# apt-get remove --purge -y python-dev python-pip
+```
+
+Install Python 3 packages
+```no-highlight
+# apt-get install -y python3 python3-dev python3-pip
+```
+
+Install Python Packages
+```no-highlight
+# cd /opt/netbox
+# pip3 install -r requirements.txt
+```
+
+Gunicorn Update
+```
+# pip uninstall gunicorn
+# pip3 install gunicorn
+```
+
+Re-install LDAP Module (Optional if using LDAP for auth)
+```
+sudo pip3 install django-auth-ldap
+```

From f9b6ddc230e457f68b609e0ab9df09c4c0534a28 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 25 Jul 2017 09:44:15 -0400
Subject: [PATCH 08/92] Added "Migrating to Python3" to the docs index

---
 ...{Migrating-to-Python3 => migrating-to-python3.md} | 12 +++++++++---
 mkdocs.yml                                           |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)
 rename docs/installation/{Migrating-to-Python3 => migrating-to-python3.md} (81%)

diff --git a/docs/installation/Migrating-to-Python3 b/docs/installation/migrating-to-python3.md
similarity index 81%
rename from docs/installation/Migrating-to-Python3
rename to docs/installation/migrating-to-python3.md
index 09fe3657b..e99018252 100644
--- a/docs/installation/Migrating-to-Python3
+++ b/docs/installation/migrating-to-python3.md
@@ -1,27 +1,33 @@
 # Migration
+
 Remove Python 2 packages
+
 ```no-highlight
 # apt-get remove --purge -y python-dev python-pip
 ```
 
 Install Python 3 packages
+
 ```no-highlight
 # apt-get install -y python3 python3-dev python3-pip
 ```
 
 Install Python Packages
+
 ```no-highlight
 # cd /opt/netbox
 # pip3 install -r requirements.txt
 ```
 
 Gunicorn Update
-```
+
+```no-highlight
 # pip uninstall gunicorn
 # pip3 install gunicorn
 ```
 
-Re-install LDAP Module (Optional if using LDAP for auth)
-```
+Re-install LDAP Module (optional if using LDAP for auth)
+
+```no-highlight
 sudo pip3 install django-auth-ldap
 ```
diff --git a/mkdocs.yml b/mkdocs.yml
index a8be998e4..f204749d5 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -8,6 +8,7 @@ pages:
         - 'Web Server': 'installation/web-server.md'
         - 'LDAP (Optional)': 'installation/ldap.md'
         - 'Upgrading': 'installation/upgrading.md'
+        - 'Migrating to Python3': 'installation/migrating-to-python3.md'
     - 'Configuration':
         - 'Mandatory Settings': 'configuration/mandatory-settings.md'
         - 'Optional Settings': 'configuration/optional-settings.md'

From 9e26198afe61c6d31a2b94114c250533a8a8e090 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 25 Jul 2017 10:09:44 -0400
Subject: [PATCH 09/92] Added note about NAPALM integration

---
 docs/installation/netbox.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/installation/netbox.md b/docs/installation/netbox.md
index c7c2eb8ed..c6c492626 100644
--- a/docs/installation/netbox.md
+++ b/docs/installation/netbox.md
@@ -32,6 +32,11 @@ Python 2:
 # yum install -y gcc python2 python-devel python-pip libxml2-devel libxslt-devel libffi-devel graphviz openssl-devel
 ```
 
+!!! info
+    As of v2.1.0, NetBox supports integration with the [NAPALM automation](https://napalm-automation.net/) library. NAPALM allows NetBox to retrieve live data from devices and return it to a requester via its REST API.
+
+    Installation of NAPALM is optional. To enable it, simply install the "napalm" package using your distribution's package manager.
+
 You may opt to install NetBox either from a numbered release or by cloning the master branch of its repository on GitHub.
 
 ## Option A: Download a Release

From e364659c6e85ba78653f9be372776daa8dc891fc Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 25 Jul 2017 10:17:28 -0400
Subject: [PATCH 10/92] Tweaked NAPALM integration instructions

---
 docs/installation/netbox.md | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/installation/netbox.md b/docs/installation/netbox.md
index c6c492626..4befbeefc 100644
--- a/docs/installation/netbox.md
+++ b/docs/installation/netbox.md
@@ -32,11 +32,6 @@ Python 2:
 # yum install -y gcc python2 python-devel python-pip libxml2-devel libxslt-devel libffi-devel graphviz openssl-devel
 ```
 
-!!! info
-    As of v2.1.0, NetBox supports integration with the [NAPALM automation](https://napalm-automation.net/) library. NAPALM allows NetBox to retrieve live data from devices and return it to a requester via its REST API.
-
-    Installation of NAPALM is optional. To enable it, simply install the "napalm" package using your distribution's package manager.
-
 You may opt to install NetBox either from a numbered release or by cloning the master branch of its repository on GitHub.
 
 ## Option A: Download a Release
@@ -102,6 +97,14 @@ Python 2:
 # pip install -r requirements.txt
 ```
 
+### NAPALM Automation
+
+As of v2.1.0, NetBox supports integration with the [NAPALM automation](https://napalm-automation.net/) library. NAPALM allows NetBox to fetch live data from devices and return it to a requester via its REST API. Installation of NAPALM is optional. To enable it, install the `napalm` package using pip or pip3:
+
+```no-highlight
+# pip install napalm
+```
+
 # Configuration
 
 Move into the NetBox configuration directory and make a copy of `configuration.example.py` named `configuration.py`.

From 1770c8568940cd801d0d2b6c7948f778043fec51 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 25 Jul 2017 10:56:23 -0400
Subject: [PATCH 11/92] Fixes #1371: Extend DeviceSerializer.parent_device to
 include standard fields

---
 netbox/dcim/api/serializers.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index 09da3ced7..50bf756e3 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -473,14 +473,10 @@ class DeviceSerializer(CustomFieldModelSerializer):
             device_bay = obj.parent_bay
         except DeviceBay.DoesNotExist:
             return None
-        return {
-            'id': device_bay.device.pk,
-            'name': device_bay.device.name,
-            'device_bay': {
-                'id': device_bay.pk,
-                'name': device_bay.name,
-            }
-        }
+        context = {'request': self.context['request']}
+        data = NestedDeviceSerializer(instance=device_bay.device, context=context).data
+        data['device_bay'] = NestedDeviceBaySerializer(instance=device_bay, context=context).data
+        return data
 
 
 class WritableDeviceSerializer(CustomFieldModelSerializer):
@@ -690,6 +686,14 @@ class DeviceBaySerializer(serializers.ModelSerializer):
         fields = ['id', 'device', 'name', 'installed_device']
 
 
+class NestedDeviceBaySerializer(serializers.ModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicebay-detail')
+
+    class Meta:
+        model = DeviceBay
+        fields = ['id', 'url', 'name']
+
+
 class WritableDeviceBaySerializer(ModelValidationMixin, serializers.ModelSerializer):
 
     class Meta:

From 7476194bd149a82aa3fbc3bc66990c1f118a55f7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 25 Jul 2017 10:58:28 -0400
Subject: [PATCH 12/92] PEP8 fix

---
 netbox/utilities/templatetags/helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index b7a40d018..7cb2753e7 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -69,7 +69,7 @@ def example_choices(field, arg=3):
     """
     examples = []
     if hasattr(field, 'queryset'):
-        choices = [(obj.pk, getattr(obj, field.to_field_name)) for obj in field.queryset[:arg+1]]
+        choices = [(obj.pk, getattr(obj, field.to_field_name)) for obj in field.queryset[:arg + 1]]
     else:
         choices = field.choices
     for id, label in choices:

From c7e9d90321b1566b0ab191adfddcc95673b54671 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 25 Jul 2017 11:19:33 -0400
Subject: [PATCH 13/92] Release v2.1.0

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index b3f0b5187..28d98acf1 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -13,7 +13,7 @@ except ImportError:
     )
 
 
-VERSION = '2.1.0-dev'
+VERSION = '2.1.0'
 
 # Import required configuration parameters
 ALLOWED_HOSTS = DATABASE = SECRET_KEY = None

From f4a873745f48f2c53bca0cd95a7198b3daea8341 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 25 Jul 2017 11:26:50 -0400
Subject: [PATCH 14/92] Post-release version bump

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 28d98acf1..d48b72c1f 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -13,7 +13,7 @@ except ImportError:
     )
 
 
-VERSION = '2.1.0'
+VERSION = '2.1.1-dev'
 
 # Import required configuration parameters
 ALLOWED_HOSTS = DATABASE = SECRET_KEY = None

From d2c6d795894a0586ffb4d56c020bdd043abe39c8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 26 Jul 2017 11:24:19 -0400
Subject: [PATCH 15/92] Closes #1375: Renamed NETBOX_USERNAME and
 NETBOX_PASSWORD configuration parameters to NAPALM_USERNAME and
 NAPALM_PASSWORD

---
 docs/configuration/optional-settings.md       | 16 +++++++++---
 netbox/dcim/api/views.py                      |  4 +--
 .../management/commands/run_inventory.py      |  4 +--
 netbox/netbox/configuration.docker.py         |  4 +--
 netbox/netbox/configuration.example.py        |  6 ++---
 netbox/netbox/settings.py                     | 25 +++++++++++++++----
 netbox/templates/home.html                    |  8 ++++++
 7 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/docs/configuration/optional-settings.md b/docs/configuration/optional-settings.md
index 05e60dcac..aacb50410 100644
--- a/docs/configuration/optional-settings.md
+++ b/docs/configuration/optional-settings.md
@@ -135,11 +135,21 @@ An API consumer can request an arbitrary number of objects by appending the "lim
 
 ---
 
-## NETBOX_USERNAME
+## NAPALM_USERNAME
 
-## NETBOX_PASSWORD
+## NAPALM_PASSWORD
 
-If provided, NetBox will use these credentials to authenticate against devices when collecting data.
+NetBox will use these credentials when authenticating to remote devices via the NAPALM library. Both parameters are optional.
+
+Note: If SSH public key authentication has been set up for the system account under which NetBox runs, these parameters are not needed.
+
+---
+
+## NETBOX_USERNAME (Deprecated)
+
+## NETBOX_PASSWORD (Deprecated)
+
+These settings have been deprecated and will be removed in NetBox v2.2. Please use `NAPALM_USERNAME` and `NAPALM_PASSWORD` instead.
 
 ---
 
diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index d32c63bfa..bfbe3c549 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -272,8 +272,8 @@ class DeviceViewSet(WritableSerializerMixin, CustomFieldModelViewSet):
         ip_address = str(device.primary_ip.address.ip)
         d = driver(
             hostname=ip_address,
-            username=settings.NETBOX_USERNAME,
-            password=settings.NETBOX_PASSWORD
+            username=settings.NAPALM_USERNAME,
+            password=settings.NAPALM_PASSWORD
         )
         try:
             d.open()
diff --git a/netbox/extras/management/commands/run_inventory.py b/netbox/extras/management/commands/run_inventory.py
index 1e52b5c8f..335cdb783 100644
--- a/netbox/extras/management/commands/run_inventory.py
+++ b/netbox/extras/management/commands/run_inventory.py
@@ -13,8 +13,8 @@ from dcim.models import Device, InventoryItem, Site, STATUS_ACTIVE
 
 class Command(BaseCommand):
     help = "Update inventory information for specified devices"
-    username = settings.NETBOX_USERNAME
-    password = settings.NETBOX_PASSWORD
+    username = settings.NAPALM_USERNAME
+    password = settings.NAPALM_PASSWORD
 
     def add_arguments(self, parser):
         parser.add_argument('-u', '--username', dest='username', help="Specify the username to use")
diff --git a/netbox/netbox/configuration.docker.py b/netbox/netbox/configuration.docker.py
index c57aca6f4..56f9da366 100644
--- a/netbox/netbox/configuration.docker.py
+++ b/netbox/netbox/configuration.docker.py
@@ -60,8 +60,8 @@ BASE_PATH = os.environ.get('BASE_PATH', '')
 MAINTENANCE_MODE = os.environ.get('MAINTENANCE_MODE', False)
 
 # Credentials that NetBox will use to access live devices.
-NETBOX_USERNAME = os.environ.get('NETBOX_USERNAME', '')
-NETBOX_PASSWORD = os.environ.get('NETBOX_PASSWORD', '')
+NAPALM_USERNAME = os.environ.get('NAPALM_USERNAME', '')
+NAPALM_PASSWORD = os.environ.get('NAPALM_PASSWORD', '')
 
 # Determine how many objects to display per page within a list. (Default: 50)
 PAGINATE_COUNT = os.environ.get('PAGINATE_COUNT', 50)
diff --git a/netbox/netbox/configuration.example.py b/netbox/netbox/configuration.example.py
index 2e08090c7..834f322bb 100644
--- a/netbox/netbox/configuration.example.py
+++ b/netbox/netbox/configuration.example.py
@@ -93,9 +93,9 @@ MAINTENANCE_MODE = False
 # all objects by specifying "?limit=0".
 MAX_PAGE_SIZE = 1000
 
-# Credentials that NetBox will use to access live devices (future use).
-NETBOX_USERNAME = ''
-NETBOX_PASSWORD = ''
+# Credentials that NetBox will uses to authenticate to devices when connecting via NAPALM.
+NAPALM_USERNAME = ''
+NAPALM_PASSWORD = ''
 
 # Determine how many objects to display per page within a list. (Default: 50)
 PAGINATE_COUNT = 50
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index d48b72c1f..fe863833f 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -46,8 +46,10 @@ MAINTENANCE_MODE = getattr(configuration, 'MAINTENANCE_MODE', False)
 MAX_PAGE_SIZE = getattr(configuration, 'MAX_PAGE_SIZE', 1000)
 PAGINATE_COUNT = getattr(configuration, 'PAGINATE_COUNT', 50)
 PREFER_IPV4 = getattr(configuration, 'PREFER_IPV4', False)
-NETBOX_USERNAME = getattr(configuration, 'NETBOX_USERNAME', '')
-NETBOX_PASSWORD = getattr(configuration, 'NETBOX_PASSWORD', '')
+NAPALM_USERNAME = getattr(configuration, 'NAPALM_USERNAME', '')
+NAPALM_PASSWORD = getattr(configuration, 'NAPALM_PASSWORD', '')
+NETBOX_USERNAME = getattr(configuration, 'NETBOX_USERNAME', '')  # Deprecated
+NETBOX_PASSWORD = getattr(configuration, 'NETBOX_PASSWORD', '')  # Deprecated
 SHORT_DATE_FORMAT = getattr(configuration, 'SHORT_DATE_FORMAT', 'Y-m-d')
 SHORT_DATETIME_FORMAT = getattr(configuration, 'SHORT_DATETIME_FORMAT', 'Y-m-d H:i')
 SHORT_TIME_FORMAT = getattr(configuration, 'SHORT_TIME_FORMAT', 'H:i:s')
@@ -56,6 +58,19 @@ TIME_ZONE = getattr(configuration, 'TIME_ZONE', 'UTC')
 
 CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS
 
+# Check for deprecated configuration parameters
+config_logger = logging.getLogger('configuration')
+config_logger.addHandler(logging.StreamHandler())
+config_logger.setLevel(logging.WARNING)
+if NETBOX_USERNAME:
+    config_logger.warning('NETBOX_USERNAME is deprecated and will be removed in v2.2. Please use NAPALM_USERNAME instead.')
+    if not NAPALM_USERNAME:
+        NAPALM_USERNAME = NETBOX_USERNAME
+if NETBOX_PASSWORD:
+    config_logger.warning('NETBOX_PASSWORD is deprecated and will be removed in v2.2. Please use NAPALM_PASSWORD instead.')
+    if not NAPALM_PASSWORD:
+        NAPALM_PASSWORD = NETBOX_PASSWORD
+
 # Attempt to import LDAP configuration if it has been defined
 LDAP_IGNORE_CERT_ERRORS = False
 try:
@@ -78,9 +93,9 @@ if LDAP_CONFIGURED:
         if LDAP_IGNORE_CERT_ERRORS:
             ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_NEVER)
         # Enable logging for django_auth_ldap
-        logger = logging.getLogger('django_auth_ldap')
-        logger.addHandler(logging.StreamHandler())
-        logger.setLevel(logging.DEBUG)
+        ldap_logger = logging.getLogger('django_auth_ldap')
+        ldap_logger.addHandler(logging.StreamHandler())
+        ldap_logger.setLevel(logging.DEBUG)
     except ImportError:
         raise ImproperlyConfigured(
             "LDAP authentication has been configured, but django-auth-ldap is not installed. You can remove "
diff --git a/netbox/templates/home.html b/netbox/templates/home.html
index f553ed9c8..0c3c7d13b 100644
--- a/netbox/templates/home.html
+++ b/netbox/templates/home.html
@@ -1,6 +1,14 @@
 {% extends '_base.html' %}
 
 {% block content %}
+{% if settings.NETBOX_USERNAME or settings.NETBOX_PASSWORD %}
+    <div class="alert alert-warning alert-dismissable" role="alert">
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+        </button>
+        <strong>Warning:</strong> The <code>NETBOX_USERNAME</code> and <code>NETBOX_PASSWORD</code> configuration parameters have been deprecated. Please replace them in configuration.py with <code>NAPALM_USERNAME</code> and <code>NAPALM_PASSWORD</code>.
+    </div>
+{% endif %}
 {% include 'search_form.html' %}
 <div class="row">
     <div class="col-sm-6 col-md-4">

From 65a633f42dbde39ec9de681cce108079155100d1 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 26 Jul 2017 11:47:59 -0400
Subject: [PATCH 16/92] Closes #1374: Added NAPALM_ARGS and NAPALM_TIMEOUT
 configiuration parameters

---
 docs/configuration/optional-settings.md | 34 ++++++++++++++++++++++++-
 netbox/dcim/api/views.py                |  6 +++--
 netbox/netbox/configuration.example.py  |  7 +++++
 netbox/netbox/settings.py               |  2 ++
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/docs/configuration/optional-settings.md b/docs/configuration/optional-settings.md
index aacb50410..83b289b9a 100644
--- a/docs/configuration/optional-settings.md
+++ b/docs/configuration/optional-settings.md
@@ -139,12 +139,44 @@ An API consumer can request an arbitrary number of objects by appending the "lim
 
 ## NAPALM_PASSWORD
 
-NetBox will use these credentials when authenticating to remote devices via the NAPALM library. Both parameters are optional.
+NetBox will use these credentials when authenticating to remote devices via the [NAPALM library](https://napalm-automation.net/), if installed. Both parameters are optional.
 
 Note: If SSH public key authentication has been set up for the system account under which NetBox runs, these parameters are not needed.
 
 ---
 
+## NAPALM_ARGS
+
+A dictionary of optional arguments to pass to NAPALM when instantiating a network driver. See the NAPALM documentation for a [complete list of optional arguments](http://napalm.readthedocs.io/en/latest/support/#optional-arguments). An example:
+
+```
+NAPALM_ARGS = {
+    'api_key': '472071a93b60a1bd1fafb401d9f8ef41',
+    'port': 2222,
+}
+```
+
+Note: Some platforms (e.g. Cisco IOS) require an argument named `secret` to be passed in addition to the normal password. If desired, you can use the configured `NAPALM_PASSWORD` as the value for this argument:
+
+```
+NAPALM_USERNAME = 'username'
+NAPALM_PASSWORD = 'MySecretPassword'
+NAPALM_ARGS = {
+    'secret': NAPALM_PASSWORD,
+    # Include any additional args here
+}
+```
+
+---
+
+## NAPALM_TIMEOUT
+
+Default: 30 seconds
+
+The amount of time (in seconds) to wait for NAPALM to connect to a device.
+
+---
+
 ## NETBOX_USERNAME (Deprecated)
 
 ## NETBOX_PASSWORD (Deprecated)
diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index bfbe3c549..116c8db00 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -273,14 +273,16 @@ class DeviceViewSet(WritableSerializerMixin, CustomFieldModelViewSet):
         d = driver(
             hostname=ip_address,
             username=settings.NAPALM_USERNAME,
-            password=settings.NAPALM_PASSWORD
+            password=settings.NAPALM_PASSWORD,
+            timeout=settings.NAPALM_TIMEOUT,
+            optional_args=settings.NAPALM_ARGS
         )
         try:
             d.open()
             for method in napalm_methods:
                 response[method] = getattr(d, method)()
         except Exception as e:
-            raise ServiceUnavailable("Error connecting to the device: {}".format(e))
+            raise ServiceUnavailable("Error connecting to the device at {}: {}".format(ip_address, e))
 
         d.close()
         return Response(response)
diff --git a/netbox/netbox/configuration.example.py b/netbox/netbox/configuration.example.py
index 834f322bb..78e870072 100644
--- a/netbox/netbox/configuration.example.py
+++ b/netbox/netbox/configuration.example.py
@@ -97,6 +97,13 @@ MAX_PAGE_SIZE = 1000
 NAPALM_USERNAME = ''
 NAPALM_PASSWORD = ''
 
+# NAPALM timeout (in seconds). (Default: 30)
+NAPALM_TIMEOUT = 30
+
+# NAPALM optional arguments (see http://napalm.readthedocs.io/en/latest/support/#optional-arguments). Arguments must
+# be provided as a dictionary.
+NAPALM_ARGS = {}
+
 # Determine how many objects to display per page within a list. (Default: 50)
 PAGINATE_COUNT = 50
 
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index fe863833f..2cac4ad7d 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -48,6 +48,8 @@ PAGINATE_COUNT = getattr(configuration, 'PAGINATE_COUNT', 50)
 PREFER_IPV4 = getattr(configuration, 'PREFER_IPV4', False)
 NAPALM_USERNAME = getattr(configuration, 'NAPALM_USERNAME', '')
 NAPALM_PASSWORD = getattr(configuration, 'NAPALM_PASSWORD', '')
+NAPALM_TIMEOUT = getattr(configuration, 'NAPALM_TIMEOUT', 30)
+NAPALM_ARGS = getattr(configuration, 'NAPALM_ARGS', {})
 NETBOX_USERNAME = getattr(configuration, 'NETBOX_USERNAME', '')  # Deprecated
 NETBOX_PASSWORD = getattr(configuration, 'NETBOX_PASSWORD', '')  # Deprecated
 SHORT_DATE_FORMAT = getattr(configuration, 'SHORT_DATE_FORMAT', 'Y-m-d')

From f2c16fbf3c318f0aac8045b9fa5fa443e2d9f516 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 27 Jul 2017 09:53:41 -0400
Subject: [PATCH 17/92] Closes #893: Allow filtering by null values for
 NullCharacterFields (e.g. return only unnamed devices)

---
 netbox/dcim/filters.py      | 12 ++++++++----
 netbox/utilities/filters.py | 10 ++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index e3579085a..ed6106c86 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -8,7 +8,7 @@ from django.db.models import Q
 
 from extras.filters import CustomFieldFilterSet
 from tenancy.models import Tenant
-from utilities.filters import NullableModelMultipleChoiceFilter, NumericInFilter
+from utilities.filters import NullableCharFieldFilter, NullableModelMultipleChoiceFilter, NumericInFilter
 from .models import (
     ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
     DeviceBayTemplate, DeviceRole, DeviceType, STATUS_CHOICES, IFACE_FF_LAG, Interface, InterfaceConnection,
@@ -113,6 +113,7 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet):
         method='search',
         label='Search',
     )
+    facility_id = NullableCharFieldFilter()
     site_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Site.objects.all(),
         label='Site (ID)',
@@ -156,7 +157,7 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet):
 
     class Meta:
         model = Rack
-        fields = ['facility_id', 'type', 'width', 'u_height', 'desc_units']
+        fields = ['type', 'width', 'u_height', 'desc_units']
 
     def search(self, queryset, name, value):
         if not value.strip():
@@ -383,6 +384,8 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet):
         to_field_name='slug',
         label='Platform (slug)',
     )
+    name = NullableCharFieldFilter()
+    asset_tag = NullableCharFieldFilter()
     site_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Site.objects.all(),
         label='Site (ID)',
@@ -439,7 +442,7 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet):
 
     class Meta:
         model = Device
-        fields = ['name', 'serial', 'asset_tag']
+        fields = ['serial']
 
     def search(self, queryset, name, value):
         if not value.strip():
@@ -596,10 +599,11 @@ class InventoryItemFilter(DeviceComponentFilterSet):
         to_field_name='slug',
         label='Manufacturer (slug)',
     )
+    asset_tag = NullableCharFieldFilter()
 
     class Meta:
         model = InventoryItem
-        fields = ['name', 'part_id', 'serial', 'asset_tag', 'discovered']
+        fields = ['name', 'part_id', 'serial', 'discovered']
 
 
 class ConsoleConnectionFilter(django_filters.FilterSet):
diff --git a/netbox/utilities/filters.py b/netbox/utilities/filters.py
index 5929c3ff1..5bd635a46 100644
--- a/netbox/utilities/filters.py
+++ b/netbox/utilities/filters.py
@@ -19,6 +19,16 @@ class NumericInFilter(django_filters.BaseInFilter, django_filters.NumberFilter):
     pass
 
 
+class NullableCharFieldFilter(django_filters.CharFilter):
+    null_value = 'NULL'
+
+    def filter(self, qs, value):
+        if value != self.null_value:
+            return super(NullableCharFieldFilter, self).filter(qs, value)
+        qs = self.get_method(qs)(**{'{}__isnull'.format(self.name): True})
+        return qs.distinct() if self.distinct else qs
+
+
 class NullableModelMultipleChoiceField(forms.ModelMultipleChoiceField):
     """
     This field operates like a normal ModelMultipleChoiceField except that it allows for one additional choice which is

From 52a490bf5d86d92957f0409114c4d69c1ed8a6d8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 28 Jul 2017 10:05:51 -0400
Subject: [PATCH 18/92] Fixes #461: Display a validation error when attempting
 to assigning a new child device to a rack face/position

---
 netbox/templates/dcim/device_edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html
index 7bfec5469..07206ca27 100644
--- a/netbox/templates/dcim/device_edit.html
+++ b/netbox/templates/dcim/device_edit.html
@@ -45,7 +45,7 @@
                         </p>
                     </div>
                 </div>
-            {% elif not obj.device_type.is_child_device %}
+            {% else %}
                 {% render_field form.face %}
                 {% render_field form.position %}
             {% endif %}

From cab2929c108a45a39cdaf74b6b6b5859eeda1e9d Mon Sep 17 00:00:00 2001
From: bdlamprecht <bdlamprecht@users.noreply.github.com>
Date: Wed, 2 Aug 2017 08:45:00 -0600
Subject: [PATCH 19/92] Updated ldap.md

Add mapping of `email` field to `mail` value in LDAP.  Also remove duplicate entries of such mapping information.
---
 docs/installation/ldap.md | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/docs/installation/ldap.md b/docs/installation/ldap.md
index 0d546863e..b43105b8b 100644
--- a/docs/installation/ldap.md
+++ b/docs/installation/ldap.md
@@ -72,7 +72,8 @@ AUTH_LDAP_USER_DN_TEMPLATE = "uid=%(user)s,ou=users,dc=example,dc=com"
 # You can map user attributes to Django attributes as so.
 AUTH_LDAP_USER_ATTR_MAP = {
     "first_name": "givenName",
-    "last_name": "sn"
+    "last_name": "sn",
+    "email": "mail"
 }
 ```
 
@@ -108,12 +109,3 @@ AUTH_LDAP_GROUP_CACHE_TIMEOUT = 3600
 * `is_active` - All users must be mapped to at least this group to enable authentication. Without this, users cannot log in.
 * `is_staff` - Users mapped to this group are enabled for access to the administration tools; this is the equivalent of checking the "staff status" box on a manually created user. This doesn't grant any specific permissions.
 * `is_superuser` - Users mapped to this group will be granted superuser status. Superusers are implicitly granted all permissions.
-
-It is also possible map user attributes to Django attributes:
-
-```python
-AUTH_LDAP_USER_ATTR_MAP = {
-    "first_name": "givenName",
-    "last_name": "sn",
-}
-```

From fd6df8e52a0876780b1c223a4cc129bb930b0b72 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 2 Aug 2017 11:17:57 -0400
Subject: [PATCH 20/92] Fixes #1385: Connected device API endpoint no longer
 requires authentication if LOGIN_REQUIRED=False

---
 netbox/dcim/api/views.py |  5 ++---
 netbox/utilities/api.py  | 29 ++++++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index 116c8db00..56d4221da 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -3,7 +3,6 @@ from collections import OrderedDict
 
 from rest_framework.decorators import detail_route
 from rest_framework.mixins import ListModelMixin
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet, ModelViewSet, ViewSet
 
@@ -21,7 +20,7 @@ from dcim import filters
 from extras.api.serializers import RenderedGraphSerializer
 from extras.api.views import CustomFieldModelViewSet
 from extras.models import Graph, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE
-from utilities.api import ServiceUnavailable, WritableSerializerMixin
+from utilities.api import IsAuthenticatedOrLoginNotRequired, ServiceUnavailable, WritableSerializerMixin
 from .exceptions import MissingFilterException
 from . import serializers
 
@@ -387,7 +386,7 @@ class ConnectedDeviceViewSet(ViewSet):
     * `peer-device`: The name of the peer device
     * `peer-interface`: The name of the peer interface
     """
-    permission_classes = [IsAuthenticated]
+    permission_classes = [IsAuthenticatedOrLoginNotRequired]
 
     def get_view_name(self):
         return "Connected Device Locator"
diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 5774584a6..6a515b21d 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -4,9 +4,10 @@ from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 
 from rest_framework import authentication, exceptions
+from rest_framework.compat import is_authenticated
 from rest_framework.exceptions import APIException
 from rest_framework.pagination import LimitOffsetPagination
-from rest_framework.permissions import DjangoModelPermissions, SAFE_METHODS
+from rest_framework.permissions import BasePermission, DjangoModelPermissions, SAFE_METHODS
 from rest_framework.serializers import Field, ValidationError
 
 from users.models import Token
@@ -20,6 +21,10 @@ class ServiceUnavailable(APIException):
     default_detail = "Service temporarily unavailable, please try again later."
 
 
+#
+# Authentication
+#
+
 class TokenAuthentication(authentication.TokenAuthentication):
     """
     A custom authentication scheme which enforces Token expiration times.
@@ -61,6 +66,20 @@ class TokenPermissions(DjangoModelPermissions):
         return super(TokenPermissions, self).has_permission(request, view)
 
 
+class IsAuthenticatedOrLoginNotRequired(BasePermission):
+    """
+    Returns True if the user is authenticated or LOGIN_REQUIRED is False.
+    """
+    def has_permission(self, request, view):
+        if not settings.LOGIN_REQUIRED:
+            return True
+        return request.user and is_authenticated(request.user)
+
+
+#
+# Serializers
+#
+
 class ChoiceFieldSerializer(Field):
     """
     Represent a ChoiceField as {'value': <DB value>, 'label': <string>}.
@@ -98,6 +117,10 @@ class ContentTypeFieldSerializer(Field):
             raise ValidationError("Invalid content type")
 
 
+#
+# Mixins
+#
+
 class ModelValidationMixin(object):
     """
     Enforce a model's validation through clean() when validating serializer data. This is necessary to ensure we're
@@ -119,6 +142,10 @@ class WritableSerializerMixin(object):
         return self.serializer_class
 
 
+#
+# Pagination
+#
+
 class OptionalLimitOffsetPagination(LimitOffsetPagination):
     """
     Override the stock paginator to allow setting limit=0 to disable pagination for a request. This returns all objects

From e50f234ba3aac2ced950db37a7ec66aeed1d9530 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 2 Aug 2017 11:54:53 -0400
Subject: [PATCH 21/92] Closes #1379: Allow searching devices by interface MAC
 address in global search

---
 netbox/dcim/filters.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index ed6106c86..dcd6c6d2e 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
 import django_filters
+from netaddr import EUI
 from netaddr.core import AddrFormatError
 
 from django.contrib.auth.models import User
@@ -447,20 +448,28 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet):
     def search(self, queryset, name, value):
         if not value.strip():
             return queryset
-        return queryset.filter(
+        qs_filter = (
             Q(name__icontains=value) |
             Q(serial__icontains=value.strip()) |
             Q(inventory_items__serial__icontains=value.strip()) |
             Q(asset_tag=value.strip()) |
             Q(comments__icontains=value)
-        ).distinct()
+        )
+        # If the query value looks like a MAC address, search interfaces as well.
+        try:
+            mac = EUI(value.strip())
+            qs_filter |= Q(interfaces__mac_address=mac)
+        except AddrFormatError:
+            pass
+        return queryset.filter(qs_filter).distinct()
 
     def _mac_address(self, queryset, name, value):
         value = value.strip()
         if not value:
             return queryset
         try:
-            return queryset.filter(interfaces__mac_address=value).distinct()
+            mac = EUI(value.strip())
+            return queryset.filter(interfaces__mac_address=mac).distinct()
         except AddrFormatError:
             return queryset.none()
 
@@ -572,7 +581,8 @@ class InterfaceFilter(django_filters.FilterSet):
         if not value:
             return queryset
         try:
-            return queryset.filter(mac_address=value)
+            mac = EUI(value.strip())
+            return queryset.filter(mac_address=mac)
         except AddrFormatError:
             return queryset.none()
 

From 3876a96b67f0ae5b091ae45c3e6fabf540ca1727 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 2 Aug 2017 12:55:21 -0400
Subject: [PATCH 22/92] Tweaked IP address layout

---
 netbox/templates/ipam/ipaddress.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index 44c5ec5ff..f386c89bf 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -43,7 +43,7 @@
 <h1>{{ ipaddress }}</h1>
 {% include 'inc/created_updated.html' with obj=ipaddress %}
 <div class="row">
-	<div class="col-md-6">
+	<div class="col-md-4">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <strong>IP Address</strong>
@@ -137,7 +137,7 @@
             {% include 'inc/custom_fields_panel.html' %}
         {% endwith %}
 	</div>
-	<div class="col-md-6">
+	<div class="col-md-8">
         {% include 'panel_table.html' with table=parent_prefixes_table heading='Parent Prefixes' %}
         {% if duplicate_ips_table.rows %}
             {% include 'panel_table.html' with table=duplicate_ips_table heading='Duplicate IP Addresses' panel_class='danger' %}

From 12d643694f7bbab55ccf5c0e567fefa6f6dbe42a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 2 Aug 2017 13:15:28 -0400
Subject: [PATCH 23/92] Cleaned up title blocks

---
 netbox/templates/circuits/circuit.html                 | 4 +---
 netbox/templates/circuits/circuit_list.html            | 4 +---
 netbox/templates/circuits/circuittermination_edit.html | 6 +-----
 netbox/templates/circuits/circuittype_list.html        | 4 +---
 netbox/templates/circuits/provider.html                | 4 +---
 netbox/templates/circuits/provider_list.html           | 4 +---
 netbox/templates/dcim/console_connections_list.html    | 4 +---
 netbox/templates/dcim/consoleport_connect.html         | 4 +---
 netbox/templates/dcim/consoleserverport_connect.html   | 4 +---
 netbox/templates/dcim/device_list.html                 | 4 +---
 netbox/templates/dcim/devicebay_populate.html          | 4 +---
 netbox/templates/dcim/devicerole_list.html             | 4 +---
 netbox/templates/dcim/devicetype.html                  | 4 +---
 netbox/templates/dcim/devicetype_list.html             | 4 +---
 netbox/templates/dcim/interface_connections_list.html  | 4 +---
 netbox/templates/dcim/manufacturer_list.html           | 4 +---
 netbox/templates/dcim/platform_list.html               | 4 +---
 netbox/templates/dcim/power_connections_list.html      | 4 +---
 netbox/templates/dcim/poweroutlet_connect.html         | 4 +---
 netbox/templates/dcim/powerport_connect.html           | 4 +---
 netbox/templates/dcim/rack.html                        | 4 +---
 netbox/templates/dcim/rack_list.html                   | 4 +---
 netbox/templates/dcim/rackgroup_list.html              | 4 +---
 netbox/templates/dcim/rackrole_list.html               | 4 +---
 netbox/templates/dcim/region_list.html                 | 4 +---
 netbox/templates/dcim/site.html                        | 4 +---
 netbox/templates/dcim/site_list.html                   | 4 +---
 netbox/templates/ipam/aggregate.html                   | 4 +---
 netbox/templates/ipam/aggregate_list.html              | 4 +---
 netbox/templates/ipam/ipaddress.html                   | 4 +---
 netbox/templates/ipam/ipaddress_assign.html            | 4 +---
 netbox/templates/ipam/ipaddress_list.html              | 4 +---
 netbox/templates/ipam/prefix_ipaddresses.html          | 2 +-
 netbox/templates/ipam/prefix_list.html                 | 4 +---
 netbox/templates/ipam/rir_list.html                    | 4 +---
 netbox/templates/ipam/role_list.html                   | 4 +---
 netbox/templates/ipam/vlan.html                        | 4 +---
 netbox/templates/ipam/vlan_list.html                   | 4 +---
 netbox/templates/ipam/vlangroup_list.html              | 4 +---
 netbox/templates/ipam/vrf.html                         | 4 +---
 netbox/templates/ipam/vrf_list.html                    | 4 +---
 netbox/templates/secrets/secret.html                   | 4 +---
 netbox/templates/secrets/secret_edit.html              | 4 +---
 netbox/templates/secrets/secret_import.html            | 4 +---
 netbox/templates/secrets/secret_list.html              | 4 +---
 netbox/templates/secrets/secretrole_list.html          | 4 +---
 netbox/templates/tenancy/tenant.html                   | 4 +---
 netbox/templates/tenancy/tenant_list.html              | 4 +---
 netbox/templates/tenancy/tenantgroup_list.html         | 4 +---
 49 files changed, 49 insertions(+), 147 deletions(-)

diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index f311ccb73..383d3bb7a 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}{{ circuit.provider }} - {{ circuit.cid }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -39,7 +37,7 @@
 		</a>
     {% endif %}
 </div>
-<h1>{{ circuit.provider }} - {{ circuit.cid }}</h1>
+<h1>{% block title %}{{ circuit.provider }} - {{ circuit.cid }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=circuit %}
 <div class="row">
 	<div class="col-md-6">
diff --git a/netbox/templates/circuits/circuit_list.html b/netbox/templates/circuits/circuit_list.html
index 63ee92f2d..418459a15 100644
--- a/netbox/templates/circuits/circuit_list.html
+++ b/netbox/templates/circuits/circuit_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Circuits{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.circuits.add_circuit %}
@@ -17,7 +15,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='circuits' %}
 </div>
-<h1>Circuits</h1>
+<h1>{% block title %}Circuits{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='circuits:circuit_bulk_edit' bulk_delete_url='circuits:circuit_bulk_delete' %}
diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html
index 13aa7e5b6..13052966b 100644
--- a/netbox/templates/circuits/circuittermination_edit.html
+++ b/netbox/templates/circuits/circuittermination_edit.html
@@ -2,10 +2,6 @@
 {% load staticfiles %}
 {% load form_helpers %}
 
-{% block title %}
-    Circuit {{ obj.circuit }} - Side {{ form.term_side.value }}
-{% endblock %}
-
 {% block content %}
     <form action="." method="post" class="form form-horizontal">
         {% csrf_token %}
@@ -14,7 +10,7 @@
         {% endfor %}
         <div class="row">
             <div class="col-md-6 col-md-offset-3">
-                <h3>Circuit {{ obj.circuit }} - Side {{ form.term_side.value }}</h3>
+                <h3>{% block title %}Circuit {{ obj.circuit }} - {{ form.term_side.value }} Side{% endblock %}</h3>
                 {% if form.non_field_errors %}
                     <div class="panel panel-danger">
                         <div class="panel-heading"><strong>Errors</strong></div>
diff --git a/netbox/templates/circuits/circuittype_list.html b/netbox/templates/circuits/circuittype_list.html
index d59a5b82f..f545b1a1e 100644
--- a/netbox/templates/circuits/circuittype_list.html
+++ b/netbox/templates/circuits/circuittype_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Circuit Types{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.circuits.add_circuittype %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Circuit Types</h1>
+<h1>{% block title %}Circuit Types{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='circuits:circuittype_bulk_delete' %}
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index 35562a7a3..6dcccfd8d 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load helpers %}
 
-{% block title %}{{ provider }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -45,7 +43,7 @@
 		</a>
     {% endif %}
 </div>
-<h1>{{ provider }}</h1>
+<h1>{% block title %}{{ provider }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=provider %}
 <div class="row">
 	<div class="col-md-4">
diff --git a/netbox/templates/circuits/provider_list.html b/netbox/templates/circuits/provider_list.html
index 36438d66b..9ba8bb838 100644
--- a/netbox/templates/circuits/provider_list.html
+++ b/netbox/templates/circuits/provider_list.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}Providers{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.circuits.add_provider %}
@@ -16,7 +14,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='providers' %}
 </div>
-<h1>Providers</h1>
+<h1>{% block title %}Providers{% endblock %}</h1>
 <div class="row">
     <div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='circuits:provider_bulk_edit' bulk_delete_url='circuits:provider_bulk_delete' %}
diff --git a/netbox/templates/dcim/console_connections_list.html b/netbox/templates/dcim/console_connections_list.html
index fc2cbb762..57d3435e5 100644
--- a/netbox/templates/dcim/console_connections_list.html
+++ b/netbox/templates/dcim/console_connections_list.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}Console Connections{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.change_consoleport %}
@@ -12,7 +10,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='connections' %}
 </div>
-<h1>Console Connections</h1>
+<h1>{% block title %}Console Connections{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'responsive_table.html' %}
diff --git a/netbox/templates/dcim/consoleport_connect.html b/netbox/templates/dcim/consoleport_connect.html
index e06bf45ec..679540960 100644
--- a/netbox/templates/dcim/consoleport_connect.html
+++ b/netbox/templates/dcim/consoleport_connect.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load form_helpers %}
 
-{% block title %}Connect {{ consoleport.device }} {{ consoleport }}{% endblock %}
-
 {% block content %}
 <form action="." method="post" class="form form-horizontal">
     {% csrf_token %}
@@ -21,7 +19,7 @@
                 </div>
             {% endif %}
             <div class="panel panel-default">
-                <div class="panel-heading">Connect {{ consoleport.device }} {{ consoleport }}</div>
+                <div class="panel-heading">{% block title %}Connect {{ consoleport.device }} {{ consoleport }}{% endblock %}</div>
                 <div class="panel-body">
                     <ul class="nav nav-tabs" role="tablist">
                         <li role="presentation" class="active"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
diff --git a/netbox/templates/dcim/consoleserverport_connect.html b/netbox/templates/dcim/consoleserverport_connect.html
index 82b80e3f7..989104329 100644
--- a/netbox/templates/dcim/consoleserverport_connect.html
+++ b/netbox/templates/dcim/consoleserverport_connect.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load form_helpers %}
 
-{% block title %}Connect {{ consoleserverport.device }} {{ consoleserverport }}{% endblock %}
-
 {% block content %}
 <form action="." method="post" class="form form-horizontal">
     {% csrf_token %}
@@ -21,7 +19,7 @@
                 </div>
             {% endif %}
             <div class="panel panel-default">
-                <div class="panel-heading">Connect {{ consoleserverport.device }} {{ consoleserverport }}</div>
+                <div class="panel-heading">{% block title %}Connect {{ consoleserverport.device }} {{ consoleserverport }}{% endblock %}</div>
                 <div class="panel-body">
                     <ul class="nav nav-tabs" role="tablist">
                         <li role="presentation" class="active"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
diff --git a/netbox/templates/dcim/device_list.html b/netbox/templates/dcim/device_list.html
index 392679348..34b143fc5 100644
--- a/netbox/templates/dcim/device_list.html
+++ b/netbox/templates/dcim/device_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Devices{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_device %}
@@ -17,7 +15,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='devices' %}
 </div>
-<h1>Devices</h1>
+<h1>{% block title %}Devices{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'dcim/inc/device_table.html' with bulk_edit_url='dcim:device_bulk_edit' bulk_delete_url='dcim:device_bulk_delete' %}
diff --git a/netbox/templates/dcim/devicebay_populate.html b/netbox/templates/dcim/devicebay_populate.html
index 94a4ef0d0..d328d557d 100644
--- a/netbox/templates/dcim/devicebay_populate.html
+++ b/netbox/templates/dcim/devicebay_populate.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load form_helpers %}
 
-{% block title %}Populate {{ device_bay }}{% endblock %}
-
 {% block content %}
 <form action="." method="post" class="form form-horizontal">
     {% csrf_token %}
@@ -17,7 +15,7 @@
                 </div>
             {% endif %}
             <div class="panel panel-default">
-                <div class="panel-heading">Populate {{ device_bay }}</div>
+                <div class="panel-heading">{% block title %}Populate {{ device_bay }}{% endblock %}</div>
                 <div class="panel-body">
                     <div class="form-group">
                         <label class="col-md-3 control-label required">Parent Device</label>
diff --git a/netbox/templates/dcim/devicerole_list.html b/netbox/templates/dcim/devicerole_list.html
index 67ff32979..2e8189017 100644
--- a/netbox/templates/dcim/devicerole_list.html
+++ b/netbox/templates/dcim/devicerole_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Device Roles{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_devicerole %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Device Roles</h1>
+<h1>{% block title %}Device Roles{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:devicerole_bulk_delete' %}
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index aac7a0622..9eb3e0a5e 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}{{ devicetype.manufacturer }} {{ devicetype.model }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-md-12">
@@ -31,7 +29,7 @@
     </div>
 {% endif %}
 
-<h1>{{ devicetype.manufacturer }} {{ devicetype.model }}</h1>
+<h1>{% block title %}{{ devicetype.manufacturer }} {{ devicetype.model }}{% endblock %}</h1>
 <div class="row">
     <div class="col-md-5">
         <div class="panel panel-default">
diff --git a/netbox/templates/dcim/devicetype_list.html b/netbox/templates/dcim/devicetype_list.html
index 5ab97a481..46d41782a 100644
--- a/netbox/templates/dcim/devicetype_list.html
+++ b/netbox/templates/dcim/devicetype_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Device Types{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_devicetype %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Device Types</h1>
+<h1>{% block title %}Device Types{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='dcim:devicetype_bulk_edit' bulk_delete_url='dcim:devicetype_bulk_delete' %}
diff --git a/netbox/templates/dcim/interface_connections_list.html b/netbox/templates/dcim/interface_connections_list.html
index a37028624..a7355a449 100644
--- a/netbox/templates/dcim/interface_connections_list.html
+++ b/netbox/templates/dcim/interface_connections_list.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}Interface Connections{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_interfaceconnection %}
@@ -12,7 +10,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='connections' %}
 </div>
-<h1>Interface Connections</h1>
+<h1>{% block title %}Interface Connections{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'responsive_table.html' %}
diff --git a/netbox/templates/dcim/manufacturer_list.html b/netbox/templates/dcim/manufacturer_list.html
index d535e11e8..c697127b1 100644
--- a/netbox/templates/dcim/manufacturer_list.html
+++ b/netbox/templates/dcim/manufacturer_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Manufacturers{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_manufacturer %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Manufacturers</h1>
+<h1>{% block title %}Manufacturers{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:manufacturer_bulk_delete' %}
diff --git a/netbox/templates/dcim/platform_list.html b/netbox/templates/dcim/platform_list.html
index 332447977..124277d0b 100644
--- a/netbox/templates/dcim/platform_list.html
+++ b/netbox/templates/dcim/platform_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Platforms{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_platform %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Platforms</h1>
+<h1>{% block title %}Platforms{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:platform_bulk_delete' %}
diff --git a/netbox/templates/dcim/power_connections_list.html b/netbox/templates/dcim/power_connections_list.html
index 79001fe40..50e983bec 100644
--- a/netbox/templates/dcim/power_connections_list.html
+++ b/netbox/templates/dcim/power_connections_list.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}Power Connections{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.change_powerport %}
@@ -12,7 +10,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='connections' %}
 </div>
-<h1>Power Connections</h1>
+<h1>{% block title %}Power Connections{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'responsive_table.html' %}
diff --git a/netbox/templates/dcim/poweroutlet_connect.html b/netbox/templates/dcim/poweroutlet_connect.html
index 839027db2..6c7cef449 100644
--- a/netbox/templates/dcim/poweroutlet_connect.html
+++ b/netbox/templates/dcim/poweroutlet_connect.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load form_helpers %}
 
-{% block title %}Connect {{ poweroutlet.device }} {{ poweroutlet }}{% endblock %}
-
 {% block content %}
 <form action="." method="post" class="form form-horizontal">
     {% csrf_token %}
@@ -21,7 +19,7 @@
                 </div>
             {% endif %}
             <div class="panel panel-default">
-                <div class="panel-heading">Connect {{ poweroutlet.device }} {{ poweroutlet }}</div>
+                <div class="panel-heading">{% block title %}Connect {{ poweroutlet.device }} {{ poweroutlet }}{% endblock %}</div>
                 <div class="panel-body">
                     <ul class="nav nav-tabs" role="tablist">
                         <li role="presentation" class="active"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
diff --git a/netbox/templates/dcim/powerport_connect.html b/netbox/templates/dcim/powerport_connect.html
index a10fecc7b..1ffa6de28 100644
--- a/netbox/templates/dcim/powerport_connect.html
+++ b/netbox/templates/dcim/powerport_connect.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load form_helpers %}
 
-{% block title %}Connect {{ powerport.device }} {{ powerport }}{% endblock %}
-
 {% block content %}
 <form action="." method="post" class="form form-horizontal">
     {% csrf_token %}
@@ -21,7 +19,7 @@
                 </div>
             {% endif %}
             <div class="panel panel-default">
-                <div class="panel-heading">Connect {{ powerport.device }} {{ powerport }}</div>
+                <div class="panel-heading">{% block title %}Connect {{ powerport.device }} {{ powerport }}{% endblock %}</div>
                 <div class="panel-body">
                     <ul class="nav nav-tabs" role="tablist">
                         <li role="presentation" class="active"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index d01320552..6f117076b 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}{{ rack.site }} - Rack {{ rack.name }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -51,7 +49,7 @@
 		</a>
     {% endif %}
 </div>
-<h1>Rack {{ rack.name }}</h1>
+<h1>{% block title %}Rack {{ rack.name }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=rack %}
 <div class="row">
 	<div class="col-md-6">
diff --git a/netbox/templates/dcim/rack_list.html b/netbox/templates/dcim/rack_list.html
index fa5371f6f..1de08d37a 100644
--- a/netbox/templates/dcim/rack_list.html
+++ b/netbox/templates/dcim/rack_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Racks{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_rack %}
@@ -17,7 +15,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='racks' %}
 </div>
-<h1>Racks</h1>
+<h1>{% block title %}Racks{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='dcim:rack_bulk_edit' bulk_delete_url='dcim:rack_bulk_delete' %}
diff --git a/netbox/templates/dcim/rackgroup_list.html b/netbox/templates/dcim/rackgroup_list.html
index dee6472fb..cf19005b7 100644
--- a/netbox/templates/dcim/rackgroup_list.html
+++ b/netbox/templates/dcim/rackgroup_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Rack Groups{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_rackgroup %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Rack Groups</h1>
+<h1>{% block title %}Rack Groups{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:rackgroup_bulk_delete' %}
diff --git a/netbox/templates/dcim/rackrole_list.html b/netbox/templates/dcim/rackrole_list.html
index 3cdf33164..1133cf9b2 100644
--- a/netbox/templates/dcim/rackrole_list.html
+++ b/netbox/templates/dcim/rackrole_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Rack Role{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_rackrole %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Rack Roles</h1>
+<h1>{% block title %}Rack Roles{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:rackrole_bulk_delete' %}
diff --git a/netbox/templates/dcim/region_list.html b/netbox/templates/dcim/region_list.html
index b54201a34..df7da82c8 100644
--- a/netbox/templates/dcim/region_list.html
+++ b/netbox/templates/dcim/region_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Regions{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_region %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>{{ block.title }}</h1>
+<h1>{% block title %}Regions{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:region_bulk_delete' %}
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index f86565bf8..c178fbf64 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load helpers %}
 
-{% block title %}{{ site }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -50,7 +48,7 @@
 		</a>
     {% endif %}
 </div>
-<h1>{{ site.name }}</h1>
+<h1>{% block title %}{{ site }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=site %}
 <div class="row">
 	<div class="col-md-7">
diff --git a/netbox/templates/dcim/site_list.html b/netbox/templates/dcim/site_list.html
index 895f90804..6d3e2f7f7 100644
--- a/netbox/templates/dcim/site_list.html
+++ b/netbox/templates/dcim/site_list.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}Sites{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_site %}
@@ -16,7 +14,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='sites' %}
 </div>
-<h1>Sites</h1>
+<h1>{% block title %}Sites{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='dcim:site_bulk_edit' %}
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index 82961d3bf..63731755c 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}Aggregate: {{ aggregate }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -38,7 +36,7 @@
         </a>
     {% endif %}
 </div>
-<h1>{{ aggregate }}</h1>
+<h1>{% block title %}{{ aggregate }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=aggregate %}
 <div class="row">
 	<div class="col-md-6">
diff --git a/netbox/templates/ipam/aggregate_list.html b/netbox/templates/ipam/aggregate_list.html
index f43274876..fde53a790 100644
--- a/netbox/templates/ipam/aggregate_list.html
+++ b/netbox/templates/ipam/aggregate_list.html
@@ -2,8 +2,6 @@
 {% load humanize %}
 {% load helpers %}
 
-{% block title %}Aggregates{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.ipam.add_aggregate %}
@@ -18,7 +16,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='aggregates' %}
 </div>
-<h1>Aggregates</h1>
+<h1>{% block title %}Aggregates{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:aggregate_bulk_edit' bulk_delete_url='ipam:aggregate_bulk_delete' %}
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index f386c89bf..789e89273 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}{{ ipaddress }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -40,7 +38,7 @@
         </a>
     {% endif %}
 </div>
-<h1>{{ ipaddress }}</h1>
+<h1>{% block title %}{{ ipaddress }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=ipaddress %}
 <div class="row">
 	<div class="col-md-4">
diff --git a/netbox/templates/ipam/ipaddress_assign.html b/netbox/templates/ipam/ipaddress_assign.html
index 03ec181ff..02eebf4e2 100644
--- a/netbox/templates/ipam/ipaddress_assign.html
+++ b/netbox/templates/ipam/ipaddress_assign.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load form_helpers %}
 
-{% block title %}Assign an IP Address{% endblock %}
-
 {% block content %}
 <form action="." method="post" class="form form-horizontal">
     {% csrf_token %}
@@ -19,7 +17,7 @@
             {% endif %}
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <strong>Assign an IP Address</strong>
+                    <strong>{% block title %}Assign an IP Address{% endblock %}</strong>
                 </div>
                 <div class="panel-body">
                     <div class="form-group">
diff --git a/netbox/templates/ipam/ipaddress_list.html b/netbox/templates/ipam/ipaddress_list.html
index ac1d980a2..2d273145d 100644
--- a/netbox/templates/ipam/ipaddress_list.html
+++ b/netbox/templates/ipam/ipaddress_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}IP Addresses{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.ipam.add_ipaddress %}
@@ -17,7 +15,7 @@
 	{% endif %}
     {% include 'inc/export_button.html' with obj_type='IPs' %}
 </div>
-<h1>IP Addresses</h1>
+<h1>{% block title %}IP Addresses{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %}
diff --git a/netbox/templates/ipam/prefix_ipaddresses.html b/netbox/templates/ipam/prefix_ipaddresses.html
index a3554da39..1b777417d 100644
--- a/netbox/templates/ipam/prefix_ipaddresses.html
+++ b/netbox/templates/ipam/prefix_ipaddresses.html
@@ -1,6 +1,6 @@
 {% extends '_base.html' %}
 
-{% block title %}{{ prefix }}{% endblock %}
+{% block title %}{{ prefix }} - IP Addresses{% endblock %}
 
 {% block content %}
 {% include 'ipam/inc/prefix_header.html' with active_tab='ip-addresses' %}
diff --git a/netbox/templates/ipam/prefix_list.html b/netbox/templates/ipam/prefix_list.html
index fd25af00d..4747731f8 100644
--- a/netbox/templates/ipam/prefix_list.html
+++ b/netbox/templates/ipam/prefix_list.html
@@ -2,8 +2,6 @@
 {% load helpers %}
 {% load form_helpers %}
 
-{% block title %}Prefixes{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     <div class="btn-group" role="group">
@@ -22,7 +20,7 @@
 	{% endif %}
     {% include 'inc/export_button.html' with obj_type='prefixes' %}
 </div>
-<h1>Prefixes</h1>
+<h1>{% block title %}Prefixes{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
diff --git a/netbox/templates/ipam/rir_list.html b/netbox/templates/ipam/rir_list.html
index 33bef6d99..df97aec88 100644
--- a/netbox/templates/ipam/rir_list.html
+++ b/netbox/templates/ipam/rir_list.html
@@ -2,8 +2,6 @@
 {% load humanize %}
 {% load helpers %}
 
-{% block title %}RIRs{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if request.GET.family == '6' %}
@@ -24,7 +22,7 @@
         </a>
     {% endif %}
 </div>
-<h1>RIRs</h1>
+<h1>{% block title %}RIRs{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_delete_url='ipam:rir_bulk_delete' %}
diff --git a/netbox/templates/ipam/role_list.html b/netbox/templates/ipam/role_list.html
index 4ee83ad4f..6d59bc697 100644
--- a/netbox/templates/ipam/role_list.html
+++ b/netbox/templates/ipam/role_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Prefix/VLAN Roles{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_devicerole %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Prefix/VLAN Roles</h1>
+<h1>{% block title %}Prefix/VLAN Roles{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='ipam:role_bulk_delete' %}
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html
index 0401e75cb..4298e9b46 100644
--- a/netbox/templates/ipam/vlan.html
+++ b/netbox/templates/ipam/vlan.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}VLAN {{ vlan.display_name }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -43,7 +41,7 @@
         </a>
     {% endif %}
 </div>
-<h1>VLAN {{ vlan.display_name }}</h1>
+<h1>{% block title %}VLAN {{ vlan.display_name }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=vlan %}
 <div class="row">
 	<div class="col-md-6">
diff --git a/netbox/templates/ipam/vlan_list.html b/netbox/templates/ipam/vlan_list.html
index 2db914721..b5db84e52 100644
--- a/netbox/templates/ipam/vlan_list.html
+++ b/netbox/templates/ipam/vlan_list.html
@@ -2,8 +2,6 @@
 {% load helpers %}
 {% load form_helpers %}
 
-{% block title %}VLANs{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.ipam.add_vlan %}
@@ -18,7 +16,7 @@
 	{% endif %}
     {% include 'inc/export_button.html' with obj_type='VLANs' %}
 </div>
-<h1>VLANs</h1>
+<h1>{% block title %}VLANs{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:vlan_bulk_edit' bulk_delete_url='ipam:vlan_bulk_delete' %}
diff --git a/netbox/templates/ipam/vlangroup_list.html b/netbox/templates/ipam/vlangroup_list.html
index b6e1d4579..2a9e7e3ae 100644
--- a/netbox/templates/ipam/vlangroup_list.html
+++ b/netbox/templates/ipam/vlangroup_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}VLAN Groups{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.ipam.add_vlangroup %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>VLAN Groups</h1>
+<h1>{% block title %}VLAN Groups{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_delete_url='ipam:vlangroup_bulk_delete' %}
diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html
index a726bb147..e041ce73a 100644
--- a/netbox/templates/ipam/vrf.html
+++ b/netbox/templates/ipam/vrf.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}VRF {{ vrf }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -37,7 +35,7 @@
         </a>
     {% endif %}
 </div>
-<h1>{{ vrf }}</h1>
+<h1>{% block title %}VRF {{ vrf }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=vrf %}
 <div class="row">
 	<div class="col-md-6">
diff --git a/netbox/templates/ipam/vrf_list.html b/netbox/templates/ipam/vrf_list.html
index 12f0b6bc3..029426a14 100644
--- a/netbox/templates/ipam/vrf_list.html
+++ b/netbox/templates/ipam/vrf_list.html
@@ -2,8 +2,6 @@
 {% load helpers %}
 {% load form_helpers %}
 
-{% block title %}VRFs{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.ipam.add_vrf %}
@@ -18,7 +16,7 @@
 	{% endif %}
     {% include 'inc/export_button.html' with obj_type='VRFs' %}
 </div>
-<h1>VRFs</h1>
+<h1>{% block title %}VRFs{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:vrf_bulk_edit' bulk_delete_url='ipam:vrf_bulk_delete' %}
diff --git a/netbox/templates/secrets/secret.html b/netbox/templates/secrets/secret.html
index 016015cbe..66c844ebf 100644
--- a/netbox/templates/secrets/secret.html
+++ b/netbox/templates/secrets/secret.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load secret_helpers %}
 
-{% block title %}Secret: {{ secret }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-md-12">
@@ -28,7 +26,7 @@
 		</a>
     {% endif %}
 </div>
-<h1>{{ secret }}</h1>
+<h1>{% block title %}{{ secret }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=secret %}
 <div class="row">
 	<div class="col-md-6">
diff --git a/netbox/templates/secrets/secret_edit.html b/netbox/templates/secrets/secret_edit.html
index 4a56bb368..920409177 100644
--- a/netbox/templates/secrets/secret_edit.html
+++ b/netbox/templates/secrets/secret_edit.html
@@ -2,15 +2,13 @@
 {% load static from staticfiles %}
 {% load form_helpers %}
 
-{% block title %}{% if secret.pk %}Editing {{ secret }}{% else %}Add a Secret{% endif %}{% endblock %}
-
 {% block content %}
 <form action="." method="post" class="form form-horizontal">
     {% csrf_token %}
     {{ form.private_key }}
     <div class="row">
         <div class="col-md-6 col-md-offset-3">
-            <h3>{% if secret.pk %}Editing {{ secret }}{% else %}Add a Secret{% endif %}</h3>
+            <h3>{% block title %}{% if secret.pk %}Editing {{ secret }}{% else %}Add a Secret{% endif %}{% endblock %}</h3>
             {% if form.non_field_errors %}
                 <div class="panel panel-danger">
                     <div class="panel-heading"><strong>Errors</strong></div>
diff --git a/netbox/templates/secrets/secret_import.html b/netbox/templates/secrets/secret_import.html
index edc308d06..1f12494ec 100644
--- a/netbox/templates/secrets/secret_import.html
+++ b/netbox/templates/secrets/secret_import.html
@@ -2,10 +2,8 @@
 {% load static from staticfiles %}
 {% load form_helpers %}
 
-{% block title %}Secret Import{% endblock %}
-
 {% block content %}
-<h1>Secret Import</h1>
+<h1>{% block title %}Secret Import{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-6">
         {% if form.non_field_errors %}
diff --git a/netbox/templates/secrets/secret_list.html b/netbox/templates/secrets/secret_list.html
index 29657d3f3..5293b5a6d 100644
--- a/netbox/templates/secrets/secret_list.html
+++ b/netbox/templates/secrets/secret_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Secrets{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.secrets.add_secret %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Secrets</h1>
+<h1>{% block title %}Secrets{% endblock %}</h1>
 <div class="row">
     <div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='secrets:secret_bulk_edit' bulk_delete_url='secrets:secret_bulk_delete' %}
diff --git a/netbox/templates/secrets/secretrole_list.html b/netbox/templates/secrets/secretrole_list.html
index 4b1ee0399..936445dec 100644
--- a/netbox/templates/secrets/secretrole_list.html
+++ b/netbox/templates/secrets/secretrole_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Secret Roles{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_devicerole %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Secret Roles</h1>
+<h1>{% block title %}Secret Roles{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='secrets:secretrole_bulk_delete' %}
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index bc00e399e..2c893adae 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}{{ tenant }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -41,7 +39,7 @@
 		</a>
     {% endif %}
 </div>
-<h1>{{ tenant }}</h1>
+<h1>{% block title %}{{ tenant }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=tenant %}
 <div class="row">
 	<div class="col-md-7">
diff --git a/netbox/templates/tenancy/tenant_list.html b/netbox/templates/tenancy/tenant_list.html
index 81173b368..afc1a154f 100644
--- a/netbox/templates/tenancy/tenant_list.html
+++ b/netbox/templates/tenancy/tenant_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Tenants{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.tenancy.add_tenant %}
@@ -17,7 +15,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='tenants' %}
 </div>
-<h1>Tenants</h1>
+<h1>{% block title %}Tenants{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='tenancy:tenant_bulk_edit' bulk_delete_url='tenancy:tenant_bulk_delete' %}
diff --git a/netbox/templates/tenancy/tenantgroup_list.html b/netbox/templates/tenancy/tenantgroup_list.html
index 7be881b00..f487122ab 100644
--- a/netbox/templates/tenancy/tenantgroup_list.html
+++ b/netbox/templates/tenancy/tenantgroup_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Tenant Groups{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.tenancy.add_tenantgroup %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Tenant Groups</h1>
+<h1>{% block title %}Tenant Groups{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='tenancy:tenantgroup_bulk_delete' %}

From 52e7f670f387297a8c2e89bc48e8b4033010dbff Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 2 Aug 2017 13:17:34 -0400
Subject: [PATCH 24/92] Deleted obsolete template

---
 netbox/templates/dcim/ipaddress_assign.html | 64 ---------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 netbox/templates/dcim/ipaddress_assign.html

diff --git a/netbox/templates/dcim/ipaddress_assign.html b/netbox/templates/dcim/ipaddress_assign.html
deleted file mode 100644
index e8596158c..000000000
--- a/netbox/templates/dcim/ipaddress_assign.html
+++ /dev/null
@@ -1,64 +0,0 @@
-{% extends '_base.html' %}
-{% load form_helpers %}
-
-{% block title %}Assign a New IP Address{% endblock %}
-
-{% block content %}
-<form action="." method="post" class="form form-horizontal">
-    {% csrf_token %}
-    <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-            {% if form.non_field_errors %}
-                <div class="panel panel-danger">
-                    <div class="panel-heading"><strong>Errors</strong></div>
-                    <div class="panel-body">
-                        {{ form.non_field_errors }}
-                    </div>
-                </div>
-            {% endif %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>IP Address</strong>
-                </div>
-                <div class="panel-body">
-                    {% render_field form.address %}
-                    {% render_field form.vrf %}
-                    {% render_field form.tenant %}
-                    {% render_field form.status %}
-                    {% render_field form.description %}
-                </div>
-            </div>
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Interface Assignment</strong>
-                </div>
-                <div class="panel-body">
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">Device</label>
-                        <div class="col-md-9">
-                            <p class="form-control-static">{{ device }}</p>
-                        </div>
-                    </div>
-                    {% render_field form.interface %}
-                    {% render_field form.set_as_primary %}
-                </div>
-            </div>
-            {% if form.custom_fields %}
-            <div class="panel panel-default">
-                <div class="panel-heading"><strong>Custom Fields</strong></div>
-                <div class="panel-body">
-                    {% render_custom_fields form %}
-                </div>
-            </div>
-            {% endif %}
-		    <div class="form-group">
-                <div class="col-md-9 col-md-offset-3">
-                    <button type="submit" name="_create" class="btn btn-primary">Create</button>
-                    <button type="submit" name="_addanother" class="btn btn-primary">Create and Add More</button>
-                    <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
-                </div>
-		    </div>
-        </div>
-    </div>
-</form>
-{% endblock %}

From b6690e00129ebc0204a0f400a3321e8545c7ccc4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 2 Aug 2017 13:33:44 -0400
Subject: [PATCH 25/92] Closes #1368: Render reservations in rack elevations
 view

---
 netbox/dcim/models.py                          | 10 ++++++++++
 netbox/dcim/views.py                           |  5 -----
 netbox/templates/dcim/rack.html                |  4 ++--
 netbox/templates/dcim/rack_elevation_list.html |  4 ++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index 8dd11e663..3719c7c25 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -357,6 +357,16 @@ class Rack(CreatedUpdatedModel, CustomFieldModel):
 
         return list(reversed(available_units))
 
+    def get_reserved_units(self):
+        """
+        Return a dictionary mapping all reserved units within the rack to their reservation.
+        """
+        reserved_units = {}
+        for r in self.reservations.all():
+            for u in r.units:
+                reserved_units[u] = r
+        return reserved_units
+
     def get_0u_devices(self):
         return self.devices.filter(position=0)
 
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index ea07138d5..78881c200 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -417,15 +417,10 @@ class RackView(View):
         prev_rack = Rack.objects.filter(site=rack.site, name__lt=rack.name).order_by('-name').first()
 
         reservations = RackReservation.objects.filter(rack=rack)
-        reserved_units = {}
-        for r in reservations:
-            for u in r.units:
-                reserved_units[u] = r
 
         return render(request, 'dcim/rack.html', {
             'rack': rack,
             'reservations': reservations,
-            'reserved_units': reserved_units,
             'nonracked_devices': nonracked_devices,
             'next_rack': next_rack,
             'prev_rack': prev_rack,
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 6f117076b..2adb78e92 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -259,13 +259,13 @@
           <div class="rack_header">
             <h4>Front</h4>
           </div>
-          {% include 'dcim/inc/rack_elevation.html' with primary_face=front_elevation secondary_face=rear_elevation face_id=0 %}
+          {% include 'dcim/inc/rack_elevation.html' with primary_face=front_elevation secondary_face=rear_elevation face_id=0 reserved_units=rack.get_reserved_units %}
       </div>
       <div class="col-md-6 col-sm-6 col-xs-12">
         <div class="rack_header">
             <h4>Rear</h4>
         </div>
-        {% include 'dcim/inc/rack_elevation.html' with primary_face=rear_elevation secondary_face=front_elevation face_id=1 %}
+        {% include 'dcim/inc/rack_elevation.html' with primary_face=rear_elevation secondary_face=front_elevation face_id=1 reserved_units=rack.get_reserved_units %}
       </div>
     </div>
 </div>
diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html
index 9f6c4df83..5304538c1 100644
--- a/netbox/templates/dcim/rack_elevation_list.html
+++ b/netbox/templates/dcim/rack_elevation_list.html
@@ -18,9 +18,9 @@
                             <p><small class="text-muted">{{ rack.facility_id|truncatechars:"30" }}</small></p>
                         </div>
                         {% if face_id %}
-                            {% include 'dcim/inc/rack_elevation.html' with primary_face=rack.get_rear_elevation secondary_face=rack.get_front_elevation face_id=1 %}
+                            {% include 'dcim/inc/rack_elevation.html' with primary_face=rack.get_rear_elevation secondary_face=rack.get_front_elevation face_id=1 reserved_units=rack.get_reserved_units %}
                         {% else %}
-                            {% include 'dcim/inc/rack_elevation.html' with primary_face=rack.get_front_elevation secondary_face=rack.get_rear_elevation face_id=0 %}
+                            {% include 'dcim/inc/rack_elevation.html' with primary_face=rack.get_front_elevation secondary_face=rack.get_rear_elevation face_id=0 reserved_units=rack.get_reserved_units %}
                         {% endif %}
                         <div class="clearfix"></div>
                         <div class="rack_header">

From 1c1f4068cd7583b8fb0ed48d6da5660ba16a3715 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 2 Aug 2017 14:20:20 -0400
Subject: [PATCH 26/92] Release v2.1.1

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 2cac4ad7d..c97c9bbc5 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -13,7 +13,7 @@ except ImportError:
     )
 
 
-VERSION = '2.1.1-dev'
+VERSION = '2.1.1'
 
 # Import required configuration parameters
 ALLOWED_HOSTS = DATABASE = SECRET_KEY = None

From 930b15ae090b0666875edb68d5ce9ceb5e805efd Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 2 Aug 2017 14:20:43 -0400
Subject: [PATCH 27/92] Post-release version bump

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index c97c9bbc5..ea8f20d97 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -13,7 +13,7 @@ except ImportError:
     )
 
 
-VERSION = '2.1.1'
+VERSION = '2.1.2-dev'
 
 # Import required configuration parameters
 ALLOWED_HOSTS = DATABASE = SECRET_KEY = None

From 3aa072b4375750c0bbcd6bf9b2d849a5843b04d1 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 3 Aug 2017 09:26:28 -0400
Subject: [PATCH 28/92] Fixes #1388: Fixed server error when searching globally
 for IPs/prefixes (rolled back #1379)

---
 netbox/dcim/filters.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index dcd6c6d2e..54a7af4e2 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -448,20 +448,13 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet):
     def search(self, queryset, name, value):
         if not value.strip():
             return queryset
-        qs_filter = (
+        return queryset.filter(
             Q(name__icontains=value) |
             Q(serial__icontains=value.strip()) |
             Q(inventory_items__serial__icontains=value.strip()) |
             Q(asset_tag=value.strip()) |
             Q(comments__icontains=value)
-        )
-        # If the query value looks like a MAC address, search interfaces as well.
-        try:
-            mac = EUI(value.strip())
-            qs_filter |= Q(interfaces__mac_address=mac)
-        except AddrFormatError:
-            pass
-        return queryset.filter(qs_filter).distinct()
+        ).distinct()
 
     def _mac_address(self, queryset, name, value):
         value = value.strip()

From 6f0f3cc11590c29c4d31f85637cb049d898e032c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 3 Aug 2017 10:09:37 -0400
Subject: [PATCH 29/92] Fixes #1390: Fixed IndexError when viewing available
 IPs within large IPv6 prefixes

---
 netbox/ipam/api/views.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py
index 87511d5c5..9cf93cb4b 100644
--- a/netbox/ipam/api/views.py
+++ b/netbox/ipam/api/views.py
@@ -115,7 +115,11 @@ class PrefixViewSet(WritableSerializerMixin, CustomFieldModelViewSet):
                 limit = min(limit, settings.MAX_PAGE_SIZE)
 
             # Calculate available IPs within the prefix
-            ip_list = list(prefix.get_available_ips())[:limit]
+            ip_list = []
+            for index, ip in enumerate(prefix.get_available_ips(), start=1):
+                ip_list.append(ip)
+                if index == limit:
+                    break
             serializer = serializers.AvailableIPSerializer(ip_list, many=True, context={
                 'request': request,
                 'prefix': prefix.prefix,

From 236229ea7e6214818ee88a670ea2831b234d72a9 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 3 Aug 2017 15:40:52 -0400
Subject: [PATCH 30/92] Closes #992: Allow the creation of multiple services
 per device with the same protocol and port

---
 ...18_remove_service_uniqueness_constraint.py | 19 +++++++++++++++++++
 netbox/ipam/models.py                         |  1 -
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 netbox/ipam/migrations/0018_remove_service_uniqueness_constraint.py

diff --git a/netbox/ipam/migrations/0018_remove_service_uniqueness_constraint.py b/netbox/ipam/migrations/0018_remove_service_uniqueness_constraint.py
new file mode 100644
index 000000000..77e083ef3
--- /dev/null
+++ b/netbox/ipam/migrations/0018_remove_service_uniqueness_constraint.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.3 on 2017-08-03 19:37
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ipam', '0017_ipaddress_roles'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='service',
+            unique_together=set([]),
+        ),
+    ]
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index 04853c5da..bbd5e1827 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -600,7 +600,6 @@ class Service(CreatedUpdatedModel):
 
     class Meta:
         ordering = ['device', 'protocol', 'port']
-        unique_together = ['device', 'protocol', 'port']
 
     def __str__(self):
         return '{} ({}/{})'.format(self.name, self.port, self.get_protocol_display())

From dadfcd4f81fc24050712f6d9fee14a4000228db3 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 3 Aug 2017 17:49:22 -0400
Subject: [PATCH 31/92] Tweaked navigation menu styling

---
 netbox/project-static/css/base.css |   5 +
 netbox/templates/_base.html        | 154 ++++++++++++++---------------
 2 files changed, 82 insertions(+), 77 deletions(-)

diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css
index 573c1c967..0f6b24077 100644
--- a/netbox/project-static/css/base.css
+++ b/netbox/project-static/css/base.css
@@ -81,6 +81,11 @@ footer p {
     }
 }
 
+/* Navigation menu */
+li.subnav > a {
+    padding-left: 30px;
+}
+
 /* Forms */
 label {
     font-weight: normal;
diff --git a/netbox/templates/_base.html b/netbox/templates/_base.html
index 10b4970a8..c56a95abe 100644
--- a/netbox/templates/_base.html
+++ b/netbox/templates/_base.html
@@ -31,197 +31,197 @@
                     <li class="dropdown{% if request.path|contains:'/dcim/sites/,/dcim/regions/,/tenancy/' %} active{% endif %}">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Organization <span class="caret"></span></a>
                         <ul class="dropdown-menu">
-                            <li><a href="{% url 'dcim:site_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Sites</a></li>
+                            <li><a href="{% url 'dcim:site_list' %}"><strong>Sites</strong></a></li>
                             {% if perms.dcim.add_site %}
-                                <li><a href="{% url 'dcim:site_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Site</a></li>
-                                <li><a href="{% url 'dcim:site_import' %}"><i class="fa fa-download" aria-hidden="true"></i> Import Sites</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:site_add' %}"><i class="fa fa-plus"></i> Add a Site</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:site_import' %}"><i class="fa fa-download"></i> Import Sites</a></li>
                             {% endif %}
                             <li class="divider"></li>
-                            <li><a href="{% url 'dcim:region_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Regions</a></li>
+                            <li><a href="{% url 'dcim:region_list' %}"><strong>Regions</strong></a></li>
                             {% if perms.dcim.add_region %}
-                                <li><a href="{% url 'dcim:region_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Region</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:region_add' %}"><i class="fa fa-plus"></i> Add a Region</a></li>
                             {% endif %}
                             <li class="divider"></li>
-                            <li><a href="{% url 'tenancy:tenant_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Tenants</a></li>
+                            <li><a href="{% url 'tenancy:tenant_list' %}"><strong>Tenants</strong></a></li>
                             {% if perms.tenancy.add_tenant %}
-                                <li><a href="{% url 'tenancy:tenant_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Tenant</a></li>
-                                <li><a href="{% url 'tenancy:tenant_import' %}"><i class="fa fa-download" aria-hidden="true"></i> Import Tenants</a></li>
+                                <li class="subnav"><a href="{% url 'tenancy:tenant_add' %}"><i class="fa fa-plus"></i> Add a Tenant</a></li>
+                                <li class="subnav"><a href="{% url 'tenancy:tenant_import' %}"><i class="fa fa-download"></i> Import Tenants</a></li>
                             {% endif %}
                             <li class="divider"></li>
-                            <li><a href="{% url 'tenancy:tenantgroup_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Tenant Groups</a></li>
+                            <li><a href="{% url 'tenancy:tenantgroup_list' %}"><strong>Tenant Groups</strong></a></li>
                             {% if perms.tenancy.add_tenantgroup %}
-                                <li><a href="{% url 'tenancy:tenantgroup_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Tenant Group</a></li>
+                                <li class="subnav"><a href="{% url 'tenancy:tenantgroup_add' %}"><i class="fa fa-plus"></i> Add a Tenant Group</a></li>
                             {% endif %}
                         </ul>
                     </li>
                     <li class="dropdown{% if request.path|contains:'/dcim/rack' %} active{% endif %}">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Racks <span class="caret"></span></a>
                         <ul class="dropdown-menu">
-                            <li><a href="{% url 'dcim:rack_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Racks</a></li>
-                            <li><a href="{% url 'dcim:rack_elevation_list' %}"><i class="fa fa-bars" aria-hidden="true"></i> Rack Elevations</a></li>
+                            <li><a href="{% url 'dcim:rack_list' %}"><strong>Racks</strong></a></li>
                             {% if perms.dcim.add_rack %}
-                                <li><a href="{% url 'dcim:rack_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Rack</a></li>
-                                <li><a href="{% url 'dcim:rack_import' %}"><i class="fa fa-download" aria-hidden="true"></i> Import Racks</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:rack_add' %}"><i class="fa fa-plus"></i> Add a Rack</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:rack_import' %}"><i class="fa fa-download"></i> Import Racks</a></li>
                             {% endif %}
+                            <li><a href="{% url 'dcim:rack_elevation_list' %}"><strong>Rack Elevations</strong></a></li>
                             <li class="divider"></li>
-                            <li><a href="{% url 'dcim:rackgroup_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Rack Groups</a></li>
+                            <li><a href="{% url 'dcim:rackgroup_list' %}"><strong>Rack Groups</strong></a></li>
                             {% if perms.dcim.add_rackgroup %}
-                                <li><a href="{% url 'dcim:rackgroup_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Rack Group</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:rackgroup_add' %}"><i class="fa fa-plus"></i> Add a Rack Group</a></li>
                             {% endif %}
                             <li class="divider"></li>
-                            <li><a href="{% url 'dcim:rackrole_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Rack Roles</a></li>
+                            <li><a href="{% url 'dcim:rackrole_list' %}"><strong>Rack Roles</strong></a></li>
                             {% if perms.dcim.add_rackrole %}
-                                <li><a href="{% url 'dcim:rackrole_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Rack Role</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:rackrole_add' %}"><i class="fa fa-plus"></i> Add a Rack Role</a></li>
                             {% endif %}
                             <li class="divider"></li>
-                            <li><a href="{% url 'dcim:rackreservation_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Rack Reservations</a></li>
+                            <li><a href="{% url 'dcim:rackreservation_list' %}"><strong>Rack Reservations</strong></a></li>
                         </ul>
                     </li>
                     <li class="dropdown{% if request.path|contains:'/dcim/device,/dcim/manufacturers/,/dcim/platforms/' %} active{% endif %}">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Devices <span class="caret"></span></a>
                         <ul class="dropdown-menu">
-                            <li><a href="{% url 'dcim:device_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Devices</a></li>
+                            <li><a href="{% url 'dcim:device_list' %}"><strong>Devices</strong></a></li>
                             {% if perms.dcim.add_device %}
-                                <li><a href="{% url 'dcim:device_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Device</a></li>
-                                <li><a href="{% url 'dcim:device_import' %}"><i class="fa fa-download" aria-hidden="true"></i> Import Devices</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:device_add' %}"><i class="fa fa-plus"></i> Add a Device</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:device_import' %}"><i class="fa fa-download"></i> Import Devices</a></li>
                             {% endif %}
                             {% if perms.ipam.add_device or perms.ipam.add_devicetype %}
                                 <li class="divider"></li>
                             {% endif %}
-                            <li><a href="{% url 'dcim:devicetype_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Device Types</a></li>
+                            <li><a href="{% url 'dcim:devicetype_list' %}"><strong>Device Types</strong></a></li>
                             {% if perms.dcim.add_devicetype %}
-                                <li><a href="{% url 'dcim:devicetype_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Device Type</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:devicetype_add' %}"><i class="fa fa-plus"></i> Add a Device Type</a></li>
                             {% endif %}
                             <li class="divider"></li>
-                            <li><a href="{% url 'dcim:devicerole_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Device Roles</a></li>
+                            <li><a href="{% url 'dcim:devicerole_list' %}"><strong>Device Roles</strong></a></li>
                             {% if perms.dcim.add_devicerole %}
-                                <li><a href="{% url 'dcim:devicerole_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Device Role</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:devicerole_add' %}"><i class="fa fa-plus"></i> Add a Device Role</a></li>
                             {% endif %}
                             {% if perms.dcim.add_devicerole or perms.dcim.add_manufacturer %}
                                 <li class="divider"></li>
                             {% endif %}
-                            <li><a href="{% url 'dcim:manufacturer_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Manufacturers</a></li>
+                            <li><a href="{% url 'dcim:manufacturer_list' %}"><strong>Manufacturers</strong></a></li>
                             {% if perms.dcim.add_manufacturer %}
-                                <li><a href="{% url 'dcim:manufacturer_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Manufacturer</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:manufacturer_add' %}"><i class="fa fa-plus"></i> Add a Manufacturer</a></li>
                             {% endif %}
                             {% if perms.dcim.add_manufacturer or perms.dcim.add_platform %}
                                 <li class="divider"></li>
                             {% endif %}
-                            <li><a href="{% url 'dcim:platform_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Platforms</a></li>
+                            <li><a href="{% url 'dcim:platform_list' %}"><strong>Platforms</strong></a></li>
                             {% if perms.dcim.add_platform %}
-                                <li><a href="{% url 'dcim:platform_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Platform</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:platform_add' %}"><i class="fa fa-plus"></i> Add a Platform</a></li>
                             {% endif %}
                         </ul>
                     </li>
                     <li class="dropdown{% if request.path|contains:'/dcim/console-connections/,/dcim/power-connections/,/dcim/interface-connections/' %} active{% endif %}">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Connections <span class="caret"></span></a>
                         <ul class="dropdown-menu">
-                            <li><a href="{% url 'dcim:console_connections_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Console Connections</a></li>
+                            <li><a href="{% url 'dcim:console_connections_list' %}"><strong>Console Connections</strong></a></li>
                             {% if perms.dcim.change_consoleport %}
-                                <li><a href="{% url 'dcim:console_connections_import' %}"><i class="fa fa-download" aria-hidden="true"></i> Import Console Connections</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:console_connections_import' %}"><i class="fa fa-download"></i> Import Console Connections</a></li>
                             {% endif %}
                             {% if perms.ipam.change_consoleport or perms.ipam.change_powerport %}
                                 <li class="divider"></li>
                             {% endif %}
-                            <li><a href="{% url 'dcim:power_connections_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Power Connections</a></li>
+                            <li><a href="{% url 'dcim:power_connections_list' %}"><strong>Power Connections</strong></a></li>
                             {% if perms.dcim.change_powerport %}
-                                <li><a href="{% url 'dcim:power_connections_import' %}"><i class="fa fa-download" aria-hidden="true"></i> Import Power Connections</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:power_connections_import' %}"><i class="fa fa-download"></i> Import Power Connections</a></li>
                             {% endif %}
                             {% if perms.ipam.change_powerport or perms.ipam.add_interfaceconnection %}
                                 <li class="divider"></li>
                             {% endif %}
-                            <li><a href="{% url 'dcim:interface_connections_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Interface Connections</a></li>
+                            <li><a href="{% url 'dcim:interface_connections_list' %}"><strong>Interface Connections</strong></a></li>
                             {% if perms.dcim.add_interfaceconnection %}
-                                <li><a href="{% url 'dcim:interface_connections_import' %}"><i class="fa fa-download" aria-hidden="true"></i> Import Interface Connections</a></li>
+                                <li class="subnav"><a href="{% url 'dcim:interface_connections_import' %}"><i class="fa fa-download"></i> Import Interface Connections</a></li>
                             {% endif %}
                         </ul>
                     </li>
                     <li class="dropdown{% if request.path|contains:'/ipam/' and not request.path|contains:'/ipam/vlan' %} active{% endif %}">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">IP Space <span class="caret"></span></a>
                         <ul class="dropdown-menu">
-                            <li><a href="{% url 'ipam:ipaddress_list' %}"><i class="fa fa-search" aria-hidden="true"></i> IP Addresses</a></li>
+                            <li><a href="{% url 'ipam:ipaddress_list' %}"><strong>IP Addresses</strong></a></li>
                             {% if perms.ipam.add_ipaddress %}
-                                <li><a href="{% url 'ipam:ipaddress_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add an IP</a></li>
-                                <li><a href="{% url 'ipam:ipaddress_import' %}"><i class="fa fa-download" aria-hidden="true"></i> Import IPs</a></li>
+                                <li class="subnav"><a href="{% url 'ipam:ipaddress_add' %}"><i class="fa fa-plus"></i> Add an IP</a></li>
+                                <li class="subnav"><a href="{% url 'ipam:ipaddress_import' %}"><i class="fa fa-download"></i> Import IPs</a></li>
                             {% endif %}
                             {% if perms.ipam.add_ipaddress or perms.ipam.add_prefix %}
                                 <li class="divider"></li>
                             {% endif %}
-                            <li><a href="{% url 'ipam:prefix_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Prefixes</a></li>
+                            <li><a href="{% url 'ipam:prefix_list' %}"><strong>Prefixes</strong></a></li>
                             {% if perms.ipam.add_prefix %}
-                                <li><a href="{% url 'ipam:prefix_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Prefix</a></li>
-                                <li><a href="{% url 'ipam:prefix_import' %}"><i class="fa fa-download" aria-hidden="true"></i> Import Prefixes</a></li>
+                                <li class="subnav"><a href="{% url 'ipam:prefix_add' %}"><i class="fa fa-plus"></i> Add a Prefix</a></li>
+                                <li class="subnav"><a href="{% url 'ipam:prefix_import' %}"><i class="fa fa-download"></i> Import Prefixes</a></li>
                             {% endif %}
                             {% if perms.ipam.add_prefix or perms.ipam.add_aggregate %}
                                 <li class="divider"></li>
                             {% endif %}
-                            <li><a href="{% url 'ipam:aggregate_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Aggregates</a></li>
+                            <li><a href="{% url 'ipam:aggregate_list' %}"><strong>Aggregates</strong></a></li>
                             {% if perms.ipam.add_aggregate %}
-                                <li><a href="{% url 'ipam:aggregate_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add an Aggregate</a></li>
-                                <li><a href="{% url 'ipam:aggregate_import' %}"><i class="fa fa-download" aria-hidden="true"></i> Import Aggregates</a></li>
+                                <li class="subnav"><a href="{% url 'ipam:aggregate_add' %}"><i class="fa fa-plus"></i> Add an Aggregate</a></li>
+                                <li class="subnav"><a href="{% url 'ipam:aggregate_import' %}"><i class="fa fa-download"></i> Import Aggregates</a></li>
                             {% endif %}
                             {% if perms.ipam.add_aggregate or perms.ipam.add_vrf %}
                                 <li class="divider"></li>
                             {% endif %}
-                            <li><a href="{% url 'ipam:vrf_list' %}"><i class="fa fa-search" aria-hidden="true"></i> VRFs</a></li>
+                            <li><a href="{% url 'ipam:vrf_list' %}"><strong>VRFs</strong></a></li>
                             {% if perms.ipam.add_vrf %}
-                                <li><a href="{% url 'ipam:vrf_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a VRF</a></li>
-                                <li><a href="{% url 'ipam:vrf_import' %}"><i class="fa fa-download" aria-hidden="true"></i> Import VRFs</a></li>
+                                <li class="subnav"><a href="{% url 'ipam:vrf_add' %}"><i class="fa fa-plus"></i> Add a VRF</a></li>
+                                <li class="subnav"><a href="{% url 'ipam:vrf_import' %}"><i class="fa fa-download"></i> Import VRFs</a></li>
                             {% endif %}
                             <li class="divider"></li>
-                            <li><a href="{% url 'ipam:rir_list' %}"><i class="fa fa-search" aria-hidden="true"></i> RIRs</a></li>
+                            <li><a href="{% url 'ipam:rir_list' %}"><strong>RIRs</strong></a></li>
                             {% if perms.ipam.add_rir %}
-                                <li><a href="{% url 'ipam:rir_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a RIR</a></li>
+                                <li class="subnav"><a href="{% url 'ipam:rir_add' %}"><i class="fa fa-plus"></i> Add a RIR</a></li>
                             {% endif %}
                             {% if perms.ipam.add_rir or perms.ipam.add_role %}
                                 <li class="divider"></li>
                             {% endif %}
-                            <li><a href="{% url 'ipam:role_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Prefix Roles</a></li>
+                            <li><a href="{% url 'ipam:role_list' %}"><strong>Prefix Roles</strong></a></li>
                             {% if perms.ipam.add_role %}
-                                <li><a href="{% url 'ipam:role_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Role</a></li>
+                                <li class="subnav"><a href="{% url 'ipam:role_add' %}"><i class="fa fa-plus"></i> Add a Role</a></li>
                             {% endif %}
                         </ul>
                     </li>
                     <li class="dropdown{% if request.path|contains:'/ipam/vlan' %} active{% endif %}">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">VLANs <span class="caret"></span></a>
                         <ul class="dropdown-menu">
-                            <li><a href="{% url 'ipam:vlan_list' %}"><i class="fa fa-search" aria-hidden="true"></i> VLANs</a></li>
+                            <li><a href="{% url 'ipam:vlan_list' %}"><strong>VLANs</strong></a></li>
                             {% if perms.ipam.add_vlan %}
-                                <li><a href="{% url 'ipam:vlan_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a VLAN</a></li>
-                                <li><a href="{% url 'ipam:vlan_import' %}"><i class="fa fa-download" aria-hidden="true"></i> Import VLANs</a></li>
+                                <li class="subnav"><a href="{% url 'ipam:vlan_add' %}"><i class="fa fa-plus"></i> Add a VLAN</a></li>
+                                <li class="subnav"><a href="{% url 'ipam:vlan_import' %}"><i class="fa fa-download"></i> Import VLANs</a></li>
                             {% endif %}
                             <li class="divider"></li>
-                            <li><a href="{% url 'ipam:vlangroup_list' %}"><i class="fa fa-search" aria-hidden="true"></i> VLAN Groups</a></li>
+                            <li><a href="{% url 'ipam:vlangroup_list' %}"><strong>VLAN Groups</strong></a></li>
                             {% if perms.ipam.add_vlangroup %}
-                                <li><a href="{% url 'ipam:vlangroup_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a VLAN Group</a></li>
+                                <li class="subnav"><a href="{% url 'ipam:vlangroup_add' %}"><i class="fa fa-plus"></i> Add a VLAN Group</a></li>
                             {% endif %}
                             <li class="divider"></li>
-                            <li><a href="{% url 'ipam:role_list' %}"><i class="fa fa-search" aria-hidden="true"></i> VLAN Roles</a></li>
+                            <li><a href="{% url 'ipam:role_list' %}"><strong>VLAN Roles</strong></a></li>
                             {% if perms.ipam.add_role %}
-                                <li><a href="{% url 'ipam:role_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Role</a></li>
+                                <li class="subnav"><a href="{% url 'ipam:role_add' %}"><i class="fa fa-plus"></i> Add a Role</a></li>
                             {% endif %}
                         </ul>
                     </li>
                     <li class="dropdown{% if request.path|contains:'/circuits/' %} active{% endif %}">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Circuits <span class="caret"></span></a>
                         <ul class="dropdown-menu">
-                            <li><a href="{% url 'circuits:provider_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Providers</a></li>
+                            <li><a href="{% url 'circuits:provider_list' %}"><strong>Providers</strong></a></li>
                             {% if perms.circuits.add_provider %}
-                                <li><a href="{% url 'circuits:provider_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Provider</a></li>
-                                <li><a href="{% url 'circuits:provider_import' %}"><i class="fa fa-download" aria-hidden="true"></i> Import Providers</a></li>
+                                <li class="subnav"><a href="{% url 'circuits:provider_add' %}"><i class="fa fa-plus"></i> Add a Provider</a></li>
+                                <li class="subnav"><a href="{% url 'circuits:provider_import' %}"><i class="fa fa-download"></i> Import Providers</a></li>
                             {% endif %}
                             {% if perms.circuits.add_circuit or perms.circuits.add_provider %}
                                 <li class="divider"></li>
                             {% endif %}
-                            <li><a href="{% url 'circuits:circuit_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Circuits</a></li>
+                            <li><a href="{% url 'circuits:circuit_list' %}"><strong>Circuits</strong></a></li>
                             {% if perms.circuits.add_circuit %}
-                                <li><a href="{% url 'circuits:circuit_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Circuit</a></li>
-                                <li><a href="{% url 'circuits:circuit_import' %}"><i class="fa fa-download" aria-hidden="true"></i> Import Circuits</a></li>
+                                <li class="subnav"><a href="{% url 'circuits:circuit_add' %}"><i class="fa fa-plus"></i> Add a Circuit</a></li>
+                                <li class="subnav"><a href="{% url 'circuits:circuit_import' %}"><i class="fa fa-download"></i> Import Circuits</a></li>
                             {% endif %}
                             <li class="divider"></li>
-                            <li><a href="{% url 'circuits:circuittype_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Circuit Types</a></li>
+                            <li><a href="{% url 'circuits:circuittype_list' %}"><strong>Circuit Types</strong></a></li>
                             {% if perms.circuits.add_circuittype %}
-                                <li><a href="{% url 'circuits:circuittype_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Circuit Type</a></li>
+                                <li class="subnav"><a href="{% url 'circuits:circuittype_add' %}"><i class="fa fa-plus"></i> Add a Circuit Type</a></li>
                             {% endif %}
                         </ul>
                     </li>
@@ -229,14 +229,14 @@
                         <li class="dropdown{% if request.path|contains:'/secrets/' %} active{% endif %}">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Secrets <span class="caret"></span></a>
                             <ul class="dropdown-menu">
-                                <li><a href="{% url 'secrets:secret_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Secrets</a></li>
+                                <li><a href="{% url 'secrets:secret_list' %}"><strong>Secrets</strong></a></li>
                                 {% if perms.secrets.add_secret %}
-                                    <li><a href="{% url 'secrets:secret_import' %}"><i class="fa fa-download" aria-hidden="true"></i> Import Secrets</a></li>
+                                    <li class="subnav"><a href="{% url 'secrets:secret_import' %}"><i class="fa fa-download"></i> Import Secrets</a></li>
                                 {% endif %}
                                 <li class="divider"></li>
-                                <li><a href="{% url 'secrets:secretrole_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Secret Roles</a></li>
+                                <li><a href="{% url 'secrets:secretrole_list' %}"><strong>Secret Roles</strong></a></li>
                                 {% if perms.secrets.add_secretrole %}
-                                    <li><a href="{% url 'secrets:secretrole_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Secret Role</a></li>
+                                    <li class="subnav"><a href="{% url 'secrets:secretrole_add' %}"><i class="fa fa-plus"></i> Add a Secret Role</a></li>
                                 {% endif %}
                             </ul>
                         </li>
@@ -250,16 +250,16 @@
                                 {{ request.user|truncatechars:"30" }} <span class="caret"></span>
                             </a>
                             <ul class="dropdown-menu">
-                                <li><a href="{% url 'user:profile' %}"><i class="fa fa-user" aria-hidden="true"></i> Profile</a></li>
+                                <li><a href="{% url 'user:profile' %}"><i class="fa fa-user"></i> Profile</a></li>
                                 {% if request.user.is_staff %}
-                                    <li><a href="{% url 'admin:index' %}"><i class="fa fa-cogs" aria-hidden="true"></i> Admin</a></li>
+                                    <li><a href="{% url 'admin:index' %}"><i class="fa fa-cogs"></i> Admin</a></li>
                                 {% endif %}
                                 <li class="divider"></li>
-                                <li><a href="{% url 'logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i> Log out</a></li>
+                                <li><a href="{% url 'logout' %}"><i class="fa fa-sign-out"></i> Log out</a></li>
                             </ul>
                         </li>
                     {% else %}
-                        <li><a href="{% url 'login' %}?next={{ request.path }}"><i class="fa fa-sign-in" aria-hidden="true"></i> Log in</a></li>
+                        <li><a href="{% url 'login' %}?next={{ request.path }}"><i class="fa fa-sign-in"></i> Log in</a></li>
                     {% endif %}
                 </ul>
                 <form action="{% url 'search' %}" method="get" class="navbar-form navbar-right" id="navbar_search" role="search">
@@ -267,7 +267,7 @@
                         <input type="text" name="q" class="form-control" placeholder="Search">
                         <span class="input-group-btn">
                             <button type="submit" class="btn btn-primary">
-                                <i class="fa fa-search" aria-hidden="true"></i>
+                                <i class="fa fa-search"></i>
                             </button>
                         </span>
                     </div>
@@ -290,7 +290,7 @@
         {% for message in messages %}
             <div class="alert alert-{{ message.tags }} alert-dismissable" role="alert">
                 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
+                    <span>&times;</span>
                 </button>
                 {{ message }}
             </div>

From a7d5fb50063bd65fb1f1aba3f80ce689e8e10bfa Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 4 Aug 2017 10:52:06 -0400
Subject: [PATCH 32/92] Release v2.1.2

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index ea8f20d97..52154fbb4 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -13,7 +13,7 @@ except ImportError:
     )
 
 
-VERSION = '2.1.2-dev'
+VERSION = '2.1.2'
 
 # Import required configuration parameters
 ALLOWED_HOSTS = DATABASE = SECRET_KEY = None

From 36d5debe74162142ab44c865d680120f3aaf4490 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 4 Aug 2017 10:52:29 -0400
Subject: [PATCH 33/92] Post-release version bump

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 52154fbb4..00acc3e67 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -13,7 +13,7 @@ except ImportError:
     )
 
 
-VERSION = '2.1.2'
+VERSION = '2.1.3-dev'
 
 # Import required configuration parameters
 ALLOWED_HOSTS = DATABASE = SECRET_KEY = None

From b6afc688474d79b03c587c037f87e282db1c10b6 Mon Sep 17 00:00:00 2001
From: johnhu <huzichunjohn@126.com>
Date: Tue, 8 Aug 2017 11:44:50 +0000
Subject: [PATCH 34/92] Fixes #1400: Device interface shows twice on IP
 Addresses page

---
 netbox/ipam/tables.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 65ab5b2e4..af82042dd 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -80,7 +80,6 @@ IPADDRESS_LINK = """
 IPADDRESS_DEVICE = """
 {% if record.interface %}
     <a href="{{ record.interface.device.get_absolute_url }}">{{ record.interface.device }}</a>
-    ({{ record.interface.name }})
 {% else %}
     &mdash;
 {% endif %}

From 7557220d5d00ad551a06cdef8abe2819af3845a3 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 8 Aug 2017 11:48:51 -0400
Subject: [PATCH 35/92] Fixes #1389: Avoid splitting carat/prefix on prefix
 list

---
 netbox/ipam/tables.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index af82042dd..96127aec5 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -45,9 +45,9 @@ ROLE_ACTIONS = """
 
 PREFIX_LINK = """
 {% if record.has_children %}
-    <span style="padding-left: {{ record.depth }}0px "><i class="fa fa-caret-right"></i></a>
+    <span class="text-nowrap" style="padding-left: {{ record.depth }}0px "><i class="fa fa-caret-right"></i></a>
 {% else %}
-    <span style="padding-left: {{ record.depth }}9px">
+    <span class="text-nowrap" style="padding-left: {{ record.depth }}9px">
 {% endif %}
     <a href="{% if record.pk %}{% url 'ipam:prefix' pk=record.pk %}{% else %}{% url 'ipam:prefix_add' %}?prefix={{ record }}{% if parent.vrf %}&vrf={{ parent.vrf.pk }}{% endif %}{% if parent.site %}&site={{ parent.site.pk }}{% endif %}{% endif %}">{{ record.prefix }}</a>
 </span>

From babe42ef352d6135d23c326105fae02245ba121b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 9 Aug 2017 13:59:25 -0400
Subject: [PATCH 36/92] Closes #1414: Selecting a site from the rack filters
 automatically updates the available rack groups

---
 netbox/templates/dcim/rack_list.html | 33 ++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/netbox/templates/dcim/rack_list.html b/netbox/templates/dcim/rack_list.html
index 1de08d37a..88b5a2f9d 100644
--- a/netbox/templates/dcim/rack_list.html
+++ b/netbox/templates/dcim/rack_list.html
@@ -25,3 +25,36 @@
     </div>
 </div>
 {% endblock %}
+
+{% block javascript %}
+<script type="text/javascript">
+$(document).ready(function() {
+
+    var site_list = $('#id_site');
+    var rack_group_list = $('#id_group_id');
+
+    // Update rack group and rack options based on selected site
+    site_list.change(function() {
+        var selected_sites = $(this).val();
+        if (selected_sites) {
+
+            // Update rack group options
+            rack_group_list.empty();
+            $.ajax({
+                url: netbox_api_path + 'dcim/rack-groups/?limit=500&site=' + selected_sites.join('&site='),
+                dataType: 'json',
+                success: function (response, status) {
+                    $.each(response["results"], function (index, group) {
+                        var option = $("<option></option>").attr("value", group.id).text(group.name);
+                        rack_group_list.append(option);
+                    });
+                }
+            });
+
+        }
+    });
+
+});
+</script>
+{% endblock %}
+

From 8fb504c963c5ea17387ee802fc4284c301d8946b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 9 Aug 2017 14:19:33 -0400
Subject: [PATCH 37/92] Tweaked installation docs to better accommodate Python
 3

---
 docs/installation/netbox.md     |  2 +-
 docs/installation/web-server.md | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/docs/installation/netbox.md b/docs/installation/netbox.md
index 4befbeefc..b0928c1b5 100644
--- a/docs/installation/netbox.md
+++ b/docs/installation/netbox.md
@@ -102,7 +102,7 @@ Python 2:
 As of v2.1.0, NetBox supports integration with the [NAPALM automation](https://napalm-automation.net/) library. NAPALM allows NetBox to fetch live data from devices and return it to a requester via its REST API. Installation of NAPALM is optional. To enable it, install the `napalm` package using pip or pip3:
 
 ```no-highlight
-# pip install napalm
+# pip3 install napalm
 ```
 
 # Configuration
diff --git a/docs/installation/web-server.md b/docs/installation/web-server.md
index 9da487f13..0acedccc6 100644
--- a/docs/installation/web-server.md
+++ b/docs/installation/web-server.md
@@ -1,13 +1,9 @@
-# Web Server Installation
-
 We'll set up a simple WSGI front end using [gunicorn](http://gunicorn.org/) for the purposes of this guide. For web servers, we provide example configurations for both [nginx](https://www.nginx.com/resources/wiki/) and [Apache](http://httpd.apache.org/docs/2.4). (You are of course free to use whichever combination of HTTP and WSGI services you'd like.) We'll also use [supervisord](http://supervisord.org/) to enable service persistence.
 
 !!! info
     For the sake of brevity, only Ubuntu 16.04 instructions are provided here, but this sort of web server and WSGI configuration is not unique to NetBox. Please consult your distribution's documentation for assistance if needed.
 
-```no-highlight
-# apt-get install -y gunicorn supervisor
-```
+# Web Server Installation
 
 ## Option A: nginx
 
@@ -104,6 +100,12 @@ To enable SSL, consider this guide on [securing Apache with Let's Encrypt](https
 
 # gunicorn Installation
 
+Install gunicorn using `pip3` (Python 3) or `pip` (Python 2):
+
+```no-highlight
+# pip3 install gunicorn
+```
+
 Save the following configuration in the root netbox installation path as `gunicorn_config.py` (e.g. `/opt/netbox/gunicorn_config.py` per our example installation). Be sure to verify the location of the gunicorn executable on your server (e.g. `which gunicorn`) and to update the `pythonpath` variable if needed. If using CentOS/RHEL, change the username from `www-data` to `nginx` or `apache`.
 
 ```no-highlight
@@ -116,6 +118,12 @@ user = 'www-data'
 
 # supervisord Installation
 
+Install supervisor:
+
+```no-highlight
+# apt-get install -y supervisor
+```
+
 Save the following as `/etc/supervisor/conf.d/netbox.conf`. Update the `command` and `directory` paths as needed. If using CentOS/RHEL, change the username from `www-data` to `nginx` or `apache`.
 
 ```no-highlight

From e6a58b67003f1d869a47fbd255a3645e2a1d5c76 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 9 Aug 2017 15:46:40 -0400
Subject: [PATCH 38/92] Fixes #1415: Ignore leading/trailing semicolons in
 topology map device lists

---
 netbox/extras/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/extras/models.py b/netbox/extras/models.py
index 9d0e636ff..4afc3afcf 100644
--- a/netbox/extras/models.py
+++ b/netbox/extras/models.py
@@ -285,7 +285,7 @@ class TopologyMap(models.Model):
 
             # Add each device to the graph
             devices = []
-            for query in device_set.split(';'):  # Split regexes on semicolons
+            for query in device_set.strip(';').split(';'):  # Split regexes on semicolons
                 devices += Device.objects.filter(name__regex=query).select_related('device_role')
             for d in devices:
                 bg_color = '#{}'.format(d.device_role.color)

From 63757af1a022dcce6acb356e65794bd910a5a60e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 9 Aug 2017 16:55:49 -0400
Subject: [PATCH 39/92] Expanded API overview documentation

---
 docs/api/overview.md | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/docs/api/overview.md b/docs/api/overview.md
index a9ad115f8..84e88a6d2 100644
--- a/docs/api/overview.md
+++ b/docs/api/overview.md
@@ -1,8 +1,42 @@
 NetBox v2.0 and later includes a full-featured REST API that allows its data model to be read and manipulated externally.
 
+# What is a REST API?
+
+REST stands for [representational state transfer](https://en.wikipedia.org/wiki/Representational_state_transfer). It's a particular type of API which employs HTTP to create, retrieve, update, and delete objects from a database. (This set of operations is commonly referred to as CRUD.) Each type of operation is associated with a particular HTTP verb:
+
+* `GET`: Retrieve an object or list of objects
+* `POST`: Create an object
+* `UPDATE`: Modify an existing object
+* `DELETE`: Delete an existing object
+
+The NetBox API represents all objects in [JavaScript Object Notation (JSON)](http://www.json.org/). This makes it very easy to interact with NetBox data on the command line with common tools. For example, we can request an IP address from NetBox and output the JSON using `curl` and `jq`. (Piping the output through `jq` isn't strictly required but makes it much easier to read.)
+
+```
+$ curl -s http://localhost:8000/api/ipam/ip-addresses/2954/ | jq '.'
+{
+  "custom_fields": {},
+  "nat_outside": null,
+  "nat_inside": null,
+  "description": "An example IP address",
+  "id": 2954,
+  "family": 4,
+  "address": "5.101.108.132/26",
+  "vrf": null,
+  "tenant": null,
+  "status": {
+    "label": "Active",
+    "value": 1
+  },
+  "role": null,
+  "interface": null
+}
+```
+
+Each attribute of the NetBox object is expressed as a field in the dictionary. Fields may include their own nested objects, as in the case of the `status` field above. Every object includes a primary key named `id` which uniquely identifies it in the database.
+
 # URL Hierarchy
 
-NetBox's entire REST API is housed under the API root, `/api/`. The API's URL structure is divided at the root level by application: circuits, DCIM, extras, IPAM, secrets, and tenancy. Within each application, each model has its own path. For example, the provider and circuit objects are located under the "circuits" application:
+NetBox's entire API is housed under the API root at `https://<hostname>/api/`. The URL structure is divided at the root level by application: circuits, DCIM, extras, IPAM, secrets, and tenancy. Within each application, each model has its own path. For example, the provider and circuit objects are located under the "circuits" application:
 
 * /api/circuits/providers/
 * /api/circuits/circuits/
@@ -13,9 +47,9 @@ Likewise, the site, rack, and device objects are located under the "DCIM" applic
 * /api/dcim/racks/
 * /api/dcim/devices/
 
-The full hierarchy of available endpoints can be viewed by navigating to the API root (e.g. /api/) in a web browser.
+The full hierarchy of available endpoints can be viewed by navigating to the API root in a web browser.
 
-Each model generally has two URLs associated with it: a list URL and a detail URL. The list URL is used to request a list of multiple objects or to create a new object. The detail URL is used to retrieve, update, or delete an existing object. All objects are referenced by their numeric primary key (ID).
+Each model generally has two views associated with it: a list view and a detail view. The list view is used to request a list of multiple objects or to create a new object. The detail view is used to retrieve, update, or delete an existing object. All objects are referenced by their numeric primary key (`id`).
 
 * /api/dcim/devices/ - List devices or create a new device
 * /api/dcim/devices/123/ - Retrieve, update, or delete the device with ID 123

From 3d92669df59179c7c97634a3a681729c4b66bb6f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 10 Aug 2017 11:41:25 -0400
Subject: [PATCH 40/92] Corrected HTTP verb in API docs

---
 docs/api/overview.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/overview.md b/docs/api/overview.md
index 84e88a6d2..bdf0a2f4c 100644
--- a/docs/api/overview.md
+++ b/docs/api/overview.md
@@ -6,7 +6,7 @@ REST stands for [representational state transfer](https://en.wikipedia.org/wiki/
 
 * `GET`: Retrieve an object or list of objects
 * `POST`: Create an object
-* `UPDATE`: Modify an existing object
+* `PUT` / `PATCH`: Modify an existing object
 * `DELETE`: Delete an existing object
 
 The NetBox API represents all objects in [JavaScript Object Notation (JSON)](http://www.json.org/). This makes it very easy to interact with NetBox data on the command line with common tools. For example, we can request an IP address from NetBox and output the JSON using `curl` and `jq`. (Piping the output through `jq` isn't strictly required but makes it much easier to read.)

From 117f33afc5a0d80e6fd58d69d921a0f7c3bd084e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 11 Aug 2017 10:47:06 -0400
Subject: [PATCH 41/92] Fixes #1419: Allow editing image attachments without
 re-uploading an image

---
 netbox/utilities/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 0fa402d52..7004d4260 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -459,7 +459,7 @@ class BootstrapMixin(forms.BaseForm):
             if field.widget.__class__ not in exempt_widgets:
                 css = field.widget.attrs.get('class', '')
                 field.widget.attrs['class'] = ' '.join([css, 'form-control']).strip()
-            if field.required:
+            if field.required and not isinstance(field.widget, forms.FileInput):
                 field.widget.attrs['required'] = 'required'
             if 'placeholder' not in field.widget.attrs:
                 field.widget.attrs['placeholder'] = field.label

From 04c300b8e2debf29af9cf3eebf96adcd464dc205 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 15 Aug 2017 11:07:26 -0400
Subject: [PATCH 42/92] Fixes #1420: Exclude virtual interfaces from device
 LLDP neighbors view

---
 netbox/dcim/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 78881c200..d2c75fc24 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -936,7 +936,7 @@ class DeviceLLDPNeighborsView(PermissionRequiredMixin, View):
         device = get_object_or_404(Device, pk=pk)
         interfaces = Interface.objects.order_naturally(
             device.device_type.interface_ordering
-        ).filter(
+        ).connectable().filter(
             device=device
         ).select_related(
             'connected_as_a', 'connected_as_b'

From c394985b1be3f2126363782018af9acd3e4865cf Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 15 Aug 2017 13:54:04 -0400
Subject: [PATCH 43/92] Fixes #1421: Improved model validation logic for API
 serializers

---
 netbox/circuits/api/serializers.py |  6 ++--
 netbox/dcim/api/serializers.py     | 44 +++++++++++++++---------------
 netbox/extras/api/customfields.py  | 13 ++-------
 netbox/extras/api/serializers.py   |  4 +--
 netbox/ipam/api/serializers.py     |  8 +++---
 netbox/secrets/api/serializers.py  |  4 +--
 netbox/tenancy/api/serializers.py  |  4 +--
 netbox/utilities/api.py            | 28 +++++++++++--------
 8 files changed, 53 insertions(+), 58 deletions(-)

diff --git a/netbox/circuits/api/serializers.py b/netbox/circuits/api/serializers.py
index cdab3427a..d2432374f 100644
--- a/netbox/circuits/api/serializers.py
+++ b/netbox/circuits/api/serializers.py
@@ -6,7 +6,7 @@ from circuits.models import Provider, Circuit, CircuitTermination, CircuitType
 from dcim.api.serializers import NestedSiteSerializer, InterfaceSerializer
 from extras.api.customfields import CustomFieldModelSerializer
 from tenancy.api.serializers import NestedTenantSerializer
-from utilities.api import ModelValidationMixin
+from utilities.api import ValidatedModelSerializer
 
 
 #
@@ -45,7 +45,7 @@ class WritableProviderSerializer(CustomFieldModelSerializer):
 # Circuit types
 #
 
-class CircuitTypeSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class CircuitTypeSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = CircuitType
@@ -111,7 +111,7 @@ class CircuitTerminationSerializer(serializers.ModelSerializer):
         ]
 
 
-class WritableCircuitTerminationSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritableCircuitTerminationSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = CircuitTermination
diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index 50bf756e3..ebfb781e0 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -15,7 +15,7 @@ from dcim.models import (
 )
 from extras.api.customfields import CustomFieldModelSerializer
 from tenancy.api.serializers import NestedTenantSerializer
-from utilities.api import ChoiceFieldSerializer, ModelValidationMixin
+from utilities.api import ChoiceFieldSerializer, ValidatedModelSerializer
 
 
 #
@@ -38,7 +38,7 @@ class RegionSerializer(serializers.ModelSerializer):
         fields = ['id', 'name', 'slug', 'parent']
 
 
-class WritableRegionSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritableRegionSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = Region
@@ -100,7 +100,7 @@ class NestedRackGroupSerializer(serializers.ModelSerializer):
         fields = ['id', 'url', 'name', 'slug']
 
 
-class WritableRackGroupSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritableRackGroupSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = RackGroup
@@ -111,7 +111,7 @@ class WritableRackGroupSerializer(ModelValidationMixin, serializers.ModelSeriali
 # Rack roles
 #
 
-class RackRoleSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class RackRoleSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = RackRole
@@ -216,7 +216,7 @@ class RackReservationSerializer(serializers.ModelSerializer):
         fields = ['id', 'rack', 'units', 'created', 'user', 'description']
 
 
-class WritableRackReservationSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritableRackReservationSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = RackReservation
@@ -227,7 +227,7 @@ class WritableRackReservationSerializer(ModelValidationMixin, serializers.ModelS
 # Manufacturers
 #
 
-class ManufacturerSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class ManufacturerSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = Manufacturer
@@ -292,7 +292,7 @@ class ConsolePortTemplateSerializer(serializers.ModelSerializer):
         fields = ['id', 'device_type', 'name']
 
 
-class WritableConsolePortTemplateSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritableConsolePortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = ConsolePortTemplate
@@ -311,7 +311,7 @@ class ConsoleServerPortTemplateSerializer(serializers.ModelSerializer):
         fields = ['id', 'device_type', 'name']
 
 
-class WritableConsoleServerPortTemplateSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritableConsoleServerPortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = ConsoleServerPortTemplate
@@ -330,7 +330,7 @@ class PowerPortTemplateSerializer(serializers.ModelSerializer):
         fields = ['id', 'device_type', 'name']
 
 
-class WritablePowerPortTemplateSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritablePowerPortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = PowerPortTemplate
@@ -349,7 +349,7 @@ class PowerOutletTemplateSerializer(serializers.ModelSerializer):
         fields = ['id', 'device_type', 'name']
 
 
-class WritablePowerOutletTemplateSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritablePowerOutletTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = PowerOutletTemplate
@@ -369,7 +369,7 @@ class InterfaceTemplateSerializer(serializers.ModelSerializer):
         fields = ['id', 'device_type', 'name', 'form_factor', 'mgmt_only']
 
 
-class WritableInterfaceTemplateSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritableInterfaceTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = InterfaceTemplate
@@ -388,7 +388,7 @@ class DeviceBayTemplateSerializer(serializers.ModelSerializer):
         fields = ['id', 'device_type', 'name']
 
 
-class WritableDeviceBayTemplateSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritableDeviceBayTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = DeviceBayTemplate
@@ -399,7 +399,7 @@ class WritableDeviceBayTemplateSerializer(ModelValidationMixin, serializers.Mode
 # Device roles
 #
 
-class DeviceRoleSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class DeviceRoleSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = DeviceRole
@@ -418,7 +418,7 @@ class NestedDeviceRoleSerializer(serializers.ModelSerializer):
 # Platforms
 #
 
-class PlatformSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class PlatformSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = Platform
@@ -516,7 +516,7 @@ class ConsoleServerPortSerializer(serializers.ModelSerializer):
         read_only_fields = ['connected_console']
 
 
-class WritableConsoleServerPortSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritableConsoleServerPortSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = ConsoleServerPort
@@ -536,7 +536,7 @@ class ConsolePortSerializer(serializers.ModelSerializer):
         fields = ['id', 'device', 'name', 'cs_port', 'connection_status']
 
 
-class WritableConsolePortSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritableConsolePortSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = ConsolePort
@@ -556,7 +556,7 @@ class PowerOutletSerializer(serializers.ModelSerializer):
         read_only_fields = ['connected_port']
 
 
-class WritablePowerOutletSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritablePowerOutletSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = PowerOutlet
@@ -576,7 +576,7 @@ class PowerPortSerializer(serializers.ModelSerializer):
         fields = ['id', 'device', 'name', 'power_outlet', 'connection_status']
 
 
-class WritablePowerPortSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritablePowerPortSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = PowerPort
@@ -664,7 +664,7 @@ class PeerInterfaceSerializer(serializers.ModelSerializer):
         ]
 
 
-class WritableInterfaceSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritableInterfaceSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = Interface
@@ -694,7 +694,7 @@ class NestedDeviceBaySerializer(serializers.ModelSerializer):
         fields = ['id', 'url', 'name']
 
 
-class WritableDeviceBaySerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritableDeviceBaySerializer(ValidatedModelSerializer):
 
     class Meta:
         model = DeviceBay
@@ -717,7 +717,7 @@ class InventoryItemSerializer(serializers.ModelSerializer):
         ]
 
 
-class WritableInventoryItemSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritableInventoryItemSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = InventoryItem
@@ -749,7 +749,7 @@ class NestedInterfaceConnectionSerializer(serializers.ModelSerializer):
         fields = ['id', 'url', 'connection_status']
 
 
-class WritableInterfaceConnectionSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritableInterfaceConnectionSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = InterfaceConnection
diff --git a/netbox/extras/api/customfields.py b/netbox/extras/api/customfields.py
index 52f127a7d..fc83b33e5 100644
--- a/netbox/extras/api/customfields.py
+++ b/netbox/extras/api/customfields.py
@@ -10,6 +10,7 @@ from django.db import transaction
 from extras.models import (
     CF_TYPE_BOOLEAN, CF_TYPE_DATE, CF_TYPE_SELECT, CustomField, CustomFieldChoice, CustomFieldValue,
 )
+from utilities.api import ValidatedModelSerializer
 
 
 #
@@ -68,7 +69,7 @@ class CustomFieldsSerializer(serializers.BaseSerializer):
         return data
 
 
-class CustomFieldModelSerializer(serializers.ModelSerializer):
+class CustomFieldModelSerializer(ValidatedModelSerializer):
     """
     Extends ModelSerializer to render any CustomFields and their values associated with an object.
     """
@@ -111,16 +112,6 @@ class CustomFieldModelSerializer(serializers.ModelSerializer):
                 defaults={'serialized_value': custom_field.serialize_value(value)},
             )
 
-    def validate(self, data):
-        """
-        Enforce model validation (see utilities.api.ModelValidationMixin)
-        """
-        model_data = data.copy()
-        model_data.pop('custom_fields', None)
-        instance = self.Meta.model(**model_data)
-        instance.clean()
-        return data
-
     def create(self, validated_data):
 
         custom_fields = validated_data.pop('custom_fields', None)
diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py
index 39ce63524..0eeab49ec 100644
--- a/netbox/extras/api/serializers.py
+++ b/netbox/extras/api/serializers.py
@@ -10,7 +10,7 @@ from extras.models import (
     ACTION_CHOICES, ExportTemplate, Graph, GRAPH_TYPE_CHOICES, ImageAttachment, TopologyMap, UserAction,
 )
 from users.api.serializers import NestedUserSerializer
-from utilities.api import ChoiceFieldSerializer, ContentTypeFieldSerializer, ModelValidationMixin
+from utilities.api import ChoiceFieldSerializer, ContentTypeFieldSerializer, ValidatedModelSerializer
 
 
 #
@@ -104,7 +104,7 @@ class ImageAttachmentSerializer(serializers.ModelSerializer):
         return serializer(obj.parent, context={'request': self.context['request']}).data
 
 
-class WritableImageAttachmentSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class WritableImageAttachmentSerializer(ValidatedModelSerializer):
     content_type = ContentTypeFieldSerializer()
 
     class Meta:
diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py
index 1374d3552..3ef152ebe 100644
--- a/netbox/ipam/api/serializers.py
+++ b/netbox/ipam/api/serializers.py
@@ -11,7 +11,7 @@ from ipam.models import (
     PREFIX_STATUS_CHOICES, RIR, Role, Service, VLAN, VLAN_STATUS_CHOICES, VLANGroup, VRF,
 )
 from tenancy.api.serializers import NestedTenantSerializer
-from utilities.api import ChoiceFieldSerializer, ModelValidationMixin
+from utilities.api import ChoiceFieldSerializer, ValidatedModelSerializer
 
 
 #
@@ -45,7 +45,7 @@ class WritableVRFSerializer(CustomFieldModelSerializer):
 # Roles
 #
 
-class RoleSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class RoleSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = Role
@@ -64,7 +64,7 @@ class NestedRoleSerializer(serializers.ModelSerializer):
 # RIRs
 #
 
-class RIRSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class RIRSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = RIR
@@ -303,7 +303,7 @@ class ServiceSerializer(serializers.ModelSerializer):
         fields = ['id', 'device', 'name', 'port', 'protocol', 'ipaddresses', 'description']
 
 
-# TODO: Figure out how to use ModelValidationMixin with ManyToManyFields. Calling clean() yields a ValueError.
+# TODO: Figure out how to use model validation with ManyToManyFields. Calling clean() yields a ValueError.
 class WritableServiceSerializer(serializers.ModelSerializer):
 
     class Meta:
diff --git a/netbox/secrets/api/serializers.py b/netbox/secrets/api/serializers.py
index ff2eb1dfa..b7c4bac9a 100644
--- a/netbox/secrets/api/serializers.py
+++ b/netbox/secrets/api/serializers.py
@@ -5,14 +5,14 @@ from rest_framework.validators import UniqueTogetherValidator
 
 from dcim.api.serializers import NestedDeviceSerializer
 from secrets.models import Secret, SecretRole
-from utilities.api import ModelValidationMixin
+from utilities.api import ValidatedModelSerializer
 
 
 #
 # SecretRoles
 #
 
-class SecretRoleSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class SecretRoleSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = SecretRole
diff --git a/netbox/tenancy/api/serializers.py b/netbox/tenancy/api/serializers.py
index ef5b15a16..a52ac2c60 100644
--- a/netbox/tenancy/api/serializers.py
+++ b/netbox/tenancy/api/serializers.py
@@ -4,14 +4,14 @@ from rest_framework import serializers
 
 from extras.api.customfields import CustomFieldModelSerializer
 from tenancy.models import Tenant, TenantGroup
-from utilities.api import ModelValidationMixin
+from utilities.api import ValidatedModelSerializer
 
 
 #
 # Tenant groups
 #
 
-class TenantGroupSerializer(ModelValidationMixin, serializers.ModelSerializer):
+class TenantGroupSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = TenantGroup
diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 6a515b21d..2e827d503 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -8,7 +8,7 @@ from rest_framework.compat import is_authenticated
 from rest_framework.exceptions import APIException
 from rest_framework.pagination import LimitOffsetPagination
 from rest_framework.permissions import BasePermission, DjangoModelPermissions, SAFE_METHODS
-from rest_framework.serializers import Field, ValidationError
+from rest_framework.serializers import Field, ModelSerializer, ValidationError
 
 from users.models import Token
 
@@ -80,6 +80,21 @@ class IsAuthenticatedOrLoginNotRequired(BasePermission):
 # Serializers
 #
 
+class ValidatedModelSerializer(ModelSerializer):
+    """
+    Extends the built-in ModelSerializer to enforce calling clean() on the associated model during validation.
+    """
+    def validate(self, attrs):
+        if self.instance is None:
+            instance = self.Meta.model(**attrs)
+        else:
+            instance = self.instance
+            for k, v in attrs.items():
+                setattr(instance, k, v)
+        instance.clean()
+        return attrs
+
+
 class ChoiceFieldSerializer(Field):
     """
     Represent a ChoiceField as {'value': <DB value>, 'label': <string>}.
@@ -121,17 +136,6 @@ class ContentTypeFieldSerializer(Field):
 # Mixins
 #
 
-class ModelValidationMixin(object):
-    """
-    Enforce a model's validation through clean() when validating serializer data. This is necessary to ensure we're
-    employing the same validation logic via both forms and the API.
-    """
-    def validate(self, attrs):
-        instance = self.Meta.model(**attrs)
-        instance.clean()
-        return attrs
-
-
 class WritableSerializerMixin(object):
     """
     Allow for the use of an alternate, writable serializer class for write operations (e.g. POST, PUT).

From 51b1da660aba8e7a97eab6eed6d569b41333ab86 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 15 Aug 2017 14:05:02 -0400
Subject: [PATCH 44/92] Fixes #1330: Raise validation error when assigning an
 unrelated IP as the primary IP for a device

---
 netbox/dcim/models.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index 3719c7c25..9f72fc83e 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -890,6 +890,18 @@ class Device(CreatedUpdatedModel, CustomFieldModel):
             except DeviceType.DoesNotExist:
                 pass
 
+        # Validate primary IPv4 address
+        if self.primary_ip4 and (self.primary_ip4.interface is None or self.primary_ip4.interface.device != self):
+            raise ValidationError({
+                'primary_ip4': "The specified IP address ({}) is not assigned to this device.".format(self.primary_ip4),
+            })
+
+        # Validate primary IPv6 address
+        if self.primary_ip6 and (self.primary_ip6.interface is None or self.primary_ip6.interface.device != self):
+            raise ValidationError({
+                'primary_ip6': "The specified IP address ({}) is not assigned to this device.".format(self.primary_ip6),
+            })
+
     def save(self, *args, **kwargs):
 
         is_new = not bool(self.pk)

From c37cfeb74f1d5488faf05bebdf993ffe46355cbc Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 15 Aug 2017 15:30:45 -0400
Subject: [PATCH 45/92] Fixed page titles in the browsable API

---
 netbox/netbox/settings.py |  3 ++-
 netbox/utilities/api.py   | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 00acc3e67..5bb6f5c0f 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -221,6 +221,7 @@ SECRETS_MIN_PUBKEY_SIZE = 2048
 # Django REST framework (API)
 REST_FRAMEWORK_VERSION = VERSION[0:3]  # Use major.minor as API version
 REST_FRAMEWORK = {
+    'ALLOWED_VERSIONS': [REST_FRAMEWORK_VERSION],
     'DEFAULT_AUTHENTICATION_CLASSES': (
         'rest_framework.authentication.SessionAuthentication',
         'utilities.api.TokenAuthentication',
@@ -233,9 +234,9 @@ REST_FRAMEWORK = {
         'utilities.api.TokenPermissions',
     ),
     'DEFAULT_VERSION': REST_FRAMEWORK_VERSION,
-    'ALLOWED_VERSIONS': [REST_FRAMEWORK_VERSION],
     'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.AcceptHeaderVersioning',
     'PAGE_SIZE': PAGINATE_COUNT,
+    'VIEW_NAME_FUNCTION': 'utilities.api.get_view_name',
 }
 
 # Django debug toolbar
diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 2e827d503..7a945c045 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -9,6 +9,7 @@ from rest_framework.exceptions import APIException
 from rest_framework.pagination import LimitOffsetPagination
 from rest_framework.permissions import BasePermission, DjangoModelPermissions, SAFE_METHODS
 from rest_framework.serializers import Field, ModelSerializer, ValidationError
+from rest_framework.views import get_view_name as drf_get_view_name
 
 from users.models import Token
 
@@ -196,3 +197,21 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination):
                 pass
 
         return self.default_limit
+
+
+#
+# Miscellaneous
+#
+
+def get_view_name(view_cls, suffix=None):
+    """
+    Derive the view name from its associated model, if it has one. Fall back to DRF's built-in `get_view_name`.
+    """
+    if hasattr(view_cls, 'queryset'):
+        name = view_cls.queryset.model._meta.verbose_name
+        name = ' '.join([w[0].upper() + w[1:] for w in name.split()])  # Capitalize each word
+        if suffix:
+            name = "{} {}".format(name, suffix)
+        return name
+
+    return drf_get_view_name(view_cls, suffix)

From 669ae104a4b020a6cd39b2d76281b4c6bec1af00 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 15 Aug 2017 15:50:51 -0400
Subject: [PATCH 46/92] Release v2.1.3

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 5bb6f5c0f..1c3f3688b 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -13,7 +13,7 @@ except ImportError:
     )
 
 
-VERSION = '2.1.3-dev'
+VERSION = '2.1.3'
 
 # Import required configuration parameters
 ALLOWED_HOSTS = DATABASE = SECRET_KEY = None

From 0c1594b8f8fb355f793c6709f583b27bba9e042d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 15 Aug 2017 15:53:10 -0400
Subject: [PATCH 47/92] Post-release version bump

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 1c3f3688b..eff6ac0bd 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -13,7 +13,7 @@ except ImportError:
     )
 
 
-VERSION = '2.1.3'
+VERSION = '2.1.4-dev'
 
 # Import required configuration parameters
 ALLOWED_HOSTS = DATABASE = SECRET_KEY = None

From 416aeb40724a5777500c6f8a3bfe1d07f1f9cb80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mudrini=C4=87?= <mudrinic.mare@gmail.com>
Date: Tue, 15 Aug 2017 23:39:10 +0200
Subject: [PATCH 48/92] docs: web-server link to new ssl tutorials for 16.04

---
 docs/installation/web-server.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/installation/web-server.md b/docs/installation/web-server.md
index 0acedccc6..f9a304ff5 100644
--- a/docs/installation/web-server.md
+++ b/docs/installation/web-server.md
@@ -51,7 +51,7 @@ Restart the nginx service to use the new configuration.
 # service nginx restart
 ```
 
-To enable SSL, consider this guide on [securing nginx with Let's Encrypt](https://www.digitalocean.com/community/tutorials/how-to-secure-nginx-with-let-s-encrypt-on-ubuntu-14-04).
+To enable SSL, consider this guide on [securing nginx with Let's Encrypt](https://www.digitalocean.com/community/tutorials/how-to-secure-nginx-with-let-s-encrypt-on-ubuntu-16-04).
 
 ## Option B: Apache
 
@@ -96,7 +96,7 @@ Save the contents of the above example in `/etc/apache2/sites-available/netbox.c
 # service apache2 restart
 ```
 
-To enable SSL, consider this guide on [securing Apache with Let's Encrypt](https://www.digitalocean.com/community/tutorials/how-to-secure-apache-with-let-s-encrypt-on-ubuntu-14-04).
+To enable SSL, consider this guide on [securing Apache with Let's Encrypt](https://www.digitalocean.com/community/tutorials/how-to-secure-apache-with-let-s-encrypt-on-ubuntu-16-04).
 
 # gunicorn Installation
 

From 70a6b171d06b8c2fe417d7e6499bcc14d14406ef Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 16 Aug 2017 11:20:52 -0400
Subject: [PATCH 49/92] Fixes #1429: Fixed uptime formatting on device status
 page

---
 netbox/templates/dcim/device_status.html | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/netbox/templates/dcim/device_status.html b/netbox/templates/dcim/device_status.html
index 4d3c9ba78..7c62b3971 100644
--- a/netbox/templates/dcim/device_status.html
+++ b/netbox/templates/dcim/device_status.html
@@ -80,13 +80,19 @@ $(document).ready(function() {
             $('#model').html(json['get_facts']['model']);
             $('#serial_number').html(json['get_facts']['serial_number']);
             $('#os_version').html(json['get_facts']['os_version']);
-            $('#uptime').html(json['get_facts']['uptime']);
+            // Calculate uptime
+            var uptime = json['get_facts']['uptime'];
+            console.log(uptime);
+            var uptime_days = Math.floor(uptime / 86400);
+            var uptime_hours = Math.floor(uptime % 86400 / 3600);
+            var uptime_minutes = Math.floor(uptime % 3600 / 60);
+            $('#uptime').html(uptime_days + "d " + uptime_hours + "h " + uptime_minutes + "m");
             $.each(json['get_environment']['cpu'], function(name, obj) {
                 var row="<tr><td>" + name + "</td><td>" + obj['%usage'] + "%</td></tr>";
                 $("#cpu").after(row)
             });
-            $('#memory').after("<tr><td>Used</td><td>" + json['get_environment']['memory']['used_ram'] + "MB</td></tr>");
-            $('#memory').after("<tr><td>Available</td><td>" + json['get_environment']['memory']['available_ram'] + "MB</td></tr>");
+            $('#memory').after("<tr><td>Used</td><td>" + json['get_environment']['memory']['used_ram'] + "</td></tr>");
+            $('#memory').after("<tr><td>Available</td><td>" + json['get_environment']['memory']['available_ram'] + "</td></tr>");
             $.each(json['get_environment']['temperature'], function(name, obj) {
                 var style = "success";
                 if (obj['is_alert']) {

From 83085d08ca9df461956300ceab9a09b854cfaacf Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 17 Aug 2017 15:11:55 -0400
Subject: [PATCH 50/92] Revised the GitHub issue template

---
 .github/ISSUE_TEMPLATE.md | 47 +++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index dbfcf4527..0027599f4 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,28 +1,41 @@
 <!--
-    Please note: GitHub issues are to be used only for feature requests
-    and bug reports. For installation assistance or general discussion,
-    please join us on the mailing list:
+    Before opening a new issue, please search through the existing issues to
+    see if your topic has already been addressed. Note that you may need to
+    remove the "is:open" filter from the search bar to include closed issues.
+
+    Check the appropriate type for your issue below by placing an x between the
+    brackets. If none of the below apply, please raise your issue for
+    discussion on our mailing list:
 
         https://groups.google.com/forum/#!forum/netbox-discuss
 
-    Please indicate "bug report" or "feature request" below. Be sure to
-    search the existing set of issues (both open and closed) to see if
-    a similar issue has already been raised.
--->
-### Issue type:
+    Please note that issues which do not fall under any of the below categories
+    will be closed.
+--->
+### Issue type
+[ ] Feature request <!-- Requesting the implementation of a new feature -->
+[ ] Bug report      <!-- Reporting unexpected or erroneous behavior -->
+[ ] Documentation   <!-- Proposing a modification to the documentation -->
 
 <!--
-    If filing a bug, please indicate the version of Python and NetBox
-    you are running. (This is not necessary for feature requests.)
+    Please describe the environment in which you are running NetBox. (Be sure
+    to verify that you are running the latest stable release of NetBox before
+    submitting a bug report.)
 -->
-**Python version:**
-**NetBox version:**
+### Environment
+* Python version:  <!-- Example: 3.5.4 -->
+* NetBox version:  <!-- Example: 2.1.3 -->
 
 <!--
-    If filing a bug, please record the exact steps taken to reproduce
-    the bug and any errors messages that are generated.
+    BUG REPORTS must include:
+        * A list of the steps needed to reproduce the bug
+        * A description of the expected behavior
+        * Any relevant error messages (screenshots may also help)
 
-    If filing a feature request, please precisely describe the data
-    model or workflow you would like to see implemented, and provide a
-    use case.
+    FEATURE REQUESTS must include:
+        * A detailed description of the proposed functionality
+        * A use case for the new feature
+        * A rough description of any necessary changes to the database schema
+        * Any relevant third-party libraries which would be needed
 -->
+### Description

From fa6d9335446865559acba781926f813f8068eb68 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 17 Aug 2017 15:14:20 -0400
Subject: [PATCH 51/92] Converted list of issue types to a task list

---
 .github/ISSUE_TEMPLATE.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 0027599f4..7160cae99 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -13,9 +13,9 @@
     will be closed.
 --->
 ### Issue type
-[ ] Feature request <!-- Requesting the implementation of a new feature -->
-[ ] Bug report      <!-- Reporting unexpected or erroneous behavior -->
-[ ] Documentation   <!-- Proposing a modification to the documentation -->
+- [ ] Feature request <!-- Requesting the implementation of a new feature -->
+- [ ] Bug report      <!-- Reporting unexpected or erroneous behavior -->
+- [ ] Documentation   <!-- Proposing a modification to the documentation -->
 
 <!--
     Please describe the environment in which you are running NetBox. (Be sure

From 7843a6bf77fe20e544c9b8abfcd9f763913eecce Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 18 Aug 2017 10:27:43 -0400
Subject: [PATCH 52/92] Fixed devicetype_id filter for DeviceType components

---
 netbox/dcim/filters.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index 54a7af4e2..a9f58d2a4 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -273,6 +273,7 @@ class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet):
 class DeviceTypeComponentFilterSet(django_filters.FilterSet):
     devicetype_id = django_filters.ModelMultipleChoiceFilter(
         queryset=DeviceType.objects.all(),
+        name='device_type_id',
         label='Device type (ID)',
     )
 

From ae73e6f04dcdbe66e703cf4c3b8f30fabc155fa9 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 21 Aug 2017 11:10:07 -0400
Subject: [PATCH 53/92] Removed task list formatting

---
 .github/ISSUE_TEMPLATE.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 7160cae99..0027599f4 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -13,9 +13,9 @@
     will be closed.
 --->
 ### Issue type
-- [ ] Feature request <!-- Requesting the implementation of a new feature -->
-- [ ] Bug report      <!-- Reporting unexpected or erroneous behavior -->
-- [ ] Documentation   <!-- Proposing a modification to the documentation -->
+[ ] Feature request <!-- Requesting the implementation of a new feature -->
+[ ] Bug report      <!-- Reporting unexpected or erroneous behavior -->
+[ ] Documentation   <!-- Proposing a modification to the documentation -->
 
 <!--
     Please describe the environment in which you are running NetBox. (Be sure

From eb994a691a8cb444582c3ac24f1cb584b91c1cc4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 21 Aug 2017 17:38:27 -0400
Subject: [PATCH 54/92] Added style to BaseTable's empty_text

---
 netbox/templates/inc/table.html | 2 +-
 netbox/utilities/tables.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/templates/inc/table.html b/netbox/templates/inc/table.html
index 0c046ff2f..3710af846 100644
--- a/netbox/templates/inc/table.html
+++ b/netbox/templates/inc/table.html
@@ -24,7 +24,7 @@
         {% empty %}
             {% if table.empty_text %}
                 <tr>
-                    <td colspan="{{ table.columns|length }}">{{ table.empty_text }}</td>
+                    <td colspan="{{ table.columns|length }}" class="text-center text-muted">&mdash; {{ table.empty_text }} &mdash;</td>
                 </tr>
             {% endif %}
         {% endfor %}
diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py
index 579280b64..d4c68c54f 100644
--- a/netbox/utilities/tables.py
+++ b/netbox/utilities/tables.py
@@ -14,7 +14,7 @@ class BaseTable(tables.Table):
 
         # Set default empty_text if none was provided
         if self.empty_text is None:
-            self.empty_text = 'No {} found.'.format(self._meta.model._meta.verbose_name_plural)
+            self.empty_text = 'No {} found'.format(self._meta.model._meta.verbose_name_plural)
 
     class Meta:
         attrs = {

From 6f8d3f7a57b0334d02d2bbc85dded1708fedc427 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 22 Aug 2017 11:31:33 -0400
Subject: [PATCH 55/92] Fixes #1443: Fixed API validation error involving
 custom field data

---
 netbox/utilities/api.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 7a945c045..36728a660 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -85,7 +85,13 @@ class ValidatedModelSerializer(ModelSerializer):
     """
     Extends the built-in ModelSerializer to enforce calling clean() on the associated model during validation.
     """
-    def validate(self, attrs):
+    def validate(self, data):
+
+        # Remove custom field data (if any) prior to model validation
+        attrs = data.copy()
+        attrs.pop('custom_fields', None)
+
+        # Run clean() on an instance of the model
         if self.instance is None:
             instance = self.Meta.model(**attrs)
         else:
@@ -93,7 +99,8 @@ class ValidatedModelSerializer(ModelSerializer):
             for k, v in attrs.items():
                 setattr(instance, k, v)
         instance.clean()
-        return attrs
+
+        return data
 
 
 class ChoiceFieldSerializer(Field):

From 3e4b66675bfa20733be8aec2ebb56bc858b5db2a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 24 Aug 2017 12:51:50 -0400
Subject: [PATCH 56/92] Rearranged circuits navigation dropdown

---
 netbox/templates/_base.html | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/netbox/templates/_base.html b/netbox/templates/_base.html
index c56a95abe..66f23a4cb 100644
--- a/netbox/templates/_base.html
+++ b/netbox/templates/_base.html
@@ -205,20 +205,18 @@
                     <li class="dropdown{% if request.path|contains:'/circuits/' %} active{% endif %}">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Circuits <span class="caret"></span></a>
                         <ul class="dropdown-menu">
-                            <li><a href="{% url 'circuits:provider_list' %}"><strong>Providers</strong></a></li>
-                            {% if perms.circuits.add_provider %}
-                                <li class="subnav"><a href="{% url 'circuits:provider_add' %}"><i class="fa fa-plus"></i> Add a Provider</a></li>
-                                <li class="subnav"><a href="{% url 'circuits:provider_import' %}"><i class="fa fa-download"></i> Import Providers</a></li>
-                            {% endif %}
-                            {% if perms.circuits.add_circuit or perms.circuits.add_provider %}
-                                <li class="divider"></li>
-                            {% endif %}
                             <li><a href="{% url 'circuits:circuit_list' %}"><strong>Circuits</strong></a></li>
                             {% if perms.circuits.add_circuit %}
                                 <li class="subnav"><a href="{% url 'circuits:circuit_add' %}"><i class="fa fa-plus"></i> Add a Circuit</a></li>
                                 <li class="subnav"><a href="{% url 'circuits:circuit_import' %}"><i class="fa fa-download"></i> Import Circuits</a></li>
                             {% endif %}
                             <li class="divider"></li>
+                            <li><a href="{% url 'circuits:provider_list' %}"><strong>Providers</strong></a></li>
+                            {% if perms.circuits.add_provider %}
+                                <li class="subnav"><a href="{% url 'circuits:provider_add' %}"><i class="fa fa-plus"></i> Add a Provider</a></li>
+                                <li class="subnav"><a href="{% url 'circuits:provider_import' %}"><i class="fa fa-download"></i> Import Providers</a></li>
+                            {% endif %}
+                            <li class="divider"></li>
                             <li><a href="{% url 'circuits:circuittype_list' %}"><strong>Circuit Types</strong></a></li>
                             {% if perms.circuits.add_circuittype %}
                                 <li class="subnav"><a href="{% url 'circuits:circuittype_add' %}"><i class="fa fa-plus"></i> Add a Circuit Type</a></li>

From 6d849ad5f65cb932cb8ebea1cb72521d7fbfa839 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 29 Aug 2017 15:31:11 -0400
Subject: [PATCH 57/92] Deleted obsolete templates

---
 netbox/templates/ipam/ipaddress_assign.html   | 70 -------------------
 netbox/templates/ipam/ipaddress_unassign.html |  8 ---
 2 files changed, 78 deletions(-)
 delete mode 100644 netbox/templates/ipam/ipaddress_assign.html
 delete mode 100644 netbox/templates/ipam/ipaddress_unassign.html

diff --git a/netbox/templates/ipam/ipaddress_assign.html b/netbox/templates/ipam/ipaddress_assign.html
deleted file mode 100644
index 02eebf4e2..000000000
--- a/netbox/templates/ipam/ipaddress_assign.html
+++ /dev/null
@@ -1,70 +0,0 @@
-{% extends '_base.html' %}
-{% load static from staticfiles %}
-{% load form_helpers %}
-
-{% block content %}
-<form action="." method="post" class="form form-horizontal">
-    {% csrf_token %}
-    <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-            {% if form.non_field_errors %}
-                <div class="panel panel-danger">
-                    <div class="panel-heading"><strong>Errors</strong></div>
-                    <div class="panel-body">
-                        {{ form.non_field_errors }}
-                    </div>
-                </div>
-            {% endif %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>{% block title %}Assign an IP Address{% endblock %}</strong>
-                </div>
-                <div class="panel-body">
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">IP Address</label>
-                        <div class="col-md-9">
-                            <p class="form-control-static">{{ ipaddress }}</p>
-                        </div>
-                        <label class="col-md-3 control-label">VRF</label>
-                        <div class="col-md-9">
-                            <p class="form-control-static">
-                                {% if ipaddress.vrf %}
-                                    <a href="{% url 'ipam:vrf' pk=ipaddress.vrf.pk %}">{{ ipaddress.vrf }}</a> ({{ ipaddress.vrf.rd }})
-                                {% else %}
-                                    <span>Global</span>
-                                {% endif %}
-                            </p>
-                        </div>
-                    </div>
-                    <ul class="nav nav-tabs" role="tablist">
-                        <li role="presentation" class="active"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
-                        <li role="presentation"><a href="#select" aria-controls="home" role="tab" data-toggle="tab">Select</a></li>
-                    </ul>
-                    <div class="tab-content">
-                        <div class="tab-pane active" id="search">
-                            {% render_field form.livesearch %}
-                        </div>
-                        <div class="tab-pane" id="select">
-                            {% render_field form.site %}
-                            {% render_field form.rack %}
-                            {% render_field form.device %}
-                        </div>
-                    </div>
-                    {% render_field form.interface %}
-                    {% render_field form.set_as_primary %}
-                </div>
-            </div>
-		    <div class="form-group">
-                <div class="col-md-9 col-md-offset-3">
-                    <button type="submit" name="_assign" class="btn btn-primary">Assign</button>
-                    <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
-                </div>
-		    </div>
-        </div>
-    </div>
-</form>
-{% endblock %}
-
-{% block javascript %}
-<script src="{% static 'js/livesearch.js' %}?v{{ settings.VERSION }}"></script>
-{% endblock %}
diff --git a/netbox/templates/ipam/ipaddress_unassign.html b/netbox/templates/ipam/ipaddress_unassign.html
deleted file mode 100644
index 5cd83abb9..000000000
--- a/netbox/templates/ipam/ipaddress_unassign.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends 'utilities/confirmation_form.html' %}
-{% load form_helpers %}
-
-{% block title %}Remove {{ ipaddress }} from {{ ipaddress.interface }}?{% endblock %}
-
-{% block message %}
-    <p>Are you sure you want to remove this IP address from <strong>{{ ipaddress.interface.device }} {{ ipaddress.interface }}</strong>?</p>
-{% endblock %}

From 1308839a411f3b4e68243947eb1ea8510eb8ac35 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 29 Aug 2017 15:36:51 -0400
Subject: [PATCH 58/92] Fixes #1458: Corrected permission name on prefix/VLAN
 roles list

---
 netbox/templates/ipam/role_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/templates/ipam/role_list.html b/netbox/templates/ipam/role_list.html
index 6d59bc697..d1c5356f4 100644
--- a/netbox/templates/ipam/role_list.html
+++ b/netbox/templates/ipam/role_list.html
@@ -3,7 +3,7 @@
 
 {% block content %}
 <div class="pull-right">
-    {% if perms.dcim.add_devicerole %}
+    {% if perms.ipam.add_role %}
         <a href="{% url 'ipam:role_add' %}" class="btn btn-primary">
             <span class="fa fa-plus" aria-hidden="true"></span>
             Add a role

From 4b3a425888f134328990e7b6d18d38c7e9d34ea7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 29 Aug 2017 16:14:32 -0400
Subject: [PATCH 59/92] Fixed role link on IP address view

---
 netbox/templates/ipam/ipaddress.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index 789e89273..51a2fb23e 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -83,7 +83,11 @@
                 <tr>
                     <td>Role</td>
                     <td>
-                        <a href="{% url 'ipam:ipaddress_list' %}?role={{ ipaddress.role }}">{{ ipaddress.get_role_display }}</a>
+                        {% if ipaddress.role %}
+                            <a href="{% url 'ipam:ipaddress_list' %}?role={{ ipaddress.role }}">{{ ipaddress.get_role_display }}</a>
+                        {% else %}
+                            <span class="text-muted">None</span>
+                        {% endif %}
                     </td>
                 </tr>
                 <tr>

From c9288a052a89363268ece0d0345ded5681b595da Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 29 Aug 2017 16:48:11 -0400
Subject: [PATCH 60/92] Closes #1432: Added a commit_rate field to the circuits
 list search form

---
 netbox/circuits/forms.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py
index d9954e55b..2a2cd6843 100644
--- a/netbox/circuits/forms.py
+++ b/netbox/circuits/forms.py
@@ -170,6 +170,7 @@ class CircuitFilterForm(BootstrapMixin, CustomFieldFilterForm):
         queryset=Site.objects.annotate(filter_count=Count('circuit_terminations')),
         to_field_name='slug'
     )
+    commit_rate = forms.IntegerField(required=False, min_value=0, label='Commit rate (Kbps)')
 
 
 #

From f0d8fdf2d8a428106e3a17b5511a83411a58e871 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 29 Aug 2017 17:02:09 -0400
Subject: [PATCH 61/92] Closes #1431: Added interface form factor for
 10GBASE-CX4

---
 netbox/dcim/constants.py                      |  2 ++
 .../migrations/0042_interface_ff_10ge_cx4.py  | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 netbox/dcim/migrations/0042_interface_ff_10ge_cx4.py

diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py
index f2c047910..9c2993b60 100644
--- a/netbox/dcim/constants.py
+++ b/netbox/dcim/constants.py
@@ -58,6 +58,7 @@ IFACE_FF_1GE_FIXED = 1000
 IFACE_FF_1GE_GBIC = 1050
 IFACE_FF_1GE_SFP = 1100
 IFACE_FF_10GE_FIXED = 1150
+IFACE_FF_10GE_CX4 = 1170
 IFACE_FF_10GE_SFP_PLUS = 1200
 IFACE_FF_10GE_XFP = 1300
 IFACE_FF_10GE_XENPAK = 1310
@@ -106,6 +107,7 @@ IFACE_FF_CHOICES = [
             [IFACE_FF_100ME_FIXED, '100BASE-TX (10/100ME)'],
             [IFACE_FF_1GE_FIXED, '1000BASE-T (1GE)'],
             [IFACE_FF_10GE_FIXED, '10GBASE-T (10GE)'],
+            [IFACE_FF_10GE_CX4, '10GBASE-CX4 (10GE)'],
         ]
     ],
     [
diff --git a/netbox/dcim/migrations/0042_interface_ff_10ge_cx4.py b/netbox/dcim/migrations/0042_interface_ff_10ge_cx4.py
new file mode 100644
index 000000000..77bea6bc6
--- /dev/null
+++ b/netbox/dcim/migrations/0042_interface_ff_10ge_cx4.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-08-29 21:00
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0041_napalm_integration'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='interface',
+            name='form_factor',
+            field=models.PositiveSmallIntegerField(choices=[['Virtual interfaces', [[0, 'Virtual'], [200, 'Link Aggregation Group (LAG)']]], ['Ethernet (fixed)', [[800, '100BASE-TX (10/100ME)'], [1000, '1000BASE-T (1GE)'], [1150, '10GBASE-T (10GE)'], [1170, '10GBASE-CX4 (10GE)']]], ['Ethernet (modular)', [[1050, 'GBIC (1GE)'], [1100, 'SFP (1GE)'], [1200, 'SFP+ (10GE)'], [1300, 'XFP (10GE)'], [1310, 'XENPAK (10GE)'], [1320, 'X2 (10GE)'], [1350, 'SFP28 (25GE)'], [1400, 'QSFP+ (40GE)'], [1500, 'CFP (100GE)'], [1600, 'QSFP28 (100GE)']]], ['Wireless', [[2600, 'IEEE 802.11a'], [2610, 'IEEE 802.11b/g'], [2620, 'IEEE 802.11n'], [2630, 'IEEE 802.11ac'], [2640, 'IEEE 802.11ad']]], ['FibreChannel', [[3010, 'SFP (1GFC)'], [3020, 'SFP (2GFC)'], [3040, 'SFP (4GFC)'], [3080, 'SFP+ (8GFC)'], [3160, 'SFP+ (16GFC)']]], ['Serial', [[4000, 'T1 (1.544 Mbps)'], [4010, 'E1 (2.048 Mbps)'], [4040, 'T3 (45 Mbps)'], [4050, 'E3 (34 Mbps)']]], ['Stacking', [[5000, 'Cisco StackWise'], [5050, 'Cisco StackWise Plus'], [5100, 'Cisco FlexStack'], [5150, 'Cisco FlexStack Plus'], [5200, 'Juniper VCP']]], ['Other', [[32767, 'Other']]]], default=1200),
+        ),
+        migrations.AlterField(
+            model_name='interfacetemplate',
+            name='form_factor',
+            field=models.PositiveSmallIntegerField(choices=[['Virtual interfaces', [[0, 'Virtual'], [200, 'Link Aggregation Group (LAG)']]], ['Ethernet (fixed)', [[800, '100BASE-TX (10/100ME)'], [1000, '1000BASE-T (1GE)'], [1150, '10GBASE-T (10GE)'], [1170, '10GBASE-CX4 (10GE)']]], ['Ethernet (modular)', [[1050, 'GBIC (1GE)'], [1100, 'SFP (1GE)'], [1200, 'SFP+ (10GE)'], [1300, 'XFP (10GE)'], [1310, 'XENPAK (10GE)'], [1320, 'X2 (10GE)'], [1350, 'SFP28 (25GE)'], [1400, 'QSFP+ (40GE)'], [1500, 'CFP (100GE)'], [1600, 'QSFP28 (100GE)']]], ['Wireless', [[2600, 'IEEE 802.11a'], [2610, 'IEEE 802.11b/g'], [2620, 'IEEE 802.11n'], [2630, 'IEEE 802.11ac'], [2640, 'IEEE 802.11ad']]], ['FibreChannel', [[3010, 'SFP (1GFC)'], [3020, 'SFP (2GFC)'], [3040, 'SFP (4GFC)'], [3080, 'SFP+ (8GFC)'], [3160, 'SFP+ (16GFC)']]], ['Serial', [[4000, 'T1 (1.544 Mbps)'], [4010, 'E1 (2.048 Mbps)'], [4040, 'T3 (45 Mbps)'], [4050, 'E3 (34 Mbps)']]], ['Stacking', [[5000, 'Cisco StackWise'], [5050, 'Cisco StackWise Plus'], [5100, 'Cisco FlexStack'], [5150, 'Cisco FlexStack Plus'], [5200, 'Juniper VCP']]], ['Other', [[32767, 'Other']]]], default=1200),
+        ),
+    ]

From aaca28c1a6414b1b50f0ba120d8bb7b00bd321da Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 29 Aug 2017 17:27:30 -0400
Subject: [PATCH 62/92] Closes #1402: Increased max length of name field for
 device components

---
 .../0043_device_component_name_lengths.py     | 70 +++++++++++++++++++
 netbox/dcim/models.py                         | 22 +++---
 2 files changed, 81 insertions(+), 11 deletions(-)
 create mode 100644 netbox/dcim/migrations/0043_device_component_name_lengths.py

diff --git a/netbox/dcim/migrations/0043_device_component_name_lengths.py b/netbox/dcim/migrations/0043_device_component_name_lengths.py
new file mode 100644
index 000000000..a52f50859
--- /dev/null
+++ b/netbox/dcim/migrations/0043_device_component_name_lengths.py
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-08-29 21:26
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0042_interface_ff_10ge_cx4'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='consoleport',
+            name='name',
+            field=models.CharField(max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='consoleporttemplate',
+            name='name',
+            field=models.CharField(max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='consoleserverport',
+            name='name',
+            field=models.CharField(max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='consoleserverporttemplate',
+            name='name',
+            field=models.CharField(max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='devicebaytemplate',
+            name='name',
+            field=models.CharField(max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='interface',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='interfacetemplate',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='poweroutlet',
+            name='name',
+            field=models.CharField(max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='poweroutlettemplate',
+            name='name',
+            field=models.CharField(max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='powerport',
+            name='name',
+            field=models.CharField(max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='powerporttemplate',
+            name='name',
+            field=models.CharField(max_length=50),
+        ),
+    ]
diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index 9f72fc83e..a44097f51 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -574,7 +574,7 @@ class ConsolePortTemplate(models.Model):
     A template for a ConsolePort to be created for a new Device.
     """
     device_type = models.ForeignKey('DeviceType', related_name='console_port_templates', on_delete=models.CASCADE)
-    name = models.CharField(max_length=30)
+    name = models.CharField(max_length=50)
 
     class Meta:
         ordering = ['device_type', 'name']
@@ -590,7 +590,7 @@ class ConsoleServerPortTemplate(models.Model):
     A template for a ConsoleServerPort to be created for a new Device.
     """
     device_type = models.ForeignKey('DeviceType', related_name='cs_port_templates', on_delete=models.CASCADE)
-    name = models.CharField(max_length=30)
+    name = models.CharField(max_length=50)
 
     class Meta:
         ordering = ['device_type', 'name']
@@ -606,7 +606,7 @@ class PowerPortTemplate(models.Model):
     A template for a PowerPort to be created for a new Device.
     """
     device_type = models.ForeignKey('DeviceType', related_name='power_port_templates', on_delete=models.CASCADE)
-    name = models.CharField(max_length=30)
+    name = models.CharField(max_length=50)
 
     class Meta:
         ordering = ['device_type', 'name']
@@ -622,7 +622,7 @@ class PowerOutletTemplate(models.Model):
     A template for a PowerOutlet to be created for a new Device.
     """
     device_type = models.ForeignKey('DeviceType', related_name='power_outlet_templates', on_delete=models.CASCADE)
-    name = models.CharField(max_length=30)
+    name = models.CharField(max_length=50)
 
     class Meta:
         ordering = ['device_type', 'name']
@@ -685,7 +685,7 @@ class InterfaceTemplate(models.Model):
     A template for a physical data interface on a new Device.
     """
     device_type = models.ForeignKey('DeviceType', related_name='interface_templates', on_delete=models.CASCADE)
-    name = models.CharField(max_length=30)
+    name = models.CharField(max_length=64)
     form_factor = models.PositiveSmallIntegerField(choices=IFACE_FF_CHOICES, default=IFACE_FF_10GE_SFP_PLUS)
     mgmt_only = models.BooleanField(default=False, verbose_name='Management only')
 
@@ -705,7 +705,7 @@ class DeviceBayTemplate(models.Model):
     A template for a DeviceBay to be created for a new parent Device.
     """
     device_type = models.ForeignKey('DeviceType', related_name='device_bay_templates', on_delete=models.CASCADE)
-    name = models.CharField(max_length=30)
+    name = models.CharField(max_length=50)
 
     class Meta:
         ordering = ['device_type', 'name']
@@ -1012,7 +1012,7 @@ class ConsolePort(models.Model):
     A physical console port within a Device. ConsolePorts connect to ConsoleServerPorts.
     """
     device = models.ForeignKey('Device', related_name='console_ports', on_delete=models.CASCADE)
-    name = models.CharField(max_length=30)
+    name = models.CharField(max_length=50)
     cs_port = models.OneToOneField('ConsoleServerPort', related_name='connected_console', on_delete=models.SET_NULL,
                                    verbose_name='Console server port', blank=True, null=True)
     connection_status = models.NullBooleanField(choices=CONNECTION_STATUS_CHOICES, default=CONNECTION_STATUS_CONNECTED)
@@ -1062,7 +1062,7 @@ class ConsoleServerPort(models.Model):
     A physical port within a Device (typically a designated console server) which provides access to ConsolePorts.
     """
     device = models.ForeignKey('Device', related_name='cs_ports', on_delete=models.CASCADE)
-    name = models.CharField(max_length=30)
+    name = models.CharField(max_length=50)
 
     objects = ConsoleServerPortManager()
 
@@ -1083,7 +1083,7 @@ class PowerPort(models.Model):
     A physical power supply (intake) port within a Device. PowerPorts connect to PowerOutlets.
     """
     device = models.ForeignKey('Device', related_name='power_ports', on_delete=models.CASCADE)
-    name = models.CharField(max_length=30)
+    name = models.CharField(max_length=50)
     power_outlet = models.OneToOneField('PowerOutlet', related_name='connected_port', on_delete=models.SET_NULL,
                                         blank=True, null=True)
     connection_status = models.NullBooleanField(choices=CONNECTION_STATUS_CHOICES, default=CONNECTION_STATUS_CONNECTED)
@@ -1127,7 +1127,7 @@ class PowerOutlet(models.Model):
     A physical power outlet (output) within a Device which provides power to a PowerPort.
     """
     device = models.ForeignKey('Device', related_name='power_outlets', on_delete=models.CASCADE)
-    name = models.CharField(max_length=30)
+    name = models.CharField(max_length=50)
 
     objects = PowerOutletManager()
 
@@ -1157,7 +1157,7 @@ class Interface(models.Model):
         blank=True,
         verbose_name='Parent LAG'
     )
-    name = models.CharField(max_length=30)
+    name = models.CharField(max_length=64)
     form_factor = models.PositiveSmallIntegerField(choices=IFACE_FF_CHOICES, default=IFACE_FF_10GE_SFP_PLUS)
     enabled = models.BooleanField(default=True)
     mac_address = MACAddressField(null=True, blank=True, verbose_name='MAC Address')

From ecdf66c4543e2b211647726aaffd2db41feffed9 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 29 Aug 2017 22:29:30 -0400
Subject: [PATCH 63/92] Closes #1326: Added dropdown widget with common values
 for circuit speed fields

---
 netbox/templates/circuits/circuit_edit.html   | 20 ++++++++++++-
 .../circuits/circuittermination_edit.html     | 28 +++++++++++++++++--
 .../templates/circuits/inc/speed_widget.html  | 17 +++++++++++
 3 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 netbox/templates/circuits/inc/speed_widget.html

diff --git a/netbox/templates/circuits/circuit_edit.html b/netbox/templates/circuits/circuit_edit.html
index 7cff002ae..63d38ef52 100644
--- a/netbox/templates/circuits/circuit_edit.html
+++ b/netbox/templates/circuits/circuit_edit.html
@@ -9,7 +9,16 @@
             {% render_field form.cid %}
             {% render_field form.type %}
             {% render_field form.install_date %}
-            {% render_field form.commit_rate %}
+            <div class="form-group">
+                <label class="col-md-3 control-label" for="id_commit_rate">{{ form.commit_rate.label }}</label>
+                <div class="col-md-9">
+                    <div class="input-group">
+                        {{ form.commit_rate }}
+                        {% include 'circuits/inc/speed_widget.html' with target_field='commit_rate' %}
+                    </div>
+                    <span class="help-block">{{ form.commit_rate.help_text }}</span>
+                </div>
+            </div>
             {% render_field form.description %}
         </div>
     </div>
@@ -35,3 +44,12 @@
         </div>
     </div>
 {% endblock %}
+
+{% block javascript %}
+<script type="text/javascript">
+    $("a.set_speed").click(function(e) {
+        e.preventDefault();
+        $("#id_" + $(this).attr("target")).val($(this).attr("data"));
+    });
+</script>
+{% endblock %}
diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html
index 13052966b..a2c7d966f 100644
--- a/netbox/templates/circuits/circuittermination_edit.html
+++ b/netbox/templates/circuits/circuittermination_edit.html
@@ -49,8 +49,26 @@
                 <div class="panel panel-default">
                     <div class="panel-heading"><strong>Termination Details</strong></div>
                     <div class="panel-body">
-                        {% render_field form.port_speed %}
-                        {% render_field form.upstream_speed %}
+                        <div class="form-group">
+                            <label class="col-md-3 control-label required" for="id_port_speed">{{ form.port_speed.label }}</label>
+                            <div class="col-md-9">
+                                <div class="input-group">
+                                    {{ form.port_speed }}
+                                    {% include 'circuits/inc/speed_widget.html' with target_field='port_speed' %}
+                                </div>
+                                <span class="help-block">{{ form.port_speed.help_text }}</span>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-md-3 control-label" for="id_upstream_speed">{{ form.upstream_speed.label }}</label>
+                            <div class="col-md-9">
+                                <div class="input-group">
+                                    {{ form.upstream_speed }}
+                                    {% include 'circuits/inc/speed_widget.html' with target_field='upstream_speed' %}
+                                </div>
+                                <span class="help-block">{{ form.upstream_speed.help_text }}</span>
+                            </div>
+                        </div>
                         {% render_field form.xconnect_id %}
                         {% render_field form.pp_info %}
                     </div>
@@ -72,4 +90,10 @@
 
 {% block javascript %}
 <script src="{% static 'js/livesearch.js' %}?v{{ settings.VERSION }}"></script>
+<script type="text/javascript">
+    $("a.set_speed").click(function(e) {
+        e.preventDefault();
+        $("#id_" + $(this).attr("target")).val($(this).attr("data"));
+    });
+</script>
 {% endblock %}
diff --git a/netbox/templates/circuits/inc/speed_widget.html b/netbox/templates/circuits/inc/speed_widget.html
new file mode 100644
index 000000000..988418945
--- /dev/null
+++ b/netbox/templates/circuits/inc/speed_widget.html
@@ -0,0 +1,17 @@
+<span class="input-group-btn">
+    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+        <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu dropdown-menu-right">
+        <li><a href="#" target="{{ target_field }}" data="10000" class="set_speed">10 Mbps</a></li>
+        <li><a href="#" target="{{ target_field }}" data="100000" class="set_speed">100 Mbps</a></li>
+        <li><a href="#" target="{{ target_field }}" data="1000000" class="set_speed">1 Gbps</a></li>
+        <li><a href="#" target="{{ target_field }}" data="10000000" class="set_speed">10 Gbps</a></li>
+        <li><a href="#" target="{{ target_field }}" data="25000000" class="set_speed">25 Gbps</a></li>
+        <li><a href="#" target="{{ target_field }}" data="40000000" class="set_speed">40 Gbps</a></li>
+        <li><a href="#" target="{{ target_field }}" data="100000000" class="set_speed">100 Gbps</a></li>
+        <li class="divider"></li>
+        <li><a href="#" target="{{ target_field }}" data="1544" class="set_speed">T1 (1.544 Mbps)</a></li>
+        <li><a href="#" target="{{ target_field }}" data="2048" class="set_speed">E1 (2.048 Mbps)</a></li>
+    </ul>
+</span>

From ae231b1d1bee62a1871fba343a8f80b0fda1d77f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 29 Aug 2017 22:42:06 -0400
Subject: [PATCH 64/92] Moved circuit speed humanization to a template tag

---
 netbox/circuits/models.py                     | 28 -------------------
 netbox/templates/circuits/circuit.html        |  2 +-
 .../circuits/inc/circuit_termination.html     |  8 ++++--
 netbox/utilities/templatetags/helpers.py      | 21 ++++++++++++++
 4 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/netbox/circuits/models.py b/netbox/circuits/models.py
index 1acd3f4a0..17b38a5d8 100644
--- a/netbox/circuits/models.py
+++ b/netbox/circuits/models.py
@@ -13,22 +13,6 @@ from utilities.models import CreatedUpdatedModel
 from .constants import *
 
 
-def humanize_speed(speed):
-    """
-    Humanize speeds given in Kbps (e.g. 10000000 becomes '10 Gbps')
-    """
-    if speed >= 1000000000 and speed % 1000000000 == 0:
-        return '{} Tbps'.format(speed / 1000000000)
-    elif speed >= 1000000 and speed % 1000000 == 0:
-        return '{} Gbps'.format(speed / 1000000)
-    elif speed >= 1000 and speed % 1000 == 0:
-        return '{} Mbps'.format(speed / 1000)
-    elif speed >= 1000:
-        return '{} Mbps'.format(float(speed) / 1000)
-    else:
-        return '{} Kbps'.format(speed)
-
-
 @python_2_unicode_compatible
 class Provider(CreatedUpdatedModel, CustomFieldModel):
     """
@@ -139,10 +123,6 @@ class Circuit(CreatedUpdatedModel, CustomFieldModel):
     def termination_z(self):
         return self._get_termination('Z')
 
-    def commit_rate_human(self):
-        return '' if not self.commit_rate else humanize_speed(self.commit_rate)
-    commit_rate_human.admin_order_field = 'commit_rate'
-
 
 @python_2_unicode_compatible
 class CircuitTermination(models.Model):
@@ -173,11 +153,3 @@ class CircuitTermination(models.Model):
             return CircuitTermination.objects.select_related('site').get(circuit=self.circuit, term_side=peer_side)
         except CircuitTermination.DoesNotExist:
             return None
-
-    def port_speed_human(self):
-        return humanize_speed(self.port_speed)
-    port_speed_human.admin_order_field = 'port_speed'
-
-    def upstream_speed_human(self):
-        return '' if not self.upstream_speed else humanize_speed(self.upstream_speed)
-    upstream_speed_human.admin_order_field = 'upstream_speed'
diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index 383d3bb7a..ce375daef 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -88,7 +88,7 @@
                     <td>Commit Rate</td>
                     <td>
                         {% if circuit.commit_rate %}
-                            {{ circuit.commit_rate_human }}
+                            {{ circuit.commit_rate|humanize_speed }}
                         {% else %}
                             <span class="text-muted">N/A</span>
                         {% endif %}
diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index 948ccfb9a..a1b236dcc 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -1,3 +1,5 @@
+{% load helpers %}
+
 <div class="panel panel-default">
     <div class="panel-heading">
         <div class="pull-right">
@@ -49,10 +51,10 @@
                 <td>Speed</td>
                 <td>
                     {% if termination.upstream_speed %}
-                        <i class="fa fa-arrow-down" title="Downstream"></i> {{ termination.port_speed_human }} &nbsp;
-                        <i class="fa fa-arrow-up" title="Upstream"></i> {{ termination.upstream_speed_human }}
+                        <i class="fa fa-arrow-down" title="Downstream"></i> {{ termination.port_speed|humanize_speed }} &nbsp;
+                        <i class="fa fa-arrow-up" title="Upstream"></i> {{ termination.upstream_speed|humanize_speed }}
                     {% else %}
-                        {{ termination.port_speed_human }}
+                        {{ termination.port_speed|humanize_speed }}
                     {% endif %}
                 </td>
             </tr>
diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index 7cb2753e7..0228df037 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -62,6 +62,27 @@ def bettertitle(value):
     return ' '.join([w[0].upper() + w[1:] for w in value.split()])
 
 
+@register.filter()
+def humanize_speed(speed):
+    """
+    Humanize speeds given in Kbps. Examples:
+
+        1544 => "1.544 Mbps"
+        100000 => "100 Mbps"
+        10000000 => "10 Gbps"
+    """
+    if speed >= 1000000000 and speed % 1000000000 == 0:
+        return '{} Tbps'.format(int(speed / 1000000000))
+    elif speed >= 1000000 and speed % 1000000 == 0:
+        return '{} Gbps'.format(int(speed / 1000000))
+    elif speed >= 1000 and speed % 1000 == 0:
+        return '{} Mbps'.format(int(speed / 1000))
+    elif speed >= 1000:
+        return '{} Mbps'.format(float(speed) / 1000)
+    else:
+        return '{} Kbps'.format(speed)
+
+
 @register.filter()
 def example_choices(field, arg=3):
     """

From a6ec1ba23b03a8720701ed3b18056364cd8cab9b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 30 Aug 2017 10:46:30 -0400
Subject: [PATCH 65/92] Closes #1376: Ignore anycast when detecting duplicate
 IPs

---
 netbox/ipam/views.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 05f16aa35..d0225e567 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -16,6 +16,7 @@ from utilities.views import (
     BulkCreateView, BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView,
 )
 from . import filters, forms, tables
+from .constants import IPADDRESS_ROLE_ANYCAST
 from .models import (
     Aggregate, IPAddress, PREFIX_STATUS_ACTIVE, PREFIX_STATUS_DEPRECATED, PREFIX_STATUS_RESERVED, Prefix, RIR, Role,
     Service, VLAN, VLANGroup, VRF,
@@ -624,6 +625,9 @@ class IPAddressView(View):
         ).select_related(
             'interface__device', 'nat_inside'
         )
+        # Exclude anycast IPs if this IP is anycast
+        if ipaddress.role == IPADDRESS_ROLE_ANYCAST:
+            duplicate_ips = duplicate_ips.exclude(role=IPADDRESS_ROLE_ANYCAST)
         duplicate_ips_table = tables.IPAddressTable(list(duplicate_ips), orderable=False)
 
         # Related IP table

From 643f64df3f02912957c2faf1a7555876fe00e2bc Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 30 Aug 2017 11:11:59 -0400
Subject: [PATCH 66/92] Closes #1341: Added a MEDIA_ROOT configuration setting
 to specify where uploaded files are stored on disk

---
 docs/configuration/optional-settings.md |  8 ++++++++
 netbox/netbox/configuration.example.py  |  4 ++++
 netbox/netbox/settings.py               | 10 +++++-----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/docs/configuration/optional-settings.md b/docs/configuration/optional-settings.md
index 83b289b9a..22916d54c 100644
--- a/docs/configuration/optional-settings.md
+++ b/docs/configuration/optional-settings.md
@@ -135,6 +135,14 @@ An API consumer can request an arbitrary number of objects by appending the "lim
 
 ---
 
+## MEDIA_ROOT
+
+Default: $BASE_DIR/netbox/media/
+
+The file path to the location where media files (such as image attachments) are stored. By default, this is the `netbox/media` directory within the base NetBox installation path.
+
+---
+
 ## NAPALM_USERNAME
 
 ## NAPALM_PASSWORD
diff --git a/netbox/netbox/configuration.example.py b/netbox/netbox/configuration.example.py
index 78e870072..192653dc4 100644
--- a/netbox/netbox/configuration.example.py
+++ b/netbox/netbox/configuration.example.py
@@ -93,6 +93,10 @@ MAINTENANCE_MODE = False
 # all objects by specifying "?limit=0".
 MAX_PAGE_SIZE = 1000
 
+# The file path where uploaded media such as image attachments are stored. A trailing slash is not needed. Note that
+# the default value of this setting is derived from the installed location.
+# MEDIA_ROOT = '/opt/netbox/netbox/media'
+
 # Credentials that NetBox will uses to authenticate to devices when connecting via NAPALM.
 NAPALM_USERNAME = ''
 NAPALM_PASSWORD = ''
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index eff6ac0bd..5e397598b 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -15,6 +15,8 @@ except ImportError:
 
 VERSION = '2.1.4-dev'
 
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
 # Import required configuration parameters
 ALLOWED_HOSTS = DATABASE = SECRET_KEY = None
 for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']:
@@ -44,14 +46,15 @@ LOGGING = getattr(configuration, 'LOGGING', {})
 LOGIN_REQUIRED = getattr(configuration, 'LOGIN_REQUIRED', False)
 MAINTENANCE_MODE = getattr(configuration, 'MAINTENANCE_MODE', False)
 MAX_PAGE_SIZE = getattr(configuration, 'MAX_PAGE_SIZE', 1000)
-PAGINATE_COUNT = getattr(configuration, 'PAGINATE_COUNT', 50)
-PREFER_IPV4 = getattr(configuration, 'PREFER_IPV4', False)
+MEDIA_ROOT = getattr(configuration, 'MEDIA_ROOT', os.path.join(BASE_DIR, 'media')).rstrip('/')
 NAPALM_USERNAME = getattr(configuration, 'NAPALM_USERNAME', '')
 NAPALM_PASSWORD = getattr(configuration, 'NAPALM_PASSWORD', '')
 NAPALM_TIMEOUT = getattr(configuration, 'NAPALM_TIMEOUT', 30)
 NAPALM_ARGS = getattr(configuration, 'NAPALM_ARGS', {})
 NETBOX_USERNAME = getattr(configuration, 'NETBOX_USERNAME', '')  # Deprecated
 NETBOX_PASSWORD = getattr(configuration, 'NETBOX_PASSWORD', '')  # Deprecated
+PAGINATE_COUNT = getattr(configuration, 'PAGINATE_COUNT', 50)
+PREFER_IPV4 = getattr(configuration, 'PREFER_IPV4', False)
 SHORT_DATE_FORMAT = getattr(configuration, 'SHORT_DATE_FORMAT', 'Y-m-d')
 SHORT_DATETIME_FORMAT = getattr(configuration, 'SHORT_DATETIME_FORMAT', 'Y-m-d H:i')
 SHORT_TIME_FORMAT = getattr(configuration, 'SHORT_TIME_FORMAT', 'H:i:s')
@@ -104,8 +107,6 @@ if LDAP_CONFIGURED:
             "netbox/ldap_config.py to disable LDAP."
         )
 
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
 # Database
 configuration.DATABASE.update({'ENGINE': 'django.db.backends.postgresql'})
 DATABASES = {
@@ -201,7 +202,6 @@ STATICFILES_DIRS = (
 )
 
 # Media
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 MEDIA_URL = '/{}media/'.format(BASE_PATH)
 
 # Disable default limit of 1000 fields per request. Needed for bulk deletion of objects. (Added in Django 1.10.)

From fde47133da8c5157f2cae04abb77eccbace6c831 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 30 Aug 2017 12:07:11 -0400
Subject: [PATCH 67/92] Fix global search placeholder text

---
 netbox/netbox/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/forms.py b/netbox/netbox/forms.py
index 85343ec77..72a3ab8de 100644
--- a/netbox/netbox/forms.py
+++ b/netbox/netbox/forms.py
@@ -35,7 +35,7 @@ OBJ_TYPE_CHOICES = (
 
 class SearchForm(BootstrapMixin, forms.Form):
     q = forms.CharField(
-        label='Query', widget=forms.TextInput(attrs={'style': 'width: 350px'})
+        label='Search', widget=forms.TextInput(attrs={'style': 'width: 350px'})
     )
     obj_type = forms.ChoiceField(
         choices=OBJ_TYPE_CHOICES, required=False, label='Type'

From e0ee0b9254553bb8b943e879cb660e42d3f1dc4b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 30 Aug 2017 14:08:39 -0400
Subject: [PATCH 68/92] Closes #1460: Hostnames with no domain are now
 acceptable in custom URL fields

---
 netbox/utilities/forms.py      | 17 ++++++-----------
 netbox/utilities/validators.py | 30 ++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 11 deletions(-)
 create mode 100644 netbox/utilities/validators.py

diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 7004d4260..36894ef26 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -7,9 +7,10 @@ from mptt.forms import TreeNodeMultipleChoiceField
 
 from django import forms
 from django.conf import settings
-from django.core.validators import URLValidator
 from django.urls import reverse_lazy
 
+from .validators import EnhancedURLValidator
+
 
 COLOR_CHOICES = (
     ('aa1409', 'Dark red'),
@@ -431,17 +432,11 @@ class FilterTreeNodeMultipleChoiceField(FilterChoiceFieldMixin, TreeNodeMultiple
 
 class LaxURLField(forms.URLField):
     """
-    Custom URLField which allows any valid URL scheme
+    Modifies Django's built-in URLField in two ways:
+      1) Allow any valid scheme per RFC 3986 section 3.1
+      2) Remove the requirement for fully-qualified domain names (e.g. http://myserver/ is valid)
     """
-
-    class AnyURLScheme(object):
-        # A fake URL list which "contains" all scheme names abiding by the syntax defined in RFC 3986 section 3.1
-        def __contains__(self, item):
-            if not item or not re.match('^[a-z][0-9a-z+\-.]*$', item.lower()):
-                return False
-            return True
-
-    default_validators = [URLValidator(schemes=AnyURLScheme())]
+    default_validators = [EnhancedURLValidator()]
 
 
 #
diff --git a/netbox/utilities/validators.py b/netbox/utilities/validators.py
new file mode 100644
index 000000000..b5b058111
--- /dev/null
+++ b/netbox/utilities/validators.py
@@ -0,0 +1,30 @@
+from __future__ import unicode_literals
+import re
+
+from django.core.validators import _lazy_re_compile, URLValidator
+
+
+class EnhancedURLValidator(URLValidator):
+    """
+    Extends Django's built-in URLValidator to permit the use of hostnames with no domain extension.
+    """
+
+    class AnyURLScheme(object):
+        """
+        A fake URL list which "contains" all scheme names abiding by the syntax defined in RFC 3986 section 3.1
+        """
+        def __contains__(self, item):
+            if not item or not re.match('^[a-z][0-9a-z+\-.]*$', item.lower()):
+                return False
+            return True
+
+    fqdn_re = URLValidator.hostname_re + URLValidator.domain_re + URLValidator.tld_re
+    host_res = [URLValidator.ipv4_re, URLValidator.ipv6_re, fqdn_re, URLValidator.hostname_re]
+    regex = _lazy_re_compile(
+        r'^(?:[a-z0-9\.\-\+]*)://'          # Scheme (previously enforced by AnyURLScheme or schemes kwarg)
+        r'(?:\S+(?::\S*)?@)?'               # HTTP basic authentication
+        r'(?:' + '|'.join(host_res) + ')'   # IPv4, IPv6, FQDN, or hostname
+        r'(?::\d{2,5})?'                    # Port number
+        r'(?:[/?#][^\s]*)?'                 # Path
+        r'\Z', re.IGNORECASE)
+    schemes = AnyURLScheme()

From e6b6082a2b7cca98fbf55764a4e0788568335a74 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 30 Aug 2017 14:40:52 -0400
Subject: [PATCH 69/92] Release v2.1.4

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 5e397598b..d3162bfe2 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -13,7 +13,7 @@ except ImportError:
     )
 
 
-VERSION = '2.1.4-dev'
+VERSION = '2.1.4'
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 

From 372e9335b16c74266e581c8802c6c8b1fec6f320 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 30 Aug 2017 14:44:55 -0400
Subject: [PATCH 70/92] Post-release version bump

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index d3162bfe2..02cb5953d 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -13,7 +13,7 @@ except ImportError:
     )
 
 
-VERSION = '2.1.4'
+VERSION = '2.1.5-dev'
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 

From 6b53d263fea334fda4e3030c980a1552928e3270 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 1 Sep 2017 13:00:44 -0400
Subject: [PATCH 71/92] Fixes #1469: Allow a NAT IP to be assigned as the
 primary IP for a device

---
 netbox/dcim/forms.py  | 29 ++++++++++++++++++++++-------
 netbox/dcim/models.py | 16 ++++++++++++++--
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 440c12623..a0fa14764 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -642,13 +642,28 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldForm):
 
             # Compile list of choices for primary IPv4 and IPv6 addresses
             for family in [4, 6]:
-                ip_choices = []
-                interface_ips = IPAddress.objects.filter(family=family, interface__device=self.instance)
-                ip_choices += [(ip.id, '{} ({})'.format(ip.address, ip.interface)) for ip in interface_ips]
-                nat_ips = IPAddress.objects.filter(family=family, nat_inside__interface__device=self.instance)\
-                    .select_related('nat_inside__interface')
-                ip_choices += [(ip.id, '{} ({} NAT)'.format(ip.address, ip.nat_inside.interface)) for ip in nat_ips]
-                self.fields['primary_ip{}'.format(family)].choices = [(None, '---------')] + ip_choices
+                ip_choices = [(None, '---------')]
+                # Collect interface IPs
+                interface_ips = IPAddress.objects.select_related('interface').filter(
+                    family=family, interface__device=self.instance
+                )
+                if interface_ips:
+                    ip_choices.append(
+                        ('Interface IPs', [
+                            (ip.id, '{} ({})'.format(ip.address, ip.interface)) for ip in interface_ips
+                        ])
+                    )
+                # Collect NAT IPs
+                nat_ips = IPAddress.objects.select_related('nat_inside').filter(
+                    family=family, nat_inside__interface__device=self.instance
+                )
+                if nat_ips:
+                    ip_choices.append(
+                        ('NAT IPs', [
+                            (ip.id, '{} ({})'.format(ip.address, ip.nat_inside.address)) for ip in nat_ips
+                        ])
+                    )
+                self.fields['primary_ip{}'.format(family)].choices = ip_choices
 
             # If editing an existing device, exclude it from the list of occupied rack units. This ensures that a device
             # can be flipped from one face to another.
diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index a44097f51..a189d9f29 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -891,13 +891,25 @@ class Device(CreatedUpdatedModel, CustomFieldModel):
                 pass
 
         # Validate primary IPv4 address
-        if self.primary_ip4 and (self.primary_ip4.interface is None or self.primary_ip4.interface.device != self):
+        if self.primary_ip4 and (
+            self.primary_ip4.interface is None or
+            self.primary_ip4.interface.device != self
+        ) and (
+            self.primary_ip4.nat_inside.interface is None or
+            self.primary_ip4.nat_inside.interface.device != self
+        ):
             raise ValidationError({
                 'primary_ip4': "The specified IP address ({}) is not assigned to this device.".format(self.primary_ip4),
             })
 
         # Validate primary IPv6 address
-        if self.primary_ip6 and (self.primary_ip6.interface is None or self.primary_ip6.interface.device != self):
+        if self.primary_ip6 and (
+            self.primary_ip6.interface is None or
+            self.primary_ip6.interface.device != self
+        ) and (
+            self.primary_ip6.nat_inside.interface is None or
+            self.primary_ip6.nat_inside.interface.device != self
+        ):
             raise ValidationError({
                 'primary_ip6': "The specified IP address ({}) is not assigned to this device.".format(self.primary_ip6),
             })

From b6df0209ba6006ce648b8cda0fa60bcbb07223fc Mon Sep 17 00:00:00 2001
From: huzichunjohn <huzichunjohn@126.com>
Date: Mon, 11 Sep 2017 22:55:04 +0800
Subject: [PATCH 72/92] Fixes #1472: Secret truncated when using '<' character
 (#1477)

---
 netbox/project-static/js/secrets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/project-static/js/secrets.js b/netbox/project-static/js/secrets.js
index 638638623..d1ec3d883 100644
--- a/netbox/project-static/js/secrets.js
+++ b/netbox/project-static/js/secrets.js
@@ -43,7 +43,7 @@ $(document).ready(function() {
             success: function (response, status) {
                 if (response.plaintext) {
                     console.log("Secret retrieved successfully");
-                    $('#secret_' + secret_id).html(response.plaintext);
+                    $('#secret_' + secret_id).text(response.plaintext);
                     $('button.unlock-secret[secret-id=' + secret_id + ']').hide();
                     $('button.lock-secret[secret-id=' + secret_id + ']').show();
                 } else {

From 17c1a1e4657be60dd1d222a390c3f1fbb664f1ce Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 14 Sep 2017 14:45:45 -0400
Subject: [PATCH 73/92] Use add_blank_choice() to prepend a null choice to
 field options

---
 netbox/dcim/forms.py | 10 ++--------
 netbox/ipam/forms.py |  7 ++-----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index a0fa14764..3df486a1b 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -12,7 +12,7 @@ from ipam.models import IPAddress
 from tenancy.forms import TenancyForm
 from tenancy.models import Tenant
 from utilities.forms import (
-    APISelect, add_blank_choice, ArrayFieldSelectMultiple, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect,
+    APISelect, ArrayFieldSelectMultiple, add_blank_choice, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect,
     ChainedFieldsMixin, ChainedModelChoiceField, CommentField, ConfirmationForm, CSVChoiceField, ExpandableNameField,
     FilterChoiceField, FlexibleModelChoiceField, Livesearch, SelectWithDisabled, SmallTextarea, SlugField,
     FilterTreeNodeMultipleChoiceField,
@@ -28,12 +28,6 @@ from .models import (
 )
 
 
-FORM_STATUS_CHOICES = [
-    ['', '---------'],
-]
-
-FORM_STATUS_CHOICES += STATUS_CHOICES
-
 DEVICE_BY_PK_RE = '{\d+\}'
 
 
@@ -863,7 +857,7 @@ class DeviceBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
     device_role = forms.ModelChoiceField(queryset=DeviceRole.objects.all(), required=False, label='Role')
     tenant = forms.ModelChoiceField(queryset=Tenant.objects.all(), required=False)
     platform = forms.ModelChoiceField(queryset=Platform.objects.all(), required=False)
-    status = forms.ChoiceField(choices=FORM_STATUS_CHOICES, required=False, initial='', label='Status')
+    status = forms.ChoiceField(choices=add_blank_choice(STATUS_CHOICES), required=False, initial='')
     serial = forms.CharField(max_length=50, required=False, label='Serial Number')
 
     class Meta:
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index e19376e8e..4152b44c1 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -25,11 +25,8 @@ IP_FAMILY_CHOICES = [
     (6, 'IPv6'),
 ]
 
-PREFIX_MASK_LENGTH_CHOICES = [
-    ('', '---------'),
-] + [(i, i) for i in range(1, 128)]
-
-IPADDRESS_MASK_LENGTH_CHOICES = PREFIX_MASK_LENGTH_CHOICES + [(128, 128)]
+PREFIX_MASK_LENGTH_CHOICES = add_blank_choice([(i, i) for i in range(1, 128)])
+IPADDRESS_MASK_LENGTH_CHOICES = add_blank_choice([(i, i) for i in range(1, 129)])
 
 
 #

From b84b526a434590797b9fadb3ceb7b9aafffeaa40 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 15 Sep 2017 15:14:35 -0400
Subject: [PATCH 74/92] Closes #1484: Added individual "add VLAN" buttons on
 the VLAN groups list

---
 netbox/ipam/models.py | 10 ++++++++++
 netbox/ipam/tables.py |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index bbd5e1827..214293b7d 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -512,6 +512,16 @@ class VLANGroup(models.Model):
     def get_absolute_url(self):
         return "{}?group_id={}".format(reverse('ipam:vlan_list'), self.pk)
 
+    def get_next_available_vid(self):
+        """
+        Return the first available VLAN ID (1-4094) in the group.
+        """
+        vids = [vlan['vid'] for vlan in self.vlans.order_by('vid').values('vid')]
+        for i in range(1, 4095):
+            if i not in vids:
+                return i
+        return None
+
 
 @python_2_unicode_compatible
 class VLAN(CreatedUpdatedModel, CustomFieldModel):
diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 96127aec5..512b75649 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -120,6 +120,13 @@ VLAN_ROLE_LINK = """
 """
 
 VLANGROUP_ACTIONS = """
+{% with next_vid=record.get_next_available_vid %}
+    {% if next_vid and perms.ipam.add_vlan %}
+        <a href="{% url 'ipam:vlan_add' %}?site={{ record.site_id }}&group={{ record.pk }}&vid={{ next_vid }}" title="Add VLAN" class="btn btn-xs btn-success">
+            <i class="glyphicon glyphicon-plus" aria-hidden="true"></i>
+        </a>
+    {% endif %}
+{% endwith %}
 {% if perms.ipam.change_vlangroup %}
     <a href="{% url 'ipam:vlangroup_edit' pk=record.pk %}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
 {% endif %}

From 81df837a3381ebc9f89ea0bbfb15f191042d8bd8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 15 Sep 2017 15:28:09 -0400
Subject: [PATCH 75/92] Closes #1485: Added LOGIN_BANNER configuration setting
 to display a banner on the login page

---
 docs/configuration/optional-settings.md | 8 +++++++-
 netbox/netbox/configuration.example.py  | 7 +++++--
 netbox/netbox/settings.py               | 5 +++--
 netbox/templates/login.html             | 7 ++++++-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/docs/configuration/optional-settings.md b/docs/configuration/optional-settings.md
index 22916d54c..9cc4e75fd 100644
--- a/docs/configuration/optional-settings.md
+++ b/docs/configuration/optional-settings.md
@@ -17,7 +17,7 @@ ADMINS = [
 
 ## BANNER_BOTTOM
 
-Setting these variables will display content in a banner at the top and/or bottom of the page, respectively. To replicate the content of the top banner in the bottom banner, set:
+Setting these variables will display content in a banner at the top and/or bottom of the page, respectively. HTML is allowed. To replicate the content of the top banner in the bottom banner, set:
 
 ```
 BANNER_TOP = 'Your banner text'
@@ -26,6 +26,12 @@ BANNER_BOTTOM = BANNER_TOP
 
 ---
 
+## BANNER_LOGIN
+
+The value of this variable will be displayed on the login page above the login form. HTML is allowed.
+
+---
+
 ## BASE_PATH
 
 Default: None
diff --git a/netbox/netbox/configuration.example.py b/netbox/netbox/configuration.example.py
index 192653dc4..ce7a62464 100644
--- a/netbox/netbox/configuration.example.py
+++ b/netbox/netbox/configuration.example.py
@@ -38,11 +38,14 @@ ADMINS = [
     # ['John Doe', 'jdoe@example.com'],
 ]
 
-# Optionally display a persistent banner at the top and/or bottom of every page. To display the same content in both
-# banners, define BANNER_TOP and set BANNER_BOTTOM = BANNER_TOP.
+# Optionally display a persistent banner at the top and/or bottom of every page. HTML is allowed. To display the same
+# content in both banners, define BANNER_TOP and set BANNER_BOTTOM = BANNER_TOP.
 BANNER_TOP = ''
 BANNER_BOTTOM = ''
 
+# Text to include on the login page above the login form. HTML is allowed.
+BANNER_LOGIN = ''
+
 # Base URL path if accessing NetBox within a directory. For example, if installed at http://example.com/netbox/, set:
 # BASE_PATH = 'netbox/'
 BASE_PATH = ''
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 02cb5953d..e9d8c04f5 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -29,8 +29,9 @@ for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']:
 
 # Import optional configuration parameters
 ADMINS = getattr(configuration, 'ADMINS', [])
-BANNER_BOTTOM = getattr(configuration, 'BANNER_BOTTOM', False)
-BANNER_TOP = getattr(configuration, 'BANNER_TOP', False)
+BANNER_BOTTOM = getattr(configuration, 'BANNER_BOTTOM', '')
+BANNER_LOGIN = getattr(configuration, 'BANNER_LOGIN', '')
+BANNER_TOP = getattr(configuration, 'BANNER_TOP', '')
 BASE_PATH = getattr(configuration, 'BASE_PATH', '')
 if BASE_PATH:
     BASE_PATH = BASE_PATH.strip('/') + '/'  # Enforce trailing slash only
diff --git a/netbox/templates/login.html b/netbox/templates/login.html
index 07b10bfcc..a34b934cc 100644
--- a/netbox/templates/login.html
+++ b/netbox/templates/login.html
@@ -2,8 +2,13 @@
 {% load form_helpers %}
 
 {% block content %}
-<div class="row" style="margin-top: 150px;">
+<div class="row" style="margin-top: {% if settings.BANNER_LOGIN %}100{% else %}150{% endif %}px;">
     <div class="col-sm-4 col-sm-offset-4">
+        {% if settings.BANNER_LOGIN %}
+            <div style="margin-bottom: 25px">
+                {{ settings.BANNER_LOGIN|safe }}
+            </div>
+        {% endif %}
         {% if form.non_field_errors %}
             <div class="panel panel-danger">
                 <div class="panel-heading"><strong>Errors</strong></div>

From ae1662e43318dabc5f6d086a748fa4d941e5b2c9 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 18 Sep 2017 16:34:28 -0400
Subject: [PATCH 76/92] Fixes #1507: Fixed error when creating the next
 available IP from a prefix within a VRF

---
 netbox/ipam/api/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py
index 9cf93cb4b..abff09c15 100644
--- a/netbox/ipam/api/views.py
+++ b/netbox/ipam/api/views.py
@@ -98,7 +98,7 @@ class PrefixViewSet(WritableSerializerMixin, CustomFieldModelViewSet):
             # Create the new IP address
             data = request.data.copy()
             data['address'] = '{}/{}'.format(ipaddress, prefix.prefix.prefixlen)
-            data['vrf'] = prefix.vrf
+            data['vrf'] = prefix.vrf.pk if prefix.vrf else None
             serializer = serializers.WritableIPAddressSerializer(data=data)
             if serializer.is_valid():
                 serializer.save()

From eba30c4d792eacc427816391a1086be251df1526 Mon Sep 17 00:00:00 2001
From: Chris Howells <chris+github@chrishowells.co.uk>
Date: Mon, 18 Sep 2017 21:37:09 +0100
Subject: [PATCH 77/92] Document the PATCH method. Closes #1481. (#1482)

---
 docs/api/examples.md | 12 ++++++++++--
 docs/api/overview.md |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/api/examples.md b/docs/api/examples.md
index 5082534bc..4ec2f0f33 100644
--- a/docs/api/examples.md
+++ b/docs/api/examples.md
@@ -4,7 +4,8 @@ Supported HTTP methods:
 
 * `GET`: Retrieve an object or list of objects
 * `POST`: Create a new object
-* `PUT`: Update an existing object
+* `PUT`: Update an existing object, all mandatory fields must be specified
+* `PATCH`: Updates an existing object, only specifiying the field to be changed
 * `DELETE`: Delete an existing object
 
 To authenticate a request, attach your token in an `Authorization` header:
@@ -104,12 +105,19 @@ $ curl -X POST -H "Authorization: Token d2f763479f703d80de0ec15254237bc651f9cdc0
 
 ### Modify an existing site
 
-Make an authenticated `PUT` request to the site detail endpoint. As with a create (POST) request, all mandatory fields must be included.
+Make an authenticated `PUT` request to the site detail endpoint. As with a create (`POST`) request, all mandatory fields must be included.
 
 ```
 $ curl -X PUT -H "Authorization: Token d2f763479f703d80de0ec15254237bc651f9cdc0" -H "Content-Type: application/json" -H "Accept: application/json; indent=4" http://localhost:8000/api/dcim/sites/16/ --data '{"name": "Renamed Site", "slug": "renamed-site"}'
 ```
 
+### Modify an object by changing a field
+
+Make an authenticated `PATCH` request to the device endpoint. With `PATCH`, unlike `POST` and `PUT`, we only specify the field that is being changed. In this example, we add a serial number to a device.
+```
+$ curl -X PATCH -H "Authorization: Token d2f763479f703d80de0ec15254237bc651f9cdc0" -H "Content-Type: application/json" -H "Accept: application/json; indent=4" http://localhost:8000/api/dcim/devices/2549/ --data '{"serial": "FTX1123A090"}'
+```
+
 ### Delete an existing site
 
 Send an authenticated `DELETE` request to the site detail endpoint.
diff --git a/docs/api/overview.md b/docs/api/overview.md
index bdf0a2f4c..39a4109f9 100644
--- a/docs/api/overview.md
+++ b/docs/api/overview.md
@@ -6,7 +6,7 @@ REST stands for [representational state transfer](https://en.wikipedia.org/wiki/
 
 * `GET`: Retrieve an object or list of objects
 * `POST`: Create an object
-* `PUT` / `PATCH`: Modify an existing object
+* `PUT` / `PATCH`: Modify an existing object. `PUT` requires all mandatory fields to be specified, while `PATCH` only expects the field that is being modified to be specified.
 * `DELETE`: Delete an existing object
 
 The NetBox API represents all objects in [JavaScript Object Notation (JSON)](http://www.json.org/). This makes it very easy to interact with NetBox data on the command line with common tools. For example, we can request an IP address from NetBox and output the JSON using `curl` and `jq`. (Piping the output through `jq` isn't strictly required but makes it much easier to read.)

From b252f52f8e845f2fdf9c25917eb679566f7c1868 Mon Sep 17 00:00:00 2001
From: Ryan Breaker <ryan@breaker.rocks>
Date: Mon, 18 Sep 2017 15:37:51 -0500
Subject: [PATCH 78/92] Added missing package for CentOS and Fedora (#1470)

Without the added package, installation fails during `pip install -r requirements.txt` on the pycrypto package for me in CentOS 6 and 7 and Fedora.
---
 docs/installation/netbox.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/installation/netbox.md b/docs/installation/netbox.md
index b0928c1b5..d1aa5d001 100644
--- a/docs/installation/netbox.md
+++ b/docs/installation/netbox.md
@@ -20,7 +20,7 @@ Python 3:
 
 ```no-highlight
 # yum install -y epel-release
-# yum install -y gcc python34 python34-devel python34-setuptools libxml2-devel libxslt-devel libffi-devel graphviz openssl-devel
+# yum install -y gcc python34 python34-devel python34-setuptools libxml2-devel libxslt-devel libffi-devel graphviz openssl-devel redhat-rpm-config
 # easy_install-3.4 pip
 # ln -s -f python3.4 /usr/bin/python
 ```
@@ -29,7 +29,7 @@ Python 2:
 
 ```no-highlight
 # yum install -y epel-release
-# yum install -y gcc python2 python-devel python-pip libxml2-devel libxslt-devel libffi-devel graphviz openssl-devel
+# yum install -y gcc python2 python-devel python-pip libxml2-devel libxslt-devel libffi-devel graphviz openssl-devel redhat-rpm-config
 ```
 
 You may opt to install NetBox either from a numbered release or by cloning the master branch of its repository on GitHub.

From e31d2c9857baeffc067fbeab0efcbcde4b9b34e7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 20 Sep 2017 09:56:20 -0400
Subject: [PATCH 79/92] Fixes #1520: Redirect on GET request to bulk
 edit/delete views

---
 netbox/utilities/views.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 1ec21b628..ec91399df 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -478,7 +478,7 @@ class BulkEditView(View):
     template_name = 'utilities/obj_bulk_edit.html'
     default_return_url = 'home'
 
-    def get(self):
+    def get(self, request):
         return redirect(self.default_return_url)
 
     def post(self, request, **kwargs):
@@ -626,6 +626,9 @@ class BulkDeleteView(View):
     template_name = 'utilities/obj_bulk_delete.html'
     default_return_url = 'home'
 
+    def get(self, request):
+        return redirect(self.default_return_url)
+
     def post(self, request, **kwargs):
 
         # Attempt to derive parent object if a parent class has been given

From 4f9379a5e22783815cf7ed7c502f86ac90b26065 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 20 Sep 2017 14:44:51 -0400
Subject: [PATCH 80/92] Cleaned up device interfaces/IPs table

---
 netbox/project-static/css/base.css       | 13 ++--
 netbox/templates/dcim/inc/interface.html | 88 ++++++++++++++----------
 2 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css
index 0f6b24077..b013aab97 100644
--- a/netbox/project-static/css/base.css
+++ b/netbox/project-static/css/base.css
@@ -329,13 +329,14 @@ li.occupied + li.available {
 }
 
 /* Devices */
-table.component-list tr.ipaddress td {
-    background-color: #eeffff;
-    padding-bottom: 4px;
-    padding-top: 4px;
+table.component-list td.subtable {
+    padding: 0;
+    padding-left: 16px;
 }
-table.component-list tr.ipaddress:hover td {
-    background-color: #e6f7f7;
+table.component-list td.subtable td {
+    border: none;
+    padding-bottom: 6px;
+    padding-top: 6px;
 }
 
 /* AJAX loader */
diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index 75d0f027d..3845c8759 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -1,4 +1,4 @@
-<tr class="interface{% if not iface.enabled %} danger{% elif iface.connection and iface.connection.connection_status %} success{% elif iface.connection and not iface.connection.connection_status %} info{% endif %}">
+<tr class="interface{% if not iface.enabled %} danger{% elif iface.connection and iface.connection.connection_status or iface.circuit_termination %} success{% elif iface.connection and not iface.connection.connection_status %} info{% elif iface.is_virtual %} warning{% endif %}">
     {% if selectable and perms.dcim.change_interface or perms.dcim.delete_interface %}
         <td class="pk">
             <input name="pk" type="checkbox" value="{{ iface.pk }}" />
@@ -113,41 +113,55 @@
         {% endif %}
     </td>
 </tr>
-{% for ip in iface.ip_addresses.all %}
-    <tr class="ipaddress">
-        {% if selectable and perms.dcim.change_interface or perms.dcim.delete_interface %}
-            <td></td>
-        {% endif %}
-        <td colspan="3">
-            <a href="{% url 'ipam:ipaddress' pk=ip.pk %}">{{ ip }}</a>
-            {% if ip.description %}
-                <i class="fa fa-fw fa-comment-o" title="{{ ip.description }}"></i>
-            {% endif %}
-            {% if device.primary_ip4 == ip or device.primary_ip6 == ip %}
-                <span class="label label-success">Primary</span>
-            {% endif %}
-        </td>
-        <td class="text-right">
-            {% if ip.vrf %}
-                <a href="{% url 'ipam:vrf' pk=ip.vrf.pk %}">{{ ip.vrf }}</a>
+{% with iface.ip_addresses.all as ipaddresses %}
+    {% if ipaddresses %}
+        <tr class="ipaddress">
+            {% if selectable and perms.dcim.change_interface or perms.dcim.delete_interface %}
+                <td></td>
+                <td colspan="6" class="subtable">
             {% else %}
-                <span class="text-muted">Global</span>
+                <td colspan="7" class="subtable">
             {% endif %}
-        </td>
-        <td>
-            <span class="label label-{{ ip.get_status_class }}">{{ ip.get_status_display }}</span>
-        </td>
-        <td class="text-right">
-            {% if perms.ipam.change_ipaddress %}
-                <a href="{% url 'ipam:ipaddress_edit' pk=ip.pk %}?return_url={{ device.get_absolute_url }}" class="btn btn-info btn-xs">
-                    <i class="glyphicon glyphicon-pencil" aria-hidden="true" title="Edit IP address"></i>
-                </a>
-            {% endif %}
-            {% if perms.ipam.delete_ipaddress %}
-                <a href="{% url 'ipam:ipaddress_delete' pk=ip.pk %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                    <i class="glyphicon glyphicon-trash" aria-hidden="true" title="Delete IP address"></i>
-                </a>
-            {% endif %}
-        </td>
-    </tr>
-{% endfor %}
+            <table class="table table-hover">
+                {% for ip in ipaddresses %}
+                    <tr>
+                        <td>
+                            <a href="{% url 'ipam:ipaddress' pk=ip.pk %}">{{ ip }}</a>
+                            {% if ip.description %}
+                                <i class="fa fa-fw fa-comment-o" title="{{ ip.description }}"></i>
+                            {% endif %}
+                        </td>
+                        <td>
+                            {% if device.primary_ip4 == ip or device.primary_ip6 == ip %}
+                                <span class="label label-success">Primary</span>
+                            {% endif %}
+                        </td>
+                        <td>
+                            {% if ip.vrf %}
+                                <a href="{% url 'ipam:vrf' pk=ip.vrf.pk %}">{{ ip.vrf }}</a>
+                            {% else %}
+                                <span class="text-muted">Global table</span>
+                            {% endif %}
+                        </td>
+                        <td>
+                            <span class="label label-{{ ip.get_status_class }}">{{ ip.get_status_display }}</span>
+                        </td>
+                        <td class="text-right">
+                            {% if perms.ipam.change_ipaddress %}
+                                <a href="{% url 'ipam:ipaddress_edit' pk=ip.pk %}?return_url={{ device.get_absolute_url }}" class="btn btn-info btn-xs">
+                                    <i class="glyphicon glyphicon-pencil" aria-hidden="true" title="Edit IP address"></i>
+                                </a>
+                            {% endif %}
+                            {% if perms.ipam.delete_ipaddress %}
+                                <a href="{% url 'ipam:ipaddress_delete' pk=ip.pk %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                    <i class="glyphicon glyphicon-trash" aria-hidden="true" title="Delete IP address"></i>
+                                </a>
+                            {% endif %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </table>
+            </td>
+        </tr>
+    {% endif %}
+{% endwith %}

From a52a871a94383a1b13b2341a296189ca119322a8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 20 Sep 2017 16:54:27 -0400
Subject: [PATCH 81/92] Fixes #1522: Removed object create/edit forms from the
 browsable API

---
 netbox/netbox/settings.py |  4 ++++
 netbox/utilities/api.py   | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index e9d8c04f5..13ae4c48b 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -234,6 +234,10 @@ REST_FRAMEWORK = {
     'DEFAULT_PERMISSION_CLASSES': (
         'utilities.api.TokenPermissions',
     ),
+    'DEFAULT_RENDERER_CLASSES': (
+        'rest_framework.renderers.JSONRenderer',
+        'utilities.api.FormlessBrowsableAPIRenderer',
+    ),
     'DEFAULT_VERSION': REST_FRAMEWORK_VERSION,
     'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.AcceptHeaderVersioning',
     'PAGE_SIZE': PAGINATE_COUNT,
diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 36728a660..3698bc47c 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -8,6 +8,7 @@ from rest_framework.compat import is_authenticated
 from rest_framework.exceptions import APIException
 from rest_framework.pagination import LimitOffsetPagination
 from rest_framework.permissions import BasePermission, DjangoModelPermissions, SAFE_METHODS
+from rest_framework.renderers import BrowsableAPIRenderer
 from rest_framework.serializers import Field, ModelSerializer, ValidationError
 from rest_framework.views import get_view_name as drf_get_view_name
 
@@ -206,6 +207,18 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination):
         return self.default_limit
 
 
+#
+# Renderers
+#
+
+class FormlessBrowsableAPIRenderer(BrowsableAPIRenderer):
+    """
+    Override the built-in BrowsableAPIRenderer to disable HTML forms.
+    """
+    def show_form_for_method(self, *args, **kwargs):
+        return False
+
+
 #
 # Miscellaneous
 #

From 466ab0b4042da616d33e403cbd0b49a49788b821 Mon Sep 17 00:00:00 2001
From: Lars Hartmann <lars.hartmann@tbh.eu>
Date: Thu, 21 Sep 2017 16:36:25 +0200
Subject: [PATCH 82/92] mentioned support of nested groups in LDAP installation
 documentation.

---
 docs/installation/ldap.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/installation/ldap.md b/docs/installation/ldap.md
index b43105b8b..bb1618e32 100644
--- a/docs/installation/ldap.md
+++ b/docs/installation/ldap.md
@@ -78,6 +78,8 @@ AUTH_LDAP_USER_ATTR_MAP = {
 ```
 
 # User Groups for Permissions
+!!! 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
 from django_auth_ldap.config import LDAPSearch, GroupOfNamesType

From 126a5e5e4e7a74c34f63872bc5500dc5dccadbd6 Mon Sep 17 00:00:00 2001
From: Joey Wilhelm <jwilhelm@godaddy.com>
Date: Thu, 21 Sep 2017 10:33:34 -0700
Subject: [PATCH 83/92] Fix order_naturally with unbalanced names and use
 RawSQL instead of extra

---
 netbox/dcim/models.py            | 48 +++++++++++++++--------
 netbox/dcim/tests/test_models.py | 66 ++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 16 deletions(-)

diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index a189d9f29..52527cc19 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -13,6 +13,7 @@ from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.db.models import Count, Q, ObjectDoesNotExist
+from django.db.models.expressions import RawSQL
 from django.urls import reverse
 from django.utils.encoding import python_2_unicode_compatible
 
@@ -642,15 +643,16 @@ class InterfaceQuerySet(models.QuerySet):
         To order interfaces naturally, the `name` field is split into six distinct components: leading text (type),
         slot, subslot, position, channel, and virtual circuit:
 
-            {type}{slot}/{subslot}/{position}:{channel}.{vc}
+            {type}{slot}/{subslot}/{position}/{subposition}:{channel}.{vc}
 
-        Components absent from the interface name are ignored. For example, an interface named GigabitEthernet0/1 would
-        be parsed as follows:
+        Components absent from the interface name are ignored. For example, an interface named GigabitEthernet1/2/3
+        would be parsed as follows:
 
             name = 'GigabitEthernet'
-            slot =  None
-            subslot = 0
-            position = 1
+            slot =  1
+            subslot = 2
+            position = 3
+            subposition = 0
             channel = None
             vc = 0
 
@@ -659,17 +661,31 @@ class InterfaceQuerySet(models.QuerySet):
         """
         sql_col = '{}.name'.format(self.model._meta.db_table)
         ordering = {
-            IFACE_ORDERING_POSITION: ('_slot', '_subslot', '_position', '_channel', '_vc', '_type', 'name'),
-            IFACE_ORDERING_NAME: ('_type', '_slot', '_subslot', '_position', '_channel', '_vc', 'name'),
+            IFACE_ORDERING_POSITION: ('_slot', '_subslot', '_position', '_subposition', '_channel', '_vc', '_type', 'name'),
+            IFACE_ORDERING_NAME: ('_type', '_slot', '_subslot', '_position', '_subposition', '_channel', '_vc', 'name'),
         }[method]
-        return self.extra(select={
-            '_type': "SUBSTRING({} FROM '^([^0-9]+)')".format(sql_col),
-            '_slot': "CAST(SUBSTRING({} FROM '([0-9]+)\/[0-9]+\/[0-9]+(:[0-9]+)?(\.[0-9]+)?$') AS integer)".format(sql_col),
-            '_subslot': "CAST(SUBSTRING({} FROM '([0-9]+)\/[0-9]+(:[0-9]+)?(\.[0-9]+)?$') AS integer)".format(sql_col),
-            '_position': "CAST(SUBSTRING({} FROM '([0-9]+)(:[0-9]+)?(\.[0-9]+)?$') AS integer)".format(sql_col),
-            '_channel': "COALESCE(CAST(SUBSTRING({} FROM ':([0-9]+)(\.[0-9]+)?$') AS integer), 0)".format(sql_col),
-            '_vc': "COALESCE(CAST(SUBSTRING({} FROM '\.([0-9]+)$') AS integer), 0)".format(sql_col),
-        }).order_by(*ordering)
+
+        fields = {
+            '_type': RawSQL(r"SUBSTRING({} FROM '^([^0-9]+)')".format(sql_col), []),
+            '_slot': RawSQL(r"CAST(SUBSTRING({} FROM '^(?:[^0-9]+)([0-9]+)') AS integer)".format(sql_col), []),
+            '_subslot': RawSQL(
+                r"COALESCE(CAST(SUBSTRING({} FROM '^(?:[^0-9]+)(?:[0-9]+)\/([0-9]+)') AS integer), 0)".format(
+                    sql_col), []
+            ),
+            '_position': RawSQL(
+                r"COALESCE(CAST(SUBSTRING({} FROM '^(?:[^0-9]+)(?:[0-9]+\/){{2}}([0-9]+)') AS integer), 0)".format(
+                    sql_col), []
+            ),
+            '_subposition': RawSQL(
+                r"COALESCE(CAST(SUBSTRING({} FROM '^(?:[^0-9]+)(?:[0-9]+\/){{3}}([0-9]+)') AS integer), 0)".format(
+                    sql_col), []
+            ),
+            '_channel': RawSQL(
+                r"COALESCE(CAST(SUBSTRING({} FROM ':([0-9]+)(\.[0-9]+)?$') AS integer), 0)".format(sql_col), []),
+            '_vc': RawSQL(r"COALESCE(CAST(SUBSTRING({} FROM '\.([0-9]+)$') AS integer), 0)".format(sql_col), []),
+        }
+
+        return self.annotate(**fields).order_by(*ordering)
 
     def connectable(self):
         """
diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py
index 340c58092..9acbe3901 100644
--- a/netbox/dcim/tests/test_models.py
+++ b/netbox/dcim/tests/test_models.py
@@ -98,3 +98,69 @@ class RackTestCase(TestCase):
             face=None,
         )
         self.assertTrue(pdu)
+
+
+class InterfaceTestCase(TestCase):
+
+    def setUp(self):
+
+        self.site = Site.objects.create(
+            name='TestSite1',
+            slug='my-test-site'
+        )
+        self.rack = Rack.objects.create(
+            name='TestRack1',
+            facility_id='A101',
+            site=self.site,
+            u_height=42
+        )
+        self.manufacturer = Manufacturer.objects.create(
+            name='Acme',
+            slug='acme'
+        )
+
+        self.device_type = DeviceType.objects.create(
+            manufacturer=self.manufacturer,
+            model='FrameForwarder 2048',
+            slug='ff2048'
+        )
+        self.role = DeviceRole.objects.create(
+            name='Switch',
+            slug='switch',
+        )
+
+    def test_device_port_order_natural(self):
+        device1 = Device.objects.create(
+            name='TestSwitch1',
+            device_type=self.device_type,
+            device_role=self.role,
+            site=self.site,
+            rack=self.rack,
+            position=10,
+            face=RACK_FACE_REAR,
+        )
+        interface1 = Interface.objects.create(
+            device=device1,
+            name='Ethernet1/3/1'
+        )
+        interface2 = Interface.objects.create(
+            device=device1,
+            name='Ethernet1/5/1'
+        )
+        interface3 = Interface.objects.create(
+            device=device1,
+            name='Ethernet1/4'
+        )
+        interface4 = Interface.objects.create(
+            device=device1,
+            name='Ethernet1/3/2/4'
+        )
+        interface5 = Interface.objects.create(
+            device=device1,
+            name='Ethernet1/3/2/1'
+        )
+
+        self.assertEqual(
+            list(Interface.objects.all().order_naturally()),
+            [interface1, interface5, interface4, interface3, interface2]
+        )

From 89194c067b89287eb5b912a01772f1aedb308ca0 Mon Sep 17 00:00:00 2001
From: Joey Wilhelm <jwilhelm@godaddy.com>
Date: Thu, 21 Sep 2017 17:20:21 -0700
Subject: [PATCH 84/92] Another test case to ensure subinterface ordering

---
 netbox/dcim/tests/test_models.py | 41 +++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py
index 9acbe3901..00a4de28c 100644
--- a/netbox/dcim/tests/test_models.py
+++ b/netbox/dcim/tests/test_models.py
@@ -129,7 +129,7 @@ class InterfaceTestCase(TestCase):
             slug='switch',
         )
 
-    def test_device_port_order_natural(self):
+    def test_interface_order_natural(self):
         device1 = Device.objects.create(
             name='TestSwitch1',
             device_type=self.device_type,
@@ -164,3 +164,42 @@ class InterfaceTestCase(TestCase):
             list(Interface.objects.all().order_naturally()),
             [interface1, interface5, interface4, interface3, interface2]
         )
+
+    def test_interface_order_natural_subinterfaces(self):
+        device1 = Device.objects.create(
+            name='TestSwitch1',
+            device_type=self.device_type,
+            device_role=self.role,
+            site=self.site,
+            rack=self.rack,
+            position=10,
+            face=RACK_FACE_REAR,
+        )
+        interface1 = Interface.objects.create(
+            device=device1,
+            name='GigabitEthernet0/0/3'
+        )
+        interface2 = Interface.objects.create(
+            device=device1,
+            name='GigabitEthernet0/0/2.2'
+        )
+        interface3 = Interface.objects.create(
+            device=device1,
+            name='GigabitEthernet0/0/0.120'
+        )
+        interface4 = Interface.objects.create(
+            device=device1,
+            name='GigabitEthernet0/0/0'
+        )
+        interface5 = Interface.objects.create(
+            device=device1,
+            name='GigabitEthernet0/0/1.117'
+        )
+        interface6 = Interface.objects.create(
+            device=device1,
+            name='GigabitEthernet0'
+        )
+        self.assertEqual(
+            list(Interface.objects.all().order_naturally()),
+            [interface6, interface4, interface3, interface5, interface2, interface1]
+        )

From a010f7439d4598df4d0edfe6db0118e801aed39c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 22 Sep 2017 16:18:43 -0400
Subject: [PATCH 85/92] More work on #1523 (natural ordering for interfaces)

---
 netbox/dcim/models.py            | 42 +++++++++++++++++---------------
 netbox/dcim/tests/test_models.py |  8 ++++--
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index 52527cc19..311f02e99 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -661,28 +661,32 @@ class InterfaceQuerySet(models.QuerySet):
         """
         sql_col = '{}.name'.format(self.model._meta.db_table)
         ordering = {
-            IFACE_ORDERING_POSITION: ('_slot', '_subslot', '_position', '_subposition', '_channel', '_vc', '_type', 'name'),
-            IFACE_ORDERING_NAME: ('_type', '_slot', '_subslot', '_position', '_subposition', '_channel', '_vc', 'name'),
+            IFACE_ORDERING_POSITION: (
+                '_slot', '_subslot', '_position', '_subposition', '_channel', '_vc', '_type', '_id', 'name',
+            ),
+            IFACE_ORDERING_NAME: (
+                '_type', '_slot', '_subslot', '_position', '_subposition', '_channel', '_vc', '_id', 'name',
+            ),
         }[method]
 
+        TYPE_RE = r"SUBSTRING({} FROM '^([^0-9]+)')"
+        ID_RE = r"CAST(SUBSTRING({} FROM '^(?:[^0-9]+)([0-9]+)$') AS integer)"
+        SLOT_RE = r"CAST(SUBSTRING({} FROM '^(?:[^0-9]+)([0-9]+)\/') AS integer)"
+        SUBSLOT_RE = r"CAST(SUBSTRING({} FROM '^(?:[^0-9]+)(?:[0-9]+\/)([0-9]+)') AS integer)"
+        POSITION_RE = r"CAST(SUBSTRING({} FROM '^(?:[^0-9]+)(?:[0-9]+\/){{2}}([0-9]+)') AS integer)"
+        SUBPOSITION_RE = r"CAST(SUBSTRING({} FROM '^(?:[^0-9]+)(?:[0-9]+\/){{3}}([0-9]+)') AS integer)"
+        CHANNEL_RE = r"COALESCE(CAST(SUBSTRING({} FROM ':([0-9]+)(\.[0-9]+)?$') AS integer), 0)"
+        VC_RE = r"COALESCE(CAST(SUBSTRING({} FROM '\.([0-9]+)$') AS integer), 0)"
+
         fields = {
-            '_type': RawSQL(r"SUBSTRING({} FROM '^([^0-9]+)')".format(sql_col), []),
-            '_slot': RawSQL(r"CAST(SUBSTRING({} FROM '^(?:[^0-9]+)([0-9]+)') AS integer)".format(sql_col), []),
-            '_subslot': RawSQL(
-                r"COALESCE(CAST(SUBSTRING({} FROM '^(?:[^0-9]+)(?:[0-9]+)\/([0-9]+)') AS integer), 0)".format(
-                    sql_col), []
-            ),
-            '_position': RawSQL(
-                r"COALESCE(CAST(SUBSTRING({} FROM '^(?:[^0-9]+)(?:[0-9]+\/){{2}}([0-9]+)') AS integer), 0)".format(
-                    sql_col), []
-            ),
-            '_subposition': RawSQL(
-                r"COALESCE(CAST(SUBSTRING({} FROM '^(?:[^0-9]+)(?:[0-9]+\/){{3}}([0-9]+)') AS integer), 0)".format(
-                    sql_col), []
-            ),
-            '_channel': RawSQL(
-                r"COALESCE(CAST(SUBSTRING({} FROM ':([0-9]+)(\.[0-9]+)?$') AS integer), 0)".format(sql_col), []),
-            '_vc': RawSQL(r"COALESCE(CAST(SUBSTRING({} FROM '\.([0-9]+)$') AS integer), 0)".format(sql_col), []),
+            '_type': RawSQL(TYPE_RE.format(sql_col), []),
+            '_id': RawSQL(ID_RE.format(sql_col), []),
+            '_slot': RawSQL(SLOT_RE.format(sql_col), []),
+            '_subslot': RawSQL(SUBSLOT_RE.format(sql_col), []),
+            '_position': RawSQL(POSITION_RE.format(sql_col), []),
+            '_subposition': RawSQL(SUBPOSITION_RE.format(sql_col), []),
+            '_channel': RawSQL(CHANNEL_RE.format(sql_col), []),
+            '_vc': RawSQL(VC_RE.format(sql_col), []),
         }
 
         return self.annotate(**fields).order_by(*ordering)
diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py
index 00a4de28c..b4101cfd5 100644
--- a/netbox/dcim/tests/test_models.py
+++ b/netbox/dcim/tests/test_models.py
@@ -159,10 +159,14 @@ class InterfaceTestCase(TestCase):
             device=device1,
             name='Ethernet1/3/2/1'
         )
+        interface6 = Interface.objects.create(
+            device=device1,
+            name='Loopback1'
+        )
 
         self.assertEqual(
             list(Interface.objects.all().order_naturally()),
-            [interface1, interface5, interface4, interface3, interface2]
+            [interface1, interface5, interface4, interface3, interface2, interface6]
         )
 
     def test_interface_order_natural_subinterfaces(self):
@@ -201,5 +205,5 @@ class InterfaceTestCase(TestCase):
         )
         self.assertEqual(
             list(Interface.objects.all().order_naturally()),
-            [interface6, interface4, interface3, interface5, interface2, interface1]
+            [interface4, interface3, interface5, interface2, interface1, interface6]
         )

From ce9f1eb20106ffbef060b896151264137012618c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 22 Sep 2017 21:17:46 -0400
Subject: [PATCH 86/92] Closes #1499: Added utilization graph to child prefixes
 table

---
 netbox/ipam/tables.py | 10 +++++-----
 netbox/ipam/views.py  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 512b75649..24bb9b3c2 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -34,7 +34,7 @@ RIR_ACTIONS = """
 
 UTILIZATION_GRAPH = """
 {% load helpers %}
-{% if record.pk %}{% utilization_graph value %}{% else %}&mdash;{% endif %}
+{% if record.pk %}{% utilization_graph record.get_utilization %}{% else %}&mdash;{% endif %}
 """
 
 ROLE_ACTIONS = """
@@ -210,10 +210,10 @@ class AggregateTable(BaseTable):
 
 class AggregateDetailTable(AggregateTable):
     child_count = tables.Column(verbose_name='Prefixes')
-    get_utilization = tables.TemplateColumn(UTILIZATION_GRAPH, orderable=False, verbose_name='Utilization')
+    utilization = tables.TemplateColumn(UTILIZATION_GRAPH, orderable=False, verbose_name='Utilization')
 
     class Meta(AggregateTable.Meta):
-        fields = ('pk', 'prefix', 'rir', 'child_count', 'get_utilization', 'date_added', 'description')
+        fields = ('pk', 'prefix', 'rir', 'child_count', 'utilization', 'date_added', 'description')
 
 
 #
@@ -256,10 +256,10 @@ class PrefixTable(BaseTable):
 
 
 class PrefixDetailTable(PrefixTable):
-    get_utilization = tables.TemplateColumn(UTILIZATION_GRAPH, orderable=False, verbose_name='Utilization')
+    utilization = tables.TemplateColumn(UTILIZATION_GRAPH, orderable=False)
 
     class Meta(PrefixTable.Meta):
-        fields = ('pk', 'prefix', 'status', 'vrf', 'get_utilization', 'tenant', 'site', 'vlan', 'role', 'description')
+        fields = ('pk', 'prefix', 'status', 'vrf', 'utilization', 'tenant', 'site', 'vlan', 'role', 'description')
 
 
 #
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index d0225e567..89eecd352 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -473,11 +473,11 @@ class PrefixView(View):
         child_prefixes = Prefix.objects.filter(
             vrf=prefix.vrf, prefix__net_contained=str(prefix.prefix)
         ).select_related(
-            'site', 'role'
+            'site', 'vlan', 'role',
         ).annotate_depth(limit=0)
         if child_prefixes:
             child_prefixes = add_available_prefixes(prefix.prefix, child_prefixes)
-        child_prefix_table = tables.PrefixTable(child_prefixes)
+        child_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.base_columns['pk'].visible = True
 

From a328e1264231beed3b1613015261bebdd3b8d3db Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 25 Sep 2017 12:14:55 -0400
Subject: [PATCH 87/92] Closes #1536: Improved formatting of aggregate prefix
 statistics

---
 netbox/ipam/views.py                      | 11 ++++++-----
 netbox/templates/ipam/aggregate_list.html | 11 +++++++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 89eecd352..29757a530 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -286,11 +286,12 @@ class AggregateListView(ObjectListView):
         ipv4_total = 0
         ipv6_total = 0
 
-        for a in self.queryset:
-            if a.prefix.version == 4:
-                ipv4_total += a.prefix.size
-            elif a.prefix.version == 6:
-                ipv6_total += a.prefix.size / 2 ** 64
+        for aggregate in self.queryset:
+            if aggregate.prefix.version == 6:
+                # Report equivalent /64s for IPv6 to keep things sane
+                ipv6_total += int(aggregate.prefix.size / 2 ** 64)
+            else:
+                ipv4_total += aggregate.prefix.size
 
         return {
             'ipv4_total': ipv4_total,
diff --git a/netbox/templates/ipam/aggregate_list.html b/netbox/templates/ipam/aggregate_list.html
index fde53a790..df8e4772e 100644
--- a/netbox/templates/ipam/aggregate_list.html
+++ b/netbox/templates/ipam/aggregate_list.html
@@ -20,11 +20,18 @@
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:aggregate_bulk_edit' bulk_delete_url='ipam:aggregate_bulk_delete' %}
-        <p class="text-right">IPv4 total: <strong>{{ ipv4_total|intcomma }} /32s</strong></p>
-        <p class="text-right">IPv6 total: <strong>{{ ipv6_total|intcomma }} /64s</strong></p>
 	</div>
 	<div class="col-md-3">
 		{% include 'inc/search_panel.html' %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong><i class="fa fa-bar-chart"></i> Statistics</strong>
+            </div>
+            <ul class="list-group">
+                <li class="list-group-item">Total IPv4 IPs <span class="badge">{{ ipv4_total|intcomma }}</span></li>
+                <li class="list-group-item">Total IPv6 /64s <span class="badge">{{ ipv6_total|intcomma }}</span></li>
+            </ul>
+        </div>
 	</div>
 </div>
 {% endblock %}

From 2badb04a03fea93e39e127f82c8ecc6916ea5e52 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 25 Sep 2017 13:37:11 -0400
Subject: [PATCH 88/92] Fixes #1489: Corrected server error on validation of
 empty required custom field

---
 netbox/extras/api/customfields.py | 61 +++++++++++++++++++------------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/netbox/extras/api/customfields.py b/netbox/extras/api/customfields.py
index fc83b33e5..5554df924 100644
--- a/netbox/extras/api/customfields.py
+++ b/netbox/extras/api/customfields.py
@@ -29,34 +29,47 @@ class CustomFieldsSerializer(serializers.BaseSerializer):
 
         for field_name, value in data.items():
 
-            cf = custom_fields[field_name]
+            try:
+                cf = custom_fields[field_name]
+            except KeyError:
+                raise ValidationError(
+                    "Invalid custom field for {} objects: {}".format(content_type, field_name)
+                )
 
-            # Validate custom field name
-            if field_name not in custom_fields:
-                raise ValidationError("Invalid custom field for {} objects: {}".format(content_type, field_name))
+            # Data validation
+            if value not in [None, '']:
 
-            # Validate boolean
-            if cf.type == CF_TYPE_BOOLEAN and value not in [True, False, 1, 0]:
-                raise ValidationError("Invalid value for boolean field {}: {}".format(field_name, value))
+                # Validate boolean
+                if cf.type == CF_TYPE_BOOLEAN and value not in [True, False, 1, 0]:
+                    raise ValidationError(
+                        "Invalid value for boolean field {}: {}".format(field_name, value)
+                    )
 
-            # Validate date
-            if cf.type == CF_TYPE_DATE:
-                try:
-                    datetime.strptime(value, '%Y-%m-%d')
-                except ValueError:
-                    raise ValidationError("Invalid date for field {}: {}. (Required format is YYYY-MM-DD.)".format(
-                        field_name, value
-                    ))
+                # Validate date
+                if cf.type == CF_TYPE_DATE:
+                    try:
+                        datetime.strptime(value, '%Y-%m-%d')
+                    except ValueError:
+                        raise ValidationError(
+                            "Invalid date for field {}: {}. (Required format is YYYY-MM-DD.)".format(field_name, value)
+                        )
 
-            # Validate selected choice
-            if cf.type == CF_TYPE_SELECT:
-                try:
-                    value = int(value)
-                except ValueError:
-                    raise ValidationError("{}: Choice selections must be passed as integers.".format(field_name))
-                valid_choices = [c.pk for c in cf.choices.all()]
-                if value not in valid_choices:
-                    raise ValidationError("Invalid choice for field {}: {}".format(field_name, value))
+                # Validate selected choice
+                if cf.type == CF_TYPE_SELECT:
+                    try:
+                        value = int(value)
+                    except ValueError:
+                        raise ValidationError(
+                            "{}: Choice selections must be passed as integers.".format(field_name)
+                        )
+                    valid_choices = [c.pk for c in cf.choices.all()]
+                    if value not in valid_choices:
+                        raise ValidationError(
+                            "Invalid choice for field {}: {}".format(field_name, value)
+                        )
+
+            elif cf.required:
+                raise ValidationError("Required field {} cannot be empty.".format(field_name))
 
         # Check for missing required fields
         missing_fields = []

From 63a4a704201aa1a59d3904e957f424ab126ec830 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 25 Sep 2017 13:39:03 -0400
Subject: [PATCH 89/92] #1499: Added utilization graph to child prefixes for
 aggregates

---
 netbox/ipam/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 29757a530..4152cae91 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -315,7 +315,7 @@ class AggregateView(View):
         )
         child_prefixes = add_available_prefixes(aggregate.prefix, child_prefixes)
 
-        prefix_table = tables.PrefixTable(child_prefixes)
+        prefix_table = tables.PrefixDetailTable(child_prefixes)
         if request.user.has_perm('ipam.change_prefix') or request.user.has_perm('ipam.delete_prefix'):
             prefix_table.base_columns['pk'].visible = True
 

From aa5aa798e61689adf18d35d101425a3a304c620b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 25 Sep 2017 14:33:32 -0400
Subject: [PATCH 90/92] Fixes #1486: Ignore subinterface IDs when validating
 LLDP neighbor connections

---
 netbox/templates/dcim/device_lldp_neighbors.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/templates/dcim/device_lldp_neighbors.html b/netbox/templates/dcim/device_lldp_neighbors.html
index a7346c5db..99c1f6465 100644
--- a/netbox/templates/dcim/device_lldp_neighbors.html
+++ b/netbox/templates/dcim/device_lldp_neighbors.html
@@ -53,7 +53,7 @@ $(document).ready(function() {
         success: function(json) {
             $.each(json['get_lldp_neighbors'], function(iface, neighbors) {
                 var neighbor = neighbors[0];
-                var row = $('#' + iface.replace(/(\/)/g, "\\$1"));
+                var row = $('#' + iface.split(".")[0].replace(/(\/)/g, "\\$1"));
                 var configured_device = row.children('td.configured_device').attr('data');
                 var configured_interface = row.children('td.configured_interface').attr('data');
                 // Add LLDP neighbors to table
@@ -62,7 +62,7 @@ $(document).ready(function() {
                 // Apply colors to rows
                 if (!configured_device && neighbor['hostname']) {
                     row.addClass('info');
-                } else if (configured_device == neighbor['hostname'] && configured_interface == neighbor['port']) {
+                } else if (configured_device == neighbor['hostname'] && configured_interface == neighbor['port'].split(".")[0]) {
                     row.addClass('success');
                 } else {
                     row.addClass('danger');

From 00154846798ff4d10375f07a6cdb0d0dfe5085ad Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 25 Sep 2017 14:50:45 -0400
Subject: [PATCH 91/92] Release v2.1.5

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 13ae4c48b..6d944d4db 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -13,7 +13,7 @@ except ImportError:
     )
 
 
-VERSION = '2.1.5-dev'
+VERSION = '2.1.5'
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 

From 02d8897b82d47ee88fb6a6647be33babf30792ef Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 25 Sep 2017 14:53:10 -0400
Subject: [PATCH 92/92] Post-release version bump

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 6d944d4db..735372b61 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -13,7 +13,7 @@ except ImportError:
     )
 
 
-VERSION = '2.1.5'
+VERSION = '2.1.6-dev'
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))