Merge pull request #2660 from digitalocean/develop

Release v2.5.0
2026-01-25 03:08:15 +01:00 · 2018-12-10 10:27:24 -05:00 · 2018-12-10 10:22:32 -05:00 · 2018-12-10 09:57:37 -05:00 · 2018-12-10 09:54:30 -05:00 · 2018-12-07 15:52:25 -05:00
88 changed files with 2314 additions and 934 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,4 @@
-v2.5-beta2 (2018-11-26)
-
-## BETA RELEASE
-
-**This is a beta release.** It is intended solely for gathering community and developer feedback in preparation for the v2.5 release. Do not run it in production, and do not give it write access to your production database. As the database schema is subject to change during the beta period, a migration path to the stable release likely will not be provided. Do not commit any data which you are not willing to lose.
+v2.5.0 (2018-12-10)

 ## Notes

@@ -18,6 +14,10 @@ The UserAction model, which was deprecated by the new change logging feature in

 Django 2.1 introduces view permissions for object types (not to be confused with object-level permissions). Implementation of [#323](https://github.com/digitalocean/netbox/issues/323) is planned for NetBox v2.6. Users are encourage to begin assigning view permissions as desired in preparation for their eventual enforcement.

+### upgrade.sh No Longer Invokes sudo
+
+The `upgrade.sh` script has been tweaked so that it no longer invokes `sudo` internally. This was done to ensure compatibility when running NetBox inside a Python virtual environment. If you need elevated permissions when upgrading NetBox, call the upgrade script with `sudo upgrade.sh`.
+
 ## New Features

 ### Patch Panels and Cables ([#20](https://github.com/digitalocean/netbox/issues/20))
@@ -38,30 +38,19 @@ NetBox now supports modeling physical cables for console, power, and interface c
 * [#2292](https://github.com/digitalocean/netbox/issues/2292) - Removed the deprecated UserAction model
 * [#2367](https://github.com/digitalocean/netbox/issues/2367) - Removed deprecated RPCClient functionality
 * [#2426](https://github.com/digitalocean/netbox/issues/2426) - Introduced `SESSION_FILE_PATH` configuration setting for authentication without write access to database
+* [#2594](https://github.com/digitalocean/netbox/issues/2594) - `upgrade.sh` no longer invokes sudo

-## Changes From v2.5-beta1
+## Changes From v2.5-beta2

-* [#2554](https://github.com/digitalocean/netbox/issues/2554) - Fix cable trace display when following a rear port with no cable attached
-* [#2563](https://github.com/digitalocean/netbox/issues/2563) - Enable export templates for cables
-* [#2566](https://github.com/digitalocean/netbox/issues/2566) - Prevent both ends of a cable from connecting to the same termination point
-* [#2567](https://github.com/digitalocean/netbox/issues/2567) - Introduced proxy models to represent console/power/interface connections
-* [#2569](https://github.com/digitalocean/netbox/issues/2569) - Added LSH fiber type; removed SC duplex/simplex designations
-* [#2570](https://github.com/digitalocean/netbox/issues/2570) - Add bulk disconnect view for front/rear pass-through ports
-* [#2571](https://github.com/digitalocean/netbox/issues/2571) - Enforce deletion of attached cable when deleting a termination point
-* [#2572](https://github.com/digitalocean/netbox/issues/2572) - Add button to disconnect cable from circuit termination
-* [#2573](https://github.com/digitalocean/netbox/issues/2573) - Fix bulk console/power/interface disconnections
-* [#2574](https://github.com/digitalocean/netbox/issues/2574) - Remove duplicate interface links from topology maps
-* [#2578](https://github.com/digitalocean/netbox/issues/2578) - Reorganized nested serializers
-* [#2579](https://github.com/digitalocean/netbox/issues/2579) - Add missing cable disconnect buttons for front/rear ports
-* [#2583](https://github.com/digitalocean/netbox/issues/2583) - Cleaned up component filters for device and device type
-* [#2584](https://github.com/digitalocean/netbox/issues/2584) - Prevent a Front port from being connected to its corresponding rear port
-* [#2585](https://github.com/digitalocean/netbox/issues/2585) - Prevent cable connections that include a virtual interface
-* [#2586](https://github.com/digitalocean/netbox/issues/2586) - Added tests for the Cable model's clean() method
-* [#2593](https://github.com/digitalocean/netbox/issues/2593) - Fix toggling of connected cable's status
-* [#2601](https://github.com/digitalocean/netbox/issues/2601) - Added a `description` field to pass-through ports
-* [#2602](https://github.com/digitalocean/netbox/issues/2602) - Return HTTP 204 when no new IPs/prefixes are available for provisioning
-* [#2608](https://github.com/digitalocean/netbox/issues/2608) - Fixed null `outer_unit` error on rack import
-* [#2609](https://github.com/digitalocean/netbox/issues/2609) - Fixed exception when ChoiceField integer value is passed as a string
+* [#2474](https://github.com/digitalocean/netbox/issues/2474) - Add `cabled` and `connection_status` filters for device components
+* [#2616](https://github.com/digitalocean/netbox/issues/2616) - Convert Rack `outer_unit` and Cable `length_unit` to integer-based choice fields
+* [#2622](https://github.com/digitalocean/netbox/issues/2622) - Enable filtering cables by multiple types/colors
+* [#2624](https://github.com/digitalocean/netbox/issues/2624) - Delete associated content type and permissions when removing InterfaceConnection model
+* [#2626](https://github.com/digitalocean/netbox/issues/2626) - Remove extraneous permissions generated from proxy models
+* [#2632](https://github.com/digitalocean/netbox/issues/2632) - Change representation of null values from `0` to `null`
+* [#2639](https://github.com/digitalocean/netbox/issues/2639) - Fix preservation of length/dimensions unit for racks and cables
+* [#2648](https://github.com/digitalocean/netbox/issues/2648) - Include the `connection_status` field in nested represenations of connectable device components
+* [#2649](https://github.com/digitalocean/netbox/issues/2649) - Add `connected_endpoint_type` to connectable device component API representations

 ## API Changes

@@ -69,6 +58,8 @@ NetBox now supports modeling physical cables for console, power, and interface c
 * The `rpc_client` field has been removed from dcim.Platform (see #2367)
 * Introduced a new API endpoint for cables at `/dcim/cables/`
 * New endpoints for front and rear pass-through ports (and their templates) in parallel with existing device components
+* The fields `interface_connection` on Interface and `interface` on CircuitTermination have been replaced with `connected_endpoint` and `connection_status`
+* A new `cable` field has been added to console, power, and interface components and to circuit terminations
 * New fields for dcim.Rack: `status`, `asset_tag`, `outer_width`, `outer_depth`, `outer_unit`
 * The following boolean filters on dcim.Device and dcim.DeviceType have been renamed:
    * `is_console_server`: `console_server_ports`
@@ -82,6 +73,28 @@ NetBox now supports modeling physical cables for console, power, and interface c
 * Added a `description` field to the CircuitTermination serializer
 * Added `ipaddress_count` to InterfaceSerializer to show the count of assigned IP addresses for each interface
 * The `available-prefixes` and `available-ips` IPAM endpoints now return an HTTP 204 response instead of HTTP 400 when no new objects can be created
+* Filtering on null values now uses the string `null` instead of zero
+
+---
+
+v2.4.9 (2018-12-07)
+
+## Enhancements
+
+* [#2089](https://github.com/digitalocean/netbox/issues/2089) - Add SONET interface form factors
+* [#2495](https://github.com/digitalocean/netbox/issues/2495) - Enable deep-merging of config context data
+* [#2597](https://github.com/digitalocean/netbox/issues/2597) - Add FibreChannel SFP28 (32GFC) interface form factor
+
+## Bug Fixes
+
+* [#2400](https://github.com/digitalocean/netbox/issues/2400) - Correct representation of nested object assignment in API docs
+* [#2576](https://github.com/digitalocean/netbox/issues/2576) - Correct type for count_* fields in site API representation
+* [#2606](https://github.com/digitalocean/netbox/issues/2606) - Fixed filtering for interfaces with a virtual form factor
+* [#2611](https://github.com/digitalocean/netbox/issues/2611) - Fix error handling when assigning a clustered device to a different site
+* [#2613](https://github.com/digitalocean/netbox/issues/2613) - Decrease live search minimum characters to three
+* [#2615](https://github.com/digitalocean/netbox/issues/2615) - Tweak live search widget to use brief format for API requests
+* [#2623](https://github.com/digitalocean/netbox/issues/2623) - Removed the need to pass the model class to the rqworker process for webhooks
+* [#2634](https://github.com/digitalocean/netbox/issues/2634) - Enforce consistent representation of unnamed devices in rack view

 ---

--- a/base_requirements.txt
+++ b/base_requirements.txt
@@ -1,19 +1,72 @@
+# The Python web framework on which NetBox is built
+# https://github.com/django/django
 Django
+
+# Django middleware which permits cross-domain API requests
+# https://github.com/OttoYiu/django-cors-headers
 django-cors-headers
+
+# Runtime UI tool for debugging Django
+# https://github.com/jazzband/django-debug-toolbar
 django-debug-toolbar
+
+# Library for writing reusable URL query filters
+# https://github.com/carltongibson/django-filter
 django-filter
+
+# Modified Preorder Tree Traversal (recursive nesting of objects)
+# https://github.com/django-mptt/django-mptt
 django-mptt
+
+# Abstraction models for rendering and paginating HTML tables
+# https://github.com/jieter/django-tables2
 django-tables2
+
+# User-defined tags for objects
+# https://github.com/alex/django-taggit
 django-taggit
+
+# A Django REST Framework serializer which represents tags
+# https://github.com/glemmaPaul/django-taggit-serializer
 django-taggit-serializer
+
+# A Django field for representing time zones
+# https://github.com/mfogel/django-timezone-field/
 django-timezone-field
+
+# A REST API framework for Django projects
+# https://github.com/encode/django-rest-framework
 djangorestframework
+
+# Swagger/OpenAPI schema generation for REST APIs
+# https://github.com/axnsan12/drf-yasg
 drf-yasg[validation]
+
+# Python interface to the graphviz graph rendering utility
+# https://github.com/xflr6/graphviz
 graphviz
+
+# Simple markup language for rendering HTML
+# https://github.com/Python-Markdown/markdown
 # py-gfm requires Markdown<3.0
 Markdown<3.0
+
+# Library for manipulating IP prefixes and addresses
+# https://github.com/drkjam/netaddr
 netaddr
+
+# Fork of PIL (Python Imaging Library) for image processing
+# https://github.com/python-pillow/Pillow
 Pillow
+
+# PostgreSQL database adapter for Python
+# https://github.com/psycopg/psycopg2
 psycopg2-binary
+
+# GitHub-flavored Markdown extensions
+# https://github.com/zopieux/py-gfm
 py-gfm
+
+# Extensive cryptographic library (fork of pycrypto)
+# https://github.com/Legrandin/pycryptodome
 pycryptodome
--- a/docs/additional-features/netbox-shell.md
+++ b/docs/additional-features/netbox-shell.md
--- a/docs/development/extending-models.md
+++ b/docs/development/extending-models.md
@@ -44,7 +44,11 @@ If you're adding a relational field (e.g. `ForeignKey`) and intend to include th

 Extend the model's API serializer in `<app>.api.serializers` to include the new field. In most cases, it will not be necessary to also extend the nested serializer, which produces a minimal represenation of the model.

-### 6. Add field to forms
+### 6. Add choices to API view
+
+If the new field has static choices, add it to the `FieldChoicesViewSet` for the app.
+
+### 7. Add field to forms

 Extend any forms to include the new field as appropriate. Common forms include:

@@ -53,18 +57,18 @@ Extend any forms to include the new field as appropriate. Common forms include:
 * **CSV import** - The form used when bulk importing objects in CSV format
 * **Filter** - Displays the options available for filtering a list of objects (both UI and API)

-### 7. Extend object filter set
+### 8. Extend object filter set

 If the new field should be filterable, add it to the `FilterSet` for the model. If the field should be searchable, remember to reference it in the FilterSet's `search()` method.

-### 8. Add column to object table
+### 9. Add column to object table

 If the new field will be included in the object list view, add a column to the model's table. For simple fields, adding the field name to `Meta.fields` will be sufficient. More complex fields may require explicitly declaring a new column.

-### 9. Update the UI templates
+### 10. Update the UI templates

 Edit the object's view template to display the new field. There may also be a custom add/edit form template that needs to be updated.

-### 10. Adjust API and model tests
+### 11. Adjust API and model tests

 Extend the model and/or API tests to verify that the new field and any accompanying validation logic perform as expected. This is especially important for relational fields.
--- a/docs/development/style-guide.md
+++ b/docs/development/style-guide.md
@@ -28,6 +28,19 @@ To invoke `pycodestyle` manually, run:
 pycodestyle --ignore=W504,E501 netbox/
 ```

+## Introducing New Dependencies
+
+The introduction of a new dependency is best avoided unless it is absolutely necessary. For small features, it's generally preferable to replicate functionality within the NetBox code base rather than to introduce reliance on an external project. This reduces both the burden of tracking new releases and our exposure to outside bugs and attacks.
+
+If there's a strong case for introducing a new depdency, it must meet the following criteria:
+
+* Its complete source code must be published and freely accessible without registration.
+* Its license must be conducive to inclusion in an open source project.
+* It must be actively maintained, with no longer than one year between releases.
+* It must be available via the [Python Package Index](https://pypi.org/) (PyPI).
+
+When adding a new dependency, a short description of the package and the URL of its code repository must be added to `base_requirements.txt`. Additionally, a line specifying the package name pinned to the current stable release must be added to `requirements.txt`. This ensures that NetBox will install only the known-good release and simplify support efforts.
+
 ## General Guidance

 * When in doubt, remain consistent: It is better to be consistently incorrect than inconsistently correct. If you notice in the course of unrelated work a pattern that should be corrected, continue to follow the pattern for now and open a bug so that the entire code base can be evaluated at a later point.
--- a/docs/installation/1-postgresql.md
+++ b/docs/installation/1-postgresql.md
@@ -1,7 +1,7 @@
 NetBox requires a PostgreSQL database to store data. This can be hosted locally or on a remote server. (Please note that MySQL is not supported, as NetBox leverages PostgreSQL's built-in [network address types](https://www.postgresql.org/docs/current/static/datatype-net-types.html).)

 !!! note
-    The installation instructions provided here have been tested to work on Ubuntu 16.04 and CentOS 7.4. The particular commands needed to install dependencies on other distributions may vary significantly. Unfortunately, this is outside the control of the NetBox maintainers. Please consult your distribution's documentation for assistance with any errors.
+    The installation instructions provided here have been tested to work on Ubuntu 18.04 and CentOS 7.5. The particular commands needed to install dependencies on other distributions may vary significantly. Unfortunately, this is outside the control of the NetBox maintainers. Please consult your distribution's documentation for assistance with any errors.

 !!! warning
    NetBox v2.2 and later requires PostgreSQL 9.4 or higher.
@@ -19,7 +19,7 @@ If a recent enough version of PostgreSQL is not available through your distribut

 **CentOS**

-CentOS 7.4 does not ship with a recent enough version of PostgreSQL, so it will need to be installed from an external repository. The instructions below show the installation of PostgreSQL 9.6.
+CentOS 7.5 does not ship with a recent enough version of PostgreSQL, so it will need to be installed from an external repository. The instructions below show the installation of PostgreSQL 9.6.

 ```no-highlight
 # yum install https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm
--- a/docs/installation/2-netbox.md
+++ b/docs/installation/2-netbox.md
@@ -5,16 +5,16 @@ This section of the documentation discusses installing and configuring the NetBo
 **Ubuntu**

 ```no-highlight
-# apt-get install -y python3 python3-dev python3-setuptools build-essential libxml2-dev libxslt1-dev libffi-dev graphviz libpq-dev libssl-dev zlib1g-dev
-# easy_install3 pip
+# apt-get install -y python3 python3-pip python3-dev build-essential libxml2-dev libxslt1-dev libffi-dev graphviz libpq-dev libssl-dev zlib1g-dev
 ```

 **CentOS**

 ```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 redhat-rpm-config
-# easy_install-3.4 pip
+# yum install -y gcc python36 python36-devel python36-setuptools libxml2-devel libxslt-devel libffi-devel graphviz openssl-devel redhat-rpm-config
+# easy_install-3.6 pip
+# ln -s /usr/bin/python36 /usr/bin/python3
 ```

 You may opt to install NetBox either from a numbered release or by cloning the master branch of its repository on GitHub.
@@ -246,13 +246,13 @@ At this point, NetBox should be able to run. We can verify this by starting a de
 Performing system checks...

 System check identified no issues (0 silenced).
-June 17, 2016 - 16:17:36
-Django version 1.9.7, using settings 'netbox.settings'
+November 28, 2018 - 09:33:45
+Django version 2.0.9, using settings 'netbox.settings'
 Starting development server at http://0.0.0.0:8000/
 Quit the server with CONTROL-C.
 ```

-Now if we navigate to the name or IP of the server (as defined in `ALLOWED_HOSTS`) we should be greeted with the NetBox home page. Note that this built-in web service is for development and testing purposes only. **It is not suited for production use.**
+Next, connect to the name or IP of the server (as defined in `ALLOWED_HOSTS`) on port 8000; for example, <http://127.0.0.1:8000/>. You should be greeted with the NetBox home page. Note that this built-in web service is for development and testing purposes only. **It is not suited for production use.**

 !!! warning
    If the test service does not run, or you cannot reach the NetBox home page, something has gone wrong. Do not proceed with the rest of this guide until the installation has been corrected.
--- a/docs/installation/3-http-daemon.md
+++ b/docs/installation/3-http-daemon.md
@@ -1,7 +1,7 @@
 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.
+    For the sake of brevity, only Ubuntu 18.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.

 # Web Server Installation

--- a/docs/installation/4-ldap.md
+++ b/docs/installation/4-ldap.md
@@ -19,7 +19,7 @@ sudo yum install -y openldap-devel
 ## Install django-auth-ldap

 ```no-highlight
-sudo pip install django-auth-ldap
+pip3 install django-auth-ldap
 ```

 # Configuration
--- a/docs/installation/index.md
+++ b/docs/installation/index.md
@@ -11,4 +11,4 @@ The following sections detail how to set up a new instance of NetBox:

 If you are upgrading from an existing installation, please consult the [upgrading guide](upgrading.md).

-NetBox v2.5 and later requires Python 3. Please see the instruction for [migrating to Python 3](migrating-to-python3.md) if you are still using Python 2.
+NetBox v2.5 and later requires Python 3.5 or higher. Please see the instructions for [migrating to Python 3](migrating-to-python3.md) if you are still using Python 2.
--- a/docs/installation/migrating-to-python3.md
+++ b/docs/installation/migrating-to-python3.md
@@ -36,3 +36,9 @@ If using LDAP authentication, install the `django-auth-ldap` package:
 ```no-highlight
 # pip3 install django-auth-ldap
 ```
+
+If using Webhooks, install the `django-rq` package:
+
+```no-highlight
+# pip3 install django-rq
+```
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -38,6 +38,7 @@ pages:
        - Change Logging: 'additional-features/change-logging.md'
    - Administration:
        - Replicating NetBox: 'administration/replicating-netbox.md'
+        - NetBox Shell: 'administration/netbox-shell.md'
    - API:
        - Overview: 'api/overview.md'
        - Authentication: 'api/authentication.md'
--- a/netbox/circuits/api/serializers.py
+++ b/netbox/circuits/api/serializers.py
@@ -60,5 +60,5 @@ class CircuitTerminationSerializer(ConnectedEndpointSerializer):
        model = CircuitTermination
        fields = [
            'id', 'circuit', 'term_side', 'site', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info',
-            'description', 'connected_endpoint', 'connection_status', 'cable',
+            'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable',
        ]
--- a/netbox/circuits/forms.py
+++ b/netbox/circuits/forms.py
@@ -21,14 +21,22 @@ from .models import Circuit, CircuitTermination, CircuitType, Provider
 class ProviderForm(BootstrapMixin, CustomFieldForm):
    slug = SlugField()
    comments = CommentField()
-    tags = TagField(required=False)
+    tags = TagField(
+        required=False
+    )

    class Meta:
        model = Provider
-        fields = ['name', 'slug', 'asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', 'comments', 'tags']
+        fields = [
+            'name', 'slug', 'asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', 'comments', 'tags',
+        ]
        widgets = {
-            'noc_contact': SmallTextarea(attrs={'rows': 5}),
-            'admin_contact': SmallTextarea(attrs={'rows': 5}),
+            'noc_contact': SmallTextarea(
+                attrs={'rows': 5}
+            ),
+            'admin_contact': SmallTextarea(
+                attrs={'rows': 5}
+            ),
        }
        help_texts = {
            'name': "Full name of the provider",
@@ -54,23 +62,57 @@ class ProviderCSVForm(forms.ModelForm):


 class ProviderBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(queryset=Provider.objects.all(), widget=forms.MultipleHiddenInput)
-    asn = forms.IntegerField(required=False, label='ASN')
-    account = forms.CharField(max_length=30, required=False, label='Account number')
-    portal_url = forms.URLField(required=False, label='Portal')
-    noc_contact = forms.CharField(required=False, widget=SmallTextarea, label='NOC contact')
-    admin_contact = forms.CharField(required=False, widget=SmallTextarea, label='Admin contact')
-    comments = CommentField(widget=SmallTextarea)
+    pk = forms.ModelMultipleChoiceField(
+        queryset=Provider.objects.all(),
+        widget=forms.MultipleHiddenInput
+    )
+    asn = forms.IntegerField(
+        required=False,
+        label='ASN'
+    )
+    account = forms.CharField(
+        max_length=30,
+        required=False,
+        label='Account number'
+    )
+    portal_url = forms.URLField(
+        required=False,
+        label='Portal'
+    )
+    noc_contact = forms.CharField(
+        required=False,
+        widget=SmallTextarea,
+        label='NOC contact'
+    )
+    admin_contact = forms.CharField(
+        required=False,
+        widget=SmallTextarea,
+        label='Admin contact'
+    )
+    comments = CommentField(
+        widget=SmallTextarea()
+    )

    class Meta:
-        nullable_fields = ['asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', 'comments']
+        nullable_fields = [
+            'asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', 'comments',
+        ]


 class ProviderFilterForm(BootstrapMixin, CustomFieldFilterForm):
    model = Provider
-    q = forms.CharField(required=False, label='Search')
-    site = FilterChoiceField(queryset=Site.objects.all(), to_field_name='slug')
-    asn = forms.IntegerField(required=False, label='ASN')
+    q = forms.CharField(
+        required=False,
+        label='Search'
+    )
+    site = FilterChoiceField(
+        queryset=Site.objects.all(),
+        to_field_name='slug'
+    )
+    asn = forms.IntegerField(
+        required=False,
+        label='ASN'
+    )


 #
@@ -82,7 +124,9 @@ class CircuitTypeForm(BootstrapMixin, forms.ModelForm):

    class Meta:
        model = CircuitType
-        fields = ['name', 'slug']
+        fields = [
+            'name', 'slug',
+        ]


 class CircuitTypeCSVForm(forms.ModelForm):
@@ -102,7 +146,9 @@ class CircuitTypeCSVForm(forms.ModelForm):

 class CircuitForm(BootstrapMixin, TenancyForm, CustomFieldForm):
    comments = CommentField()
-    tags = TagField(required=False)
+    tags = TagField(
+        required=False
+    )

    class Meta:
        model = Circuit
@@ -157,28 +203,61 @@ class CircuitCSVForm(forms.ModelForm):


 class CircuitBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(queryset=Circuit.objects.all(), widget=forms.MultipleHiddenInput)
-    type = forms.ModelChoiceField(queryset=CircuitType.objects.all(), required=False)
-    provider = forms.ModelChoiceField(queryset=Provider.objects.all(), required=False)
-    status = forms.ChoiceField(choices=add_blank_choice(CIRCUIT_STATUS_CHOICES), required=False, initial='')
-    tenant = forms.ModelChoiceField(queryset=Tenant.objects.all(), required=False)
-    commit_rate = forms.IntegerField(required=False, label='Commit rate (Kbps)')
-    description = forms.CharField(max_length=100, required=False)
-    comments = CommentField(widget=SmallTextarea)
+    pk = forms.ModelMultipleChoiceField(
+        queryset=Circuit.objects.all(),
+        widget=forms.MultipleHiddenInput
+    )
+    type = forms.ModelChoiceField(
+        queryset=CircuitType.objects.all(),
+        required=False
+    )
+    provider = forms.ModelChoiceField(
+        queryset=Provider.objects.all(),
+        required=False
+    )
+    status = forms.ChoiceField(
+        choices=add_blank_choice(CIRCUIT_STATUS_CHOICES),
+        required=False,
+        initial=''
+    )
+    tenant = forms.ModelChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False
+    )
+    commit_rate = forms.IntegerField(
+        required=False,
+        label='Commit rate (Kbps)'
+    )
+    description = forms.CharField(
+        max_length=100,
+        required=False
+    )
+    comments = CommentField(
+        widget=SmallTextarea
+    )

    class Meta:
-        nullable_fields = ['tenant', 'commit_rate', 'description', 'comments']
+        nullable_fields = [
+            'tenant', 'commit_rate', 'description', 'comments',
+        ]


 class CircuitFilterForm(BootstrapMixin, CustomFieldFilterForm):
    model = Circuit
-    q = forms.CharField(required=False, label='Search')
+    q = forms.CharField(
+        required=False,
+        label='Search'
+    )
    type = FilterChoiceField(
-        queryset=CircuitType.objects.annotate(filter_count=Count('circuits')),
+        queryset=CircuitType.objects.annotate(
+            filter_count=Count('circuits')
+        ),
        to_field_name='slug'
    )
    provider = FilterChoiceField(
-        queryset=Provider.objects.annotate(filter_count=Count('circuits')),
+        queryset=Provider.objects.annotate(
+            filter_count=Count('circuits')
+        ),
        to_field_name='slug'
    )
    status = AnnotatedMultipleChoiceField(
@@ -188,15 +267,23 @@ class CircuitFilterForm(BootstrapMixin, CustomFieldFilterForm):
        required=False
    )
    tenant = FilterChoiceField(
-        queryset=Tenant.objects.annotate(filter_count=Count('circuits')),
+        queryset=Tenant.objects.annotate(
+            filter_count=Count('circuits')
+        ),
        to_field_name='slug',
        null_label='-- None --'
    )
    site = FilterChoiceField(
-        queryset=Site.objects.annotate(filter_count=Count('circuit_terminations')),
+        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)')
+    commit_rate = forms.IntegerField(
+        required=False,
+        min_value=0,
+        label='Commit rate (Kbps)'
+    )


 #
--- a/netbox/circuits/tests/test_api.py
+++ b/netbox/circuits/tests/test_api.py
@@ -13,7 +13,7 @@ class ProviderTest(APITestCase):

    def setUp(self):

-        super(ProviderTest, self).setUp()
+        super().setUp()

        self.provider1 = Provider.objects.create(name='Test Provider 1', slug='test-provider-1')
        self.provider2 = Provider.objects.create(name='Test Provider 2', slug='test-provider-2')
@@ -135,7 +135,7 @@ class CircuitTypeTest(APITestCase):

    def setUp(self):

-        super(CircuitTypeTest, self).setUp()
+        super().setUp()

        self.circuittype1 = CircuitType.objects.create(name='Test Circuit Type 1', slug='test-circuit-type-1')
        self.circuittype2 = CircuitType.objects.create(name='Test Circuit Type 2', slug='test-circuit-type-2')
@@ -210,7 +210,7 @@ class CircuitTest(APITestCase):

    def setUp(self):

-        super(CircuitTest, self).setUp()
+        super().setUp()

        self.provider1 = Provider.objects.create(name='Test Provider 1', slug='test-provider-1')
        self.provider2 = Provider.objects.create(name='Test Provider 2', slug='test-provider-2')
@@ -326,7 +326,7 @@ class CircuitTerminationTest(APITestCase):

    def setUp(self):

-        super(CircuitTerminationTest, self).setUp()
+        super().setUp()

        self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1')
        self.site2 = Site.objects.create(name='Test Site 2', slug='test-site-2')
--- a/netbox/dcim/api/nested_serializers.py
+++ b/netbox/dcim/api/nested_serializers.py
@@ -1,11 +1,12 @@
 from rest_framework import serializers

+from dcim.constants import CONNECTION_STATUS_CHOICES
 from dcim.models import (
    Cable, ConsolePort, ConsoleServerPort, Device, DeviceBay, DeviceType, DeviceRole, FrontPort, FrontPortTemplate,
    Interface, Manufacturer, Platform, PowerOutlet, PowerPort, Rack, RackGroup, RackRole, RearPort, RearPortTemplate,
    Region, Site, VirtualChassis,
 )
-from utilities.api import WritableNestedSerializer
+from utilities.api import ChoiceField, WritableNestedSerializer

 __all__ = [
    'NestedCableSerializer',
@@ -149,46 +150,51 @@ class NestedDeviceSerializer(WritableNestedSerializer):
 class NestedConsoleServerPortSerializer(WritableNestedSerializer):
    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverport-detail')
    device = NestedDeviceSerializer(read_only=True)
+    connection_status = ChoiceField(choices=CONNECTION_STATUS_CHOICES, read_only=True)

    class Meta:
        model = ConsoleServerPort
-        fields = ['id', 'url', 'device', 'name', 'cable']
+        fields = ['id', 'url', 'device', 'name', 'cable', 'connection_status']


 class NestedConsolePortSerializer(WritableNestedSerializer):
    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleport-detail')
    device = NestedDeviceSerializer(read_only=True)
+    connection_status = ChoiceField(choices=CONNECTION_STATUS_CHOICES, read_only=True)

    class Meta:
        model = ConsolePort
-        fields = ['id', 'url', 'device', 'name', 'cable']
+        fields = ['id', 'url', 'device', 'name', 'cable', 'connection_status']


 class NestedPowerOutletSerializer(WritableNestedSerializer):
    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlet-detail')
    device = NestedDeviceSerializer(read_only=True)
+    connection_status = ChoiceField(choices=CONNECTION_STATUS_CHOICES, read_only=True)

    class Meta:
        model = PowerOutlet
-        fields = ['id', 'url', 'device', 'name', 'cable']
+        fields = ['id', 'url', 'device', 'name', 'cable', 'connection_status']


 class NestedPowerPortSerializer(WritableNestedSerializer):
    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerport-detail')
    device = NestedDeviceSerializer(read_only=True)
+    connection_status = ChoiceField(choices=CONNECTION_STATUS_CHOICES, read_only=True)

    class Meta:
        model = PowerPort
-        fields = ['id', 'url', 'device', 'name', 'cable']
+        fields = ['id', 'url', 'device', 'name', 'cable', 'connection_status']


 class NestedInterfaceSerializer(WritableNestedSerializer):
    device = NestedDeviceSerializer(read_only=True)
    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interface-detail')
+    connection_status = ChoiceField(choices=CONNECTION_STATUS_CHOICES, read_only=True)

    class Meta:
        model = Interface
-        fields = ['id', 'url', 'device', 'name', 'cable']
+        fields = ['id', 'url', 'device', 'name', 'cable', 'connection_status']


 class NestedRearPortSerializer(WritableNestedSerializer):
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -23,9 +23,18 @@ from .nested_serializers import *


 class ConnectedEndpointSerializer(ValidatedModelSerializer):
+    connected_endpoint_type = serializers.SerializerMethodField(read_only=True)
    connected_endpoint = serializers.SerializerMethodField(read_only=True)
    connection_status = ChoiceField(choices=CONNECTION_STATUS_CHOICES, read_only=True)

+    def get_connected_endpoint_type(self, obj):
+        if hasattr(obj, 'connected_endpoint') and obj.connected_endpoint is not None:
+            return '{}.{}'.format(
+                obj.connected_endpoint._meta.app_label,
+                obj.connected_endpoint._meta.model_name
+            )
+        return None
+
    def get_connected_endpoint(self, obj):
        """
        Return the appropriate serializer for the type of connected object.
@@ -58,6 +67,11 @@ class SiteSerializer(TaggitSerializer, CustomFieldModelSerializer):
    tenant = NestedTenantSerializer(required=False, allow_null=True)
    time_zone = TimeZoneField(required=False)
    tags = TagListSerializerField(required=False)
+    count_prefixes = serializers.IntegerField(read_only=True)
+    count_vlans = serializers.IntegerField(read_only=True)
+    count_racks = serializers.IntegerField(read_only=True)
+    count_devices = serializers.IntegerField(read_only=True)
+    count_circuits = serializers.IntegerField(read_only=True)

    class Meta:
        model = Site
@@ -121,7 +135,7 @@ class RackSerializer(TaggitSerializer, CustomFieldModelSerializer):
            validator(data)

        # Enforce model validation
-        super(RackSerializer, self).validate(data)
+        super().validate(data)

        return data

@@ -294,7 +308,7 @@ class DeviceSerializer(TaggitSerializer, CustomFieldModelSerializer):
            validator(data)

        # Enforce model validation
-        super(DeviceSerializer, self).validate(data)
+        super().validate(data)

        return data

@@ -331,7 +345,10 @@ class ConsoleServerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer)

    class Meta:
        model = ConsoleServerPort
-        fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags']
+        fields = [
+            'id', 'device', 'name', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable',
+            'tags',
+        ]


 class ConsolePortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
@@ -341,7 +358,10 @@ class ConsolePortSerializer(TaggitSerializer, ConnectedEndpointSerializer):

    class Meta:
        model = ConsolePort
-        fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags']
+        fields = [
+            'id', 'device', 'name', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable',
+            'tags',
+        ]


 class PowerOutletSerializer(TaggitSerializer, ConnectedEndpointSerializer):
@@ -351,7 +371,10 @@ class PowerOutletSerializer(TaggitSerializer, ConnectedEndpointSerializer):

    class Meta:
        model = PowerOutlet
-        fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags']
+        fields = [
+            'id', 'device', 'name', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable',
+            'tags',
+        ]


 class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
@@ -361,7 +384,10 @@ class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer):

    class Meta:
        model = PowerPort
-        fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags']
+        fields = [
+            'id', 'device', 'name', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable',
+            'tags',
+        ]


 class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer):
@@ -383,8 +409,8 @@ class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer):
        model = Interface
        fields = [
            'id', 'device', 'name', 'form_factor', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description',
-            'connected_endpoint', 'connection_status', 'cable', 'mode', 'untagged_vlan', 'tagged_vlans', 'tags',
-            'count_ipaddresses',
+            'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', 'mode', 'untagged_vlan',
+            'tagged_vlans', 'tags', 'count_ipaddresses',
        ]

    # TODO: This validation should be handled by Interface.clean()
@@ -405,7 +431,7 @@ class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer):
                                    "be global.".format(vlan)
                })

-        return super(InterfaceSerializer, self).validate(data)
+        return super().validate(data)


 class RearPortSerializer(ValidatedModelSerializer):
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -35,12 +35,13 @@ from .exceptions import MissingFilterException

 class DCIMFieldChoicesViewSet(FieldChoicesViewSet):
    fields = (
+        (Cable, ['length_unit']),
        (Device, ['face', 'status']),
        (ConsolePort, ['connection_status']),
        (Interface, ['connection_status', 'form_factor', 'mode']),
        (InterfaceTemplate, ['form_factor']),
        (PowerPort, ['connection_status']),
-        (Rack, ['type', 'width']),
+        (Rack, ['outer_unit', 'status', 'type', 'width']),
        (Site, ['status']),
    )

--- a/netbox/dcim/constants.py
+++ b/netbox/dcim/constants.py
@@ -88,12 +88,21 @@ IFACE_FF_80211G = 2610
 IFACE_FF_80211N = 2620
 IFACE_FF_80211AC = 2630
 IFACE_FF_80211AD = 2640
+# SONET
+IFACE_FF_SONET_OC3 = 6100
+IFACE_FF_SONET_OC12 = 6200
+IFACE_FF_SONET_OC48 = 6300
+IFACE_FF_SONET_OC192 = 6400
+IFACE_FF_SONET_OC768 = 6500
+IFACE_FF_SONET_OC1920 = 6600
+IFACE_FF_SONET_OC3840 = 6700
 # Fibrechannel
 IFACE_FF_1GFC_SFP = 3010
 IFACE_FF_2GFC_SFP = 3020
 IFACE_FF_4GFC_SFP = 3040
 IFACE_FF_8GFC_SFP_PLUS = 3080
 IFACE_FF_16GFC_SFP_PLUS = 3160
+IFACE_FF_32GFC_SFP28 = 3320
 # Serial
 IFACE_FF_T1 = 4000
 IFACE_FF_E1 = 4010
@@ -158,6 +167,18 @@ IFACE_FF_CHOICES = [
            [IFACE_FF_80211AD, 'IEEE 802.11ad'],
        ]
    ],
+    [
+        'SONET',
+        [
+            [IFACE_FF_SONET_OC3, 'OC-3/STM-1'],
+            [IFACE_FF_SONET_OC12, 'OC-12/STM-4'],
+            [IFACE_FF_SONET_OC48, 'OC-48/STM-16'],
+            [IFACE_FF_SONET_OC192, 'OC-192/STM-64'],
+            [IFACE_FF_SONET_OC768, 'OC-768/STM-256'],
+            [IFACE_FF_SONET_OC1920, 'OC-1920/STM-640'],
+            [IFACE_FF_SONET_OC3840, 'OC-3840/STM-1234'],
+        ]
+    ],
    [
        'FibreChannel',
        [
@@ -166,6 +187,7 @@ IFACE_FF_CHOICES = [
            [IFACE_FF_4GFC_SFP, 'SFP (4GFC)'],
            [IFACE_FF_8GFC_SFP_PLUS, 'SFP+ (8GFC)'],
            [IFACE_FF_16GFC_SFP_PLUS, 'SFP+ (16GFC)'],
+            [IFACE_FF_32GFC_SFP28, 'SFP28 (32GFC)'],
        ]
    ],
    [
@@ -360,11 +382,11 @@ COMPATIBLE_TERMINATION_TYPES = {
    'circuittermination': ['interface', 'frontport', 'rearport'],
 }

-LENGTH_UNIT_METER = 'm'
-LENGTH_UNIT_CENTIMETER = 'cm'
-LENGTH_UNIT_MILLIMETER = 'mm'
-LENGTH_UNIT_FOOT = 'ft'
-LENGTH_UNIT_INCH = 'in'
+LENGTH_UNIT_METER = 1200
+LENGTH_UNIT_CENTIMETER = 1100
+LENGTH_UNIT_MILLIMETER = 1000
+LENGTH_UNIT_FOOT = 2100
+LENGTH_UNIT_INCH = 2000
 CABLE_LENGTH_UNIT_CHOICES = (
    (LENGTH_UNIT_METER, 'Meters'),
    (LENGTH_UNIT_CENTIMETER, 'Centimeters'),
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -7,6 +7,7 @@ from netaddr.core import AddrFormatError

 from extras.filters import CustomFieldFilterSet
 from tenancy.models import Tenant
+from utilities.constants import COLOR_CHOICES
 from utilities.filters import NullableCharFieldFilter, NumericInFilter, TagFilter
 from virtualization.models import Cluster
 from .constants import *
@@ -698,37 +699,56 @@ class DeviceComponentFilterSet(django_filters.FilterSet):


 class ConsolePortFilter(DeviceComponentFilterSet):
+    cabled = django_filters.BooleanFilter(
+        field_name='cable',
+        lookup_expr='isnull',
+        exclude=True
+    )

    class Meta:
        model = ConsolePort
-        fields = ['name']
+        fields = ['name', 'connection_status']


 class ConsoleServerPortFilter(DeviceComponentFilterSet):
+    cabled = django_filters.BooleanFilter(
+        field_name='cable',
+        lookup_expr='isnull',
+        exclude=True
+    )

    class Meta:
        model = ConsoleServerPort
-        fields = ['name']
+        fields = ['name', 'connection_status']


 class PowerPortFilter(DeviceComponentFilterSet):
+    cabled = django_filters.BooleanFilter(
+        field_name='cable',
+        lookup_expr='isnull',
+        exclude=True
+    )

    class Meta:
        model = PowerPort
-        fields = ['name']
+        fields = ['name', 'connection_status']


 class PowerOutletFilter(DeviceComponentFilterSet):
+    cabled = django_filters.BooleanFilter(
+        field_name='cable',
+        lookup_expr='isnull',
+        exclude=True
+    )

    class Meta:
        model = PowerOutlet
-        fields = ['name']
+        fields = ['name', 'connection_status']


 class InterfaceFilter(django_filters.FilterSet):
    """
-    Not using DeviceComponentFilterSet for Interfaces because we need to glean the ordering logic from the parent
-    Device's DeviceType.
+    Not using DeviceComponentFilterSet for Interfaces because we need to check for VirtualChassis membership.
    """
    device = django_filters.CharFilter(
        method='filter_device',
@@ -740,6 +760,11 @@ class InterfaceFilter(django_filters.FilterSet):
        field_name='pk',
        label='Device (ID)',
    )
+    cabled = django_filters.BooleanFilter(
+        field_name='cable',
+        lookup_expr='isnull',
+        exclude=True
+    )
    type = django_filters.CharFilter(
        method='filter_type',
        label='Interface type',
@@ -762,15 +787,19 @@ class InterfaceFilter(django_filters.FilterSet):
        method='filter_vlan',
        label='Assigned VID'
    )
+    form_factor = django_filters.MultipleChoiceFilter(
+        choices=IFACE_FF_CHOICES,
+        null_value=None
+    )

    class Meta:
        model = Interface
-        fields = ['name', 'form_factor', 'enabled', 'mtu', 'mgmt_only']
+        fields = ['name', 'connection_status', 'form_factor', 'enabled', 'mtu', 'mgmt_only']

    def filter_device(self, queryset, name, value):
        try:
            device = Device.objects.get(**{name: value})
-            vc_interface_ids = [i['id'] for i in device.vc_interfaces.values('id')]
+            vc_interface_ids = device.vc_interfaces.values_list('id', flat=True)
            return queryset.filter(pk__in=vc_interface_ids)
        except Device.DoesNotExist:
            return queryset.none()
@@ -814,6 +843,11 @@ class InterfaceFilter(django_filters.FilterSet):


 class FrontPortFilter(DeviceComponentFilterSet):
+    cabled = django_filters.BooleanFilter(
+        field_name='cable',
+        lookup_expr='isnull',
+        exclude=True
+    )

    class Meta:
        model = FrontPort
@@ -821,6 +855,11 @@ class FrontPortFilter(DeviceComponentFilterSet):


 class RearPortFilter(DeviceComponentFilterSet):
+    cabled = django_filters.BooleanFilter(
+        field_name='cable',
+        lookup_expr='isnull',
+        exclude=True
+    )

    class Meta:
        model = RearPort
@@ -929,6 +968,12 @@ class CableFilter(django_filters.FilterSet):
        method='search',
        label='Search',
    )
+    type = django_filters.MultipleChoiceFilter(
+        choices=CABLE_TYPE_CHOICES
+    )
+    color = django_filters.MultipleChoiceFilter(
+        choices=COLOR_CHOICES
+    )

    class Meta:
        model = Cable
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
--- a/netbox/dcim/managers.py
+++ b/netbox/dcim/managers.py
@@ -18,7 +18,7 @@ class DeviceComponentManager(Manager):

    def get_queryset(self):

-        queryset = super(DeviceComponentManager, self).get_queryset()
+        queryset = super().get_queryset()
        table_name = self.model._meta.db_table
        sql = r"CONCAT(REGEXP_REPLACE({}.name, '\d+$', ''), LPAD(SUBSTRING({}.name FROM '\d+$'), 8, '0'))"

--- a/netbox/dcim/migrations/0062_interface_mtu.py
+++ b/netbox/dcim/migrations/0062_interface_mtu.py
@@ -19,11 +19,11 @@ class Migration(migrations.Migration):
        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)'], [1510, 'CFP2 (100GE)'], [1520, 'CFP4 (100GE)'], [1550, 'Cisco CPAK (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'], [5300, 'Extreme SummitStack'], [5310, 'Extreme SummitStack-128'], [5320, 'Extreme SummitStack-256'], [5330, 'Extreme SummitStack-512']]], ['Other', [[32767, 'Other']]]], default=1200),
+            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)'], [1510, 'CFP2 (100GE)'], [1520, 'CFP4 (100GE)'], [1550, 'Cisco CPAK (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']]], ['SONET', [[6100, 'OC-3/STM-1'], [6200, 'OC-12/STM-4'], [6300, 'OC-48/STM-16'], [6400, 'OC-192/STM-64'], [6500, 'OC-768/STM-256'], [6600, 'OC-1920/STM-640'], [6700, 'OC-3840/STM-1234']]], ['FibreChannel', [[3010, 'SFP (1GFC)'], [3020, 'SFP (2GFC)'], [3040, 'SFP (4GFC)'], [3080, 'SFP+ (8GFC)'], [3160, 'SFP+ (16GFC)'], [3320, 'SFP28 (32GFC)']]], ['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'], [5300, 'Extreme SummitStack'], [5310, 'Extreme SummitStack-128'], [5320, 'Extreme SummitStack-256'], [5330, 'Extreme SummitStack-512']]], ['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)'], [1510, 'CFP2 (100GE)'], [1520, 'CFP4 (100GE)'], [1550, 'Cisco CPAK (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'], [5300, 'Extreme SummitStack'], [5310, 'Extreme SummitStack-128'], [5320, 'Extreme SummitStack-256'], [5330, 'Extreme SummitStack-512']]], ['Other', [[32767, 'Other']]]], default=1200),
+            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)'], [1510, 'CFP2 (100GE)'], [1520, 'CFP4 (100GE)'], [1550, 'Cisco CPAK (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']]], ['SONET', [[6100, 'OC-3/STM-1'], [6200, 'OC-12/STM-4'], [6300, 'OC-48/STM-16'], [6400, 'OC-192/STM-64'], [6500, 'OC-768/STM-256'], [6600, 'OC-1920/STM-640'], [6700, 'OC-3840/STM-1234']]], ['FibreChannel', [[3010, 'SFP (1GFC)'], [3020, 'SFP (2GFC)'], [3040, 'SFP (4GFC)'], [3080, 'SFP+ (8GFC)'], [3160, 'SFP+ (16GFC)'], [3320, 'SFP28 (32GFC)']]], ['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'], [5300, 'Extreme SummitStack'], [5310, 'Extreme SummitStack-128'], [5320, 'Extreme SummitStack-256'], [5330, 'Extreme SummitStack-512']]], ['Other', [[32767, 'Other']]]], default=1200),
        ),
    ]
--- a/netbox/dcim/migrations/0066_cables.py
+++ b/netbox/dcim/migrations/0066_cables.py
@@ -46,6 +46,9 @@ def console_connections_to_cables(apps, schema_editor):
    if 'test' not in sys.argv:
        print("{} cables created".format(cable_count))

+    # Normalize connection_status for all non-connected ConsolePorts
+    ConsolePort.objects.filter(connected_endpoint__isnull=True).update(connection_status=None)
+

 def power_connections_to_cables(apps, schema_editor):
    """
@@ -87,6 +90,9 @@ def power_connections_to_cables(apps, schema_editor):
    if 'test' not in sys.argv:
        print("{} cables created".format(cable_count))

+    # Normalize connection_status for all non-connected PowerPorts
+    PowerPort.objects.filter(connected_endpoint__isnull=True).update(connection_status=None)
+

 def interface_connections_to_cables(apps, schema_editor):
    """
@@ -131,6 +137,15 @@ def interface_connections_to_cables(apps, schema_editor):
        print("{} cables created".format(cable_count))


+def delete_interfaceconnection_content_type(apps, schema_editor):
+    """
+    Delete the ContentType for the InterfaceConnection model. (This is not done automatically upon model deletion.)
+    """
+    ContentType = apps.get_model('contenttypes', 'ContentType')
+    InterfaceConnection = apps.get_model('dcim', 'InterfaceConnection')
+    ContentType.objects.get_for_model(InterfaceConnection).delete()
+
+
 class Migration(migrations.Migration):
    atomic = False

@@ -157,7 +172,7 @@ class Migration(migrations.Migration):
                ('label', models.CharField(blank=True, max_length=100)),
                ('color', utilities.fields.ColorField(blank=True, max_length=6)),
                ('length', models.PositiveSmallIntegerField(blank=True, null=True)),
-                ('length_unit', models.CharField(blank=True, max_length=2)),
+                ('length_unit', models.PositiveSmallIntegerField(blank=True, null=True)),
                ('_abs_length', models.DecimalField(blank=True, decimal_places=4, max_digits=10, null=True)),
                ('termination_a_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')),
                ('termination_b_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')),
@@ -291,7 +306,8 @@ class Migration(migrations.Migration):
        migrations.RunPython(power_connections_to_cables),
        migrations.RunPython(interface_connections_to_cables),

-        # Delete the InterfaceConnection model
+        # Delete the InterfaceConnection model and its ContentType
+        migrations.RunPython(delete_interfaceconnection_content_type),
        migrations.RemoveField(
            model_name='interfaceconnection',
            name='interface_a',
@@ -303,36 +319,4 @@ class Migration(migrations.Migration):
        migrations.DeleteModel(
            name='InterfaceConnection',
        ),
-
-        # Proxy models
-        migrations.CreateModel(
-            name='ConsoleConnection',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-                'indexes': [],
-            },
-            bases=('dcim.consoleport',),
-        ),
-        migrations.CreateModel(
-            name='InterfaceConnection',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-                'indexes': [],
-            },
-            bases=('dcim.interface',),
-        ),
-        migrations.CreateModel(
-            name='PowerConnection',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-                'indexes': [],
-            },
-            bases=('dcim.powerport',),
-        ),
    ]
--- a/netbox/dcim/migrations/0068_rack_new_fields.py
+++ b/netbox/dcim/migrations/0068_rack_new_fields.py
@@ -28,7 +28,7 @@ class Migration(migrations.Migration):
        migrations.AddField(
            model_name='rack',
            name='outer_unit',
-            field=models.CharField(blank=True, max_length=2),
+            field=models.PositiveSmallIntegerField(blank=True, null=True),
        ),
        migrations.AddField(
            model_name='rack',
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -511,10 +511,10 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
        blank=True,
        null=True
    )
-    outer_unit = models.CharField(
+    outer_unit = models.PositiveSmallIntegerField(
        choices=RACK_DIMENSION_UNIT_CHOICES,
-        max_length=2,
-        blank=True
+        blank=True,
+        null=True
    )
    comments = models.TextField(
        blank=True
@@ -544,7 +544,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
        ]

    def __str__(self):
-        return self.display_name or super(Rack, self).__str__()
+        return self.display_name or super().__str__()

    def get_absolute_url(self):
        return reverse('dcim:rack', args=[self.pk])
@@ -552,10 +552,10 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
    def clean(self):

        # Validate outer dimensions and unit
-        if (self.outer_width or self.outer_depth) and not self.outer_unit:
+        if (self.outer_width is not None or self.outer_depth is not None) and self.outer_unit is None:
            raise ValidationError("Must specify a unit when setting an outer width/depth")
-        else:
-            self.outer_unit = ''
+        elif self.outer_width is None and self.outer_depth is None:
+            self.outer_unit = None

        if self.pk:
            # Validate that Rack is tall enough to house the installed Devices
@@ -582,7 +582,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
        if self.pk:
            _site_id = Rack.objects.get(pk=self.pk).site_id

-        super(Rack, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)

        # Update racked devices if the assigned Site has been changed.
        if _site_id is not None and self.site_id != _site_id:
@@ -894,7 +894,7 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel):
        return self.model

    def __init__(self, *args, **kwargs):
-        super(DeviceType, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        # Save a copy of u_height for validation in clean()
        self._original_u_height = self.u_height
@@ -1437,7 +1437,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
        )

    def __str__(self):
-        return self.display_name or super(Device, self).__str__()
+        return self.display_name or super().__str__()

    def get_absolute_url(self):
        return reverse('dcim:device', args=[self.pk])
@@ -1552,7 +1552,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):

        is_new = not bool(self.pk)

-        super(Device, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)

        # If this is a new Device, instantiate all of the related components per the DeviceType definition
        if is_new:
@@ -2055,7 +2055,7 @@ class Interface(CableTermination, ComponentModel):
        if self.pk and self.mode is not IFACE_MODE_TAGGED:
            self.tagged_vlans.clear()

-        return super(Interface, self).save(*args, **kwargs)
+        return super().save(*args, **kwargs)

    def log_change(self, user, request_id, action):
        """
@@ -2495,10 +2495,10 @@ class Cable(ChangeLoggedModel):
        blank=True,
        null=True
    )
-    length_unit = models.CharField(
+    length_unit = models.PositiveSmallIntegerField(
        choices=CABLE_LENGTH_UNIT_CHOICES,
-        max_length=2,
-        blank=True
+        blank=True,
+        null=True
    )
    # Stores the normalized length (in meters) for database ordering
    _abs_length = models.DecimalField(
@@ -2522,7 +2522,7 @@ class Cable(ChangeLoggedModel):

    def __init__(self, *args, **kwargs):

-        super(Cable, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        # Create an ID string for use by __str__(). We have to save a copy of pk since it's nullified after .delete()
        # is called.
@@ -2584,10 +2584,10 @@ class Cable(ChangeLoggedModel):
            raise ValidationError("Cannot connect to a virtual interface")

        # Validate length and length_unit
-        if self.length and not self.length_unit:
+        if self.length is not None and self.length_unit is None:
            raise ValidationError("Must specify a unit when setting a cable length")
-        if self.length_unit and self.length is None:
-            self.length_unit = ''
+        elif self.length is None:
+            self.length_unit = None

    def save(self, *args, **kwargs):

@@ -2595,7 +2595,7 @@ class Cable(ChangeLoggedModel):
        if self.length and self.length_unit:
            self._abs_length = to_meters(self.length, self.length_unit)

-        super(Cable, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)

    def to_csv(self):
        return (
@@ -2631,64 +2631,3 @@ class Cable(ChangeLoggedModel):

        # (A path end, B path end, connected/planned)
        return a_path[-1][2], b_path[-1][2], path_status
-
-
-#
-# Connection proxy models
-#
-
-class ConsoleConnection(ConsolePort):
-
-    csv_headers = [
-        'console_server', 'port', 'device', 'console_port', 'connection_status',
-    ]
-
-    class Meta:
-        proxy = True
-
-    def to_csv(self):
-        return (
-            self.connected_endpoint.device.identifier if self.connected_endpoint else None,
-            self.connected_endpoint.name if self.connected_endpoint else None,
-            self.device.identifier,
-            self.name,
-            self.get_connection_status_display(),
-        )
-
-
-class PowerConnection(PowerPort):
-
-    csv_headers = [
-        'pdu', 'outlet', 'device', 'power_port', 'connection_status',
-    ]
-
-    class Meta:
-        proxy = True
-
-    def to_csv(self):
-        return (
-            self.connected_endpoint.device.identifier if self.connected_endpoint else None,
-            self.connected_endpoint.name if self.connected_endpoint else None,
-            self.device.identifier,
-            self.name,
-            self.get_connection_status_display(),
-        )
-
-
-class InterfaceConnection(Interface):
-
-    csv_headers = [
-        'device_a', 'interface_a', 'device_b', 'interface_b', 'connection_status',
-    ]
-
-    class Meta:
-        proxy = True
-
-    def to_csv(self):
-        return (
-            self.connected_endpoint.device.identifier if self.connected_endpoint else None,
-            self.connected_endpoint.name if self.connected_endpoint else None,
-            self.device.identifier,
-            self.name,
-            self.get_connection_status_display(),
-        )
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -4,11 +4,10 @@ from django_tables2.utils import Accessor
 from tenancy.tables import COL_TENANT
 from utilities.tables import BaseTable, BooleanColumn, ColorColumn, ToggleColumn
 from .models import (
-    Cable, ConsoleConnection, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device,
-    DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceConnection,
-    InterfaceTemplate, InventoryItem, Manufacturer, Platform, PowerConnection, PowerOutlet, PowerOutletTemplate,
-    PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site,
-    VirtualChassis,
+    Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
+    DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate,
+    InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack,
+    RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis,
 )

 REGION_LINK = """
@@ -683,7 +682,7 @@ class ConsoleConnectionTable(BaseTable):
    )

    class Meta(BaseTable.Meta):
-        model = ConsoleConnection
+        model = ConsolePort
        fields = ('console_server', 'connected_endpoint', 'device', 'name', 'connection_status')


@@ -706,7 +705,7 @@ class PowerConnectionTable(BaseTable):
    )

    class Meta(BaseTable.Meta):
-        model = PowerConnection
+        model = PowerPort
        fields = ('pdu', 'connected_endpoint', 'device', 'name', 'connection_status')


@@ -745,7 +744,7 @@ class InterfaceConnectionTable(BaseTable):
    )

    class Meta(BaseTable.Meta):
-        model = InterfaceConnection
+        model = Interface
        fields = (
            'device_a', 'interface_a', 'description_a', 'device_b', 'interface_b', 'description_b', 'connection_status',
        )
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -20,7 +20,7 @@ class RegionTest(APITestCase):

    def setUp(self):

-        super(RegionTest, self).setUp()
+        super().setUp()

        self.region1 = Region.objects.create(name='Test Region 1', slug='test-region-1')
        self.region2 = Region.objects.create(name='Test Region 2', slug='test-region-2')
@@ -121,7 +121,7 @@ class SiteTest(APITestCase):

    def setUp(self):

-        super(SiteTest, self).setUp()
+        super().setUp()

        self.region1 = Region.objects.create(name='Test Region 1', slug='test-region-1')
        self.region2 = Region.objects.create(name='Test Region 2', slug='test-region-2')
@@ -256,7 +256,7 @@ class RackGroupTest(APITestCase):

    def setUp(self):

-        super(RackGroupTest, self).setUp()
+        super().setUp()

        self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1')
        self.site2 = Site.objects.create(name='Test Site 2', slug='test-site-2')
@@ -366,7 +366,7 @@ class RackRoleTest(APITestCase):

    def setUp(self):

-        super(RackRoleTest, self).setUp()
+        super().setUp()

        self.rackrole1 = RackRole.objects.create(name='Test Rack Role 1', slug='test-rack-role-1', color='ff0000')
        self.rackrole2 = RackRole.objects.create(name='Test Rack Role 2', slug='test-rack-role-2', color='00ff00')
@@ -474,7 +474,7 @@ class RackTest(APITestCase):

    def setUp(self):

-        super(RackTest, self).setUp()
+        super().setUp()

        self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1')
        self.site2 = Site.objects.create(name='Test Site 2', slug='test-site-2')
@@ -608,7 +608,7 @@ class RackReservationTest(APITestCase):

    def setUp(self):

-        super(RackReservationTest, self).setUp()
+        super().setUp()

        self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1')
        self.rack1 = Rack.objects.create(site=self.site1, name='Test Rack 1')
@@ -719,7 +719,7 @@ class ManufacturerTest(APITestCase):

    def setUp(self):

-        super(ManufacturerTest, self).setUp()
+        super().setUp()

        self.manufacturer1 = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
        self.manufacturer2 = Manufacturer.objects.create(name='Test Manufacturer 2', slug='test-manufacturer-2')
@@ -820,7 +820,7 @@ class DeviceTypeTest(APITestCase):

    def setUp(self):

-        super(DeviceTypeTest, self).setUp()
+        super().setUp()

        self.manufacturer1 = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
        self.manufacturer2 = Manufacturer.objects.create(name='Test Manufacturer 2', slug='test-manufacturer-2')
@@ -936,7 +936,7 @@ class ConsolePortTemplateTest(APITestCase):

    def setUp(self):

-        super(ConsolePortTemplateTest, self).setUp()
+        super().setUp()

        self.manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
        self.devicetype = DeviceType.objects.create(
@@ -1036,7 +1036,7 @@ class ConsoleServerPortTemplateTest(APITestCase):

    def setUp(self):

-        super(ConsoleServerPortTemplateTest, self).setUp()
+        super().setUp()

        self.manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
        self.devicetype = DeviceType.objects.create(
@@ -1136,7 +1136,7 @@ class PowerPortTemplateTest(APITestCase):

    def setUp(self):

-        super(PowerPortTemplateTest, self).setUp()
+        super().setUp()

        self.manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
        self.devicetype = DeviceType.objects.create(
@@ -1236,7 +1236,7 @@ class PowerOutletTemplateTest(APITestCase):

    def setUp(self):

-        super(PowerOutletTemplateTest, self).setUp()
+        super().setUp()

        self.manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
        self.devicetype = DeviceType.objects.create(
@@ -1336,7 +1336,7 @@ class InterfaceTemplateTest(APITestCase):

    def setUp(self):

-        super(InterfaceTemplateTest, self).setUp()
+        super().setUp()

        self.manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
        self.devicetype = DeviceType.objects.create(
@@ -1436,7 +1436,7 @@ class DeviceBayTemplateTest(APITestCase):

    def setUp(self):

-        super(DeviceBayTemplateTest, self).setUp()
+        super().setUp()

        self.manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
        self.devicetype = DeviceType.objects.create(
@@ -1536,7 +1536,7 @@ class DeviceRoleTest(APITestCase):

    def setUp(self):

-        super(DeviceRoleTest, self).setUp()
+        super().setUp()

        self.devicerole1 = DeviceRole.objects.create(
            name='Test Device Role 1', slug='test-device-role-1', color='ff0000'
@@ -1650,7 +1650,7 @@ class PlatformTest(APITestCase):

    def setUp(self):

-        super(PlatformTest, self).setUp()
+        super().setUp()

        self.platform1 = Platform.objects.create(name='Test Platform 1', slug='test-platform-1')
        self.platform2 = Platform.objects.create(name='Test Platform 2', slug='test-platform-2')
@@ -1751,7 +1751,7 @@ class DeviceTest(APITestCase):

    def setUp(self):

-        super(DeviceTest, self).setUp()
+        super().setUp()

        self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1')
        self.site2 = Site.objects.create(name='Test Site 2', slug='test-site-2')
@@ -1913,7 +1913,7 @@ class ConsolePortTest(APITestCase):

    def setUp(self):

-        super(ConsolePortTest, self).setUp()
+        super().setUp()

        site = Site.objects.create(name='Test Site 1', slug='test-site-1')
        manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
@@ -1951,7 +1951,7 @@ class ConsolePortTest(APITestCase):

        self.assertEqual(
            sorted(response.data['results'][0]),
-            ['cable', 'device', 'id', 'name', 'url']
+            ['cable', 'connection_status', 'device', 'id', 'name', 'url']
        )

    def test_create_consoleport(self):
@@ -2026,7 +2026,7 @@ class ConsoleServerPortTest(APITestCase):

    def setUp(self):

-        super(ConsoleServerPortTest, self).setUp()
+        super().setUp()

        site = Site.objects.create(name='Test Site 1', slug='test-site-1')
        manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
@@ -2064,7 +2064,7 @@ class ConsoleServerPortTest(APITestCase):

        self.assertEqual(
            sorted(response.data['results'][0]),
-            ['cable', 'device', 'id', 'name', 'url']
+            ['cable', 'connection_status', 'device', 'id', 'name', 'url']
        )

    def test_create_consoleserverport(self):
@@ -2137,7 +2137,7 @@ class PowerPortTest(APITestCase):

    def setUp(self):

-        super(PowerPortTest, self).setUp()
+        super().setUp()

        site = Site.objects.create(name='Test Site 1', slug='test-site-1')
        manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
@@ -2175,7 +2175,7 @@ class PowerPortTest(APITestCase):

        self.assertEqual(
            sorted(response.data['results'][0]),
-            ['cable', 'device', 'id', 'name', 'url']
+            ['cable', 'connection_status', 'device', 'id', 'name', 'url']
        )

    def test_create_powerport(self):
@@ -2250,7 +2250,7 @@ class PowerOutletTest(APITestCase):

    def setUp(self):

-        super(PowerOutletTest, self).setUp()
+        super().setUp()

        site = Site.objects.create(name='Test Site 1', slug='test-site-1')
        manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
@@ -2288,7 +2288,7 @@ class PowerOutletTest(APITestCase):

        self.assertEqual(
            sorted(response.data['results'][0]),
-            ['cable', 'device', 'id', 'name', 'url']
+            ['cable', 'connection_status', 'device', 'id', 'name', 'url']
        )

    def test_create_poweroutlet(self):
@@ -2361,7 +2361,7 @@ class InterfaceTest(APITestCase):

    def setUp(self):

-        super(InterfaceTest, self).setUp()
+        super().setUp()

        site = Site.objects.create(name='Test Site 1', slug='test-site-1')
        manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
@@ -2425,7 +2425,7 @@ class InterfaceTest(APITestCase):

        self.assertEqual(
            sorted(response.data['results'][0]),
-            ['cable', 'device', 'id', 'name', 'url']
+            ['cable', 'connection_status', 'device', 'id', 'name', 'url']
        )

    def test_create_interface(self):
@@ -2560,7 +2560,7 @@ class DeviceBayTest(APITestCase):

    def setUp(self):

-        super(DeviceBayTest, self).setUp()
+        super().setUp()

        site = Site.objects.create(name='Test Site 1', slug='test-site-1')
        manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
@@ -2683,7 +2683,7 @@ class InventoryItemTest(APITestCase):

    def setUp(self):

-        super(InventoryItemTest, self).setUp()
+        super().setUp()

        site = Site.objects.create(name='Test Site 1', slug='test-site-1')
        self.manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
@@ -2799,7 +2799,7 @@ class CableTest(APITestCase):

    def setUp(self):

-        super(CableTest, self).setUp()
+        super().setUp()

        site = Site.objects.create(name='Test Site 1', slug='test-site-1')
        self.manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
@@ -2940,7 +2940,7 @@ class ConnectionTest(APITestCase):

    def setUp(self):

-        super(ConnectionTest, self).setUp()
+        super().setUp()

        self.site = Site.objects.create(
            name='Test Site 1', slug='test-site-1'
@@ -3304,7 +3304,7 @@ class ConnectedDeviceTest(APITestCase):

    def setUp(self):

-        super(ConnectedDeviceTest, self).setUp()
+        super().setUp()

        self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1')
        self.site2 = Site.objects.create(name='Test Site 2', slug='test-site-2')
@@ -3346,7 +3346,7 @@ class VirtualChassisTest(APITestCase):

    def setUp(self):

-        super(VirtualChassisTest, self).setUp()
+        super().setUp()

        site = Site.objects.create(name='Test Site', slug='test-site')
        manufacturer = Manufacturer.objects.create(name='Test Manufacturer', slug='test-manufacturer')
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -17,6 +17,7 @@ from ipam.models import Prefix, VLAN
 from ipam.tables import InterfaceIPAddressTable, InterfaceVLANTable
 from utilities.forms import ConfirmationForm
 from utilities.paginator import EnhancedPaginator
+from utilities.utils import csv_format
 from utilities.views import (
    BulkComponentCreateView, BulkDeleteView, BulkEditView, BulkImportView, ComponentCreateView, GetReturnURLMixin,
    ObjectDeleteView, ObjectEditView, ObjectListView,
@@ -24,11 +25,10 @@ from utilities.views import (
 from virtualization.models import VirtualMachine
 from . import filters, forms, tables
 from .models import (
-    Cable, ConsoleConnection, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device,
-    DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceConnection,
-    InterfaceTemplate, InventoryItem, Manufacturer, Platform, PowerConnection, PowerOutlet, PowerOutletTemplate,
-    PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site,
-    VirtualChassis,
+    Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
+    DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate,
+    InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack,
+    RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis,
 )


@@ -1688,7 +1688,7 @@ class CableBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 #

 class ConsoleConnectionsListView(ObjectListView):
-    queryset = ConsoleConnection.objects.select_related(
+    queryset = ConsolePort.objects.select_related(
        'device', 'connected_endpoint__device'
    ).filter(
        connected_endpoint__isnull=False
@@ -1700,9 +1700,25 @@ class ConsoleConnectionsListView(ObjectListView):
    table = tables.ConsoleConnectionTable
    template_name = 'dcim/console_connections_list.html'

+    def queryset_to_csv(self):
+        csv_data = [
+            # Headers
+            ','.join(['console_server', 'port', 'device', 'console_port', 'connection_status'])
+        ]
+        for obj in self.queryset:
+            csv = csv_format([
+                obj.connected_endpoint.device.identifier if obj.connected_endpoint else None,
+                obj.connected_endpoint.name if obj.connected_endpoint else None,
+                obj.device.identifier,
+                obj.name,
+                obj.get_connection_status_display(),
+            ])
+            csv_data.append(csv)
+        return csv_data
+

 class PowerConnectionsListView(ObjectListView):
-    queryset = PowerConnection.objects.select_related(
+    queryset = PowerPort.objects.select_related(
        'device', 'connected_endpoint__device'
    ).filter(
        connected_endpoint__isnull=False
@@ -1714,9 +1730,25 @@ class PowerConnectionsListView(ObjectListView):
    table = tables.PowerConnectionTable
    template_name = 'dcim/power_connections_list.html'

+    def queryset_to_csv(self):
+        csv_data = [
+            # Headers
+            ','.join(['pdu', 'outlet', 'device', 'power_port', 'connection_status'])
+        ]
+        for obj in self.queryset:
+            csv = csv_format([
+                obj.connected_endpoint.device.identifier if obj.connected_endpoint else None,
+                obj.connected_endpoint.name if obj.connected_endpoint else None,
+                obj.device.identifier,
+                obj.name,
+                obj.get_connection_status_display(),
+            ])
+            csv_data.append(csv)
+        return csv_data
+

 class InterfaceConnectionsListView(ObjectListView):
-    queryset = InterfaceConnection.objects.select_related(
+    queryset = Interface.objects.select_related(
        'device', 'cable', '_connected_interface__device'
    ).filter(
        # Avoid duplicate connections by only selecting the lower PK in a connected pair
@@ -1730,6 +1762,22 @@ class InterfaceConnectionsListView(ObjectListView):
    table = tables.InterfaceConnectionTable
    template_name = 'dcim/interface_connections_list.html'

+    def queryset_to_csv(self):
+        csv_data = [
+            # Headers
+            ','.join(['device_a', 'interface_a', 'device_b', 'interface_b', 'connection_status'])
+        ]
+        for obj in self.queryset:
+            csv = csv_format([
+                obj.connected_endpoint.device.identifier if obj.connected_endpoint else None,
+                obj.connected_endpoint.name if obj.connected_endpoint else None,
+                obj.device.identifier,
+                obj.name,
+                obj.get_connection_status_display(),
+            ])
+            csv_data.append(csv)
+        return csv_data
+

 #
 # Inventory items
--- a/netbox/extras/admin.py
+++ b/netbox/extras/admin.py
@@ -28,7 +28,7 @@ class WebhookForm(forms.ModelForm):
        exclude = []

    def __init__(self, *args, **kwargs):
-        super(WebhookForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        order_content_types(self.fields['obj_type'])

@@ -56,7 +56,7 @@ class CustomFieldForm(forms.ModelForm):
        exclude = []

    def __init__(self, *args, **kwargs):
-        super(CustomFieldForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        order_content_types(self.fields['obj_type'])

@@ -96,7 +96,7 @@ class ExportTemplateForm(forms.ModelForm):
        exclude = []

    def __init__(self, *args, **kwargs):
-        super(ExportTemplateForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        # Format ContentType choices
        order_content_types(self.fields['content_type'])
--- a/netbox/extras/api/customfields.py
+++ b/netbox/extras/api/customfields.py
@@ -105,7 +105,7 @@ class CustomFieldModelSerializer(ValidatedModelSerializer):
                    custom_fields[cfv.field.name] = cfv.value
            instance.custom_fields = custom_fields

-        super(CustomFieldModelSerializer, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        if self.instance is not None:

@@ -137,7 +137,7 @@ class CustomFieldModelSerializer(ValidatedModelSerializer):

        with transaction.atomic():

-            instance = super(CustomFieldModelSerializer, self).create(validated_data)
+            instance = super().create(validated_data)

            # Save custom fields
            if custom_fields is not None:
@@ -152,7 +152,7 @@ class CustomFieldModelSerializer(ValidatedModelSerializer):

        with transaction.atomic():

-            instance = super(CustomFieldModelSerializer, self).update(instance, validated_data)
+            instance = super().update(instance, validated_data)

            # Save custom fields
            if custom_fields is not None:
--- a/netbox/extras/api/serializers.py
+++ b/netbox/extras/api/serializers.py
@@ -108,7 +108,7 @@ class ImageAttachmentSerializer(ValidatedModelSerializer):
            )

        # Enforce model validation
-        super(ImageAttachmentSerializer, self).validate(data)
+        super().validate(data)

        return data

--- a/netbox/extras/api/views.py
+++ b/netbox/extras/api/views.py
@@ -50,7 +50,7 @@ class CustomFieldModelViewSet(ModelViewSet):
                custom_field_choices[cfc.id] = cfc.value
        custom_field_choices = custom_field_choices

-        context = super(CustomFieldModelViewSet, self).get_serializer_context()
+        context = super().get_serializer_context()
        context.update({
            'custom_fields': custom_fields,
            'custom_field_choices': custom_field_choices,
@@ -59,7 +59,7 @@ class CustomFieldModelViewSet(ModelViewSet):

    def get_queryset(self):
        # Prefetch custom field values
-        return super(CustomFieldModelViewSet, self).get_queryset().prefetch_related('custom_field_values__field')
+        return super().get_queryset().prefetch_related('custom_field_values__field')


 #
--- a/netbox/extras/filters.py
+++ b/netbox/extras/filters.py
@@ -17,7 +17,7 @@ class CustomFieldFilter(django_filters.Filter):
    def __init__(self, custom_field, *args, **kwargs):
        self.cf_type = custom_field.type
        self.filter_logic = custom_field.filter_logic
-        super(CustomFieldFilter, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

    def filter(self, queryset, value):

@@ -63,7 +63,7 @@ class CustomFieldFilterSet(django_filters.FilterSet):
    """

    def __init__(self, *args, **kwargs):
-        super(CustomFieldFilterSet, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        obj_type = ContentType.objects.get_for_model(self._meta.model)
        custom_fields = CustomField.objects.filter(obj_type=obj_type).exclude(filter_logic=CF_FILTER_DISABLED)
--- a/netbox/extras/forms.py
+++ b/netbox/extras/forms.py
@@ -102,7 +102,7 @@ class CustomFieldForm(forms.ModelForm):
        self.custom_fields = []
        self.obj_type = ContentType.objects.get_for_model(self._meta.model)

-        super(CustomFieldForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        # Add all applicable CustomFields to the form
        custom_fields = []
@@ -138,7 +138,7 @@ class CustomFieldForm(forms.ModelForm):
            cfv.save()

    def save(self, commit=True):
-        obj = super(CustomFieldForm, self).save(commit)
+        obj = super().save(commit)

        # Handle custom fields the same way we do M2M fields
        if commit:
@@ -152,7 +152,7 @@ class CustomFieldForm(forms.ModelForm):
 class CustomFieldBulkEditForm(BulkEditForm):

    def __init__(self, *args, **kwargs):
-        super(CustomFieldBulkEditForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        self.custom_fields = []
        self.obj_type = ContentType.objects.get_for_model(self.model)
@@ -175,7 +175,7 @@ class CustomFieldFilterForm(forms.Form):

        self.obj_type = ContentType.objects.get_for_model(self.model)

-        super(CustomFieldFilterForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        # Add all applicable CustomFields to the form
        custom_fields = get_custom_fields_for_model(self.obj_type, filterable_only=True).items()
@@ -193,13 +193,15 @@ class TagForm(BootstrapMixin, forms.ModelForm):

    class Meta:
        model = Tag
-        fields = ['name', 'slug']
+        fields = [
+            'name', 'slug',
+        ]


 class AddRemoveTagsForm(forms.Form):

    def __init__(self, *args, **kwargs):
-        super(AddRemoveTagsForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        # Add add/remove tags fields
        self.fields['add_tags'] = TagField(required=False)
@@ -208,7 +210,10 @@ class AddRemoveTagsForm(forms.Form):

 class TagFilterForm(BootstrapMixin, forms.Form):
    model = Tag
-    q = forms.CharField(required=False, label='Search')
+    q = forms.CharField(
+        required=False,
+        label='Search'
+    )


 #
@@ -249,7 +254,9 @@ class ConfigContextBulkEditForm(BootstrapMixin, BulkEditForm):
    )

    class Meta:
-        nullable_fields = ['description']
+        nullable_fields = [
+            'description',
+        ]


 class ConfigContextFilterForm(BootstrapMixin, forms.Form):
@@ -291,7 +298,9 @@ class ImageAttachmentForm(BootstrapMixin, forms.ModelForm):

    class Meta:
        model = ImageAttachment
-        fields = ['name', 'image']
+        fields = [
+            'name', 'image',
+        ]


 #
--- a/netbox/extras/migrations/0001_initial_squashed_0010_customfield_filter_logic.py
+++ b/netbox/extras/migrations/0001_initial_squashed_0010_customfield_filter_logic.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.14 on 2018-07-31 02:19
-import re
-from distutils.version import StrictVersion

 from django.conf import settings
 import django.contrib.postgres.fields.jsonb
@@ -17,13 +15,14 @@ def verify_postgresql_version(apps, schema_editor):
    """
    Verify that PostgreSQL is version 9.4 or higher.
    """
+    # https://www.postgresql.org/docs/current/libpq-status.html#LIBPQ-PQSERVERVERSION
+    DB_MINIMUM_VERSION = 90400  # 9.4.0
+
    try:
-        with connection.cursor() as cursor:
-            cursor.execute("SELECT VERSION()")
-            row = cursor.fetchone()
-            pg_version = re.match(r'^PostgreSQL (\d+\.\d+(\.\d+)?)', row[0]).group(1)
-            if StrictVersion(pg_version) < StrictVersion('9.4.0'):
-                raise Exception("PostgreSQL 9.4.0 or higher is required ({} found). Upgrade PostgreSQL and then run migrations again.".format(pg_version))
+        pg_version = connection.pg_version
+
+        if pg_version < DB_MINIMUM_VERSION:
+            raise Exception("PostgreSQL 9.4.0 ({}) or higher is required ({} found). Upgrade PostgreSQL and then run migrations again.".format(DB_MINIMUM_VERSION, pg_version))

    # Skip if the database is missing (e.g. for CI testing) or misconfigured.
    except OperationalError:
--- a/netbox/extras/migrations/0008_reports.py
+++ b/netbox/extras/migrations/0008_reports.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-09-26 21:25
-from distutils.version import StrictVersion
-import re

 from django.conf import settings
 import django.contrib.postgres.fields.jsonb
@@ -14,13 +12,14 @@ def verify_postgresql_version(apps, schema_editor):
    """
    Verify that PostgreSQL is version 9.4 or higher.
    """
+    # https://www.postgresql.org/docs/current/libpq-status.html#LIBPQ-PQSERVERVERSION
+    DB_MINIMUM_VERSION = 90400  # 9.4.0
+
    try:
-        with connection.cursor() as cursor:
-            cursor.execute("SELECT VERSION()")
-            row = cursor.fetchone()
-            pg_version = re.match(r'^PostgreSQL (\d+\.\d+(\.\d+)?)', row[0]).group(1)
-            if StrictVersion(pg_version) < StrictVersion('9.4.0'):
-                raise Exception("PostgreSQL 9.4.0 or higher is required ({} found). Upgrade PostgreSQL and then run migrations again.".format(pg_version))
+        pg_version = connection.pg_version
+
+        if pg_version < DB_MINIMUM_VERSION:
+            raise Exception("PostgreSQL 9.4.0 ({}) or higher is required ({} found). Upgrade PostgreSQL and then run migrations again.".format(DB_MINIMUM_VERSION, pg_version))

    # Skip if the database is missing (e.g. for CI testing) or misconfigured.
    except OperationalError:
--- a/netbox/extras/models.py
+++ b/netbox/extras/models.py
@@ -14,7 +14,7 @@ from django.template import Template, Context
 from django.urls import reverse

 from dcim.constants import CONNECTION_STATUS_CONNECTED
-from utilities.utils import foreground_color
+from utilities.utils import deepmerge, foreground_color
 from .constants import *
 from .querysets import ConfigContextQuerySet

@@ -261,7 +261,7 @@ class CustomFieldValue(models.Model):
        if self.pk and self.value is None:
            self.delete()
        else:
-            super(CustomFieldValue, self).save(*args, **kwargs)
+            super().save(*args, **kwargs)


 class CustomFieldChoice(models.Model):
@@ -293,7 +293,7 @@ class CustomFieldChoice(models.Model):
    def delete(self, using=None, keep_parents=False):
        # When deleting a CustomFieldChoice, delete all CustomFieldValues which point to it
        pk = self.pk
-        super(CustomFieldChoice, self).delete(using, keep_parents)
+        super().delete(using, keep_parents)
        CustomFieldValue.objects.filter(field__type=CF_TYPE_SELECT, serialized_value=str(pk)).delete()


@@ -603,7 +603,7 @@ class ImageAttachment(models.Model):

        _name = self.image.name

-        super(ImageAttachment, self).delete(*args, **kwargs)
+        super().delete(*args, **kwargs)

        # Delete file from disk
        self.image.delete(save=False)
@@ -717,11 +717,11 @@ class ConfigContextModel(models.Model):
        # Compile all config data, overwriting lower-weight values with higher-weight values where a collision occurs
        data = OrderedDict()
        for context in ConfigContext.objects.get_for_object(self):
-            data.update(context.data)
+            data = deepmerge(data, context.data)

-        # If the object has local config context data defined, that data overwrites all rendered data
+        # If the object has local config context data defined, merge it last
        if self.local_context_data is not None:
-            data.update(self.local_context_data)
+            data = deepmerge(data, self.local_context_data)

        return data

@@ -841,7 +841,7 @@ class ObjectChange(models.Model):
        self.user_name = self.user.username
        self.object_repr = str(self.changed_object)

-        return super(ObjectChange, self).save(*args, **kwargs)
+        return super().save(*args, **kwargs)

    def get_absolute_url(self):
        return reverse('extras:objectchange', args=[self.pk])
--- a/netbox/extras/tests/test_api.py
+++ b/netbox/extras/tests/test_api.py
@@ -14,7 +14,7 @@ class GraphTest(APITestCase):

    def setUp(self):

-        super(GraphTest, self).setUp()
+        super().setUp()

        self.graph1 = Graph.objects.create(
            type=GRAPH_TYPE_SITE, name='Test Graph 1', source='http://example.com/graphs.py?site={{ obj.name }}&foo=1'
@@ -118,7 +118,7 @@ class ExportTemplateTest(APITestCase):

    def setUp(self):

-        super(ExportTemplateTest, self).setUp()
+        super().setUp()

        self.content_type = ContentType.objects.get_for_model(Device)
        self.exporttemplate1 = ExportTemplate.objects.create(
@@ -225,7 +225,7 @@ class TagTest(APITestCase):

    def setUp(self):

-        super(TagTest, self).setUp()
+        super().setUp()

        self.tag1 = Tag.objects.create(name='Test Tag 1', slug='test-tag-1')
        self.tag2 = Tag.objects.create(name='Test Tag 2', slug='test-tag-2')
@@ -316,7 +316,7 @@ class ConfigContextTest(APITestCase):

    def setUp(self):

-        super(ConfigContextTest, self).setUp()
+        super().setUp()

        self.configcontext1 = ConfigContext.objects.create(
            name='Test Config Context 1',
--- a/netbox/extras/tests/test_customfields.py
+++ b/netbox/extras/tests/test_customfields.py
@@ -101,7 +101,7 @@ class CustomFieldAPITest(APITestCase):

    def setUp(self):

-        super(CustomFieldAPITest, self).setUp()
+        super().setUp()

        content_type = ContentType.objects.get_for_model(Site)

--- a/netbox/extras/tests/test_tags.py
+++ b/netbox/extras/tests/test_tags.py
@@ -12,7 +12,7 @@ class TaggedItemTest(APITestCase):

    def setUp(self):

-        super(TaggedItemTest, self).setUp()
+        super().setUp()

    def test_create_tagged_item(self):

--- a/netbox/extras/webhooks.py
+++ b/netbox/extras/webhooks.py
@@ -45,7 +45,7 @@ def enqueue_webhooks(instance, action):
                "extras.webhooks_worker.process_webhook",
                webhook,
                serializer.data,
-                instance.__class__,
+                instance._meta.model_name,
                action,
                str(datetime.datetime.now())
            )
--- a/netbox/extras/webhooks_worker.py
+++ b/netbox/extras/webhooks_worker.py
@@ -10,14 +10,14 @@ from extras.constants import WEBHOOK_CT_JSON, WEBHOOK_CT_X_WWW_FORM_ENCODED, OBJ


@job('default')
-def process_webhook(webhook, data, model_class, event, timestamp):
+def process_webhook(webhook, data, model_name, event, timestamp):
    """
    Make a POST request to the defined Webhook
    """
    payload = {
        'event': dict(OBJECTCHANGE_ACTION_CHOICES)[event].lower(),
        'timestamp': timestamp,
-        'model': model_class._meta.model_name,
+        'model': model_name,
        'data': data
    }
    headers = {
--- a/netbox/ipam/api/serializers.py
+++ b/netbox/ipam/api/serializers.py
@@ -87,7 +87,7 @@ class VLANGroupSerializer(ValidatedModelSerializer):
                validator(data)

        # Enforce model validation
-        super(VLANGroupSerializer, self).validate(data)
+        super().validate(data)

        return data

@@ -118,7 +118,7 @@ class VLANSerializer(TaggitSerializer, CustomFieldModelSerializer):
                validator(data)

        # Enforce model validation
-        super(VLANSerializer, self).validate(data)
+        super().validate(data)

        return data

--- a/netbox/ipam/fields.py
+++ b/netbox/ipam/fields.py
@@ -40,7 +40,7 @@ class BaseIPField(models.Field):
    def formfield(self, **kwargs):
        defaults = {'form_class': self.form_class()}
        defaults.update(kwargs)
-        return super(BaseIPField, self).formfield(**defaults)
+        return super().formfield(**defaults)


 class IPNetworkField(BaseIPField):
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -34,11 +34,15 @@ IPADDRESS_MASK_LENGTH_CHOICES = add_blank_choice([(i, i) for i in range(1, 129)]
 #

 class VRFForm(BootstrapMixin, TenancyForm, CustomFieldForm):
-    tags = TagField(required=False)
+    tags = TagField(
+        required=False
+    )

    class Meta:
        model = VRF
-        fields = ['name', 'rd', 'enforce_unique', 'description', 'tenant_group', 'tenant', 'tags']
+        fields = [
+            'name', 'rd', 'enforce_unique', 'description', 'tenant_group', 'tenant', 'tags',
+        ]
        labels = {
            'rd': "RD",
        }
@@ -67,22 +71,40 @@ class VRFCSVForm(forms.ModelForm):


 class VRFBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(queryset=VRF.objects.all(), widget=forms.MultipleHiddenInput)
-    tenant = forms.ModelChoiceField(queryset=Tenant.objects.all(), required=False)
-    enforce_unique = forms.NullBooleanField(
-        required=False, widget=BulkEditNullBooleanSelect, label='Enforce unique space'
+    pk = forms.ModelMultipleChoiceField(
+        queryset=VRF.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )
+    tenant = forms.ModelChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False
+    )
+    enforce_unique = forms.NullBooleanField(
+        required=False,
+        widget=BulkEditNullBooleanSelect(),
+        label='Enforce unique space'
+    )
+    description = forms.CharField(
+        max_length=100,
+        required=False
    )
-    description = forms.CharField(max_length=100, required=False)

    class Meta:
-        nullable_fields = ['tenant', 'description']
+        nullable_fields = [
+            'tenant', 'description',
+        ]


 class VRFFilterForm(BootstrapMixin, CustomFieldFilterForm):
    model = VRF
-    q = forms.CharField(required=False, label='Search')
+    q = forms.CharField(
+        required=False,
+        label='Search'
+    )
    tenant = FilterChoiceField(
-        queryset=Tenant.objects.annotate(filter_count=Count('vrfs')),
+        queryset=Tenant.objects.annotate(
+            filter_count=Count('vrfs')
+        ),
        to_field_name='slug',
        null_label='-- None --'
    )
@@ -97,7 +119,9 @@ class RIRForm(BootstrapMixin, forms.ModelForm):

    class Meta:
        model = RIR
-        fields = ['name', 'slug', 'is_private']
+        fields = [
+            'name', 'slug', 'is_private',
+        ]


 class RIRCSVForm(forms.ModelForm):
@@ -112,11 +136,17 @@ class RIRCSVForm(forms.ModelForm):


 class RIRFilterForm(BootstrapMixin, forms.Form):
-    is_private = forms.NullBooleanField(required=False, label='Private', widget=forms.Select(choices=[
-        ('', '---------'),
-        ('True', 'Yes'),
-        ('False', 'No'),
-    ]))
+    is_private = forms.NullBooleanField(
+        required=False,
+        label='Private',
+        widget=forms.Select(
+            choices=[
+                ('', '---------'),
+                ('True', 'Yes'),
+                ('False', 'No'),
+            ]
+        )
+    )


 #
@@ -124,11 +154,15 @@ class RIRFilterForm(BootstrapMixin, forms.Form):
 #

 class AggregateForm(BootstrapMixin, CustomFieldForm):
-    tags = TagField(required=False)
+    tags = TagField(
+        required=False
+    )

    class Meta:
        model = Aggregate
-        fields = ['prefix', 'rir', 'date_added', 'description', 'tags']
+        fields = [
+            'prefix', 'rir', 'date_added', 'description', 'tags',
+        ]
        help_texts = {
            'prefix': "IPv4 or IPv6 network",
            'rir': "Regional Internet Registry responsible for this prefix",
@@ -152,19 +186,40 @@ class AggregateCSVForm(forms.ModelForm):


 class AggregateBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(queryset=Aggregate.objects.all(), widget=forms.MultipleHiddenInput)
-    rir = forms.ModelChoiceField(queryset=RIR.objects.all(), required=False, label='RIR')
-    date_added = forms.DateField(required=False)
-    description = forms.CharField(max_length=100, required=False)
+    pk = forms.ModelMultipleChoiceField(
+        queryset=Aggregate.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )
+    rir = forms.ModelChoiceField(
+        queryset=RIR.objects.all(),
+        required=False,
+        label='RIR'
+    )
+    date_added = forms.DateField(
+        required=False
+    )
+    description = forms.CharField(
+        max_length=100,
+        required=False
+    )

    class Meta:
-        nullable_fields = ['date_added', 'description']
+        nullable_fields = [
+            'date_added', 'description',
+        ]


 class AggregateFilterForm(BootstrapMixin, CustomFieldFilterForm):
    model = Aggregate
-    q = forms.CharField(required=False, label='Search')
-    family = forms.ChoiceField(required=False, choices=IP_FAMILY_CHOICES, label='Address Family')
+    q = forms.CharField(
+        required=False,
+        label='Search'
+    )
+    family = forms.ChoiceField(
+        required=False,
+        choices=IP_FAMILY_CHOICES,
+        label='Address family'
+    )
    rir = FilterChoiceField(
        queryset=RIR.objects.annotate(filter_count=Count('aggregates')),
        to_field_name='slug',
@@ -181,7 +236,9 @@ class RoleForm(BootstrapMixin, forms.ModelForm):

    class Meta:
        model = Role
-        fields = ['name', 'slug']
+        fields = [
+            'name', 'slug',
+        ]


 class RoleCSVForm(forms.ModelForm):
@@ -205,7 +262,10 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldForm):
        required=False,
        label='Site',
        widget=forms.Select(
-            attrs={'filter-for': 'vlan_group', 'nullable': 'true'}
+            attrs={
+                'filter-for': 'vlan_group',
+                'nullable': 'true',
+            }
        )
    )
    vlan_group = ChainedModelChoiceField(
@@ -217,7 +277,10 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldForm):
        label='VLAN group',
        widget=APISelect(
            api_url='/api/ipam/vlan-groups/?site_id={{site}}',
-            attrs={'filter-for': 'vlan', 'nullable': 'true'}
+            attrs={
+                'filter-for': 'vlan',
+                'nullable': 'true',
+            }
        )
    )
    vlan = ChainedModelChoiceField(
@@ -229,7 +292,8 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldForm):
        required=False,
        label='VLAN',
        widget=APISelect(
-            api_url='/api/ipam/vlans/?site_id={{site}}&group_id={{vlan_group}}', display_field='display_name'
+            api_url='/api/ipam/vlans/?site_id={{site}}&group_id={{vlan_group}}',
+            display_field='display_name'
        )
    )
    tags = TagField(required=False)
@@ -250,7 +314,7 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldForm):
            initial['vlan_group'] = instance.vlan.group
        kwargs['initial'] = initial

-        super(PrefixForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        self.fields['vrf'].empty_label = 'Global'

@@ -311,7 +375,7 @@ class PrefixCSVForm(forms.ModelForm):

    def clean(self):

-        super(PrefixCSVForm, self).clean()
+        super().clean()

        site = self.cleaned_data.get('site')
        vlan_group = self.cleaned_data.get('vlan_group')
@@ -345,35 +409,84 @@ class PrefixCSVForm(forms.ModelForm):


 class PrefixBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(queryset=Prefix.objects.all(), widget=forms.MultipleHiddenInput)
-    site = forms.ModelChoiceField(queryset=Site.objects.all(), required=False)
-    vrf = forms.ModelChoiceField(queryset=VRF.objects.all(), required=False, label='VRF')
-    tenant = forms.ModelChoiceField(queryset=Tenant.objects.all(), required=False)
-    status = forms.ChoiceField(choices=add_blank_choice(PREFIX_STATUS_CHOICES), required=False)
-    role = forms.ModelChoiceField(queryset=Role.objects.all(), required=False)
-    is_pool = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect, label='Is a pool')
-    description = forms.CharField(max_length=100, required=False)
+    pk = forms.ModelMultipleChoiceField(
+        queryset=Prefix.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )
+    site = forms.ModelChoiceField(
+        queryset=Site.objects.all(),
+        required=False
+    )
+    vrf = forms.ModelChoiceField(
+        queryset=VRF.objects.all(),
+        required=False,
+        label='VRF'
+    )
+    tenant = forms.ModelChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False
+    )
+    status = forms.ChoiceField(
+        choices=add_blank_choice(PREFIX_STATUS_CHOICES),
+        required=False
+    )
+    role = forms.ModelChoiceField(
+        queryset=Role.objects.all(),
+        required=False
+    )
+    is_pool = forms.NullBooleanField(
+        required=False,
+        widget=BulkEditNullBooleanSelect(),
+        label='Is a pool'
+    )
+    description = forms.CharField(
+        max_length=100,
+        required=False
+    )

    class Meta:
-        nullable_fields = ['site', 'vrf', 'tenant', 'role', 'description']
+        nullable_fields = [
+            'site', 'vrf', 'tenant', 'role', 'description',
+        ]


 class PrefixFilterForm(BootstrapMixin, CustomFieldFilterForm):
    model = Prefix
-    q = forms.CharField(required=False, label='Search')
-    within_include = forms.CharField(required=False, label='Search within', widget=forms.TextInput(attrs={
-        'placeholder': 'Prefix',
-    }))
-    family = forms.ChoiceField(required=False, choices=IP_FAMILY_CHOICES, label='Address family')
-    mask_length = forms.ChoiceField(required=False, choices=PREFIX_MASK_LENGTH_CHOICES, label='Mask length')
+    q = forms.CharField(
+        required=False,
+        label='Search'
+    )
+    within_include = forms.CharField(
+        required=False,
+        widget=forms.TextInput(
+            attrs={
+                'placeholder': 'Prefix',
+            }
+        ),
+        label='Search within'
+    )
+    family = forms.ChoiceField(
+        required=False,
+        choices=IP_FAMILY_CHOICES,
+        label='Address family'
+    )
+    mask_length = forms.ChoiceField(
+        required=False,
+        choices=PREFIX_MASK_LENGTH_CHOICES,
+        label='Mask length'
+    )
    vrf = FilterChoiceField(
-        queryset=VRF.objects.annotate(filter_count=Count('prefixes')),
+        queryset=VRF.objects.annotate(
+            filter_count=Count('prefixes')
+        ),
        to_field_name='rd',
        label='VRF',
        null_label='-- Global --'
    )
    tenant = FilterChoiceField(
-        queryset=Tenant.objects.annotate(filter_count=Count('prefixes')),
+        queryset=Tenant.objects.annotate(
+            filter_count=Count('prefixes')
+        ),
        to_field_name='slug',
        null_label='-- None --'
    )
@@ -384,16 +497,23 @@ class PrefixFilterForm(BootstrapMixin, CustomFieldFilterForm):
        required=False
    )
    site = FilterChoiceField(
-        queryset=Site.objects.annotate(filter_count=Count('prefixes')),
+        queryset=Site.objects.annotate(
+            filter_count=Count('prefixes')
+        ),
        to_field_name='slug',
        null_label='-- None --'
    )
    role = FilterChoiceField(
-        queryset=Role.objects.annotate(filter_count=Count('prefixes')),
+        queryset=Role.objects.annotate(
+            filter_count=Count('prefixes')
+        ),
        to_field_name='slug',
        null_label='-- None --'
    )
-    expand = forms.BooleanField(required=False, label='Expand prefix hierarchy')
+    expand = forms.BooleanField(
+        required=False,
+        label='Expand prefix hierarchy'
+    )


 #
@@ -410,7 +530,9 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldForm)
        required=False,
        label='Site',
        widget=forms.Select(
-            attrs={'filter-for': 'nat_rack'}
+            attrs={
+                'filter-for': 'nat_rack'
+            }
        )
    )
    nat_rack = ChainedModelChoiceField(
@@ -423,7 +545,10 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldForm)
        widget=APISelect(
            api_url='/api/dcim/racks/?site_id={{nat_site}}',
            display_field='display_name',
-            attrs={'filter-for': 'nat_device', 'nullable': 'true'}
+            attrs={
+                'filter-for': 'nat_device',
+                'nullable': 'true'
+            }
        )
    )
    nat_device = ChainedModelChoiceField(
@@ -462,8 +587,13 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldForm)
            obj_label='address'
        )
    )
-    primary_for_parent = forms.BooleanField(required=False, label='Make this the primary IP for the device/VM')
-    tags = TagField(required=False)
+    primary_for_parent = forms.BooleanField(
+        required=False,
+        label='Make this the primary IP for the device/VM'
+    )
+    tags = TagField(
+        required=False
+    )

    class Meta:
        model = IPAddress
@@ -483,7 +613,7 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldForm)
            initial['nat_device'] = instance.nat_inside.device
        kwargs['initial'] = initial

-        super(IPAddressForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        self.fields['vrf'].empty_label = 'Global'

@@ -505,7 +635,7 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldForm)
                self.initial['primary_for_parent'] = True

    def clean(self):
-        super(IPAddressForm, self).clean()
+        super().clean()

        # Primary IP assignment is only available if an interface has been assigned.
        if self.cleaned_data.get('primary_for_parent') and not self.cleaned_data.get('interface'):
@@ -515,7 +645,7 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldForm)

    def save(self, *args, **kwargs):

-        ipaddress = super(IPAddressForm, self).save(*args, **kwargs)
+        ipaddress = super().save(*args, **kwargs)

        # Assign/clear this IPAddress as the primary for the associated Device/VirtualMachine.
        if self.cleaned_data['primary_for_parent']:
@@ -538,17 +668,21 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldForm)


 class IPAddressBulkCreateForm(BootstrapMixin, forms.Form):
-    pattern = ExpandableIPAddressField(label='Address pattern')
+    pattern = ExpandableIPAddressField(
+        label='Address pattern'
+    )


 class IPAddressBulkAddForm(BootstrapMixin, TenancyForm, CustomFieldForm):

    class Meta:
        model = IPAddress
-        fields = ['address', 'vrf', 'status', 'role', 'description', 'tenant_group', 'tenant']
+        fields = [
+            'address', 'vrf', 'status', 'role', 'description', 'tenant_group', 'tenant',
+        ]

    def __init__(self, *args, **kwargs):
-        super(IPAddressBulkAddForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
        self.fields['vrf'].empty_label = 'Global'


@@ -612,8 +746,7 @@ class IPAddressCSVForm(forms.ModelForm):
        fields = IPAddress.csv_headers

    def clean(self):
-
-        super(IPAddressCSVForm, self).clean()
+        super().clean()

        device = self.cleaned_data.get('device')
        virtual_machine = self.cleaned_data.get('virtual_machine')
@@ -662,7 +795,7 @@ class IPAddressCSVForm(forms.ModelForm):
                name=self.cleaned_data['interface_name']
            )

-        ipaddress = super(IPAddressCSVForm, self).save(*args, **kwargs)
+        ipaddress = super().save(*args, **kwargs)

        # Set as primary for device/VM
        if self.cleaned_data['is_primary']:
@@ -677,38 +810,86 @@ class IPAddressCSVForm(forms.ModelForm):


 class IPAddressBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(queryset=IPAddress.objects.all(), widget=forms.MultipleHiddenInput)
-    vrf = forms.ModelChoiceField(queryset=VRF.objects.all(), required=False, label='VRF')
-    tenant = forms.ModelChoiceField(queryset=Tenant.objects.all(), required=False)
-    status = forms.ChoiceField(choices=add_blank_choice(IPADDRESS_STATUS_CHOICES), required=False)
-    role = forms.ChoiceField(choices=add_blank_choice(IPADDRESS_ROLE_CHOICES), required=False)
-    description = forms.CharField(max_length=100, required=False)
+    pk = forms.ModelMultipleChoiceField(
+        queryset=IPAddress.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )
+    vrf = forms.ModelChoiceField(
+        queryset=VRF.objects.all(),
+        required=False,
+        label='VRF'
+    )
+    tenant = forms.ModelChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False
+    )
+    status = forms.ChoiceField(
+        choices=add_blank_choice(IPADDRESS_STATUS_CHOICES),
+        required=False
+    )
+    role = forms.ChoiceField(
+        choices=add_blank_choice(IPADDRESS_ROLE_CHOICES),
+        required=False
+    )
+    description = forms.CharField(
+        max_length=100, required=False
+    )

    class Meta:
-        nullable_fields = ['vrf', 'role', 'tenant', 'description']
+        nullable_fields = [
+            'vrf', 'role', 'tenant', 'description',
+        ]


 class IPAddressAssignForm(BootstrapMixin, forms.Form):
-    vrf = forms.ModelChoiceField(queryset=VRF.objects.all(), required=False, label='VRF', empty_label='Global')
-    address = forms.CharField(label='IP Address')
+    vrf = forms.ModelChoiceField(
+        queryset=VRF.objects.all(),
+        required=False,
+        label='VRF',
+        empty_label='Global'
+    )
+    address = forms.CharField(
+        label='IP Address'
+    )


 class IPAddressFilterForm(BootstrapMixin, CustomFieldFilterForm):
    model = IPAddress
-    q = forms.CharField(required=False, label='Search')
-    parent = forms.CharField(required=False, label='Parent Prefix', widget=forms.TextInput(attrs={
-        'placeholder': 'Prefix',
-    }))
-    family = forms.ChoiceField(required=False, choices=IP_FAMILY_CHOICES, label='Address family')
-    mask_length = forms.ChoiceField(required=False, choices=IPADDRESS_MASK_LENGTH_CHOICES, label='Mask length')
+    q = forms.CharField(
+        required=False,
+        label='Search'
+    )
+    parent = forms.CharField(
+        required=False,
+        widget=forms.TextInput(
+            attrs={
+                'placeholder': 'Prefix',
+            }
+        ),
+        label='Parent Prefix'
+    )
+    family = forms.ChoiceField(
+        required=False,
+        choices=IP_FAMILY_CHOICES,
+        label='Address family'
+    )
+    mask_length = forms.ChoiceField(
+        required=False,
+        choices=IPADDRESS_MASK_LENGTH_CHOICES,
+        label='Mask length'
+    )
    vrf = FilterChoiceField(
-        queryset=VRF.objects.annotate(filter_count=Count('ip_addresses')),
+        queryset=VRF.objects.annotate(
+            filter_count=Count('ip_addresses')
+        ),
        to_field_name='rd',
        label='VRF',
        null_label='-- Global --'
    )
    tenant = FilterChoiceField(
-        queryset=Tenant.objects.annotate(filter_count=Count('ip_addresses')),
+        queryset=Tenant.objects.annotate(
+            filter_count=Count('ip_addresses')
+        ),
        to_field_name='slug',
        null_label='-- None --'
    )
@@ -735,7 +916,9 @@ class VLANGroupForm(BootstrapMixin, forms.ModelForm):

    class Meta:
        model = VLANGroup
-        fields = ['site', 'name', 'slug']
+        fields = [
+            'site', 'name', 'slug',
+        ]


 class VLANGroupCSVForm(forms.ModelForm):
@@ -760,7 +943,9 @@ class VLANGroupCSVForm(forms.ModelForm):

 class VLANGroupFilterForm(BootstrapMixin, forms.Form):
    site = FilterChoiceField(
-        queryset=Site.objects.annotate(filter_count=Count('vlan_groups')),
+        queryset=Site.objects.annotate(
+            filter_count=Count('vlan_groups')
+        ),
        to_field_name='slug',
        null_label='-- Global --'
    )
@@ -775,7 +960,10 @@ class VLANForm(BootstrapMixin, TenancyForm, CustomFieldForm):
        queryset=Site.objects.all(),
        required=False,
        widget=forms.Select(
-            attrs={'filter-for': 'group', 'nullable': 'true'}
+            attrs={
+                'filter-for': 'group',
+                'nullable': 'true',
+            }
        )
    )
    group = ChainedModelChoiceField(
@@ -793,7 +981,9 @@ class VLANForm(BootstrapMixin, TenancyForm, CustomFieldForm):

    class Meta:
        model = VLAN
-        fields = ['site', 'group', 'vid', 'name', 'status', 'role', 'description', 'tenant_group', 'tenant', 'tags']
+        fields = [
+            'site', 'group', 'vid', 'name', 'status', 'role', 'description', 'tenant_group', 'tenant', 'tags',
+        ]
        help_texts = {
            'site': "Leave blank if this VLAN spans multiple sites",
            'group': "VLAN group (optional)",
@@ -850,8 +1040,7 @@ class VLANCSVForm(forms.ModelForm):
        }

    def clean(self):
-
-        super(VLANCSVForm, self).clean()
+        super().clean()

        site = self.cleaned_data.get('site')
        group_name = self.cleaned_data.get('group_name')
@@ -862,39 +1051,75 @@ class VLANCSVForm(forms.ModelForm):
                self.instance.group = VLANGroup.objects.get(site=site, name=group_name)
            except VLANGroup.DoesNotExist:
                if site:
-                    raise forms.ValidationError("VLAN group {} not found for site {}".format(group_name, site))
+                    raise forms.ValidationError(
+                        "VLAN group {} not found for site {}".format(group_name, site)
+                    )
                else:
-                    raise forms.ValidationError("Global VLAN group {} not found".format(group_name))
+                    raise forms.ValidationError(
+                        "Global VLAN group {} not found".format(group_name)
+                    )


 class VLANBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(queryset=VLAN.objects.all(), widget=forms.MultipleHiddenInput)
-    site = forms.ModelChoiceField(queryset=Site.objects.all(), required=False)
-    group = forms.ModelChoiceField(queryset=VLANGroup.objects.all(), required=False)
-    tenant = forms.ModelChoiceField(queryset=Tenant.objects.all(), required=False)
-    status = forms.ChoiceField(choices=add_blank_choice(VLAN_STATUS_CHOICES), required=False)
-    role = forms.ModelChoiceField(queryset=Role.objects.all(), required=False)
-    description = forms.CharField(max_length=100, required=False)
+    pk = forms.ModelMultipleChoiceField(
+        queryset=VLAN.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )
+    site = forms.ModelChoiceField(
+        queryset=Site.objects.all(),
+        required=False
+    )
+    group = forms.ModelChoiceField(
+        queryset=VLANGroup.objects.all(),
+        required=False
+    )
+    tenant = forms.ModelChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False
+    )
+    status = forms.ChoiceField(
+        choices=add_blank_choice(VLAN_STATUS_CHOICES),
+        required=False
+    )
+    role = forms.ModelChoiceField(
+        queryset=Role.objects.all(),
+        required=False
+    )
+    description = forms.CharField(
+        max_length=100,
+        required=False
+    )

    class Meta:
-        nullable_fields = ['site', 'group', 'tenant', 'role', 'description']
+        nullable_fields = [
+            'site', 'group', 'tenant', 'role', 'description',
+        ]


 class VLANFilterForm(BootstrapMixin, CustomFieldFilterForm):
    model = VLAN
-    q = forms.CharField(required=False, label='Search')
+    q = forms.CharField(
+        required=False,
+        label='Search'
+    )
    site = FilterChoiceField(
-        queryset=Site.objects.annotate(filter_count=Count('vlans')),
+        queryset=Site.objects.annotate(
+            filter_count=Count('vlans')
+        ),
        to_field_name='slug',
        null_label='-- Global --'
    )
    group_id = FilterChoiceField(
-        queryset=VLANGroup.objects.annotate(filter_count=Count('vlans')),
+        queryset=VLANGroup.objects.annotate(
+            filter_count=Count('vlans')
+        ),
        label='VLAN group',
        null_label='-- None --'
    )
    tenant = FilterChoiceField(
-        queryset=Tenant.objects.annotate(filter_count=Count('vlans')),
+        queryset=Tenant.objects.annotate(
+            filter_count=Count('vlans')
+        ),
        to_field_name='slug',
        null_label='-- None --'
    )
@@ -905,7 +1130,9 @@ class VLANFilterForm(BootstrapMixin, CustomFieldFilterForm):
        required=False
    )
    role = FilterChoiceField(
-        queryset=Role.objects.annotate(filter_count=Count('vlans')),
+        queryset=Role.objects.annotate(
+            filter_count=Count('vlans')
+        ),
        to_field_name='slug',
        null_label='-- None --'
    )
@@ -916,19 +1143,22 @@ class VLANFilterForm(BootstrapMixin, CustomFieldFilterForm):
 #

 class ServiceForm(BootstrapMixin, CustomFieldForm):
-    tags = TagField(required=False)
+    tags = TagField(
+        required=False
+    )

    class Meta:
        model = Service
-        fields = ['name', 'protocol', 'port', 'ipaddresses', 'description', 'tags']
+        fields = [
+            'name', 'protocol', 'port', 'ipaddresses', 'description', 'tags',
+        ]
        help_texts = {
            'ipaddresses': "IP address assignment is optional. If no IPs are selected, the service is assumed to be "
                           "reachable via all IPs assigned to the device.",
        }

    def __init__(self, *args, **kwargs):
-
-        super(ServiceForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        # Limit IP address choices to those assigned to interfaces of the parent device/VM
        if self.instance.device:
@@ -960,10 +1190,27 @@ class ServiceFilterForm(BootstrapMixin, CustomFieldFilterForm):


 class ServiceBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(queryset=Service.objects.all(), widget=forms.MultipleHiddenInput)
-    protocol = forms.ChoiceField(choices=add_blank_choice(IP_PROTOCOL_CHOICES), required=False)
-    port = forms.IntegerField(validators=[MinValueValidator(1), MaxValueValidator(65535)], required=False)
-    description = forms.CharField(max_length=100, required=False)
+    pk = forms.ModelMultipleChoiceField(
+        queryset=Service.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )
+    protocol = forms.ChoiceField(
+        choices=add_blank_choice(IP_PROTOCOL_CHOICES),
+        required=False
+    )
+    port = forms.IntegerField(
+        validators=[
+            MinValueValidator(1),
+            MaxValueValidator(65535),
+        ],
+        required=False
+    )
+    description = forms.CharField(
+        max_length=100,
+        required=False
+    )

    class Meta:
-        nullable_fields = ['site', 'group', 'tenant', 'role', 'description']
+        nullable_fields = [
+            'site', 'group', 'tenant', 'role', 'description',
+        ]
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -63,7 +63,7 @@ class VRF(ChangeLoggedModel, CustomFieldModel):
        verbose_name_plural = 'VRFs'

    def __str__(self):
-        return self.display_name or super(VRF, self).__str__()
+        return self.display_name or super().__str__()

    def get_absolute_url(self):
        return reverse('ipam:vrf', args=[self.pk])
@@ -198,7 +198,7 @@ class Aggregate(ChangeLoggedModel, CustomFieldModel):
        if self.prefix:
            # Infer address family from IPNetwork object
            self.family = self.prefix.version
-        super(Aggregate, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)

    def to_csv(self):
        return (
@@ -369,7 +369,7 @@ class Prefix(ChangeLoggedModel, CustomFieldModel):
            self.prefix = self.prefix.cidr
            # Infer address family from IPNetwork object
            self.family = self.prefix.version
-        super(Prefix, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)

    def to_csv(self):
        return (
@@ -484,7 +484,7 @@ class IPAddressManager(models.Manager):
        then re-cast this value to INET() so that records will be ordered properly. We are essentially re-casting each
        IP address as a /32 or /128.
        """
-        qs = super(IPAddressManager, self).get_queryset()
+        qs = super().get_queryset()
        return qs.annotate(host=RawSQL('INET(HOST(ipam_ipaddress.address))', [])).order_by('family', 'host')


@@ -605,7 +605,7 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
        if self.address:
            # Infer address family from IPAddress object
            self.family = self.address.version
-        super(IPAddress, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)

    def to_csv(self):

@@ -773,7 +773,7 @@ class VLAN(ChangeLoggedModel, CustomFieldModel):
        verbose_name_plural = 'VLANs'

    def __str__(self):
-        return self.display_name or super(VLAN, self).__str__()
+        return self.display_name or super().__str__()

    def get_absolute_url(self):
        return reverse('ipam:vlan', args=[self.pk])
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -464,7 +464,7 @@ class InterfaceVLANTable(BaseTable):

    def __init__(self, interface, *args, **kwargs):
        self.interface = interface
-        super(InterfaceVLANTable, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)


 #
--- a/netbox/ipam/tests/test_api.py
+++ b/netbox/ipam/tests/test_api.py
@@ -12,7 +12,7 @@ class VRFTest(APITestCase):

    def setUp(self):

-        super(VRFTest, self).setUp()
+        super().setUp()

        self.vrf1 = VRF.objects.create(name='Test VRF 1', rd='65000:1')
        self.vrf2 = VRF.objects.create(name='Test VRF 2', rd='65000:2')
@@ -113,7 +113,7 @@ class RIRTest(APITestCase):

    def setUp(self):

-        super(RIRTest, self).setUp()
+        super().setUp()

        self.rir1 = RIR.objects.create(name='Test RIR 1', slug='test-rir-1')
        self.rir2 = RIR.objects.create(name='Test RIR 2', slug='test-rir-2')
@@ -214,7 +214,7 @@ class AggregateTest(APITestCase):

    def setUp(self):

-        super(AggregateTest, self).setUp()
+        super().setUp()

        self.rir1 = RIR.objects.create(name='Test RIR 1', slug='test-rir-1')
        self.rir2 = RIR.objects.create(name='Test RIR 2', slug='test-rir-2')
@@ -317,7 +317,7 @@ class RoleTest(APITestCase):

    def setUp(self):

-        super(RoleTest, self).setUp()
+        super().setUp()

        self.role1 = Role.objects.create(name='Test Role 1', slug='test-role-1')
        self.role2 = Role.objects.create(name='Test Role 2', slug='test-role-2')
@@ -418,7 +418,7 @@ class PrefixTest(APITestCase):

    def setUp(self):

-        super(PrefixTest, self).setUp()
+        super().setUp()

        self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1')
        self.vrf1 = VRF.objects.create(name='Test VRF 1', rd='65000:1')
@@ -657,7 +657,7 @@ class IPAddressTest(APITestCase):

    def setUp(self):

-        super(IPAddressTest, self).setUp()
+        super().setUp()

        self.vrf1 = VRF.objects.create(name='Test VRF 1', rd='65000:1')
        self.ipaddress1 = IPAddress.objects.create(address=IPNetwork('192.168.0.1/24'))
@@ -756,7 +756,7 @@ class VLANGroupTest(APITestCase):

    def setUp(self):

-        super(VLANGroupTest, self).setUp()
+        super().setUp()

        self.vlangroup1 = VLANGroup.objects.create(name='Test VLAN Group 1', slug='test-vlan-group-1')
        self.vlangroup2 = VLANGroup.objects.create(name='Test VLAN Group 2', slug='test-vlan-group-2')
@@ -857,7 +857,7 @@ class VLANTest(APITestCase):

    def setUp(self):

-        super(VLANTest, self).setUp()
+        super().setUp()

        self.vlan1 = VLAN.objects.create(vid=1, name='Test VLAN 1')
        self.vlan2 = VLAN.objects.create(vid=2, name='Test VLAN 2')
@@ -958,7 +958,7 @@ class ServiceTest(APITestCase):

    def setUp(self):

-        super(ServiceTest, self).setUp()
+        super().setUp()

        site = Site.objects.create(name='Test Site 1', slug='test-site-1')
        manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -715,7 +715,7 @@ class IPAddressAssignView(PermissionRequiredMixin, View):
        if 'interface' not in request.GET:
            return redirect('ipam:ipaddress_add')

-        return super(IPAddressAssignView, self).dispatch(request, *args, **kwargs)
+        return super().dispatch(request, *args, **kwargs)

    def get(self, request):

--- a/netbox/netbox/api.py
+++ b/netbox/netbox/api.py
@@ -58,14 +58,14 @@ class TokenPermissions(DjangoModelPermissions):
    def __init__(self):
        # LOGIN_REQUIRED determines whether read-only access is provided to anonymous users.
        self.authenticated_users_only = settings.LOGIN_REQUIRED
-        super(TokenPermissions, self).__init__()
+        super().__init__()

    def has_permission(self, request, view):
        # If token authentication is in use, verify that the token allows write operations (for unsafe methods).
        if request.method not in SAFE_METHODS and isinstance(request.auth, Token):
            if not request.auth.write_enabled:
                return False
-        return super(TokenPermissions, self).has_permission(request, view)
+        return super().has_permission(request, view)


 #
@@ -132,7 +132,7 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination):
        if not self.limit:
            return None

-        return super(OptionalLimitOffsetPagination, self).get_next_link()
+        return super().get_next_link()

    def get_previous_link(self):

@@ -140,7 +140,7 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination):
        if not self.limit:
            return None

-        return super(OptionalLimitOffsetPagination, self).get_previous_link()
+        return super().get_previous_link()


 #
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -7,7 +7,7 @@ import warnings
 from django.contrib.messages import constants as messages
 from django.core.exceptions import ImproperlyConfigured

-# Check for Python 3.5+
+# Django 2.1 requires Python 3.5+
 if sys.version_info < (3, 5):
    raise RuntimeError(
        "NetBox requires Python 3.5 or higher (current: Python {})".format(sys.version.split()[0])
@@ -21,7 +21,8 @@ except ImportError:
        "Configuration file is not present. Please define netbox/netbox/configuration.py per the documentation."
    )

-VERSION = '2.5-beta2'
+
+VERSION = '2.5.0'

 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

@@ -247,7 +248,7 @@ SECRETS_MIN_PUBKEY_SIZE = 2048

 # Django filters
 FILTERS_NULL_CHOICE_LABEL = 'None'
-FILTERS_NULL_CHOICE_VALUE = '0'  # Must be a string
+FILTERS_NULL_CHOICE_VALUE = 'null'

 # Django REST framework (API)
 REST_FRAMEWORK_VERSION = VERSION[0:3]  # Use major.minor as API version
@@ -287,9 +288,12 @@ RQ_QUEUES = {

 # drf_yasg settings for Swagger
 SWAGGER_SETTINGS = {
+    'DEFAULT_AUTO_SCHEMA_CLASS': 'utilities.custom_inspectors.NetBoxSwaggerAutoSchema',
    'DEFAULT_FIELD_INSPECTORS': [
        'utilities.custom_inspectors.NullableBooleanFieldInspector',
        'utilities.custom_inspectors.CustomChoiceFieldInspector',
+        'utilities.custom_inspectors.TagListFieldInspector',
+        'utilities.custom_inspectors.SerializedPKRelatedFieldInspector',
        'drf_yasg.inspectors.CamelCaseJSONFilter',
        'drf_yasg.inspectors.ReferencingSerializerInspector',
        'drf_yasg.inspectors.RelatedFieldInspector',
--- a/netbox/project-static/js/livesearch.js
+++ b/netbox/project-static/js/livesearch.js
@@ -24,7 +24,7 @@ $(document).ready(function() {
        source: function(request, response) {
            $.ajax({
                type: 'GET',
-                url: search_field.attr('data-source'),
+                url: search_field.attr('data-source') + '?brief=1',
                data: search_key + '=' + request.term,
                success: function(data) {
                    var choices = [];
@@ -49,7 +49,7 @@ $(document).ready(function() {
            // Disable parent selection fields
            // $('select[filter-for="' + real_field.attr('name') + '"]').val('');
        },
-        minLength: 4,
+        minLength: 3,
        delay: 500
    });

--- a/netbox/secrets/admin.py
+++ b/netbox/secrets/admin.py
@@ -21,7 +21,7 @@ class UserKeyAdmin(admin.ModelAdmin):

    def get_actions(self, request):
        # Bulk deletion is disabled at the manager level, so remove the action from the admin site for this model.
-        actions = super(UserKeyAdmin, self).get_actions(request)
+        actions = super().get_actions(request)
        if 'delete_selected' in actions:
            del actions['delete_selected']
        if not request.user.has_perm('secrets.activate_userkey'):
--- a/netbox/secrets/api/serializers.py
+++ b/netbox/secrets/api/serializers.py
@@ -49,6 +49,6 @@ class SecretSerializer(TaggitSerializer, CustomFieldModelSerializer):
            validator(data)

        # Enforce model validation
-        super(SecretSerializer, self).validate(data)
+        super().validate(data)

        return data
--- a/netbox/secrets/api/views.py
+++ b/netbox/secrets/api/views.py
@@ -56,14 +56,14 @@ class SecretViewSet(ModelViewSet):
    def get_serializer_context(self):

        # Make the master key available to the serializer for encrypting plaintext values
-        context = super(SecretViewSet, self).get_serializer_context()
+        context = super().get_serializer_context()
        context['master_key'] = self.master_key

        return context

    def initial(self, request, *args, **kwargs):

-        super(SecretViewSet, self).initial(request, *args, **kwargs)
+        super().initial(request, *args, **kwargs)

        if request.user.is_authenticated:

--- a/netbox/secrets/forms.py
+++ b/netbox/secrets/forms.py
@@ -39,7 +39,9 @@ class SecretRoleForm(BootstrapMixin, forms.ModelForm):

    class Meta:
        model = SecretRole
-        fields = ['name', 'slug', 'users', 'groups']
+        fields = [
+            'name', 'slug', 'users', 'groups',
+        ]


 class SecretRoleCSVForm(forms.ModelForm):
@@ -62,7 +64,11 @@ class SecretForm(BootstrapMixin, CustomFieldForm):
        max_length=65535,
        required=False,
        label='Plaintext',
-        widget=forms.PasswordInput(attrs={'class': 'requires-session-key'})
+        widget=forms.PasswordInput(
+            attrs={
+                'class': 'requires-session-key',
+            }
+        )
    )
    plaintext2 = forms.CharField(
        max_length=65535,
@@ -70,15 +76,18 @@ class SecretForm(BootstrapMixin, CustomFieldForm):
        label='Plaintext (verify)',
        widget=forms.PasswordInput()
    )
-    tags = TagField(required=False)
+    tags = TagField(
+        required=False
+    )

    class Meta:
        model = Secret
-        fields = ['role', 'name', 'plaintext', 'plaintext2', 'tags']
+        fields = [
+            'role', 'name', 'plaintext', 'plaintext2', 'tags',
+        ]

    def __init__(self, *args, **kwargs):
-
-        super(SecretForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        # A plaintext value is required when creating a new Secret
        if not self.instance.pk:
@@ -122,25 +131,41 @@ class SecretCSVForm(forms.ModelForm):
        }

    def save(self, *args, **kwargs):
-        s = super(SecretCSVForm, self).save(*args, **kwargs)
+        s = super().save(*args, **kwargs)
        s.plaintext = str(self.cleaned_data['plaintext'])
        return s


 class SecretBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(queryset=Secret.objects.all(), widget=forms.MultipleHiddenInput)
-    role = forms.ModelChoiceField(queryset=SecretRole.objects.all(), required=False)
-    name = forms.CharField(max_length=100, required=False)
+    pk = forms.ModelMultipleChoiceField(
+        queryset=Secret.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )
+    role = forms.ModelChoiceField(
+        queryset=SecretRole.objects.all(),
+        required=False
+    )
+    name = forms.CharField(
+        max_length=100,
+        required=False
+    )

    class Meta:
-        nullable_fields = ['name']
+        nullable_fields = [
+            'name',
+        ]


 class SecretFilterForm(BootstrapMixin, CustomFieldFilterForm):
    model = Secret
-    q = forms.CharField(required=False, label='Search')
+    q = forms.CharField(
+        required=False,
+        label='Search'
+    )
    role = FilterChoiceField(
-        queryset=SecretRole.objects.annotate(filter_count=Count('secrets')),
+        queryset=SecretRole.objects.annotate(
+            filter_count=Count('secrets')
+        ),
        to_field_name='slug'
    )

@@ -169,5 +194,15 @@ class UserKeyForm(BootstrapMixin, forms.ModelForm):


 class ActivateUserKeyForm(forms.Form):
-    _selected_action = forms.ModelMultipleChoiceField(queryset=UserKey.objects.all(), label='User Keys')
-    secret_key = forms.CharField(label='Your private key', widget=forms.Textarea(attrs={'class': 'vLargeTextField'}))
+    _selected_action = forms.ModelMultipleChoiceField(
+        queryset=UserKey.objects.all(),
+        label='User Keys'
+    )
+    secret_key = forms.CharField(
+        widget=forms.Textarea(
+            attrs={
+                'class': 'vLargeTextField',
+            }
+        ),
+        label='Your private key'
+    )
--- a/netbox/secrets/models.py
+++ b/netbox/secrets/models.py
@@ -85,7 +85,7 @@ class UserKey(models.Model):
        )

    def __init__(self, *args, **kwargs):
-        super(UserKey, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        # Store the initial public_key and master_key_cipher to check for changes on save().
        self.__initial_public_key = self.public_key
@@ -125,7 +125,7 @@ class UserKey(models.Model):
                    )
                })

-        super(UserKey, self).clean()
+        super().clean()

    def save(self, *args, **kwargs):

@@ -138,7 +138,7 @@ class UserKey(models.Model):
            master_key = generate_random_key()
            self.master_key_cipher = encrypt_master_key(master_key, self.public_key)

-        super(UserKey, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)

    def delete(self, *args, **kwargs):

@@ -148,7 +148,7 @@ class UserKey(models.Model):
            raise Exception("Cannot delete the last active UserKey when Secrets exist! This would render all secrets "
                            "inaccessible.")

-        super(UserKey, self).delete(*args, **kwargs)
+        super().delete(*args, **kwargs)

    def is_filled(self):
        """
@@ -230,7 +230,7 @@ class SessionKey(models.Model):
        # Encrypt master key using the session key
        self.cipher = strxor.strxor(self.key, master_key)

-        super(SessionKey, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)

    def get_master_key(self, session_key):

@@ -356,7 +356,7 @@ class Secret(ChangeLoggedModel, CustomFieldModel):

    def __init__(self, *args, **kwargs):
        self.plaintext = kwargs.pop('plaintext', None)
-        super(Secret, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

    def __str__(self):
        if self.role and self.device and self.name:
--- a/netbox/secrets/tests/test_api.py
+++ b/netbox/secrets/tests/test_api.py
@@ -51,7 +51,7 @@ class SecretRoleTest(APITestCase):

    def setUp(self):

-        super(SecretRoleTest, self).setUp()
+        super().setUp()

        self.secretrole1 = SecretRole.objects.create(name='Test Secret Role 1', slug='test-secret-role-1')
        self.secretrole2 = SecretRole.objects.create(name='Test Secret Role 2', slug='test-secret-role-2')
@@ -152,7 +152,7 @@ class SecretTest(APITestCase):

    def setUp(self):

-        super(SecretTest, self).setUp()
+        super().setUp()

        userkey = UserKey(user=self.user, public_key=PUBLIC_KEY)
        userkey.save()
@@ -294,7 +294,7 @@ class GetSessionKeyTest(APITestCase):

    def setUp(self):

-        super(GetSessionKeyTest, self).setUp()
+        super().setUp()

        userkey = UserKey(user=self.user, public_key=PUBLIC_KEY)
        userkey.save()
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -228,7 +228,7 @@ class SecretBulkImportView(BulkImportView):
                messages.error(request, "No session key found for this user.")

            if self.master_key is not None:
-                return super(SecretBulkImportView, self).post(request)
+                return super().post(request)
            else:
                messages.error(request, "Invalid private key! Unable to encrypt secret data.")

--- a/netbox/templates/_base.html
+++ b/netbox/templates/_base.html
@@ -54,7 +54,7 @@
                </div>
                <div class="col-xs-4 text-right">
                    <p class="text-muted">
-                        <i class="fa fa-fw fa-book text-primary"></i> <a href="http://netbox.readthedocs.io/" target="_blank">Docs</a> &middot;
+                        <i class="fa fa-fw fa-book text-primary"></i> <a href="http://netbox.readthedocs.io/">Docs</a> &middot;
                        <i class="fa fa-fw fa-cloud text-primary"></i> <a href="{% url 'api_docs' %}">API</a> &middot;
                        <i class="fa fa-fw fa-code text-primary"></i> <a href="https://github.com/digitalocean/netbox">Code</a> &middot;
                        <i class="fa fa-fw fa-support text-primary"></i> <a href="https://github.com/digitalocean/netbox/wiki">Help</a>
--- a/netbox/templates/dcim/cable_trace.html
+++ b/netbox/templates/dcim/cable_trace.html
@@ -31,7 +31,7 @@
                    </h4>
                    {{ cable.get_status_display }}<br />
                    {{ cable.get_type_display|default:"" }}
-                    {% if cable.length %}- {{ cable.length }}{{ cable.length_unit }}{% endif %}
+                    {% if cable.length %}- {{ cable.length }}{{ cable.get_length_unit_display }}{% endif %}
                    <span class="label color-block center-block" style="background-color: #{{ cable.color }}">&nbsp;</span>
                {% else %}
                    <h4 class="text-muted">No Cable</h4>
--- a/netbox/templates/dcim/device_edit.html
+++ b/netbox/templates/dcim/device_edit.html
@@ -62,6 +62,13 @@
            {% endif %}
        </div>
    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Virtualization</strong></div>
+        <div class="panel-body">
+            {% render_field form.cluster_group %}
+            {% render_field form.cluster %}
+        </div>
+    </div>
    <div class="panel panel-default">
        <div class="panel-heading"><strong>Tenancy</strong></div>
        <div class="panel-body">
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -70,7 +70,10 @@
                </tr>
                <tr>
                    <td>Model Name</td>
-                    <td>{{ devicetype.model }}</td>
+                    <td>
+                        {{ devicetype.model }}<br/>
+                        <small class="text-muted">{{ devicetype.slug }}</small>
+                    </td>
                </tr>
                <tr>
                    <td>Part Number</td>
@@ -160,7 +163,7 @@
 {% if devicetype.interface_templates.exists %}
    <div class="row">
        <div class="col-md-12">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfacaes' add_url='dcim:devicetype_add_interface' delete_url='dcim:devicetype_delete_interface' %}
+            {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' add_url='dcim:devicetype_add_interface' delete_url='dcim:devicetype_delete_interface' %}
        </div>
    </div>
 {% endif %}
--- a/netbox/templates/dcim/inc/rack_elevation.html
+++ b/netbox/templates/dcim/inc/rack_elevation.html
@@ -27,13 +27,13 @@
                    {% ifequal u.device.face face_id %}
                        <a href="{% url 'dcim:device' pk=u.device.pk %}" data-toggle="popover" data-trigger="hover" data-container="body" data-html="true"
                           data-content="{{ u.device.device_role }}<br />{{ u.device.device_type.full_name }} ({{ u.device.device_type.u_height }}U){% if u.device.asset_tag %}<br />{{ u.device.asset_tag }}{% endif %}{% if u.device.serial %}<br />{{ u.device.serial }}{% endif %}">
-                            {{ u.device.name|default:u.device.device_role }}
+                            {{ u.device }}
                            {% if u.device.devicebay_count %}
                                ({{ u.device.get_children.count }}/{{ u.device.devicebay_count }})
                            {% endif %}
                        </a>
                    {% else %}
-                        <span>{{ u.device.name|default:u.device.device_role }}</span>
+                        <span>{{ u.device }}</span>
                    {% endifequal %}
                </li>
            {% else %}
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -158,7 +158,7 @@
                    <td>Outer Width</td>
                    <td>
                        {% if rack.outer_width %}
-                            <span>{{ rack.outer_width }}{{ rack.outer_unit }}</span>
+                            <span>{{ rack.outer_width }} {{ rack.get_outer_unit_display }}</span>
                        {% else %}
                            <span class="text-muted">&mdash;</span>
                        {% endif %}
@@ -168,7 +168,7 @@
                    <td>Outer Depth</td>
                    <td>
                        {% if rack.outer_depth %}
-                            <span>{{ rack.outer_depth }}{{ rack.outer_unit }}</span>
+                            <span>{{ rack.outer_depth }} {{ rack.get_outer_unit_display }}</span>
                        {% else %}
                            <span class="text-muted">&mdash;</span>
                        {% endif %}
--- a/netbox/tenancy/forms.py
+++ b/netbox/tenancy/forms.py
@@ -18,7 +18,9 @@ class TenantGroupForm(BootstrapMixin, forms.ModelForm):

    class Meta:
        model = TenantGroup
-        fields = ['name', 'slug']
+        fields = [
+            'name', 'slug',
+        ]


 class TenantGroupCSVForm(forms.ModelForm):
@@ -39,11 +41,15 @@ class TenantGroupCSVForm(forms.ModelForm):
 class TenantForm(BootstrapMixin, CustomFieldForm):
    slug = SlugField()
    comments = CommentField()
-    tags = TagField(required=False)
+    tags = TagField(
+        required=False
+    )

    class Meta:
        model = Tenant
-        fields = ['name', 'slug', 'group', 'description', 'comments', 'tags']
+        fields = [
+            'name', 'slug', 'group', 'description', 'comments', 'tags',
+        ]


 class TenantCSVForm(forms.ModelForm):
@@ -68,18 +74,31 @@ class TenantCSVForm(forms.ModelForm):


 class TenantBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(queryset=Tenant.objects.all(), widget=forms.MultipleHiddenInput)
-    group = forms.ModelChoiceField(queryset=TenantGroup.objects.all(), required=False)
+    pk = forms.ModelMultipleChoiceField(
+        queryset=Tenant.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )
+    group = forms.ModelChoiceField(
+        queryset=TenantGroup.objects.all(),
+        required=False
+    )

    class Meta:
-        nullable_fields = ['group']
+        nullable_fields = [
+            'group',
+        ]


 class TenantFilterForm(BootstrapMixin, CustomFieldFilterForm):
    model = Tenant
-    q = forms.CharField(required=False, label='Search')
+    q = forms.CharField(
+        required=False,
+        label='Search'
+    )
    group = FilterChoiceField(
-        queryset=TenantGroup.objects.annotate(filter_count=Count('tenants')),
+        queryset=TenantGroup.objects.annotate(
+            filter_count=Count('tenants')
+        ),
        to_field_name='slug',
        null_label='-- None --'
    )
@@ -94,7 +113,10 @@ class TenancyForm(ChainedFieldsMixin, forms.Form):
        queryset=TenantGroup.objects.all(),
        required=False,
        widget=forms.Select(
-            attrs={'filter-for': 'tenant', 'nullable': 'true'}
+            attrs={
+                'filter-for': 'tenant',
+                'nullable': 'true',
+            }
        )
    )
    tenant = ChainedModelChoiceField(
@@ -117,4 +139,4 @@ class TenancyForm(ChainedFieldsMixin, forms.Form):
            initial['tenant_group'] = instance.tenant.group
            kwargs['initial'] = initial

-        super(TenancyForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
--- a/netbox/tenancy/tests/test_api.py
+++ b/netbox/tenancy/tests/test_api.py
@@ -9,7 +9,7 @@ class TenantGroupTest(APITestCase):

    def setUp(self):

-        super(TenantGroupTest, self).setUp()
+        super().setUp()

        self.tenantgroup1 = TenantGroup.objects.create(name='Test Tenant Group 1', slug='test-tenant-group-1')
        self.tenantgroup2 = TenantGroup.objects.create(name='Test Tenant Group 2', slug='test-tenant-group-2')
@@ -110,7 +110,7 @@ class TenantTest(APITestCase):

    def setUp(self):

-        super(TenantTest, self).setUp()
+        super().setUp()

        self.tenantgroup1 = TenantGroup.objects.create(name='Test Tenant Group 1', slug='test-tenant-group-1')
        self.tenantgroup2 = TenantGroup.objects.create(name='Test Tenant Group 2', slug='test-tenant-group-2')
--- a/netbox/users/forms.py
+++ b/netbox/users/forms.py
@@ -8,7 +8,7 @@ from .models import Token
 class LoginForm(BootstrapMixin, AuthenticationForm):

    def __init__(self, *args, **kwargs):
-        super(LoginForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        self.fields['username'].widget.attrs['placeholder'] = ''
        self.fields['password'].widget.attrs['placeholder'] = ''
@@ -19,11 +19,16 @@ class PasswordChangeForm(BootstrapMixin, DjangoPasswordChangeForm):


 class TokenForm(BootstrapMixin, forms.ModelForm):
-    key = forms.CharField(required=False, help_text="If no key is provided, one will be generated automatically.")
+    key = forms.CharField(
+        required=False,
+        help_text="If no key is provided, one will be generated automatically."
+    )

    class Meta:
        model = Token
-        fields = ['key', 'write_enabled', 'expires', 'description']
+        fields = [
+            'key', 'write_enabled', 'expires', 'description',
+        ]
        help_texts = {
            'expires': 'YYYY-MM-DD [HH:MM:SS]'
        }
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -48,7 +48,7 @@ class Token(models.Model):
    def save(self, *args, **kwargs):
        if not self.key:
            self.key = self.generate_key()
-        return super(Token, self).save(*args, **kwargs)
+        return super().save(*args, **kwargs)

    def generate_key(self):
        # Generate a random 160-bit key expressed in hexadecimal.
--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -132,7 +132,7 @@ class UserKeyEditView(View):
        except UserKey.DoesNotExist:
            self.userkey = UserKey(user=request.user)

-        return super(UserKeyEditView, self).dispatch(request, *args, **kwargs)
+        return super().dispatch(request, *args, **kwargs)

    def get(self, request):
        form = UserKeyForm(instance=self.userkey)
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -66,7 +66,7 @@ class ChoiceField(Field):
                    self._choices[k2] = v2
            else:
                self._choices[k] = v
-        super(ChoiceField, self).__init__(**kwargs)
+        super().__init__(**kwargs)

    def to_representation(self, obj):
        if obj is '':
@@ -130,7 +130,7 @@ class SerializedPKRelatedField(PrimaryKeyRelatedField):
    def __init__(self, serializer, **kwargs):
        self.serializer = serializer
        self.pk_field = kwargs.pop('pk_field', None)
-        super(SerializedPKRelatedField, self).__init__(**kwargs)
+        super().__init__(**kwargs)

    def to_representation(self, value):
        return self.serializer(value, context={'request': self.context['request']}).data
@@ -206,7 +206,7 @@ class ModelViewSet(_ModelViewSet):
        if isinstance(kwargs.get('data', {}), list):
            kwargs['many'] = True

-        return super(ModelViewSet, self).get_serializer(*args, **kwargs)
+        return super().get_serializer(*args, **kwargs)

    def get_serializer_class(self):

@@ -230,7 +230,7 @@ class FieldChoicesViewSet(ViewSet):
    fields = []

    def __init__(self, *args, **kwargs):
-        super(FieldChoicesViewSet, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        # Compile a dict of all fields in this view
        self._fields = OrderedDict()
--- a/netbox/utilities/constants.py
+++ b/netbox/utilities/constants.py
@@ -1,7 +1,26 @@
-from utilities.forms import ChainedModelMultipleChoiceField
-
-
-# Fields which are used on ManyToMany relationships
-M2M_FIELD_TYPES = [
-    ChainedModelMultipleChoiceField,
-]
+COLOR_CHOICES = (
+    ('aa1409', 'Dark red'),
+    ('f44336', 'Red'),
+    ('e91e63', 'Pink'),
+    ('ff66ff', 'Fuschia'),
+    ('9c27b0', 'Purple'),
+    ('673ab7', 'Dark purple'),
+    ('3f51b5', 'Indigo'),
+    ('2196f3', 'Blue'),
+    ('03a9f4', 'Light blue'),
+    ('00bcd4', 'Cyan'),
+    ('009688', 'Teal'),
+    ('2f6a31', 'Dark green'),
+    ('4caf50', 'Green'),
+    ('8bc34a', 'Light green'),
+    ('cddc39', 'Lime'),
+    ('ffeb3b', 'Yellow'),
+    ('ffc107', 'Amber'),
+    ('ff9800', 'Orange'),
+    ('ff5722', 'Dark orange'),
+    ('795548', 'Brown'),
+    ('c0c0c0', 'Light grey'),
+    ('9e9e9e', 'Grey'),
+    ('607d8b', 'Dark grey'),
+    ('111111', 'Black'),
+)
--- a/netbox/utilities/custom_inspectors.py
+++ b/netbox/utilities/custom_inspectors.py
@@ -1,9 +1,52 @@
 from drf_yasg import openapi
-from drf_yasg.inspectors import FieldInspector, NotHandled, PaginatorInspector, FilterInspector
+from drf_yasg.inspectors import FieldInspector, NotHandled, PaginatorInspector, FilterInspector, SwaggerAutoSchema
 from rest_framework.fields import ChoiceField
+from rest_framework.relations import ManyRelatedField
+from taggit_serializer.serializers import TagListSerializerField

 from extras.api.customfields import CustomFieldsSerializer
-from utilities.api import ChoiceField
+from utilities.api import ChoiceField, SerializedPKRelatedField, WritableNestedSerializer
+
+
+class NetBoxSwaggerAutoSchema(SwaggerAutoSchema):
+    def get_request_serializer(self):
+        serializer = super().get_request_serializer()
+
+        if serializer is not None and self.method in self.implicit_body_methods:
+            properties = {}
+            for child_name, child in serializer.fields.items():
+                if isinstance(child, (ChoiceField, WritableNestedSerializer)):
+                    properties[child_name] = None
+                elif isinstance(child, ManyRelatedField) and isinstance(child.child_relation, SerializedPKRelatedField):
+                    properties[child_name] = None
+
+            if properties:
+                writable_class = type('Writable' + type(serializer).__name__, (type(serializer),), properties)
+                serializer = writable_class()
+
+        return serializer
+
+
+class SerializedPKRelatedFieldInspector(FieldInspector):
+    def field_to_swagger_object(self, field, swagger_object_type, use_references, **kwargs):
+        SwaggerType, ChildSwaggerType = self._get_partial_types(field, swagger_object_type, use_references, **kwargs)
+        if isinstance(field, SerializedPKRelatedField):
+            return self.probe_field_inspectors(field.serializer(), ChildSwaggerType, use_references)
+
+        return NotHandled
+
+
+class TagListFieldInspector(FieldInspector):
+    def field_to_swagger_object(self, field, swagger_object_type, use_references, **kwargs):
+        SwaggerType, ChildSwaggerType = self._get_partial_types(field, swagger_object_type, use_references, **kwargs)
+        if isinstance(field, TagListSerializerField):
+            child_schema = self.probe_field_inspectors(field.child, ChildSwaggerType, use_references)
+            return SwaggerType(
+                type=openapi.TYPE_ARRAY,
+                items=child_schema,
+            )
+
+        return NotHandled


 class CustomChoiceFieldInspector(FieldInspector):
--- a/netbox/utilities/fields.py
+++ b/netbox/utilities/fields.py
@@ -28,8 +28,8 @@ class ColorField(models.CharField):

    def __init__(self, *args, **kwargs):
        kwargs['max_length'] = 6
-        super(ColorField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

    def formfield(self, **kwargs):
        kwargs['widget'] = ColorSelect
-        return super(ColorField, self).formfield(**kwargs)
+        return super().formfield(**kwargs)
--- a/netbox/utilities/filters.py
+++ b/netbox/utilities/filters.py
@@ -17,7 +17,7 @@ class NullableCharFieldFilter(django_filters.CharFilter):

    def filter(self, qs, value):
        if value != self.null_value:
-            return super(NullableCharFieldFilter, self).filter(qs, value)
+            return super().filter(qs, value)
        qs = self.get_method(qs)(**{'{}__isnull'.format(self.name): True})
        return qs.distinct() if self.distinct else qs

@@ -34,4 +34,4 @@ class TagFilter(django_filters.ModelMultipleChoiceFilter):
        kwargs.setdefault('conjoined', True)
        kwargs.setdefault('queryset', Tag.objects.all())

-        super(TagFilter, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -10,34 +10,9 @@ from django.db.models import Count
 from django.urls import reverse_lazy
 from mptt.forms import TreeNodeMultipleChoiceField

+from .constants import *
 from .validators import EnhancedURLValidator

-COLOR_CHOICES = (
-    ('aa1409', 'Dark red'),
-    ('f44336', 'Red'),
-    ('e91e63', 'Pink'),
-    ('ff66ff', 'Fuschia'),
-    ('9c27b0', 'Purple'),
-    ('673ab7', 'Dark purple'),
-    ('3f51b5', 'Indigo'),
-    ('2196f3', 'Blue'),
-    ('03a9f4', 'Light blue'),
-    ('00bcd4', 'Cyan'),
-    ('009688', 'Teal'),
-    ('2f6a31', 'Dark green'),
-    ('4caf50', 'Green'),
-    ('8bc34a', 'Light green'),
-    ('cddc39', 'Lime'),
-    ('ffeb3b', 'Yellow'),
-    ('ffc107', 'Amber'),
-    ('ff9800', 'Orange'),
-    ('ff5722', 'Dark orange'),
-    ('795548', 'Brown'),
-    ('c0c0c0', 'Light grey'),
-    ('9e9e9e', 'Grey'),
-    ('607d8b', 'Dark grey'),
-    ('111111', 'Black'),
-)
 NUMERIC_EXPANSION_PATTERN = r'\[((?:\d+[?:,-])+\d+)\]'
 ALPHANUMERIC_EXPANSION_PATTERN = r'\[((?:[a-zA-Z0-9]+[?:,-])+[a-zA-Z0-9]+)\]'
 IP4_EXPANSION_PATTERN = r'\[((?:[0-9]{1,3}[?:,-])+[0-9]{1,3})\]'
@@ -193,7 +168,7 @@ class ColorSelect(forms.Select):

    def __init__(self, *args, **kwargs):
        kwargs['choices'] = add_blank_choice(COLOR_CHOICES)
-        super(ColorSelect, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)


 class BulkEditNullBooleanSelect(forms.NullBooleanSelect):
@@ -202,7 +177,7 @@ class BulkEditNullBooleanSelect(forms.NullBooleanSelect):
    """

    def __init__(self, *args, **kwargs):
-        super(BulkEditNullBooleanSelect, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        # Override the built-in choice labels
        self.choices = (
@@ -242,17 +217,17 @@ class ArrayFieldSelectMultiple(SelectWithDisabled, forms.SelectMultiple):
    """
    def __init__(self, *args, **kwargs):
        self.delimiter = kwargs.pop('delimiter', ',')
-        super(ArrayFieldSelectMultiple, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

    def optgroups(self, name, value, attrs=None):
        # Split the delimited string of values into a list
        if value:
            value = value[0].split(self.delimiter)
-        return super(ArrayFieldSelectMultiple, self).optgroups(name, value, attrs)
+        return super().optgroups(name, value, attrs)

    def value_from_datadict(self, data, files, name):
        # Condense the list of selected choices into a delimited string
-        data = super(ArrayFieldSelectMultiple, self).value_from_datadict(data, files, name)
+        data = super().value_from_datadict(data, files, name)
        return self.delimiter.join(data)


@@ -279,7 +254,7 @@ class APISelect(SelectWithDisabled):
        **kwargs
    ):

-        super(APISelect, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        self.attrs['class'] = 'api-select'
        self.attrs['api-url'] = '/{}{}'.format(settings.BASE_PATH, api_url.lstrip('/'))  # Inject BASE_PATH
@@ -308,7 +283,7 @@ class Livesearch(forms.TextInput):

    def __init__(self, query_key, query_url, field_to_update, obj_label=None, *args, **kwargs):

-        super(Livesearch, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        self.attrs = {
            'data-key': query_key,
@@ -336,7 +311,7 @@ class CSVDataField(forms.CharField):
        self.fields = fields
        self.required_fields = required_fields

-        super(CSVDataField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        self.strip = False
        if not self.label:
@@ -382,12 +357,12 @@ class CSVChoiceField(forms.ChoiceField):
    """

    def __init__(self, choices, *args, **kwargs):
-        super(CSVChoiceField, self).__init__(choices=choices, *args, **kwargs)
+        super().__init__(choices=choices, *args, **kwargs)
        self.choices = [(label, label) for value, label in unpack_grouped_choices(choices)]
        self.choice_values = {label: value for value, label in unpack_grouped_choices(choices)}

    def clean(self, value):
-        value = super(CSVChoiceField, self).clean(value)
+        value = super().clean(value)
        if not value:
            return None
        if value not in self.choice_values:
@@ -401,7 +376,7 @@ class ExpandableNameField(forms.CharField):
      Example: 'Gi0/[1-3]' => ['Gi0/1', 'Gi0/2', 'Gi0/3']
    """
    def __init__(self, *args, **kwargs):
-        super(ExpandableNameField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
        if not self.help_text:
            self.help_text = 'Alphanumeric ranges are supported for bulk creation.<br />' \
                             'Mixed cases and types within a single range are not supported.<br />' \
@@ -421,7 +396,7 @@ class ExpandableIPAddressField(forms.CharField):
      Example: '192.0.2.[1-254]/24' => ['192.0.2.1/24', '192.0.2.2/24', '192.0.2.3/24' ... '192.0.2.254/24']
    """
    def __init__(self, *args, **kwargs):
-        super(ExpandableIPAddressField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
        if not self.help_text:
            self.help_text = 'Specify a numeric range to create multiple IPs.<br />'\
                             'Example: <code>192.0.2.[1,5,100-254]/24</code>'
@@ -450,7 +425,7 @@ class CommentField(forms.CharField):
        required = kwargs.pop('required', False)
        label = kwargs.pop('label', self.default_label)
        help_text = kwargs.pop('help_text', self.default_helptext)
-        super(CommentField, self).__init__(required=required, label=label, help_text=help_text, *args, **kwargs)
+        super().__init__(required=required, label=label, help_text=help_text, *args, **kwargs)


 class FlexibleModelChoiceField(forms.ModelChoiceField):
@@ -490,7 +465,7 @@ class ChainedModelChoiceField(forms.ModelChoiceField):
    """
    def __init__(self, chains=None, *args, **kwargs):
        self.chains = chains
-        super(ChainedModelChoiceField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)


 class ChainedModelMultipleChoiceField(forms.ModelMultipleChoiceField):
@@ -499,7 +474,7 @@ class ChainedModelMultipleChoiceField(forms.ModelMultipleChoiceField):
    """
    def __init__(self, chains=None, *args, **kwargs):
        self.chains = chains
-        super(ChainedModelMultipleChoiceField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)


 class SlugField(forms.SlugField):
@@ -509,7 +484,7 @@ class SlugField(forms.SlugField):
    def __init__(self, slug_source='name', *args, **kwargs):
        label = kwargs.pop('label', "Slug")
        help_text = kwargs.pop('help_text', "URL-friendly unique shorthand")
-        super(SlugField, self).__init__(label=label, help_text=help_text, *args, **kwargs)
+        super().__init__(label=label, help_text=help_text, *args, **kwargs)
        self.widget.attrs['slug-source'] = slug_source


@@ -536,10 +511,10 @@ class FilterChoiceFieldMixin(object):
            kwargs['required'] = False
        if 'widget' not in kwargs:
            kwargs['widget'] = forms.SelectMultiple(attrs={'size': 6})
-        super(FilterChoiceFieldMixin, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

    def label_from_instance(self, obj):
-        label = super(FilterChoiceFieldMixin, self).label_from_instance(obj)
+        label = super().label_from_instance(obj)
        if hasattr(obj, 'filter_count'):
            return '{} ({})'.format(label, obj.filter_count)
        return label
@@ -582,7 +557,7 @@ class AnnotatedMultipleChoiceField(forms.MultipleChoiceField):
        self.annotate_field = annotate_field
        self.static_choices = unpack_grouped_choices(choices)

-        super(AnnotatedMultipleChoiceField, self).__init__(choices=self.annotate_choices, *args, **kwargs)
+        super().__init__(choices=self.annotate_choices, *args, **kwargs)


 class LaxURLField(forms.URLField):
@@ -599,7 +574,7 @@ class JSONField(_JSONField):
    Custom wrapper around Django's built-in JSONField to avoid presenting "null" as the default text.
    """
    def __init__(self, *args, **kwargs):
-        super(JSONField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
        if not self.help_text:
            self.help_text = 'Enter context data in <a href="https://json.org/">JSON</a> format.'
            self.widget.attrs['placeholder'] = ''
@@ -621,7 +596,7 @@ class BootstrapMixin(forms.BaseForm):
    Add the base Bootstrap CSS classes to form elements.
    """
    def __init__(self, *args, **kwargs):
-        super(BootstrapMixin, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        exempt_widgets = [
            forms.CheckboxInput, forms.ClearableFileInput, forms.FileInput, forms.RadioSelect
@@ -642,7 +617,7 @@ class ChainedFieldsMixin(forms.BaseForm):
    Iterate through all ChainedModelChoiceFields in the form and modify their querysets based on chained fields.
    """
    def __init__(self, *args, **kwargs):
-        super(ChainedFieldsMixin, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        for field_name, field in self.fields.items():

@@ -691,7 +666,7 @@ class ComponentForm(BootstrapMixin, forms.Form):
    """
    def __init__(self, parent, *args, **kwargs):
        self.parent = parent
-        super(ComponentForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

    def get_iterative_data(self, iteration):
        return {}
@@ -702,7 +677,7 @@ class BulkEditForm(forms.Form):
    Base form for editing multiple objects in bulk
    """
    def __init__(self, model, parent_obj=None, *args, **kwargs):
-        super(BulkEditForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
        self.model = model
        self.parent_obj = parent_obj
        self.nullable_fields = []
--- a/netbox/utilities/managers.py
+++ b/netbox/utilities/managers.py
@@ -15,7 +15,7 @@ class NaturalOrderingManager(Manager):

    def get_queryset(self):

-        queryset = super(NaturalOrderingManager, self).get_queryset()
+        queryset = super().get_queryset()

        db_table = self.model._meta.db_table
        db_field = self.natural_order_field
--- a/netbox/utilities/paginator.py
+++ b/netbox/utilities/paginator.py
@@ -7,7 +7,7 @@ class EnhancedPaginator(Paginator):
    def __init__(self, object_list, per_page, **kwargs):
        if not isinstance(per_page, int) or per_page < 1:
            per_page = getattr(settings, 'PAGINATE_COUNT', 50)
-        super(EnhancedPaginator, self).__init__(object_list, per_page, **kwargs)
+        super().__init__(object_list, per_page, **kwargs)

    def _get_page(self, *args, **kwargs):
        return EnhancedPage(*args, **kwargs)
--- a/netbox/utilities/sql.py
+++ b/netbox/utilities/sql.py
@@ -5,7 +5,7 @@ from django.db.models.sql.compiler import SQLCompiler
 class NullsFirstSQLCompiler(SQLCompiler):

    def get_order_by(self):
-        result = super(NullsFirstSQLCompiler, self).get_order_by()
+        result = super().get_order_by()
        if result:
            return [(expr, (sql + ' NULLS FIRST', params, is_ref)) for (expr, (sql, params, is_ref)) in result]
        return result
@@ -28,5 +28,5 @@ class NullsFirstQuerySet(models.QuerySet):
    """

    def __init__(self, model=None, query=None, using=None, hints=None):
-        super(NullsFirstQuerySet, self).__init__(model, query, using, hints)
+        super().__init__(model, query, using, hints)
        self.query = query or NullsFirstQuery(self.model)
--- a/netbox/utilities/tables.py
+++ b/netbox/utilities/tables.py
@@ -7,7 +7,7 @@ class BaseTable(tables.Table):
    Default table for object lists
    """
    def __init__(self, *args, **kwargs):
-        super(BaseTable, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        # Set default empty_text if none was provided
        if self.empty_text is None:
@@ -26,7 +26,7 @@ class ToggleColumn(tables.CheckBoxColumn):
    def __init__(self, *args, **kwargs):
        default = kwargs.pop('default', '')
        visible = kwargs.pop('visible', False)
-        super(ToggleColumn, self).__init__(*args, default=default, visible=visible, **kwargs)
+        super().__init__(*args, default=default, visible=visible, **kwargs)

    @property
    def header(self):
--- a/netbox/utilities/tests/test_utils.py
+++ b/netbox/utilities/tests/test_utils.py
@@ -0,0 +1,89 @@
+from django.test import TestCase
+
+from utilities.utils import deepmerge
+
+
+class DeepMergeTest(TestCase):
+    """
+    Validate the behavior of the deepmerge() utility.
+    """
+
+    def setUp(self):
+        return
+
+    def test_deepmerge(self):
+
+        dict1 = {
+            'active': True,
+            'foo': 123,
+            'fruits': {
+                'orange': 1,
+                'apple': 2,
+                'pear': 3,
+            },
+            'vegetables': None,
+            'dairy': {
+                'milk': 1,
+                'cheese': 2,
+            },
+            'deepnesting': {
+                'foo': {
+                    'a': 10,
+                    'b': 20,
+                    'c': 30,
+                },
+            },
+        }
+
+        dict2 = {
+            'active': False,
+            'bar': 456,
+            'fruits': {
+                'banana': 4,
+                'grape': 5,
+            },
+            'vegetables': {
+                'celery': 1,
+                'carrots': 2,
+                'corn': 3,
+            },
+            'dairy': None,
+            'deepnesting': {
+                'foo': {
+                    'a': 100,
+                    'd': 40,
+                },
+            },
+        }
+
+        merged = {
+            'active': False,
+            'foo': 123,
+            'bar': 456,
+            'fruits': {
+                'orange': 1,
+                'apple': 2,
+                'pear': 3,
+                'banana': 4,
+                'grape': 5,
+            },
+            'vegetables': {
+                'celery': 1,
+                'carrots': 2,
+                'corn': 3,
+            },
+            'dairy': None,
+            'deepnesting': {
+                'foo': {
+                    'a': 100,
+                    'b': 20,
+                    'c': 30,
+                    'd': 40,
+                },
+            },
+        }
+
+        self.assertEqual(
+            deepmerge(dict1, dict2),
+            merged
+        )
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -1,8 +1,9 @@
+from collections import OrderedDict
+
 import datetime
 import json

 from django.core.serializers import serialize
-from django.http import HttpResponse

 from dcim.constants import LENGTH_UNIT_CENTIMETER, LENGTH_UNIT_FOOT, LENGTH_UNIT_INCH, LENGTH_UNIT_METER

@@ -36,32 +37,6 @@ def csv_format(data):
    return ','.join(csv)


-def queryset_to_csv(queryset):
-    """
-    Export a queryset of objects as CSV, using the model's to_csv() method.
-    """
-    output = []
-
-    # Start with the column headers
-    headers = ','.join(queryset.model.csv_headers)
-    output.append(headers)
-
-    # Iterate through the queryset
-    for obj in queryset:
-        data = csv_format(obj.to_csv())
-        output.append(data)
-
-    # Build the HTTP response
-    response = HttpResponse(
-        '\n'.join(output),
-        content_type='text/csv'
-    )
-    filename = 'netbox_{}.csv'.format(queryset.model._meta.verbose_name_plural)
-    response['Content-Disposition'] = 'attachment; filename="{}"'.format(filename)
-
-    return response
-
-
 def foreground_color(bg_color):
    """
    Return the ideal foreground color (black or white) for a given background color in hexadecimal RGB format.
@@ -110,6 +85,19 @@ def serialize_object(obj, extra=None):
    return data


+def deepmerge(original, new):
+    """
+    Deep merge two dictionaries (new into original) and return a new dict
+    """
+    merged = OrderedDict(original)
+    for key, val in new.items():
+        if key in original and isinstance(original[key], dict) and isinstance(val, dict):
+            merged[key] = deepmerge(original[key], val)
+        else:
+            merged[key] = val
+    return merged
+
+
 def to_meters(length, unit):
    """
    Convert the given length to meters.
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -9,7 +9,7 @@ from django.core.exceptions import ValidationError
 from django.db import transaction, IntegrityError
 from django.db.models import Count, ProtectedError
 from django.forms import CharField, Form, ModelMultipleChoiceField, MultipleHiddenInput, Textarea
-from django.http import HttpResponseServerError
+from django.http import HttpResponse, HttpResponseServerError
 from django.shortcuts import get_object_or_404, redirect, render
 from django.template import loader
 from django.template.exceptions import TemplateDoesNotExist, TemplateSyntaxError
@@ -24,7 +24,7 @@ from django_tables2 import RequestConfig

 from extras.models import CustomField, CustomFieldValue, ExportTemplate
 from utilities.forms import BootstrapMixin, CSVDataField
-from utilities.utils import queryset_to_csv
+from utilities.utils import csv_format
 from .error_handlers import handle_protectederror
 from .forms import ConfirmationForm
 from .paginator import EnhancedPaginator
@@ -88,6 +88,23 @@ class ObjectListView(View):
    table = None
    template_name = None

+    def queryset_to_csv(self):
+        """
+        Export the queryset of objects as comma-separated value (CSV), using the model's to_csv() method.
+        """
+        csv_data = []
+
+        # Start with the column headers
+        headers = ','.join(self.queryset.model.csv_headers)
+        csv_data.append(headers)
+
+        # Iterate through the queryset appending each object
+        for obj in self.queryset:
+            data = csv_format(obj.to_csv())
+            csv_data.append(data)
+
+        return csv_data
+
    def get(self, request):

        model = self.queryset.model
@@ -113,9 +130,17 @@ class ObjectListView(View):
                    request,
                    "There was an error rendering the selected export template ({}).".format(et.name)
                )
-        # Fall back to built-in CSV export if no template was specified
+
+        # Fall back to built-in CSV formatting if export requested but no template specified
        elif 'export' in request.GET and hasattr(model, 'to_csv'):
-            return queryset_to_csv(self.queryset)
+            data = self.queryset_to_csv()
+            response = HttpResponse(
+                '\n'.join(data),
+                content_type='text/csv'
+            )
+            filename = 'netbox_{}.csv'.format(self.queryset.model._meta.verbose_name_plural)
+            response['Content-Disposition'] = 'attachment; filename="{}"'.format(filename)
+            return response

        # Provide a hook to tweak the queryset based on the request immediately prior to rendering the object list
        self.queryset = self.alter_queryset(request)
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -34,7 +34,9 @@ class ClusterTypeForm(BootstrapMixin, forms.ModelForm):

    class Meta:
        model = ClusterType
-        fields = ['name', 'slug']
+        fields = [
+            'name', 'slug',
+        ]


 class ClusterTypeCSVForm(forms.ModelForm):
@@ -57,7 +59,9 @@ class ClusterGroupForm(BootstrapMixin, forms.ModelForm):

    class Meta:
        model = ClusterGroup
-        fields = ['name', 'slug']
+        fields = [
+            'name', 'slug',
+        ]


 class ClusterGroupCSVForm(forms.ModelForm):
@@ -76,12 +80,18 @@ class ClusterGroupCSVForm(forms.ModelForm):
 #

 class ClusterForm(BootstrapMixin, CustomFieldForm):
-    comments = CommentField(widget=SmallTextarea)
-    tags = TagField(required=False)
+    comments = CommentField(
+        widget=SmallTextarea()
+    )
+    tags = TagField(
+        required=False
+    )

    class Meta:
        model = Cluster
-        fields = ['name', 'type', 'group', 'site', 'comments', 'tags']
+        fields = [
+            'name', 'type', 'group', 'site', 'comments', 'tags',
+        ]


 class ClusterCSVForm(forms.ModelForm):
@@ -118,32 +128,54 @@ class ClusterCSVForm(forms.ModelForm):


 class ClusterBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(queryset=Cluster.objects.all(), widget=forms.MultipleHiddenInput)
-    type = forms.ModelChoiceField(queryset=ClusterType.objects.all(), required=False)
-    group = forms.ModelChoiceField(queryset=ClusterGroup.objects.all(), required=False)
-    site = forms.ModelChoiceField(queryset=Site.objects.all(), required=False)
-    comments = CommentField(widget=SmallTextarea)
+    pk = forms.ModelMultipleChoiceField(
+        queryset=Cluster.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )
+    type = forms.ModelChoiceField(
+        queryset=ClusterType.objects.all(),
+        required=False
+    )
+    group = forms.ModelChoiceField(
+        queryset=ClusterGroup.objects.all(),
+        required=False
+    )
+    site = forms.ModelChoiceField(
+        queryset=Site.objects.all(),
+        required=False
+    )
+    comments = CommentField(
+        widget=SmallTextarea()
+    )

    class Meta:
-        nullable_fields = ['group', 'site', 'comments']
+        nullable_fields = [
+            'group', 'site', 'comments',
+        ]


 class ClusterFilterForm(BootstrapMixin, CustomFieldFilterForm):
    model = Cluster
    q = forms.CharField(required=False, label='Search')
    type = FilterChoiceField(
-        queryset=ClusterType.objects.annotate(filter_count=Count('clusters')),
+        queryset=ClusterType.objects.annotate(
+            filter_count=Count('clusters')
+        ),
        to_field_name='slug',
        required=False,
    )
    group = FilterChoiceField(
-        queryset=ClusterGroup.objects.annotate(filter_count=Count('clusters')),
+        queryset=ClusterGroup.objects.annotate(
+            filter_count=Count('clusters')
+        ),
        to_field_name='slug',
        null_label='-- None --',
        required=False,
    )
    site = FilterChoiceField(
-        queryset=Site.objects.annotate(filter_count=Count('clusters')),
+        queryset=Site.objects.annotate(
+            filter_count=Count('clusters')
+        ),
        to_field_name='slug',
        null_label='-- None --',
        required=False,
@@ -155,7 +187,10 @@ class ClusterAddDevicesForm(BootstrapMixin, ChainedFieldsMixin, forms.Form):
        queryset=Region.objects.all(),
        required=False,
        widget=forms.Select(
-            attrs={'filter-for': 'site', 'nullable': 'true'}
+            attrs={
+                'filter-for': 'site',
+                'nullable': 'true',
+            }
        )
    )
    site = ChainedModelChoiceField(
@@ -166,7 +201,9 @@ class ClusterAddDevicesForm(BootstrapMixin, ChainedFieldsMixin, forms.Form):
        required=False,
        widget=APISelect(
            api_url='/api/dcim/sites/?region_id={{region}}',
-            attrs={'filter-for': 'rack'}
+            attrs={
+                'filter-for': 'rack',
+            }
        )
    )
    rack = ChainedModelChoiceField(
@@ -177,7 +214,10 @@ class ClusterAddDevicesForm(BootstrapMixin, ChainedFieldsMixin, forms.Form):
        required=False,
        widget=APISelect(
            api_url='/api/dcim/racks/?site_id={{site}}',
-            attrs={'filter-for': 'devices', 'nullable': 'true'}
+            attrs={
+                'filter-for': 'devices',
+                'nullable': 'true',
+            }
        )
    )
    devices = ChainedModelMultipleChoiceField(
@@ -194,19 +234,20 @@ class ClusterAddDevicesForm(BootstrapMixin, ChainedFieldsMixin, forms.Form):
    )

    class Meta:
-        fields = ['region', 'site', 'rack', 'devices']
+        fields = [
+            'region', 'site', 'rack', 'devices',
+        ]

    def __init__(self, cluster, *args, **kwargs):

        self.cluster = cluster

-        super(ClusterAddDevicesForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        self.fields['devices'].choices = []

    def clean(self):
-
-        super(ClusterAddDevicesForm, self).clean()
+        super().clean()

        # If the Cluster is assigned to a Site, all Devices must be assigned to that Site.
        if self.cluster.site is not None:
@@ -220,7 +261,10 @@ class ClusterAddDevicesForm(BootstrapMixin, ChainedFieldsMixin, forms.Form):


 class ClusterRemoveDevicesForm(ConfirmationForm):
-    pk = forms.ModelMultipleChoiceField(queryset=Device.objects.all(), widget=forms.MultipleHiddenInput)
+    pk = forms.ModelMultipleChoiceField(
+        queryset=Device.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )


 #
@@ -232,7 +276,10 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldForm):
        queryset=ClusterGroup.objects.all(),
        required=False,
        widget=forms.Select(
-            attrs={'filter-for': 'cluster', 'nullable': 'true'}
+            attrs={
+                'filter-for': 'cluster',
+                'nullable': 'true',
+            }
        )
    )
    cluster = ChainedModelChoiceField(
@@ -244,8 +291,12 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldForm):
            api_url='/api/virtualization/clusters/?group_id={{cluster_group}}'
        )
    )
-    tags = TagField(required=False)
-    local_context_data = JSONField(required=False)
+    tags = TagField(
+        required=False
+    )
+    local_context_data = JSONField(
+        required=False
+    )

    class Meta:
        model = VirtualMachine
@@ -254,7 +305,8 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldForm):
            'vcpus', 'memory', 'disk', 'comments', 'tags', 'local_context_data',
        ]
        help_texts = {
-            'local_context_data': "Local config context data overwrites all sources contexts in the final rendered config context",
+            'local_context_data': "Local config context data overwrites all sources contexts in the final rendered "
+                                  "config context",
        }

    def __init__(self, *args, **kwargs):
@@ -266,7 +318,7 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldForm):
            initial['cluster_group'] = instance.cluster.group
            kwargs['initial'] = initial

-        super(VirtualMachineForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)

        if self.instance.pk:

@@ -319,7 +371,9 @@ class VirtualMachineCSVForm(forms.ModelForm):
        }
    )
    role = forms.ModelChoiceField(
-        queryset=DeviceRole.objects.filter(vm_role=True),
+        queryset=DeviceRole.objects.filter(
+            vm_role=True
+        ),
        required=False,
        to_field_name='name',
        help_text='Name of functional role',
@@ -352,24 +406,61 @@ class VirtualMachineCSVForm(forms.ModelForm):


 class VirtualMachineBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(queryset=VirtualMachine.objects.all(), widget=forms.MultipleHiddenInput)
-    status = forms.ChoiceField(choices=add_blank_choice(VM_STATUS_CHOICES), required=False, initial='')
-    cluster = forms.ModelChoiceField(queryset=Cluster.objects.all(), required=False)
-    role = forms.ModelChoiceField(queryset=DeviceRole.objects.filter(vm_role=True), required=False)
-    tenant = forms.ModelChoiceField(queryset=Tenant.objects.all(), required=False)
-    platform = forms.ModelChoiceField(queryset=Platform.objects.all(), required=False)
-    vcpus = forms.IntegerField(required=False, label='vCPUs')
-    memory = forms.IntegerField(required=False, label='Memory (MB)')
-    disk = forms.IntegerField(required=False, label='Disk (GB)')
-    comments = CommentField(widget=SmallTextarea)
+    pk = forms.ModelMultipleChoiceField(
+        queryset=VirtualMachine.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )
+    status = forms.ChoiceField(
+        choices=add_blank_choice(VM_STATUS_CHOICES),
+        required=False,
+        initial=''
+    )
+    cluster = forms.ModelChoiceField(
+        queryset=Cluster.objects.all(),
+        required=False
+    )
+    role = forms.ModelChoiceField(
+        queryset=DeviceRole.objects.filter(
+            vm_role=True
+        ),
+        required=False
+    )
+    tenant = forms.ModelChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False
+    )
+    platform = forms.ModelChoiceField(
+        queryset=Platform.objects.all(),
+        required=False
+    )
+    vcpus = forms.IntegerField(
+        required=False,
+        label='vCPUs'
+    )
+    memory = forms.IntegerField(
+        required=False,
+        label='Memory (MB)'
+    )
+    disk = forms.IntegerField(
+        required=False,
+        label='Disk (GB)'
+    )
+    comments = CommentField(
+        widget=SmallTextarea()
+    )

    class Meta:
-        nullable_fields = ['role', 'tenant', 'platform', 'vcpus', 'memory', 'disk', 'comments']
+        nullable_fields = [
+            'role', 'tenant', 'platform', 'vcpus', 'memory', 'disk', 'comments',
+        ]


 class VirtualMachineFilterForm(BootstrapMixin, CustomFieldFilterForm):
    model = VirtualMachine
-    q = forms.CharField(required=False, label='Search')
+    q = forms.CharField(
+        required=False,
+        label='Search'
+    )
    cluster_group = FilterChoiceField(
        queryset=ClusterGroup.objects.all(),
        to_field_name='slug',
@@ -381,7 +472,9 @@ class VirtualMachineFilterForm(BootstrapMixin, CustomFieldFilterForm):
        null_label='-- None --'
    )
    cluster_id = FilterChoiceField(
-        queryset=Cluster.objects.annotate(filter_count=Count('virtual_machines')),
+        queryset=Cluster.objects.annotate(
+            filter_count=Count('virtual_machines')
+        ),
        label='Cluster'
    )
    region = FilterTreeNodeMultipleChoiceField(
@@ -390,12 +483,18 @@ class VirtualMachineFilterForm(BootstrapMixin, CustomFieldFilterForm):
        required=False,
    )
    site = FilterChoiceField(
-        queryset=Site.objects.annotate(filter_count=Count('clusters__virtual_machines')),
+        queryset=Site.objects.annotate(
+            filter_count=Count('clusters__virtual_machines')
+        ),
        to_field_name='slug',
        null_label='-- None --'
    )
    role = FilterChoiceField(
-        queryset=DeviceRole.objects.filter(vm_role=True).annotate(filter_count=Count('virtual_machines')),
+        queryset=DeviceRole.objects.filter(
+            vm_role=True
+        ).annotate(
+            filter_count=Count('virtual_machines')
+        ),
        to_field_name='slug',
        null_label='-- None --'
    )
@@ -406,12 +505,16 @@ class VirtualMachineFilterForm(BootstrapMixin, CustomFieldFilterForm):
        required=False
    )
    tenant = FilterChoiceField(
-        queryset=Tenant.objects.annotate(filter_count=Count('virtual_machines')),
+        queryset=Tenant.objects.annotate(
+            filter_count=Count('virtual_machines')
+        ),
        to_field_name='slug',
        null_label='-- None --'
    )
    platform = FilterChoiceField(
-        queryset=Platform.objects.annotate(filter_count=Count('virtual_machines')),
+        queryset=Platform.objects.annotate(
+            filter_count=Count('virtual_machines')
+        ),
        to_field_name='slug',
        null_label='-- None --'
    )
@@ -422,7 +525,9 @@ class VirtualMachineFilterForm(BootstrapMixin, CustomFieldFilterForm):
 #

 class InterfaceForm(BootstrapMixin, forms.ModelForm):
-    tags = TagField(required=False)
+    tags = TagField(
+        required=False
+    )

    class Meta:
        model = Interface
@@ -442,8 +547,7 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm):
        }

    def clean(self):
-
-        super(InterfaceForm, self).clean()
+        super().clean()

        # Validate VLAN assignments
        tagged_vlans = self.cleaned_data['tagged_vlans']
@@ -460,13 +564,34 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm):


 class InterfaceCreateForm(ComponentForm):
-    name_pattern = ExpandableNameField(label='Name')
-    form_factor = forms.ChoiceField(choices=VIFACE_FF_CHOICES, initial=IFACE_FF_VIRTUAL, widget=forms.HiddenInput())
-    enabled = forms.BooleanField(required=False)
-    mtu = forms.IntegerField(required=False, min_value=1, max_value=32767, label='MTU')
-    mac_address = forms.CharField(required=False, label='MAC Address')
-    description = forms.CharField(max_length=100, required=False)
-    tags = TagField(required=False)
+    name_pattern = ExpandableNameField(
+        label='Name'
+    )
+    form_factor = forms.ChoiceField(
+        choices=VIFACE_FF_CHOICES,
+        initial=IFACE_FF_VIRTUAL,
+        widget=forms.HiddenInput()
+    )
+    enabled = forms.BooleanField(
+        required=False
+    )
+    mtu = forms.IntegerField(
+        required=False,
+        min_value=1,
+        max_value=32767,
+        label='MTU'
+    )
+    mac_address = forms.CharField(
+        required=False,
+        label='MAC Address'
+    )
+    description = forms.CharField(
+        max_length=100,
+        required=False
+    )
+    tags = TagField(
+        required=False
+    )

    def __init__(self, *args, **kwargs):

@@ -474,17 +599,33 @@ class InterfaceCreateForm(ComponentForm):
        kwargs['initial'] = kwargs.get('initial', {}).copy()
        kwargs['initial'].update({'enabled': True})

-        super(InterfaceCreateForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)


 class InterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
-    pk = forms.ModelMultipleChoiceField(queryset=Interface.objects.all(), widget=forms.MultipleHiddenInput)
-    enabled = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect)
-    mtu = forms.IntegerField(required=False, min_value=1, max_value=32767, label='MTU')
-    description = forms.CharField(max_length=100, required=False)
+    pk = forms.ModelMultipleChoiceField(
+        queryset=Interface.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )
+    enabled = forms.NullBooleanField(
+        required=False,
+        widget=BulkEditNullBooleanSelect()
+    )
+    mtu = forms.IntegerField(
+        required=False,
+        min_value=1,
+        max_value=32767,
+        label='MTU'
+    )
+    description = forms.CharField(
+        max_length=100,
+        required=False
+    )

    class Meta:
-        nullable_fields = ['mtu', 'description']
+        nullable_fields = [
+            'mtu', 'description',
+        ]


 #
@@ -492,12 +633,32 @@ class InterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
 #

 class VirtualMachineBulkAddComponentForm(BootstrapMixin, forms.Form):
-    pk = forms.ModelMultipleChoiceField(queryset=VirtualMachine.objects.all(), widget=forms.MultipleHiddenInput)
-    name_pattern = ExpandableNameField(label='Name')
+    pk = forms.ModelMultipleChoiceField(
+        queryset=VirtualMachine.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )
+    name_pattern = ExpandableNameField(
+        label='Name'
+    )


 class VirtualMachineBulkAddInterfaceForm(VirtualMachineBulkAddComponentForm):
-    form_factor = forms.ChoiceField(choices=VIFACE_FF_CHOICES, initial=IFACE_FF_VIRTUAL, widget=forms.HiddenInput())
-    enabled = forms.BooleanField(required=False, initial=True)
-    mtu = forms.IntegerField(required=False, min_value=1, max_value=32767, label='MTU')
-    description = forms.CharField(max_length=100, required=False)
+    form_factor = forms.ChoiceField(
+        choices=VIFACE_FF_CHOICES,
+        initial=IFACE_FF_VIRTUAL,
+        widget=forms.HiddenInput()
+    )
+    enabled = forms.BooleanField(
+        required=False,
+        initial=True
+    )
+    mtu = forms.IntegerField(
+        required=False,
+        min_value=1,
+        max_value=32767,
+        label='MTU'
+    )
+    description = forms.CharField(
+        max_length=100,
+        required=False
+    )
--- a/netbox/virtualization/tests/test_api.py
+++ b/netbox/virtualization/tests/test_api.py
@@ -13,7 +13,7 @@ class ClusterTypeTest(APITestCase):

    def setUp(self):

-        super(ClusterTypeTest, self).setUp()
+        super().setUp()

        self.clustertype1 = ClusterType.objects.create(name='Test Cluster Type 1', slug='test-cluster-type-1')
        self.clustertype2 = ClusterType.objects.create(name='Test Cluster Type 2', slug='test-cluster-type-2')
@@ -114,7 +114,7 @@ class ClusterGroupTest(APITestCase):

    def setUp(self):

-        super(ClusterGroupTest, self).setUp()
+        super().setUp()

        self.clustergroup1 = ClusterGroup.objects.create(name='Test Cluster Group 1', slug='test-cluster-group-1')
        self.clustergroup2 = ClusterGroup.objects.create(name='Test Cluster Group 2', slug='test-cluster-group-2')
@@ -215,7 +215,7 @@ class ClusterTest(APITestCase):

    def setUp(self):

-        super(ClusterTest, self).setUp()
+        super().setUp()

        cluster_type = ClusterType.objects.create(name='Test Cluster Type 1', slug='test-cluster-type-1')
        cluster_group = ClusterGroup.objects.create(name='Test Cluster Group 1', slug='test-cluster-group-1')
@@ -328,7 +328,7 @@ class VirtualMachineTest(APITestCase):

    def setUp(self):

-        super(VirtualMachineTest, self).setUp()
+        super().setUp()

        cluster_type = ClusterType.objects.create(name='Test Cluster Type 1', slug='test-cluster-type-1')
        cluster_group = ClusterGroup.objects.create(name='Test Cluster Group 1', slug='test-cluster-group-1')
@@ -458,7 +458,7 @@ class InterfaceTest(APITestCase):

    def setUp(self):

-        super(InterfaceTest, self).setUp()
+        super().setUp()

        clustertype = ClusterType.objects.create(name='Test Cluster Type 1', slug='test-cluster-type-1')
        cluster = Cluster.objects.create(name='Test Cluster 1', type=clustertype)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
-Django==2.1.3
+Django==2.1.4
 django-cors-headers==2.4.0
-django-debug-toolbar==1.10.1
+django-debug-toolbar==1.11
 django-filter==2.0.0
 django-mptt==0.9.1
 django-tables2==2.0.3
@@ -8,11 +8,11 @@ django-taggit==0.23.0
 django-taggit-serializer==0.1.7
 django-timezone-field==3.0
 djangorestframework==3.9.0
-drf-yasg[validation]==1.11.0
+drf-yasg[validation]==1.11.1
 graphviz==0.10.1
 Markdown==2.6.11
 netaddr==0.7.19
 Pillow==5.3.0
 psycopg2-binary==2.7.6.1
 py-gfm==0.1.4
-pycryptodome==3.7.1
+pycryptodome==3.7.2
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -8,28 +8,19 @@
 PYTHON="python3"
 PIP="pip3"

-# Optionally use sudo if not already root, and always prompt for password
-# before running the command
-PREFIX="sudo -k "
-if [ "$(whoami)" = "root" ]; then
-	# When running upgrade as root, ask user to confirm if they wish to
-	# continue
-	read -n1 -rsp $'Running NetBox upgrade as root, press any key to continue or ^C to cancel\n'
-	PREFIX=""
-fi
-
+# TODO: Remove this in v2.6 as it is no longer needed under Python 3
 # Delete stale bytecode
-COMMAND="${PREFIX}find . -name \"*.pyc\" -delete"
+COMMAND="find . -name \"*.pyc\" -delete"
 echo "Cleaning up stale Python bytecode ($COMMAND)..."
 eval $COMMAND

 # Uninstall any Python packages which are no longer needed
-COMMAND="${PREFIX}${PIP} uninstall -r old_requirements.txt -y"
+COMMAND="${PIP} uninstall -r old_requirements.txt -y"
 echo "Removing old Python packages ($COMMAND)..."
 eval $COMMAND

 # Install any new Python packages
-COMMAND="${PREFIX}${PIP} install -r requirements.txt --upgrade"
+COMMAND="${PIP} install -r requirements.txt --upgrade"
 echo "Updating required Python packages ($COMMAND)..."
 eval $COMMAND
Author	SHA1	Message	Date
Jeremy Stretch	8863a3126d	Merge pull request #2660 from digitalocean/develop Release v2.5.0	2018-12-10 10:27:24 -05:00
Jeremy Stretch	acbe5f6418	Release v2.5.0	2018-12-10 10:22:32 -05:00
Jeremy Stretch	4e6652d811	Change pip command to pip3	2018-12-10 09:57:37 -05:00
Jeremy Stretch	7d4fa69595	Fixes #2657 : Fix typo	2018-12-10 09:54:30 -05:00
Jeremy Stretch	baeb7937fc	Updated requirements for v2.5 release	2018-12-07 15:52:25 -05:00
Jeremy Stretch	2bd9f8a11f	Updated installation docs for v2.5 release	2018-12-07 15:29:18 -05:00
Jeremy Stretch	44a2919a29	Django 2.1 requires Python 3.5+	2018-12-07 14:44:36 -05:00
Jeremy Stretch	77fbc42f75	Relax Python version requirement to 3.4	2018-12-07 14:29:17 -05:00
Jeremy Stretch	65edffea63	Merge v2.5 work	2018-12-07 10:51:28 -05:00
Jeremy Stretch	bf0083552d	Merge pull request #2653 from digitalocean/develop Release v2.4.9	2018-12-07 10:25:46 -05:00
Jeremy Stretch	869194354c	Release v2.4.9	2018-12-07 10:19:57 -05:00
Jeremy Stretch	aa8c836b94	Closes #2611 : Fix error handling when assigning a clustered device to a different site	2018-12-07 09:57:55 -05:00
Jeremy Stretch	9689ba2c4f	Fix representation of connected_endpoint_type for non-connected components	2018-12-06 16:39:03 -05:00
Jeremy Stretch	703be259fd	Normalize connection_status for non-connected device components during migration	2018-12-06 16:32:42 -05:00
Jeremy Stretch	45a1dfbd8a	Closes #2649 : Add connected_endpoint_type to connectable device component API representations	2018-12-06 16:14:03 -05:00
Jeremy Stretch	360303f86c	Closes #2474 : Add cabled and connection_status filters for device components	2018-12-06 12:39:12 -05:00
Jeremy Stretch	64d37cd450	Closes #2648 : Include the connection_status field in nested represenations of connectable device components	2018-12-06 12:14:54 -05:00
Jeremy Stretch	71dee2758b	Simplified filter_device() for Interfaces	2018-12-06 11:33:24 -05:00
Jeremy Stretch	870edbb44a	Fixes #2626 : Remove extraneous permissions generated from proxy models	2018-12-05 16:53:58 -05:00
Jeremy Stretch	2a07e8f3f0	Move queryset_to_csv() utility into ObjectListView to allow overriding by individual views	2018-12-05 16:35:59 -05:00
Jeremy Stretch	686a65880e	Closes #2495 : Enable deep-merging of config context data	2018-12-05 14:34:49 -05:00
Jeremy Stretch	ab4cb46d94	Additional API change notes	2018-12-05 11:13:29 -05:00
Jeremy Stretch	d3d6c83fbb	Fixes #2634 : Enforce consistent representation of unnamed devices in rack view	2018-12-04 15:29:58 -05:00
Jeremy Stretch	4e3567659a	Add reminder to update static field choices	2018-12-04 15:19:38 -05:00
Jeremy Stretch	f0874f4be0	Add missing choices for new cable and rack fields	2018-12-04 15:15:40 -05:00
Jeremy Stretch	dffa2d3556	Closes #2632 : Change representation of null values from 0 to 'null'	2018-12-04 15:09:07 -05:00
Jeremy Stretch	7bbf33ee39	Don't force the docs to open in a new window	2018-12-04 09:44:25 -05:00
Jeremy Stretch	90e7080b63	Closes #2641 : Restored link to NetBox shell documentation	2018-12-04 09:19:32 -05:00
John Anderson	e6ee26cf0e	CHANGELOG.md	2018-12-04 00:46:36 -05:00
John Anderson	0dcab07519	fixes #2623 - model class being passed to rqworker	2018-12-04 00:40:54 -05:00
Jeremy Stretch	a3ade01224	Fixes #2639 : Fix preservation of length/dimensions unit for racks and cables	2018-12-03 11:13:37 -05:00
mmahacek	232e6f5076	#2635 - Update documentation for python3 update (#2636 ) Add reference to reinstalling the django-rq module	2018-12-03 09:56:43 -05:00
Jeremy Stretch	d1cd366dc9	Fixes #2616 : Convert Rack outer_unit and Cable length_unit to integer-based choice fields	2018-11-30 12:26:28 -05:00
Jeremy Stretch	a1a9396287	Closes #2594 : upgrade.sh no longer invokes sudo	2018-11-30 11:12:10 -05:00
Jeremy Stretch	ca0248c3a2	Closes #2089 : Add SONET interface form factors	2018-11-30 09:28:56 -05:00
Jeremy Stretch	a43fc0d3d3	Closes #2560 : Add slug to DeviceType UI view	2018-11-28 16:19:05 -05:00
Jeremy Stretch	08b4b24296	Fixes #2622 : Enable filtering cables by multiple types/colors	2018-11-28 14:22:55 -05:00
Jeremy Stretch	5acd429c55	Fixes #2624 : Delete associated content type and permissions when removing InterfaceConnection model	2018-11-28 13:45:02 -05:00
Jeremy Stretch	6c2a9107dd	Closes #2597 : Add FibreChannel SFP28 (32GFC) interface form factor	2018-11-28 09:56:48 -05:00
Jeremy Stretch	879d879e56	Closes #2617 : Explicitly mention that test service runs on port 8000	2018-11-28 09:35:33 -05:00
Jeremy Stretch	c6d048ca51	Fixes #2576 : Correct type for count_* fields in site API representation	2018-11-27 16:27:47 -05:00
Jeremy Stretch	112aaea51f	Updated changelog for #2400	2018-11-27 16:18:57 -05:00
Tatsushi Demachi	c3cdf8e97e	Fix type mismatches in API view (#2429 ) * Fix tags field to be shown as array in API view `tags` field in serializers is defineded as `TagListSerializerField`. It should be shown as an array value in API view but actually, it is a simple string value. This fixes it by introducing a new `FieldInspector` to handle `TagListSerializerField` type field as an array. It doesn't affects any other type fields. * Fix SerializedPKRelatedField type API expression A field definded as `SerializedPKRelatedField` should be shown as an array of child serializer objects in a response value definition in API view but it is shown as an array of primary key values (usually `integer` type) of a child serializer. This fixes it by introducing a new `FieldInspector` to handle the field. It doesn't affect any other type fields. * Fix request parameter representation in API view In API view, representation of a parameter defined as a sub class of `WritableNestedSerializer` should be vary between a request and a response. For example, `tenant` field in `IPAddressSerializer` should be shown like following as a request body: ``` tenant: integer ... ``` while it should be shown like following as a response body: ``` tenant: { id: integer ..., url: string ..., name: string ..., slug: string ... } ``` But in both cases, it is shown as a response body type expression. This causes an error at sending an API request with that type value. It is only an API view issue, API can handle a request if a request parameter is structured as an expected request body by ignoring the wrong expression. This fixes the issue by replacing an implicitly used default auto schema generator class by its sub class and returning a pseudo serializer with 'Writable' prefix at generating a request body. The reason to introduce a new generator class is that there is no other point which can distinguish a request and a response. It is not enough to distinguish POST, PUT, PATCH methods from GET because former cases may return a JSON object as a response but it is also represented as same as a request body, causes another mismatch. This also fixes `SerializedPKRelatedField` type field representation. It should be shown as an array of primary keys in a request body. Fixed #2400	2018-11-27 16:14:45 -05:00
Jeremy Stretch	d2744700c6	Fixes #2615 : Tweak live search widget to use brief format for API requests	2018-11-27 12:41:00 -05:00
Jeremy Stretch	5d07a5a670	Fixes #2613 : Decrease live search minimum characters to three	2018-11-27 12:20:52 -05:00
Jeremy Stretch	4da755e75f	Formatting cleanup	2018-11-27 11:57:29 -05:00
Jeremy Stretch	bd7aee7c1f	Closes #2614 : Simplify calls of super() for Python 3	2018-11-27 10:52:24 -05:00
Jeremy Stretch	f3aef37163	Add developer guidance for the introduction of new dependencies	2018-11-27 10:45:10 -05:00
Jeremy Stretch	7d262296e1	Added a description and repo URL for each dependency	2018-11-27 09:51:48 -05:00
Jeremy Stretch	90a4b62976	Changelog for #2606	2018-11-26 14:41:09 -05:00
Daniel Sheppard	7346083b26	Fixes #2606 - Added MultipleChoiceFilter for form_factor (#2610 ) * Fixes #2606 - Added MultipleChoiceFilter for form_factor * Fixes #2606 - Add MultipleChoiceField for form_factor Fixes error with too many lines.	2018-11-26 14:19:05 -05:00
Tyler Bigler	f052bbc36e	Refactor Extras Migration Version Check (#2604 ) * Add constant for DB_MINIMUM_VERSION * Refactor verify_postgresql_version to use Django connection pg_version method for comparing versions. * Remove StrictVersion import * Remove DB_MINIMUM_VERSION as not necessary in constants. * Define DB_MINIMUM_VERSION locally to freeze to migration. * Refactor database version verification to use django builtin methods.	2018-11-26 14:16:37 -05:00
Jeremy Stretch	8d4329197a	Merge pull request #2600 from digitalocean/develop Release v2.4.8	2018-11-20 11:58:29 -05:00
Jeremy Stretch	cb83eb204b	Merge pull request #2552 from digitalocean/develop Release v2.4.7	2018-11-06 10:55:29 -05:00
Jeremy Stretch	74d525364a	Merge pull request #2494 from digitalocean/develop Release v2.4.6	2018-10-05 15:48:11 -04:00
Jeremy Stretch	125975832b	Merge pull request #2478 from digitalocean/develop Release v2.4.5	2018-10-02 15:29:13 -04:00
Jeremy Stretch	bcf22831e2	Merge pull request #2387 from digitalocean/develop Release v2.4.4	2018-08-22 11:53:56 -04:00
Jeremy Stretch	3b26ce6501	Merge pull request #2386 from digitalocean/revert-2376-patch-1 Revert "Add missing library"	2018-08-22 11:44:31 -04:00
Jeremy Stretch	1b2d3bf08b	Revert "Add missing library"	2018-08-22 11:44:07 -04:00
Jeremy Stretch	492bc9f86e	Merge pull request #2376 from craig/patch-1 Add missing library	2018-08-22 11:43:46 -04:00
Craig	967feb6931	Add missing library WSGIPassAuthorization fails if libapache2-mod-wsgi-py3 is missing	2018-08-21 00:41:29 +02:00
Jeremy Stretch	f224ad2959	Merge pull request #2346 from digitalocean/develop Release v2.4.3	2018-08-09 16:39:45 -04:00
Jeremy Stretch	242cb7c7cb	Merge pull request #2332 from digitalocean/develop Release v2.4.2	2018-08-08 09:16:50 -04:00
Jeremy Stretch	ea7386b04b	Merge pull request #2316 from digitalocean/develop Release v2.4.1	2018-08-07 09:25:10 -04:00
Jeremy Stretch	7a27dbb374	Merge pull request #2307 from digitalocean/develop Release v2.4.0	2018-08-06 12:40:00 -04:00
Jeremy Stretch	a85e6370a8	Merge pull request #2275 from digitalocean/develop Release v2.3.7	2018-07-26 14:29:15 -04:00
Jeremy Stretch	09a03565d7	Merge pull request #2244 from digitalocean/develop Release v2.3.6	2018-07-16 11:54:12 -04:00
Jeremy Stretch	6159994552	Merge pull request #2212 from digitalocean/develop Release v2.3.5	2018-07-02 15:55:25 -04:00
Jeremy Stretch	a1f624c1cc	Merge pull request #2152 from digitalocean/develop Release v2.3.4	2018-06-07 16:14:18 -04:00
Jeremy Stretch	328958876a	Merge pull request #2041 from digitalocean/develop Release v2.3.3	2018-04-19 11:15:48 -04:00
Jeremy Stretch	68f73c7f94	Merge pull request #1987 from digitalocean/develop Release v2.3.2	2018-03-22 15:05:59 -04:00
Jeremy Stretch	ec4d28ac6c	Merge pull request #1937 from digitalocean/develop Release v2.3.1	2018-03-01 15:36:10 -05:00
Jeremy Stretch	957074a134	Merge pull request #1913 from digitalocean/develop Release v2.3.0	2018-02-26 14:23:03 -05:00
Jeremy Stretch	c4f7e8121a	Merge pull request #1903 from digitalocean/develop Release v2.2.10	2018-02-21 16:05:45 -05:00
Jeremy Stretch	6436d703f5	Merge pull request #1852 from digitalocean/develop Release v2.2.9	2018-01-31 10:43:20 -05:00
Jeremy Stretch	ec0cb7a8bc	Merge pull request #1789 from digitalocean/develop Release v2.2.8	2017-12-20 15:27:22 -05:00
Jeremy Stretch	e98f0c39d1	Merge pull request #1757 from digitalocean/develop Release v2.2.7	2017-12-07 14:52:28 -05:00
Jeremy Stretch	50a451eddc	Merge pull request #1720 from digitalocean/develop Release v2.2.6	2017-11-16 12:00:34 -05:00
Jeremy Stretch	a5a7358d26	Merge pull request #1708 from digitalocean/develop Release v2.2.5	2017-11-14 13:25:11 -05:00
Jeremy Stretch	f9452163c5	Merge pull request #1671 from digitalocean/develop Release v2.2.4	2017-10-31 15:21:23 -04:00
Jeremy Stretch	3067c3f262	Merge pull request #1668 from digitalocean/develop Release v2.2.3	2017-10-31 14:02:15 -04:00
Jeremy Stretch	7a64404299	Merge pull request #1614 from digitalocean/develop Release v2.2.2	2017-10-17 11:24:02 -04:00
Jeremy Stretch	2bda399982	Merge pull request #1577 from digitalocean/develop Release v2.2.1	2017-10-12 16:11:17 -04:00
Jeremy Stretch	74731bc6ae	Merge pull request #1575 from digitalocean/develop Release v2.2.0	2017-10-12 14:01:28 -04:00
Jeremy Stretch	7cb287d6c6	Merge pull request #1572 from digitalocean/develop Release v2.1.6	2017-10-11 13:02:32 -04:00
Jeremy Stretch	aa8f734bd1	Merge pull request #1537 from digitalocean/develop Release v2.1.5	2017-09-25 14:52:43 -04:00
Jeremy Stretch	f6d1163ddd	Merge pull request #1461 from digitalocean/develop Release v2.1.4	2017-08-30 14:43:01 -04:00
Jeremy Stretch	5be30bd278	Merge pull request #1428 from digitalocean/develop Release v2.1.3	2017-08-15 15:52:34 -04:00
Jeremy Stretch	fa7b7288c9	Merge pull request #1398 from digitalocean/develop Release v2.1.2	2017-08-04 10:54:29 -04:00
Jeremy Stretch	9cc03aaa9a	Merge pull request #1387 from digitalocean/develop Release v2.1.1	2017-08-02 14:22:30 -04:00
Jeremy Stretch	1bda56ea23	Merge pull request #1372 from digitalocean/develop Release v2.1.0	2017-07-25 11:21:44 -04:00
Jeremy Stretch	64a34ced72	Merge pull request #1346 from digitalocean/develop Release v2.0.10	2017-07-14 10:09:16 -04:00
Jeremy Stretch	e05d379101	Merge pull request #1327 from digitalocean/develop Release v2.0.9	2017-07-10 09:43:59 -04:00
Jeremy Stretch	a355783377	Merge pull request #1316 from digitalocean/develop Release v2.0.8	2017-07-05 14:36:08 -04:00
Jeremy Stretch	88239e0b0d	Merge pull request #1278 from digitalocean/develop Release v2.0.7	2017-06-15 14:26:38 -04:00
Jeremy Stretch	5c63a499d5	Merge pull request #1259 from digitalocean/develop Release v2.0.6	2017-06-12 09:51:15 -04:00
Jeremy Stretch	50496b1a59	Merge pull request #1251 from digitalocean/develop Release v2.0.5	2017-06-08 10:10:41 -04:00
Jeremy Stretch	f7b0d22f86	Merge pull request #1230 from digitalocean/develop Release v2.0.4	2017-05-25 14:45:13 -04:00
Jeremy Stretch	ad95b86fdd	Merge pull request #1201 from digitalocean/develop Release v2.0.3	2017-05-18 14:37:19 -04:00
Jeremy Stretch	43e1e0dbc8	Merge pull request #1181 from digitalocean/develop Release v2.0.2	2017-05-15 13:23:33 -04:00
Jeremy Stretch	f731900e2f	Merge pull request #1154 from digitalocean/develop Release v2.0.1	2017-05-09 22:47:52 -04:00
Jeremy Stretch	b1bcaa33e7	Merge pull request #1148 from digitalocean/develop Release v2.0.0	2017-05-09 15:09:28 -04:00
Jeremy Stretch	17873706b7	Merge pull request #1094 from digitalocean/develop Release v1.9.6	2017-04-21 14:52:53 -04:00
Jeremy Stretch	e0ad2b4555	Merge pull request #1054 from digitalocean/develop Release v1.9.5	2017-04-06 16:35:15 -04:00
Jeremy Stretch	f89d91783b	Merge pull request #1035 from digitalocean/develop Release v1.9.4-r1	2017-04-04 15:50:28 -04:00
Jeremy Stretch	3ffe36e5ed	Merge pull request #1032 from digitalocean/develop Release v1.9.4	2017-04-04 12:01:58 -04:00
Jeremy Stretch	be393a9d10	Merge pull request #989 from digitalocean/develop Release v1.9.3	2017-03-23 16:27:06 -04:00
Jeremy Stretch	27eefd8705	Merge pull request #966 from digitalocean/develop Release v1.9.2	2017-03-14 17:14:19 -04:00
Jeremy Stretch	097e0f38ff	Merge pull request #949 from digitalocean/develop Release v1.9.1	2017-03-08 14:40:16 -05:00
Jeremy Stretch	ce26b566a4	Merge pull request #939 from digitalocean/develop Release v1.9.0-r1	2017-03-03 11:28:02 -05:00
Jeremy Stretch	0e14bc1e02	Merge pull request #933 from digitalocean/develop Release v1.9.0	2017-03-02 13:27:10 -05:00
Jeremy Stretch	ce6796ed9b	Merge pull request #870 from digitalocean/develop Release v1.8.4	2017-02-03 13:59:02 -05:00
Jeremy Stretch	c90cecc2fb	Merge pull request #849 from digitalocean/develop Release v1.8.3	2017-01-26 13:58:52 -05:00
Jeremy Stretch	b6bbcb0609	Merge pull request #814 from digitalocean/develop Release v1.8.2	2017-01-18 16:23:28 -05:00
Jeremy Stretch	23f6832d9c	Merge pull request #774 from digitalocean/develop Release v1.8.1	2017-01-04 15:30:54 -05:00
Jeremy Stretch	88dace75a1	Merge pull request #766 from digitalocean/develop Release v1.8.0	2017-01-03 15:13:36 -05:00
Jeremy Stretch	8eb140fd65	Merge pull request #736 from digitalocean/develop Release v1.7.3	2016-12-08 12:34:53 -05:00
Jeremy Stretch	1f09f3d096	Merge pull request #728 from digitalocean/develop Release v1.7.2-r1	2016-12-06 15:38:52 -05:00
Jeremy Stretch	66be85a41f	Merge pull request #726 from digitalocean/develop Release v1.7.2	2016-12-06 14:55:19 -05:00
Jeremy Stretch	814c11167e	Merge pull request #694 from digitalocean/develop Release v1.7.1	2016-11-15 12:34:09 -05:00
Jeremy Stretch	57ddd5086f	Merge pull request #666 from digitalocean/develop Release v1.7.0	2016-11-03 15:12:33 -04:00
Jeremy Stretch	c171547037	Merge pull request #625 from digitalocean/develop Release v1.6.3	2016-10-19 16:25:50 -04:00