Merge pull request #2660 from digitalocean/develop

Release v2.5.0

CHANGELOG.md

@@ -1,8 +1,4 @@
-v2.5-beta1 (2018-11-06)
-
-## 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))
@@ -31,11 +31,26 @@ NetBox now supports modeling physical cables for console, power, and interface c
 * [#1444](https://github.com/digitalocean/netbox/issues/1444) - Added an `asset_tag` field for racks
 * [#1931](https://github.com/digitalocean/netbox/issues/1931) - Added a count of assigned IP addresses to the interface API serializer
 * [#2000](https://github.com/digitalocean/netbox/issues/2000) - Dropped support for Python 2
+* [#2053](https://github.com/digitalocean/netbox/issues/2053) - Introduced the `LOGIN_TIMEOUT` configuration setting
 * [#2057](https://github.com/digitalocean/netbox/issues/2057) - Added description columns to interface connections list
 * [#2104](https://github.com/digitalocean/netbox/issues/2104) - Added a `status` field for racks
 * [#2165](https://github.com/digitalocean/netbox/issues/2165) - Improved natural ordering of Interfaces
 * [#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-beta2
+
+* [#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
 
@@ -43,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`
@@ -55,6 +72,47 @@ NetBox now supports modeling physical cables for console, power, and interface c
 * The field `interface_ordering` has been removed from the DeviceType serializer
 * 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
+
+---
+
+v2.4.8 (2018-11-20)
+
+## Enhancements
+
+* [#2490](https://github.com/digitalocean/netbox/issues/2490) - Added bulk editing for config contexts
+* [#2557](https://github.com/digitalocean/netbox/issues/2557) - Added object view for tags
+
+## Bug Fixes
+
+* [#2473](https://github.com/digitalocean/netbox/issues/2473) - Fix encoding of long (>127 character) secrets
+* [#2558](https://github.com/digitalocean/netbox/issues/2558) - Filter on all tags when multiple are passed
+* [#2565](https://github.com/digitalocean/netbox/issues/2565) - Improved rendering of Markdown tables
+* [#2575](https://github.com/digitalocean/netbox/issues/2575) - Correct model specified for rack roles table
+* [#2588](https://github.com/digitalocean/netbox/issues/2588) - Catch all exceptions from failed NAPALM API Calls
+* [#2589](https://github.com/digitalocean/netbox/issues/2589) - Virtual machine API serializer should require cluster assignment
 
 ---
 

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

docs/configuration/optional-settings.md

@@ -133,6 +133,14 @@ Setting this to True will permit only authenticated users to access any part of
 
 ---
 
+## LOGIN_TIMEOUT
+
+Default: 1209600 seconds (14 days)
+
+The liftetime (in seconds) of the authentication cookie issued to a NetBox user upon login.
+
+---
+
 ## MAINTENANCE_MODE
 
 Default: False
@@ -223,6 +231,14 @@ The file path to the location where custom reports will be kept. By default, thi
 
 ---
 
+## SESSION_FILE_PATH
+
+Default: None
+
+Session data is used to track authenticated users when they access NetBox. By default, NetBox stores session data in the PostgreSQL database. However, this inhibits authentication to a standby instance of NetBox without write access to the database. Alternatively, a local file path may be specified here and NetBox will store session data as files instead of using the database. Note that the user as which NetBox runs must have read and write permissions to this path.
+
+---
+
 ## TIME_ZONE
 
 Default: UTC

docs/development/extending-models.md

@@ -0,0 +1,74 @@
+# Extending Models
+
+Below is a list of items to consider when adding a new field to a model:
+
+### 1. Generate and run database migration
+
+Django migrations are used to express changes to the database schema. In most cases, Django can generate these automatically, however very complex changes may require manual intervention. Always remember to specify a short but descriptive name when generating a new migration.
+
+```
+./manage.py makemigrations <app> -n <name>
+./manage.py migrate
+```
+
+Where possible, try to merge related changes into a single migration. For example, if three new fields are being added to different models within an app, these can be expressed in the same migration. You can merge a new migration with an existing one by combining their `operations` lists.
+
+!!! note
+    Migrations can only be merged within a release. Once a new release has been published, its migrations cannot be altered.
+
+### 2. Add validation logic to `clean()`
+
+If the new field introduces additional validation requirements (beyond what's included with the field itself), implement them in the model's `clean()` method. Remember to call the model's original method using `super()` before or agter your custom validation as appropriate:
+
+```
+class Foo(models.Model):
+
+    def clean(self):
+
+        super(DeviceCSVForm, self).clean()
+
+        # Custom validation goes here
+        if self.bar is None:
+            raise ValidationError()
+```
+
+### 3. Add CSV helpers
+
+Add the name of the new field to `csv_headers` and included a CSV-friendly representation of its data in the model's `to_csv()` method. These will be used when exporting objects in CSV format.
+
+### 4. Update relevant querysets
+
+If you're adding a relational field (e.g. `ForeignKey`) and intend to include the data when retreiving a list of objects, be sure to include the field using `select_related()` or `prefetch_related()` as appropriate. This will optimize the view and avoid excessive database lookups.
+
+### 5. Update API serializer
+
+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 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:
+
+* **Credit/edit** - Manipulating a single object
+* **Bulk edit** - Performing a change on mnay objects at once
+* **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)
+
+### 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.
+
+### 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.
+
+### 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.
+
+### 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.

docs/development/index.md

@@ -28,10 +28,3 @@ NetBox components are arranged into functional subsections called _apps_ (a carr
 * `tenancy`: Tenants (such as customers) to which NetBox objects may be assigned
 * `utilities`: Resources which are not user-facing (extendable classes, etc.)
 * `virtualization`: Virtual machines and clusters
-
-## Style Guide
-
-NetBox generally follows the [Django style guide](https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/coding-style/), which is itself based on [PEP 8](https://www.python.org/dev/peps/pep-0008/). The following exceptions are noted:
-
-* [Pycodestyle](https://github.com/pycqa/pycodestyle) is used to validate code formatting, ignoring certain violations. See `scripts/cibuild.sh`.
-* Constants may be imported via wildcard (for example, `from .constants import *`).

docs/development/style-guide.md

@@ -0,0 +1,54 @@
+# Style Guide
+
+NetBox generally follows the [Django style guide](https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/coding-style/), which is itself based on [PEP 8](https://www.python.org/dev/peps/pep-0008/). [Pycodestyle](https://github.com/pycqa/pycodestyle) is used to validate code formatting, ignoring certain violations. See `scripts/cibuild.sh`.
+
+## PEP 8 Exceptions
+
+* Wildcard imports (for example, `from .constants import *`) are acceptable under any of the following conditions:
+    * The library being import contains only constant declarations (`constants.py`)
+    * The library being imported explicitly defines `__all__` (e.g. `<app>.api.nested_serializers`)
+
+* Maximum line length is 120 characters (E501)
+    * This does not apply to HTML templates or to automatically generated code (e.g. database migrations).
+
+* Line breaks are permitted following binary operators (W504)
+
+## Enforcing Code Style
+
+The `pycodestyle` utility (previously `pep8`) is used by the CI process to enforce code style. It is strongly recommended to include as part of your commit process. A git commit hook is provided in the source at `scripts/git-hooks/pre-commit`. Linking to this script from `.git/hooks/` will invoke `pycodestyle` prior to every commit attempt and abort if the validation fails.
+
+```
+$ cd .git/hooks/
+$ ln -s ../../scripts/git-hooks/pre-commit
+```
+
+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.
+
+* No easter eggs. While they can be fun, NetBox must be considered as a business-critical tool. The potential, however minor, for introducing a bug caused by unnecessary logic is best avoided entirely.
+
+* Constants (variables which generally do not change) should be declared in `constants.py` within each app. Wildcard imports from the file are acceptable.
+
+* Every model should have a docstring. Every custom method should include an expalantion of its function.
+
+* Nested API serializers generate minimal representations of an object. These are stored separately from the primary serializers to avoid circular dependencies. Always import nested serializers from other apps directly. For example, from within the DCIM app you would write `from ipam.api.nested_serializers import NestedIPAddressSerializer`.

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

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.

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
 

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

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.

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
+```

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'
@@ -45,7 +46,9 @@ pages:
         - Examples: 'api/examples.md'
     - Development:
         - Introduction: 'development/index.md'
+        - Style Guide: 'development/style-guide.md'
         - Utility Views: 'development/utility-views.md'
+        - Extending Models: 'development/extending-models.md'
         - Release Checklist: 'development/release-checklist.md'
 
 markdown_extensions:

netbox/circuits/api/nested_serializers.py

@@ -0,0 +1,52 @@
+from rest_framework import serializers
+
+from circuits.models import Circuit, CircuitTermination, CircuitType, Provider
+from utilities.api import WritableNestedSerializer
+
+__all__ = [
+    'NestedCircuitSerializer',
+    'NestedCircuitTerminationSerializer',
+    'NestedCircuitTypeSerializer',
+    'NestedProviderSerializer',
+]
+
+
+#
+# Providers
+#
+
+class NestedProviderSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='circuits-api:provider-detail')
+
+    class Meta:
+        model = Provider
+        fields = ['id', 'url', 'name', 'slug']
+
+
+#
+# Circuits
+#
+
+class NestedCircuitTypeSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittype-detail')
+
+    class Meta:
+        model = CircuitType
+        fields = ['id', 'url', 'name', 'slug']
+
+
+class NestedCircuitSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuit-detail')
+
+    class Meta:
+        model = Circuit
+        fields = ['id', 'url', 'cid']
+
+
+class NestedCircuitTerminationSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittermination-detail')
+    circuit = NestedCircuitSerializer()
+
+    class Meta:
+        model = CircuitTermination
+        fields = ['id', 'url', 'circuit', 'term_side']

netbox/circuits/api/serializers.py

@@ -1,12 +1,13 @@
-from rest_framework import serializers
 from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField
 
 from circuits.constants import CIRCUIT_STATUS_CHOICES
 from circuits.models import Provider, Circuit, CircuitTermination, CircuitType
-from dcim.api.serializers import NestedCableSerializer, NestedInterfaceSerializer, NestedSiteSerializer
+from dcim.api.nested_serializers import NestedCableSerializer, NestedSiteSerializer
+from dcim.api.serializers import ConnectedEndpointSerializer
 from extras.api.customfields import CustomFieldModelSerializer
-from tenancy.api.serializers import NestedTenantSerializer
-from utilities.api import ChoiceField, ValidatedModelSerializer, WritableNestedSerializer
+from tenancy.api.nested_serializers import NestedTenantSerializer
+from utilities.api import ChoiceField, ValidatedModelSerializer
+from .nested_serializers import *
 
 
 #
@@ -24,16 +25,8 @@ class ProviderSerializer(TaggitSerializer, CustomFieldModelSerializer):
         ]
 
 
-class NestedProviderSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='circuits-api:provider-detail')
-
-    class Meta:
-        model = Provider
-        fields = ['id', 'url', 'name', 'slug']
-
-
 #
-# Circuit types
+# Circuits
 #
 
 class CircuitTypeSerializer(ValidatedModelSerializer):
@@ -43,18 +36,6 @@ class CircuitTypeSerializer(ValidatedModelSerializer):
         fields = ['id', 'name', 'slug']
 
 
-class NestedCircuitTypeSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittype-detail')
-
-    class Meta:
-        model = CircuitType
-        fields = ['id', 'url', 'name', 'slug']
-
-
-#
-# Circuits
-#
-
 class CircuitSerializer(TaggitSerializer, CustomFieldModelSerializer):
     provider = NestedProviderSerializer()
     status = ChoiceField(choices=CIRCUIT_STATUS_CHOICES, required=False)
@@ -70,36 +51,14 @@ class CircuitSerializer(TaggitSerializer, CustomFieldModelSerializer):
         ]
 
 
-class NestedCircuitSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuit-detail')
-
-    class Meta:
-        model = Circuit
-        fields = ['id', 'url', 'cid']
-
-
-#
-# Circuit Terminations
-#
-
-class CircuitTerminationSerializer(ValidatedModelSerializer):
+class CircuitTerminationSerializer(ConnectedEndpointSerializer):
     circuit = NestedCircuitSerializer()
     site = NestedSiteSerializer()
-    connected_endpoint = NestedInterfaceSerializer(read_only=True)
     cable = NestedCableSerializer(read_only=True)
 
     class Meta:
         model = CircuitTermination
         fields = [
             'id', 'circuit', 'term_side', 'site', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info',
-            'description', 'connected_endpoint', 'cable',
+            'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable',
         ]
-
-
-class NestedCircuitTerminationSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittermination-detail')
-    circuit = NestedCircuitSerializer()
-
-    class Meta:
-        model = CircuitTermination
-        fields = ['id', 'url', 'circuit', 'term_side']

netbox/circuits/filters.py

@@ -4,7 +4,7 @@ from django.db.models import Q
 from dcim.models import Site
 from extras.filters import CustomFieldFilterSet
 from tenancy.models import Tenant
-from utilities.filters import NumericInFilter
+from utilities.filters import NumericInFilter, TagFilter
 from .constants import CIRCUIT_STATUS_CHOICES
 from .models import Provider, Circuit, CircuitTermination, CircuitType
 
@@ -29,9 +29,7 @@ class ProviderFilter(CustomFieldFilterSet, django_filters.FilterSet):
         to_field_name='slug',
         label='Site (slug)',
     )
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
-    )
+    tag = TagFilter()
 
     class Meta:
         model = Provider
@@ -110,9 +108,7 @@ class CircuitFilter(CustomFieldFilterSet, django_filters.FilterSet):
         to_field_name='slug',
         label='Site (slug)',
     )
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
-    )
+    tag = TagFilter()
 
     class Meta:
         model = Circuit

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)'
+    )
 
 
 #

netbox/circuits/migrations/0013_cables.py

@@ -70,7 +70,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='circuittermination',
             name='connection_status',
-            field=models.NullBooleanField(default=True),
+            field=models.NullBooleanField(),
         ),
         migrations.AddField(
             model_name='circuittermination',

netbox/circuits/models.py

@@ -237,7 +237,7 @@ class CircuitTermination(CableTermination):
     )
     connection_status = models.NullBooleanField(
         choices=CONNECTION_STATUS_CHOICES,
-        default=CONNECTION_STATUS_CONNECTED
+        blank=True
     )
     port_speed = models.PositiveIntegerField(
         verbose_name='Port speed (Kbps)'

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')

netbox/dcim/api/nested_serializers.py

@@ -0,0 +1,249 @@
+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 ChoiceField, WritableNestedSerializer
+
+__all__ = [
+    'NestedCableSerializer',
+    'NestedConsolePortSerializer',
+    'NestedConsoleServerPortSerializer',
+    'NestedDeviceBaySerializer',
+    'NestedDeviceRoleSerializer',
+    'NestedDeviceSerializer',
+    'NestedDeviceTypeSerializer',
+    'NestedFrontPortSerializer',
+    'NestedFrontPortTemplateSerializer',
+    'NestedInterfaceSerializer',
+    'NestedManufacturerSerializer',
+    'NestedPlatformSerializer',
+    'NestedPowerOutletSerializer',
+    'NestedPowerPortSerializer',
+    'NestedRackGroupSerializer',
+    'NestedRackRoleSerializer',
+    'NestedRackSerializer',
+    'NestedRearPortSerializer',
+    'NestedRearPortTemplateSerializer',
+    'NestedRegionSerializer',
+    'NestedSiteSerializer',
+    'NestedVirtualChassisSerializer',
+]
+
+
+#
+# Regions/sites
+#
+
+class NestedRegionSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:region-detail')
+
+    class Meta:
+        model = Region
+        fields = ['id', 'url', 'name', 'slug']
+
+
+class NestedSiteSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:site-detail')
+
+    class Meta:
+        model = Site
+        fields = ['id', 'url', 'name', 'slug']
+
+
+#
+# Racks
+#
+
+class NestedRackGroupSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackgroup-detail')
+
+    class Meta:
+        model = RackGroup
+        fields = ['id', 'url', 'name', 'slug']
+
+
+class NestedRackRoleSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackrole-detail')
+
+    class Meta:
+        model = RackRole
+        fields = ['id', 'url', 'name', 'slug']
+
+
+class NestedRackSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rack-detail')
+
+    class Meta:
+        model = Rack
+        fields = ['id', 'url', 'name', 'display_name']
+
+
+#
+# Device types
+#
+
+class NestedManufacturerSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:manufacturer-detail')
+
+    class Meta:
+        model = Manufacturer
+        fields = ['id', 'url', 'name', 'slug']
+
+
+class NestedDeviceTypeSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicetype-detail')
+    manufacturer = NestedManufacturerSerializer(read_only=True)
+
+    class Meta:
+        model = DeviceType
+        fields = ['id', 'url', 'manufacturer', 'model', 'slug']
+
+
+class NestedRearPortTemplateSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearporttemplate-detail')
+
+    class Meta:
+        model = RearPortTemplate
+        fields = ['id', 'url', 'name']
+
+
+class NestedFrontPortTemplateSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontporttemplate-detail')
+
+    class Meta:
+        model = FrontPortTemplate
+        fields = ['id', 'url', 'name']
+
+
+#
+# Devices
+#
+
+class NestedDeviceRoleSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicerole-detail')
+
+    class Meta:
+        model = DeviceRole
+        fields = ['id', 'url', 'name', 'slug']
+
+
+class NestedPlatformSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:platform-detail')
+
+    class Meta:
+        model = Platform
+        fields = ['id', 'url', 'name', 'slug']
+
+
+class NestedDeviceSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:device-detail')
+
+    class Meta:
+        model = Device
+        fields = ['id', 'url', 'name', 'display_name']
+
+
+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', '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', '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', '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', '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', 'connection_status']
+
+
+class NestedRearPortSerializer(WritableNestedSerializer):
+    device = NestedDeviceSerializer(read_only=True)
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail')
+
+    class Meta:
+        model = RearPort
+        fields = ['id', 'url', 'device', 'name', 'cable']
+
+
+class NestedFrontPortSerializer(WritableNestedSerializer):
+    device = NestedDeviceSerializer(read_only=True)
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontport-detail')
+
+    class Meta:
+        model = FrontPort
+        fields = ['id', 'url', 'device', 'name', 'cable']
+
+
+class NestedDeviceBaySerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail')
+    device = NestedDeviceSerializer(read_only=True)
+
+    class Meta:
+        model = DeviceBay
+        fields = ['id', 'url', 'device', 'name']
+
+
+#
+# Cables
+#
+
+class NestedCableSerializer(serializers.ModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail')
+
+    class Meta:
+        model = Cable
+        fields = ['id', 'url', 'label']
+
+
+#
+# Virtual chassis
+#
+
+class NestedVirtualChassisSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:virtualchassis-detail')
+    master = NestedDeviceSerializer()
+
+    class Meta:
+        model = VirtualChassis
+        fields = ['id', 'url', 'master']

netbox/dcim/api/serializers.py

@@ -2,7 +2,6 @@ from rest_framework import serializers
 from rest_framework.validators import UniqueTogetherValidator
 from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField
 
-from circuits.models import Circuit, CircuitTermination
 from dcim.constants import *
 from dcim.models import (
     Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
@@ -11,28 +10,49 @@ from dcim.models import (
     RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis,
 )
 from extras.api.customfields import CustomFieldModelSerializer
-from ipam.models import IPAddress, VLAN
-from tenancy.api.serializers import NestedTenantSerializer
-from users.api.serializers import NestedUserSerializer
+from ipam.api.nested_serializers import NestedIPAddressSerializer, NestedVLANSerializer
+from ipam.models import VLAN
+from tenancy.api.nested_serializers import NestedTenantSerializer
+from users.api.nested_serializers import NestedUserSerializer
 from utilities.api import (
     ChoiceField, ContentTypeField, SerializedPKRelatedField, TimeZoneField, ValidatedModelSerializer,
     WritableNestedSerializer, get_serializer_for_model,
 )
-from virtualization.models import Cluster
+from virtualization.api.nested_serializers import NestedClusterSerializer
+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.
+        """
+        if getattr(obj, 'connected_endpoint', None) is None:
+            return None
+
+        serializer = get_serializer_for_model(obj.connected_endpoint, prefix='Nested')
+        context = {'request': self.context['request']}
+        data = serializer(obj.connected_endpoint, context=context).data
+
+        return data
 
 
 #
-# Regions
+# Regions/sites
 #
 
-class NestedRegionSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:region-detail')
-
-    class Meta:
-        model = Region
-        fields = ['id', 'url', 'name', 'slug']
-
-
 class RegionSerializer(serializers.ModelSerializer):
     parent = NestedRegionSerializer(required=False, allow_null=True)
 
@@ -41,16 +61,17 @@ class RegionSerializer(serializers.ModelSerializer):
         fields = ['id', 'name', 'slug', 'parent']
 
 
-#
-# Sites
-#
-
 class SiteSerializer(TaggitSerializer, CustomFieldModelSerializer):
     status = ChoiceField(choices=SITE_STATUS_CHOICES, required=False)
     region = NestedRegionSerializer(required=False, allow_null=True)
     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
@@ -62,16 +83,8 @@ class SiteSerializer(TaggitSerializer, CustomFieldModelSerializer):
         ]
 
 
-class NestedSiteSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:site-detail')
-
-    class Meta:
-        model = Site
-        fields = ['id', 'url', 'name', 'slug']
-
-
 #
-# Rack groups
+# Racks
 #
 
 class RackGroupSerializer(ValidatedModelSerializer):
@@ -82,18 +95,6 @@ class RackGroupSerializer(ValidatedModelSerializer):
         fields = ['id', 'name', 'slug', 'site']
 
 
-class NestedRackGroupSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackgroup-detail')
-
-    class Meta:
-        model = RackGroup
-        fields = ['id', 'url', 'name', 'slug']
-
-
-#
-# Rack roles
-#
-
 class RackRoleSerializer(ValidatedModelSerializer):
 
     class Meta:
@@ -101,18 +102,6 @@ class RackRoleSerializer(ValidatedModelSerializer):
         fields = ['id', 'name', 'slug', 'color']
 
 
-class NestedRackRoleSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackrole-detail')
-
-    class Meta:
-        model = RackRole
-        fields = ['id', 'url', 'name', 'slug']
-
-
-#
-# Racks
-#
-
 class RackSerializer(TaggitSerializer, CustomFieldModelSerializer):
     site = NestedSiteSerializer()
     group = NestedRackGroupSerializer(required=False, allow_null=True, default=None)
@@ -146,31 +135,11 @@ class RackSerializer(TaggitSerializer, CustomFieldModelSerializer):
             validator(data)
 
         # Enforce model validation
-        super(RackSerializer, self).validate(data)
+        super().validate(data)
 
         return data
 
 
-class NestedRackSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rack-detail')
-
-    class Meta:
-        model = Rack
-        fields = ['id', 'url', 'name', 'display_name']
-
-
-#
-# Rack units
-#
-
-class NestedDeviceSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:device-detail')
-
-    class Meta:
-        model = Device
-        fields = ['id', 'url', 'name', 'display_name']
-
-
 class RackUnitSerializer(serializers.Serializer):
     """
     A rack unit is an abstraction formed by the set (rack, position, face); it does not exist as a row in the database.
@@ -181,10 +150,6 @@ class RackUnitSerializer(serializers.Serializer):
     device = NestedDeviceSerializer(read_only=True)
 
 
-#
-# Rack reservations
-#
-
 class RackReservationSerializer(ValidatedModelSerializer):
     rack = NestedRackSerializer()
     user = NestedUserSerializer()
@@ -196,7 +161,7 @@ class RackReservationSerializer(ValidatedModelSerializer):
 
 
 #
-# Manufacturers
+# Device types
 #
 
 class ManufacturerSerializer(ValidatedModelSerializer):
@@ -206,18 +171,6 @@ class ManufacturerSerializer(ValidatedModelSerializer):
         fields = ['id', 'name', 'slug']
 
 
-class NestedManufacturerSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:manufacturer-detail')
-
-    class Meta:
-        model = Manufacturer
-        fields = ['id', 'url', 'name', 'slug']
-
-
-#
-# Device types
-#
-
 class DeviceTypeSerializer(TaggitSerializer, CustomFieldModelSerializer):
     manufacturer = NestedManufacturerSerializer()
     subdevice_role = ChoiceField(choices=SUBDEVICE_ROLE_CHOICES, required=False, allow_null=True)
@@ -232,19 +185,6 @@ class DeviceTypeSerializer(TaggitSerializer, CustomFieldModelSerializer):
         ]
 
 
-class NestedDeviceTypeSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicetype-detail')
-    manufacturer = NestedManufacturerSerializer(read_only=True)
-
-    class Meta:
-        model = DeviceType
-        fields = ['id', 'url', 'manufacturer', 'model', 'slug']
-
-
-#
-# Console port templates
-#
-
 class ConsolePortTemplateSerializer(ValidatedModelSerializer):
     device_type = NestedDeviceTypeSerializer()
 
@@ -253,10 +193,6 @@ class ConsolePortTemplateSerializer(ValidatedModelSerializer):
         fields = ['id', 'device_type', 'name']
 
 
-#
-# Console server port templates
-#
-
 class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer):
     device_type = NestedDeviceTypeSerializer()
 
@@ -265,10 +201,6 @@ class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer):
         fields = ['id', 'device_type', 'name']
 
 
-#
-# Power port templates
-#
-
 class PowerPortTemplateSerializer(ValidatedModelSerializer):
     device_type = NestedDeviceTypeSerializer()
 
@@ -277,10 +209,6 @@ class PowerPortTemplateSerializer(ValidatedModelSerializer):
         fields = ['id', 'device_type', 'name']
 
 
-#
-# Power outlet templates
-#
-
 class PowerOutletTemplateSerializer(ValidatedModelSerializer):
     device_type = NestedDeviceTypeSerializer()
 
@@ -289,10 +217,6 @@ class PowerOutletTemplateSerializer(ValidatedModelSerializer):
         fields = ['id', 'device_type', 'name']
 
 
-#
-# Interface templates
-#
-
 class InterfaceTemplateSerializer(ValidatedModelSerializer):
     device_type = NestedDeviceTypeSerializer()
     form_factor = ChoiceField(choices=IFACE_FF_CHOICES, required=False)
@@ -302,10 +226,6 @@ class InterfaceTemplateSerializer(ValidatedModelSerializer):
         fields = ['id', 'device_type', 'name', 'form_factor', 'mgmt_only']
 
 
-#
-# Rear port templates
-#
-
 class RearPortTemplateSerializer(ValidatedModelSerializer):
     device_type = NestedDeviceTypeSerializer()
     type = ChoiceField(choices=PORT_TYPE_CHOICES)
@@ -315,18 +235,6 @@ class RearPortTemplateSerializer(ValidatedModelSerializer):
         fields = ['id', 'device_type', 'name', 'type', 'positions']
 
 
-class NestedRearPortTemplateSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearporttemplate-detail')
-
-    class Meta:
-        model = RearPortTemplate
-        fields = ['id', 'url', 'name']
-
-
-#
-# Front port templates
-#
-
 class FrontPortTemplateSerializer(ValidatedModelSerializer):
     device_type = NestedDeviceTypeSerializer()
     type = ChoiceField(choices=PORT_TYPE_CHOICES)
@@ -337,18 +245,6 @@ class FrontPortTemplateSerializer(ValidatedModelSerializer):
         fields = ['id', 'device_type', 'name', 'type', 'rear_port', 'rear_port_position']
 
 
-class NestedFrontPortTemplateSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontporttemplate-detail')
-
-    class Meta:
-        model = FrontPortTemplate
-        fields = ['id', 'url', 'name']
-
-
-#
-# Device bay templates
-#
-
 class DeviceBayTemplateSerializer(ValidatedModelSerializer):
     device_type = NestedDeviceTypeSerializer()
 
@@ -358,7 +254,7 @@ class DeviceBayTemplateSerializer(ValidatedModelSerializer):
 
 
 #
-# Device roles
+# Devices
 #
 
 class DeviceRoleSerializer(ValidatedModelSerializer):
@@ -368,18 +264,6 @@ class DeviceRoleSerializer(ValidatedModelSerializer):
         fields = ['id', 'name', 'slug', 'color', 'vm_role']
 
 
-class NestedDeviceRoleSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicerole-detail')
-
-    class Meta:
-        model = DeviceRole
-        fields = ['id', 'url', 'name', 'slug']
-
-
-#
-# Platforms
-#
-
 class PlatformSerializer(ValidatedModelSerializer):
     manufacturer = NestedManufacturerSerializer(required=False, allow_null=True)
 
@@ -388,46 +272,6 @@ class PlatformSerializer(ValidatedModelSerializer):
         fields = ['id', 'name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_args']
 
 
-class NestedPlatformSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:platform-detail')
-
-    class Meta:
-        model = Platform
-        fields = ['id', 'url', 'name', 'slug']
-
-
-#
-# Devices
-#
-
-# Cannot import ipam.api.NestedIPAddressSerializer due to circular dependency
-class DeviceIPAddressSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:ipaddress-detail')
-
-    class Meta:
-        model = IPAddress
-        fields = ['id', 'url', 'family', 'address']
-
-
-# Cannot import virtualization.api.NestedClusterSerializer due to circular dependency
-class NestedClusterSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:cluster-detail')
-
-    class Meta:
-        model = Cluster
-        fields = ['id', 'url', 'name']
-
-
-# Cannot import NestedVirtualChassisSerializer due to circular dependency
-class DeviceVirtualChassisSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:virtualchassis-detail')
-    master = NestedDeviceSerializer()
-
-    class Meta:
-        model = VirtualChassis
-        fields = ['id', 'url', 'master']
-
-
 class DeviceSerializer(TaggitSerializer, CustomFieldModelSerializer):
     device_type = NestedDeviceTypeSerializer()
     device_role = NestedDeviceRoleSerializer()
@@ -437,12 +281,12 @@ class DeviceSerializer(TaggitSerializer, CustomFieldModelSerializer):
     rack = NestedRackSerializer(required=False, allow_null=True)
     face = ChoiceField(choices=RACK_FACE_CHOICES, required=False, allow_null=True)
     status = ChoiceField(choices=DEVICE_STATUS_CHOICES, required=False)
-    primary_ip = DeviceIPAddressSerializer(read_only=True)
-    primary_ip4 = DeviceIPAddressSerializer(required=False, allow_null=True)
-    primary_ip6 = DeviceIPAddressSerializer(required=False, allow_null=True)
+    primary_ip = NestedIPAddressSerializer(read_only=True)
+    primary_ip4 = NestedIPAddressSerializer(required=False, allow_null=True)
+    primary_ip6 = NestedIPAddressSerializer(required=False, allow_null=True)
     parent_device = serializers.SerializerMethodField()
     cluster = NestedClusterSerializer(required=False, allow_null=True)
-    virtual_chassis = DeviceVirtualChassisSerializer(required=False, allow_null=True)
+    virtual_chassis = NestedVirtualChassisSerializer(required=False, allow_null=True)
     tags = TagListSerializerField(required=False)
 
     class Meta:
@@ -450,8 +294,8 @@ class DeviceSerializer(TaggitSerializer, CustomFieldModelSerializer):
         fields = [
             'id', 'name', 'display_name', 'device_type', 'device_role', 'tenant', 'platform', 'serial', 'asset_tag',
             'site', 'rack', 'position', 'face', 'parent_device', 'status', 'primary_ip', 'primary_ip4', 'primary_ip6',
-            'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', 'tags', 'custom_fields', 'created',
-            'last_updated', 'local_context_data',
+            'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', 'local_context_data', 'tags',
+            'custom_fields', 'created', 'last_updated',
         ]
         validators = []
 
@@ -464,7 +308,7 @@ class DeviceSerializer(TaggitSerializer, CustomFieldModelSerializer):
             validator(data)
 
         # Enforce model validation
-        super(DeviceSerializer, self).validate(data)
+        super().validate(data)
 
         return data
 
@@ -486,14 +330,173 @@ class DeviceWithConfigContextSerializer(DeviceSerializer):
         fields = [
             'id', 'name', 'display_name', 'device_type', 'device_role', 'tenant', 'platform', 'serial', 'asset_tag',
             'site', 'rack', 'position', 'face', 'parent_device', 'status', 'primary_ip', 'primary_ip4', 'primary_ip6',
-            'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', 'tags', 'custom_fields',
-            'config_context', 'created', 'last_updated', 'local_context_data',
+            'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', 'local_context_data', 'tags',
+            'custom_fields', 'config_context', 'created', 'last_updated',
         ]
 
     def get_config_context(self, obj):
         return obj.get_config_context()
 
 
+class ConsoleServerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
+    device = NestedDeviceSerializer()
+    cable = NestedCableSerializer(read_only=True)
+    tags = TagListSerializerField(required=False)
+
+    class Meta:
+        model = ConsoleServerPort
+        fields = [
+            'id', 'device', 'name', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable',
+            'tags',
+        ]
+
+
+class ConsolePortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
+    device = NestedDeviceSerializer()
+    cable = NestedCableSerializer(read_only=True)
+    tags = TagListSerializerField(required=False)
+
+    class Meta:
+        model = ConsolePort
+        fields = [
+            'id', 'device', 'name', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable',
+            'tags',
+        ]
+
+
+class PowerOutletSerializer(TaggitSerializer, ConnectedEndpointSerializer):
+    device = NestedDeviceSerializer()
+    cable = NestedCableSerializer(read_only=True)
+    tags = TagListSerializerField(required=False)
+
+    class Meta:
+        model = PowerOutlet
+        fields = [
+            'id', 'device', 'name', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable',
+            'tags',
+        ]
+
+
+class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
+    device = NestedDeviceSerializer()
+    cable = NestedCableSerializer(read_only=True)
+    tags = TagListSerializerField(required=False)
+
+    class Meta:
+        model = PowerPort
+        fields = [
+            'id', 'device', 'name', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable',
+            'tags',
+        ]
+
+
+class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer):
+    device = NestedDeviceSerializer()
+    form_factor = ChoiceField(choices=IFACE_FF_CHOICES, required=False)
+    lag = NestedInterfaceSerializer(required=False, allow_null=True)
+    mode = ChoiceField(choices=IFACE_MODE_CHOICES, required=False, allow_null=True)
+    untagged_vlan = NestedVLANSerializer(required=False, allow_null=True)
+    tagged_vlans = SerializedPKRelatedField(
+        queryset=VLAN.objects.all(),
+        serializer=NestedVLANSerializer,
+        required=False,
+        many=True
+    )
+    cable = NestedCableSerializer(read_only=True)
+    tags = TagListSerializerField(required=False)
+
+    class Meta:
+        model = Interface
+        fields = [
+            'id', 'device', 'name', 'form_factor', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description',
+            '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()
+    def validate(self, data):
+
+        # All associated VLANs be global or assigned to the parent device's site.
+        device = self.instance.device if self.instance else data.get('device')
+        untagged_vlan = data.get('untagged_vlan')
+        if untagged_vlan and untagged_vlan.site not in [device.site, None]:
+            raise serializers.ValidationError({
+                'untagged_vlan': "VLAN {} must belong to the same site as the interface's parent device, or it must be "
+                                 "global.".format(untagged_vlan)
+            })
+        for vlan in data.get('tagged_vlans', []):
+            if vlan.site not in [device.site, None]:
+                raise serializers.ValidationError({
+                    'tagged_vlans': "VLAN {} must belong to the same site as the interface's parent device, or it must "
+                                    "be global.".format(vlan)
+                })
+
+        return super().validate(data)
+
+
+class RearPortSerializer(ValidatedModelSerializer):
+    device = NestedDeviceSerializer()
+    type = ChoiceField(choices=PORT_TYPE_CHOICES)
+    cable = NestedCableSerializer(read_only=True)
+    tags = TagListSerializerField(required=False)
+
+    class Meta:
+        model = RearPort
+        fields = ['id', 'device', 'name', 'type', 'positions', 'description', 'cable', 'tags']
+
+
+class FrontPortRearPortSerializer(WritableNestedSerializer):
+    """
+    NestedRearPortSerializer but with parent device omitted (since front and rear ports must belong to same device)
+    """
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail')
+
+    class Meta:
+        model = RearPort
+        fields = ['id', 'url', 'name']
+
+
+class FrontPortSerializer(ValidatedModelSerializer):
+    device = NestedDeviceSerializer()
+    type = ChoiceField(choices=PORT_TYPE_CHOICES)
+    rear_port = FrontPortRearPortSerializer()
+    cable = NestedCableSerializer(read_only=True)
+    tags = TagListSerializerField(required=False)
+
+    class Meta:
+        model = FrontPort
+        fields = ['id', 'device', 'name', 'type', 'rear_port', 'rear_port_position', 'description', 'cable', 'tags']
+
+
+class DeviceBaySerializer(TaggitSerializer, ValidatedModelSerializer):
+    device = NestedDeviceSerializer()
+    installed_device = NestedDeviceSerializer(required=False, allow_null=True)
+    tags = TagListSerializerField(required=False)
+
+    class Meta:
+        model = DeviceBay
+        fields = ['id', 'device', 'name', 'installed_device', 'tags']
+
+
+#
+# Inventory items
+#
+
+class InventoryItemSerializer(TaggitSerializer, ValidatedModelSerializer):
+    device = NestedDeviceSerializer()
+    # Provide a default value to satisfy UniqueTogetherValidator
+    parent = serializers.PrimaryKeyRelatedField(queryset=InventoryItem.objects.all(), allow_null=True, default=None)
+    manufacturer = NestedManufacturerSerializer(required=False, allow_null=True, default=None)
+    tags = TagListSerializerField(required=False)
+
+    class Meta:
+        model = InventoryItem
+        fields = [
+            'id', 'device', 'parent', 'name', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered',
+            'description', 'tags',
+        ]
+
+
 #
 # Cables
 #
@@ -548,305 +551,6 @@ class TracedCableSerializer(serializers.ModelSerializer):
         ]
 
 
-class NestedCableSerializer(serializers.ModelSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail')
-
-    class Meta:
-        model = Cable
-        fields = ['id', 'url', 'label']
-
-
-#
-# Console server ports
-#
-
-class ConsoleServerPortSerializer(TaggitSerializer, ValidatedModelSerializer):
-    device = NestedDeviceSerializer()
-    cable = NestedCableSerializer(read_only=True)
-    tags = TagListSerializerField(required=False)
-
-    class Meta:
-        model = ConsoleServerPort
-        fields = ['id', 'device', 'name', 'connected_endpoint', 'cable', 'tags']
-        read_only_fields = ['connected_endpoint']
-
-
-class NestedConsoleServerPortSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverport-detail')
-    device = NestedDeviceSerializer(read_only=True)
-
-    class Meta:
-        model = ConsoleServerPort
-        fields = ['id', 'url', 'device', 'name', 'cable']
-
-
-#
-# Console ports
-#
-
-class ConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer):
-    device = NestedDeviceSerializer()
-    connected_endpoint = NestedConsoleServerPortSerializer(read_only=True)
-    cable = NestedCableSerializer(read_only=True)
-    tags = TagListSerializerField(required=False)
-
-    class Meta:
-        model = ConsolePort
-        fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags']
-
-
-class NestedConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleport-detail')
-    device = NestedDeviceSerializer(read_only=True)
-
-    class Meta:
-        model = ConsolePort
-        fields = ['id', 'url', 'device', 'name', 'cable']
-
-
-#
-# Power outlets
-#
-
-class PowerOutletSerializer(TaggitSerializer, ValidatedModelSerializer):
-    device = NestedDeviceSerializer()
-    cable = NestedCableSerializer(read_only=True)
-    tags = TagListSerializerField(required=False)
-
-    class Meta:
-        model = PowerOutlet
-        fields = ['id', 'device', 'name', 'connected_endpoint', 'cable', 'tags']
-        read_only_fields = ['connected_endpoint']
-
-
-class NestedPowerOutletSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlet-detail')
-    device = NestedDeviceSerializer(read_only=True)
-
-    class Meta:
-        model = PowerOutlet
-        fields = ['id', 'url', 'device', 'name', 'cable']
-
-
-#
-# Power ports
-#
-
-class PowerPortSerializer(TaggitSerializer, ValidatedModelSerializer):
-    device = NestedDeviceSerializer()
-    connected_endpoint = NestedPowerOutletSerializer(read_only=True)
-    cable = NestedCableSerializer(read_only=True)
-    tags = TagListSerializerField(required=False)
-
-    class Meta:
-        model = PowerPort
-        fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags']
-
-
-class NestedPowerPortSerializer(TaggitSerializer, ValidatedModelSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerport-detail')
-    device = NestedDeviceSerializer(read_only=True)
-
-    class Meta:
-        model = PowerPort
-        fields = ['id', 'url', 'device', 'name', 'cable']
-
-
-#
-# Interfaces
-#
-
-class NestedInterfaceSerializer(WritableNestedSerializer):
-    device = NestedDeviceSerializer(read_only=True)
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interface-detail')
-
-    class Meta:
-        model = Interface
-        fields = ['id', 'url', 'device', 'name', 'cable']
-
-
-class InterfaceNestedCircuitSerializer(serializers.ModelSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuit-detail')
-
-    class Meta:
-        model = Circuit
-        fields = ['id', 'url', 'cid']
-
-
-class InterfaceCircuitTerminationSerializer(WritableNestedSerializer):
-    circuit = InterfaceNestedCircuitSerializer(read_only=True)
-
-    class Meta:
-        model = CircuitTermination
-        fields = [
-            'id', 'circuit', 'term_side', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info',
-        ]
-
-
-# Cannot import ipam.api.NestedVLANSerializer due to circular dependency
-class InterfaceVLANSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlan-detail')
-
-    class Meta:
-        model = VLAN
-        fields = ['id', 'url', 'vid', 'name', 'display_name']
-
-
-class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer):
-    device = NestedDeviceSerializer()
-    form_factor = ChoiceField(choices=IFACE_FF_CHOICES, required=False)
-    lag = NestedInterfaceSerializer(required=False, allow_null=True)
-    connected_endpoint = serializers.SerializerMethodField(read_only=True)
-    mode = ChoiceField(choices=IFACE_MODE_CHOICES, required=False, allow_null=True)
-    untagged_vlan = InterfaceVLANSerializer(required=False, allow_null=True)
-    tagged_vlans = SerializedPKRelatedField(
-        queryset=VLAN.objects.all(),
-        serializer=InterfaceVLANSerializer,
-        required=False,
-        many=True
-    )
-    cable = NestedCableSerializer(read_only=True)
-    tags = TagListSerializerField(required=False)
-
-    class Meta:
-        model = Interface
-        fields = [
-            'id', 'device', 'name', 'form_factor', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description',
-            'connected_endpoint', 'cable', 'mode', 'untagged_vlan', 'tagged_vlans', 'tags', 'count_ipaddresses',
-        ]
-
-    def validate(self, data):
-
-        # All associated VLANs be global or assigned to the parent device's site.
-        device = self.instance.device if self.instance else data.get('device')
-        untagged_vlan = data.get('untagged_vlan')
-        if untagged_vlan and untagged_vlan.site not in [device.site, None]:
-            raise serializers.ValidationError({
-                'untagged_vlan': "VLAN {} must belong to the same site as the interface's parent device, or it must be "
-                                 "global.".format(untagged_vlan)
-            })
-        for vlan in data.get('tagged_vlans', []):
-            if vlan.site not in [device.site, None]:
-                raise serializers.ValidationError({
-                    'tagged_vlans': "VLAN {} must belong to the same site as the interface's parent device, or it must "
-                                    "be global.".format(vlan)
-                })
-
-        return super(InterfaceSerializer, self).validate(data)
-
-    def get_connected_endpoint(self, obj):
-        """
-        Return the appropriate serializer for the type of connected object.
-        """
-        if obj.connected_endpoint is None:
-            return None
-
-        serializer = get_serializer_for_model(obj.connected_endpoint, prefix='Nested')
-        context = {'request': self.context['request']}
-        data = serializer(obj.connected_endpoint, context=context).data
-
-        return data
-
-
-#
-# Rear ports
-#
-
-class RearPortSerializer(ValidatedModelSerializer):
-    device = NestedDeviceSerializer()
-    type = ChoiceField(choices=PORT_TYPE_CHOICES)
-    cable = NestedCableSerializer(read_only=True)
-    tags = TagListSerializerField(required=False)
-
-    class Meta:
-        model = RearPort
-        fields = ['id', 'device', 'name', 'type', 'positions', 'cable', 'tags']
-
-
-class NestedRearPortSerializer(WritableNestedSerializer):
-    device = NestedDeviceSerializer(read_only=True)
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail')
-
-    class Meta:
-        model = RearPort
-        fields = ['id', 'url', 'device', 'name', 'cable']
-
-
-#
-# Front ports
-#
-
-class FrontPortRearPortSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail')
-
-    class Meta:
-        model = RearPort
-        fields = ['id', 'url', 'name']
-
-
-class FrontPortSerializer(ValidatedModelSerializer):
-    device = NestedDeviceSerializer()
-    type = ChoiceField(choices=PORT_TYPE_CHOICES)
-    rear_port = FrontPortRearPortSerializer()
-    cable = NestedCableSerializer(read_only=True)
-    tags = TagListSerializerField(required=False)
-
-    class Meta:
-        model = FrontPort
-        fields = ['id', 'device', 'name', 'type', 'rear_port', 'rear_port_position', 'cable', 'tags']
-
-
-class NestedFrontPortSerializer(WritableNestedSerializer):
-    device = NestedDeviceSerializer(read_only=True)
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontport-detail')
-
-    class Meta:
-        model = FrontPort
-        fields = ['id', 'url', 'device', 'name', 'cable']
-
-
-#
-# Device bays
-#
-
-class DeviceBaySerializer(TaggitSerializer, ValidatedModelSerializer):
-    device = NestedDeviceSerializer()
-    installed_device = NestedDeviceSerializer(required=False, allow_null=True)
-    tags = TagListSerializerField(required=False)
-
-    class Meta:
-        model = DeviceBay
-        fields = ['id', 'device', 'name', 'installed_device', 'tags']
-
-
-class NestedDeviceBaySerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail')
-    device = NestedDeviceSerializer(read_only=True)
-
-    class Meta:
-        model = DeviceBay
-        fields = ['id', 'url', 'device', 'name']
-
-
-#
-# Inventory items
-#
-
-class InventoryItemSerializer(TaggitSerializer, ValidatedModelSerializer):
-    device = NestedDeviceSerializer()
-    # Provide a default value to satisfy UniqueTogetherValidator
-    parent = serializers.PrimaryKeyRelatedField(queryset=InventoryItem.objects.all(), allow_null=True, default=None)
-    manufacturer = NestedManufacturerSerializer(required=False, allow_null=True, default=None)
-    tags = TagListSerializerField(required=False)
-
-    class Meta:
-        model = InventoryItem
-        fields = [
-            'id', 'device', 'parent', 'name', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered',
-            'description', 'tags',
-        ]
-
-
 #
 # Interface connections
 #
@@ -876,11 +580,3 @@ class VirtualChassisSerializer(TaggitSerializer, ValidatedModelSerializer):
     class Meta:
         model = VirtualChassis
         fields = ['id', 'master', 'domain', 'tags']
-
-
-class NestedVirtualChassisSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:virtualchassis-detail')
-
-    class Meta:
-        model = VirtualChassis
-        fields = ['id', 'url']

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']),
     )
 
@@ -309,9 +310,9 @@ class DeviceViewSet(CustomFieldModelViewSet):
         # Check that NAPALM is installed
         try:
             import napalm
+            from napalm.base.exceptions import ModuleImportError
         except ImportError:
             raise ServiceUnavailable("NAPALM is not installed. Please see the documentation for instructions.")
-        from napalm.base.exceptions import ModuleImportError
 
         # Validate the configured driver
         try:
@@ -355,7 +356,9 @@ class DeviceViewSet(CustomFieldModelViewSet):
             try:
                 response[method] = getattr(d, method)()
             except NotImplementedError:
-                response[method] = {'error': 'Method not implemented for NAPALM driver {}'.format(driver)}
+                response[method] = {'error': 'Method {} not implemented for NAPALM driver {}'.format(method, driver)}
+            except Exception as e:
+                response[method] = {'error': 'Method {} failed: {}'.format(method, e)}
         d.close()
 
         return Response(response)

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)'],
         ]
     ],
     [
@@ -226,12 +248,12 @@ IFACE_MODE_CHOICES = [
 # Pass-through port types
 PORT_TYPE_8P8C = 1000
 PORT_TYPE_ST = 2000
-PORT_TYPE_SC_SIMPLEX = 2100
-PORT_TYPE_SC_DUPLEX = 2110
+PORT_TYPE_SC = 2100
 PORT_TYPE_FC = 2200
 PORT_TYPE_LC = 2300
 PORT_TYPE_MTRJ = 2400
 PORT_TYPE_MPO = 2500
+PORT_TYPE_LSH = 2600
 PORT_TYPE_CHOICES = [
     [
         'Copper',
@@ -242,13 +264,13 @@ PORT_TYPE_CHOICES = [
     [
         'Fiber Optic',
         [
-            [PORT_TYPE_ST, 'ST'],
-            [PORT_TYPE_SC_SIMPLEX, 'SC (Simplex)'],
-            [PORT_TYPE_SC_DUPLEX, 'SC (Duplex)'],
             [PORT_TYPE_FC, 'FC'],
             [PORT_TYPE_LC, 'LC'],
-            [PORT_TYPE_MTRJ, 'MTRJ'],
+            [PORT_TYPE_LSH, 'LSH'],
             [PORT_TYPE_MPO, 'MPO'],
+            [PORT_TYPE_MTRJ, 'MTRJ'],
+            [PORT_TYPE_SC, 'SC'],
+            [PORT_TYPE_ST, 'ST'],
         ]
     ]
 ]
@@ -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'),

netbox/dcim/filters.py

@@ -7,7 +7,8 @@ from netaddr.core import AddrFormatError
 
 from extras.filters import CustomFieldFilterSet
 from tenancy.models import Tenant
-from utilities.filters import NullableCharFieldFilter, NumericInFilter
+from utilities.constants import COLOR_CHOICES
+from utilities.filters import NullableCharFieldFilter, NumericInFilter, TagFilter
 from virtualization.models import Cluster
 from .constants import *
 from .models import (
@@ -81,9 +82,7 @@ class SiteFilter(CustomFieldFilterSet, django_filters.FilterSet):
         to_field_name='slug',
         label='Tenant (slug)',
     )
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
-    )
+    tag = TagFilter()
 
     class Meta:
         model = Site
@@ -202,9 +201,7 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet):
         label='Role (slug)',
     )
     asset_tag = NullableCharFieldFilter()
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
-    )
+    tag = TagFilter()
 
     class Meta:
         model = Rack
@@ -303,7 +300,7 @@ class ManufacturerFilter(django_filters.FilterSet):
         fields = ['name', 'slug']
 
 
-class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet):
+class DeviceTypeFilter(CustomFieldFilterSet):
     id__in = NumericInFilter(
         field_name='id',
         lookup_expr='in'
@@ -322,33 +319,31 @@ class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet):
         to_field_name='slug',
         label='Manufacturer (slug)',
     )
-    console_ports = django_filters.CharFilter(
+    console_ports = django_filters.BooleanFilter(
         method='_console_ports',
         label='Has console ports',
     )
-    console_server_ports = django_filters.CharFilter(
+    console_server_ports = django_filters.BooleanFilter(
         method='_console_server_ports',
         label='Has console server ports',
     )
-    power_ports = django_filters.CharFilter(
+    power_ports = django_filters.BooleanFilter(
         method='_power_ports',
         label='Has power ports',
     )
-    power_outlets = django_filters.CharFilter(
+    power_outlets = django_filters.BooleanFilter(
         method='_power_outlets',
         label='Has power outlets',
     )
-    interfaces = django_filters.CharFilter(
+    interfaces = django_filters.BooleanFilter(
         method='_interfaces',
         label='Has interfaces',
     )
-    pass_through_ports = django_filters.CharFilter(
+    pass_through_ports = django_filters.BooleanFilter(
         method='_pass_through_ports',
         label='Has pass-through ports',
     )
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
-    )
+    tag = TagFilter()
 
     class Meta:
         model = DeviceType
@@ -367,30 +362,24 @@ class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet):
         )
 
     def _console_ports(self, queryset, name, value):
-        value = value.strip()
-        return queryset.exclude(consoleport_templates__isnull=bool(value))
+        return queryset.exclude(consoleport_templates__isnull=value)
 
     def _console_server_ports(self, queryset, name, value):
-        value = value.strip()
-        return queryset.exclude(consoleserverport_templates__isnull=bool(value))
+        return queryset.exclude(consoleserverport_templates__isnull=value)
 
     def _power_ports(self, queryset, name, value):
-        value = value.strip()
-        return queryset.exclude(powerport_templates__isnull=bool(value))
+        return queryset.exclude(powerport_templates__isnull=value)
 
     def _power_outlets(self, queryset, name, value):
-        value = value.strip()
-        return queryset.exclude(poweroutlet_templates__isnull=bool(value))
+        return queryset.exclude(poweroutlet_templates__isnull=value)
 
     def _interfaces(self, queryset, name, value):
-        value = value.strip()
-        return queryset.exclude(interface_templates__isnull=bool(value))
+        return queryset.exclude(interface_templates__isnull=value)
 
     def _pass_through_ports(self, queryset, name, value):
-        value = value.strip()
         return queryset.exclude(
-            frontport_templates__isnull=bool(value),
-            rearport_templates__isnull=bool(value)
+            frontport_templates__isnull=value,
+            rearport_templates__isnull=value
         )
 
 
@@ -483,7 +472,7 @@ class PlatformFilter(django_filters.FilterSet):
         fields = ['name', 'slug']
 
 
-class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet):
+class DeviceFilter(CustomFieldFilterSet):
     id__in = NumericInFilter(
         field_name='id',
         lookup_expr='in'
@@ -588,30 +577,6 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet):
         field_name='device_type__is_full_depth',
         label='Is full depth',
     )
-    console_ports = django_filters.CharFilter(
-        method='_console_ports',
-        label='Has console ports',
-    )
-    console_server_ports = django_filters.CharFilter(
-        method='_console_server_ports',
-        label='Has console server ports',
-    )
-    power_ports = django_filters.CharFilter(
-        method='_power_ports',
-        label='Has power ports',
-    )
-    power_outlets = django_filters.CharFilter(
-        method='_power_outlets',
-        label='Has power outlets',
-    )
-    interfaces = django_filters.CharFilter(
-        method='_interfaces',
-        label='Has interfaces',
-    )
-    pass_through_ports = django_filters.CharFilter(
-        method='_pass_through_ports',
-        label='Has pass-through ports',
-    )
     mac_address = django_filters.CharFilter(
         method='_mac_address',
         label='MAC address',
@@ -625,9 +590,31 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet):
         queryset=VirtualChassis.objects.all(),
         label='Virtual chassis (ID)',
     )
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
+    console_ports = django_filters.BooleanFilter(
+        method='_console_ports',
+        label='Has console ports',
     )
+    console_server_ports = django_filters.BooleanFilter(
+        method='_console_server_ports',
+        label='Has console server ports',
+    )
+    power_ports = django_filters.BooleanFilter(
+        method='_power_ports',
+        label='Has power ports',
+    )
+    power_outlets = django_filters.BooleanFilter(
+        method='_power_outlets',
+        label='Has power outlets',
+    )
+    interfaces = django_filters.BooleanFilter(
+        method='_interfaces',
+        label='Has interfaces',
+    )
+    pass_through_ports = django_filters.BooleanFilter(
+        method='_pass_through_ports',
+        label='Has pass-through ports',
+    )
+    tag = TagFilter()
 
     class Meta:
         model = Device
@@ -677,30 +664,24 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet):
             )
 
     def _console_ports(self, queryset, name, value):
-        value = value.strip()
-        return queryset.exclude(consoleports__isnull=bool(value))
+        return queryset.exclude(consoleports__isnull=value)
 
     def _console_server_ports(self, queryset, name, value):
-        value = value.strip()
-        return queryset.exclude(consoleserverports__isnull=bool(value))
+        return queryset.exclude(consoleserverports__isnull=value)
 
     def _power_ports(self, queryset, name, value):
-        value = value.strip()
-        return queryset.exclude(powerports__isnull=bool(value))
+        return queryset.exclude(powerports__isnull=value)
 
     def _power_outlets(self, queryset, name, value):
-        value = value.strip()
-        return queryset.exclude(poweroutlets__isnull=bool(value))
+        return queryset.exclude(poweroutlets_isnull=value)
 
     def _interfaces(self, queryset, name, value):
-        value = value.strip()
-        return queryset.exclude(interfaces__isnull=bool(value))
+        return queryset.exclude(interfaces__isnull=value)
 
     def _pass_through_ports(self, queryset, name, value):
-        value = value.strip()
         return queryset.exclude(
-            frontports__isnull=bool(value),
-            rearports__isnull=bool(value)
+            frontports__isnull=value,
+            rearports__isnull=value
         )
 
 
@@ -714,43 +695,60 @@ class DeviceComponentFilterSet(django_filters.FilterSet):
         to_field_name='name',
         label='Device (name)',
     )
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
-    )
+    tag = TagFilter()
 
 
 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',
@@ -762,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',
@@ -775,9 +778,7 @@ class InterfaceFilter(django_filters.FilterSet):
         method='_mac_address',
         label='MAC address',
     )
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
-    )
+    tag = TagFilter()
     vlan_id = django_filters.CharFilter(
         method='filter_vlan_id',
         label='Assigned VLAN'
@@ -786,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()
@@ -838,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
@@ -845,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
@@ -932,9 +947,7 @@ class VirtualChassisFilter(django_filters.FilterSet):
         to_field_name='slug',
         label='Tenant (slug)',
     )
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
-    )
+    tag = TagFilter()
 
     class Meta:
         model = VirtualChassis
@@ -955,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

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'))"
 

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),
         ),
     ]

netbox/dcim/migrations/0065_front_rear_ports.py

@@ -19,6 +19,7 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=64)),
                 ('type', models.PositiveSmallIntegerField()),
                 ('rear_port_position', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(64)])),
+                ('description', models.CharField(blank=True, max_length=100)),
                 ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='frontports', to='dcim.Device')),
             ],
             options={
@@ -44,6 +45,7 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=64)),
                 ('type', models.PositiveSmallIntegerField()),
                 ('positions', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(64)])),
+                ('description', models.CharField(blank=True, max_length=100)),
                 ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rearports', to='dcim.Device')),
                 ('tags', taggit.managers.TaggableManager(through='taggit.TaggedItem', to='taggit.Tag')),
             ],

netbox/dcim/migrations/0066_cables.py

@@ -34,13 +34,21 @@ def console_connections_to_cables(apps, schema_editor):
         )
 
         # Cache the Cable on its two termination points
-        ConsolePort.objects.filter(pk=consoleport.id).update(cable=cable)
-        ConsoleServerPort.objects.filter(pk=consoleport.connected_endpoint_id).update(cable=cable)
+        ConsolePort.objects.filter(pk=consoleport.id).update(
+            cable=cable
+        )
+        ConsoleServerPort.objects.filter(pk=consoleport.connected_endpoint_id).update(
+            connection_status=consoleport.connection_status,
+            cable=cable
+        )
 
     cable_count = Cable.objects.filter(termination_a_type=consoleport_type).count()
     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):
     """
@@ -70,13 +78,21 @@ def power_connections_to_cables(apps, schema_editor):
         )
 
         # Cache the Cable on its two termination points
-        PowerPort.objects.filter(pk=powerport.id).update(cable=cable)
-        PowerOutlet.objects.filter(pk=powerport.connected_endpoint_id).update(cable=cable)
+        PowerPort.objects.filter(pk=powerport.id).update(
+            cable=cable
+        )
+        PowerOutlet.objects.filter(pk=powerport.connected_endpoint_id).update(
+            connection_status=powerport.connection_status,
+            cable=cable
+        )
 
     cable_count = Cable.objects.filter(termination_a_type=powerport_type).count()
     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):
     """
@@ -121,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
 
@@ -147,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')),
@@ -174,6 +199,11 @@ class Migration(migrations.Migration):
             name='connected_endpoint',
             field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='connected_endpoint', to='dcim.ConsoleServerPort'),
         ),
+        migrations.AlterField(
+            model_name='consoleport',
+            name='connection_status',
+            field=models.NullBooleanField(),
+        ),
         migrations.AddField(
             model_name='consoleport',
             name='cable',
@@ -189,6 +219,11 @@ class Migration(migrations.Migration):
             name='cable',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable'),
         ),
+        migrations.AddField(
+            model_name='consoleserverport',
+            name='connection_status',
+            field=models.NullBooleanField(),
+        ),
 
         # Alter power port models
         migrations.RenameField(
@@ -206,6 +241,11 @@ class Migration(migrations.Migration):
             name='connected_endpoint',
             field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='connected_endpoint', to='dcim.PowerOutlet'),
         ),
+        migrations.AlterField(
+            model_name='powerport',
+            name='connection_status',
+            field=models.NullBooleanField(),
+        ),
         migrations.AddField(
             model_name='powerport',
             name='cable',
@@ -221,6 +261,11 @@ class Migration(migrations.Migration):
             name='cable',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable'),
         ),
+        migrations.AddField(
+            model_name='poweroutlet',
+            name='connection_status',
+            field=models.NullBooleanField(),
+        ),
 
         # Alter the Interface model
         migrations.AddField(
@@ -236,7 +281,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='interface',
             name='connection_status',
-            field=models.NullBooleanField(default=True),
+            field=models.NullBooleanField(),
         ),
         migrations.AddField(
             model_name='interface',
@@ -261,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',
@@ -273,5 +319,4 @@ class Migration(migrations.Migration):
         migrations.DeleteModel(
             name='InterfaceConnection',
         ),
-
     ]

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',

netbox/dcim/models.py

@@ -73,10 +73,22 @@ class CableTermination(models.Model):
         null=True
     )
 
+    # Generic relations to Cable. These ensure that an attached Cable is deleted if the terminated object is deleted.
+    _cabled_as_a = GenericRelation(
+        to='dcim.Cable',
+        content_type_field='termination_a_type',
+        object_id_field='termination_a_id'
+    )
+    _cabled_as_b = GenericRelation(
+        to='dcim.Cable',
+        content_type_field='termination_b_type',
+        object_id_field='termination_b_id'
+    )
+
     class Meta:
         abstract = True
 
-    def trace(self, position=1):
+    def trace(self, position=1, follow_circuits=False):
         """
         Return a list representing a complete cable path, with each individual segment represented as a three-tuple:
             [
@@ -85,7 +97,7 @@ class CableTermination(models.Model):
                 (termination E, cable, termination F)
             ]
         """
-        def get_peer_port(termination, position=1):
+        def get_peer_port(termination, position=1, follow_circuits=False):
             from circuits.models import CircuitTermination
 
             # Map a front port to its corresponding rear port
@@ -105,7 +117,7 @@ class CableTermination(models.Model):
                 return peer_port, 1
 
             # Follow a circuit to its other termination
-            elif isinstance(termination, CircuitTermination):
+            elif isinstance(termination, CircuitTermination) and follow_circuits:
                 peer_termination = termination.get_peer_termination()
                 if peer_termination is None:
                     return None, None
@@ -121,7 +133,7 @@ class CableTermination(models.Model):
         far_end = self.cable.termination_b if self.cable.termination_a == self else self.cable.termination_a
         path = [(self, self.cable, far_end)]
 
-        peer_port, position = get_peer_port(far_end, position)
+        peer_port, position = get_peer_port(far_end, position, follow_circuits)
         if peer_port is None:
             return path
 
@@ -499,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
@@ -532,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])
@@ -540,12 +552,10 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
     def clean(self):
 
         # Validate outer dimensions and unit
-        if self.outer_width and not self.outer_unit:
-            raise ValidationError("Must specify a unit when setting an outer width")
-        if self.outer_depth and not self.outer_unit:
-            raise ValidationError("Must specify a unit when setting an outer depth")
-        if self.outer_unit and self.outer_width is None and self.outer_depth is None:
-            self.length_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")
+        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
@@ -572,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:
@@ -884,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
@@ -1427,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])
@@ -1542,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:
@@ -1692,13 +1702,13 @@ class ConsolePort(CableTermination, ComponentModel):
     )
     connection_status = models.NullBooleanField(
         choices=CONNECTION_STATUS_CHOICES,
-        default=CONNECTION_STATUS_CONNECTED
+        blank=True
     )
 
     objects = DeviceComponentManager()
     tags = TaggableManager()
 
-    csv_headers = ['console_server', 'connected_endpoint', 'device', 'console_port', 'connection_status']
+    csv_headers = ['device', 'name']
 
     class Meta:
         ordering = ['device', 'name']
@@ -1712,11 +1722,8 @@ class ConsolePort(CableTermination, ComponentModel):
 
     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(),
         )
 
 
@@ -1736,10 +1743,16 @@ class ConsoleServerPort(CableTermination, ComponentModel):
     name = models.CharField(
         max_length=50
     )
+    connection_status = models.NullBooleanField(
+        choices=CONNECTION_STATUS_CHOICES,
+        blank=True
+    )
 
     objects = DeviceComponentManager()
     tags = TaggableManager()
 
+    csv_headers = ['device', 'name']
+
     class Meta:
         unique_together = ['device', 'name']
 
@@ -1749,6 +1762,12 @@ class ConsoleServerPort(CableTermination, ComponentModel):
     def get_absolute_url(self):
         return self.device.get_absolute_url()
 
+    def to_csv(self):
+        return (
+            self.device.identifier,
+            self.name,
+        )
+
 
 #
 # Power ports
@@ -1775,13 +1794,13 @@ class PowerPort(CableTermination, ComponentModel):
     )
     connection_status = models.NullBooleanField(
         choices=CONNECTION_STATUS_CHOICES,
-        default=CONNECTION_STATUS_CONNECTED
+        blank=True
     )
 
     objects = DeviceComponentManager()
     tags = TaggableManager()
 
-    csv_headers = ['pdu', 'connected_endpoint', 'device', 'power_port', 'connection_status']
+    csv_headers = ['device', 'name']
 
     class Meta:
         ordering = ['device', 'name']
@@ -1795,11 +1814,8 @@ class PowerPort(CableTermination, ComponentModel):
 
     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(),
         )
 
 
@@ -1819,10 +1835,16 @@ class PowerOutlet(CableTermination, ComponentModel):
     name = models.CharField(
         max_length=50
     )
+    connection_status = models.NullBooleanField(
+        choices=CONNECTION_STATUS_CHOICES,
+        blank=True
+    )
 
     objects = DeviceComponentManager()
     tags = TaggableManager()
 
+    csv_headers = ['device', 'name']
+
     class Meta:
         unique_together = ['device', 'name']
 
@@ -1832,6 +1854,12 @@ class PowerOutlet(CableTermination, ComponentModel):
     def get_absolute_url(self):
         return self.device.get_absolute_url()
 
+    def to_csv(self):
+        return (
+            self.device.identifier,
+            self.name,
+        )
+
 
 #
 # Interfaces
@@ -1875,7 +1903,7 @@ class Interface(CableTermination, ComponentModel):
     )
     connection_status = models.NullBooleanField(
         choices=CONNECTION_STATUS_CHOICES,
-        default=CONNECTION_STATUS_CONNECTED
+        blank=True
     )
     lag = models.ForeignKey(
         to='self',
@@ -1935,6 +1963,11 @@ class Interface(CableTermination, ComponentModel):
     objects = InterfaceManager()
     tags = TaggableManager()
 
+    csv_headers = [
+        'device', 'virtual_machine', 'name', 'lag', 'form_factor', 'enabled', 'mac_address', 'mtu', 'mgmt_only',
+        'description', 'mode',
+    ]
+
     class Meta:
         ordering = ['device', 'name']
         unique_together = ['device', 'name']
@@ -1945,6 +1978,21 @@ class Interface(CableTermination, ComponentModel):
     def get_absolute_url(self):
         return reverse('dcim:interface', kwargs={'pk': self.pk})
 
+    def to_csv(self):
+        return (
+            self.device.identifier if self.device else None,
+            self.virtual_machine.name if self.virtual_machine else None,
+            self.name,
+            self.lag.name if self.lag else None,
+            self.get_form_factor_display(),
+            self.enabled,
+            self.mac_address,
+            self.mtu,
+            self.mgmt_only,
+            self.description,
+            self.get_mode_display(),
+        )
+
     def clean(self):
 
         # An Interface must belong to a Device *or* to a VirtualMachine
@@ -2007,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):
         """
@@ -2108,10 +2156,16 @@ class FrontPort(CableTermination, ComponentModel):
         default=1,
         validators=[MinValueValidator(1), MaxValueValidator(64)]
     )
+    description = models.CharField(
+        max_length=100,
+        blank=True
+    )
 
     objects = DeviceComponentManager()
     tags = TaggableManager()
 
+    csv_headers = ['device', 'name', 'type', 'rear_port', 'rear_port_position', 'description']
+
     class Meta:
         ordering = ['device', 'name']
         unique_together = [
@@ -2122,6 +2176,16 @@ class FrontPort(CableTermination, ComponentModel):
     def __str__(self):
         return self.name
 
+    def to_csv(self):
+        return (
+            self.device.identifier,
+            self.name,
+            self.get_type_display(),
+            self.rear_port.name,
+            self.rear_port_position,
+            self.description,
+        )
+
     def clean(self):
 
         # Validate rear port assignment
@@ -2158,10 +2222,16 @@ class RearPort(CableTermination, ComponentModel):
         default=1,
         validators=[MinValueValidator(1), MaxValueValidator(64)]
     )
+    description = models.CharField(
+        max_length=100,
+        blank=True
+    )
 
     objects = DeviceComponentManager()
     tags = TaggableManager()
 
+    csv_headers = ['device', 'name', 'type', 'positions', 'description']
+
     class Meta:
         ordering = ['device', 'name']
         unique_together = ['device', 'name']
@@ -2169,6 +2239,15 @@ class RearPort(CableTermination, ComponentModel):
     def __str__(self):
         return self.name
 
+    def to_csv(self):
+        return (
+            self.device.identifier,
+            self.name,
+            self.get_type_display(),
+            self.positions,
+            self.description,
+        )
+
 
 #
 # Device bays
@@ -2198,6 +2277,8 @@ class DeviceBay(ComponentModel):
     objects = DeviceComponentManager()
     tags = TaggableManager()
 
+    csv_headers = ['device', 'name', 'installed_device']
+
     class Meta:
         ordering = ['device', 'name']
         unique_together = ['device', 'name']
@@ -2208,6 +2289,13 @@ class DeviceBay(ComponentModel):
     def get_absolute_url(self):
         return self.device.get_absolute_url()
 
+    def to_csv(self):
+        return (
+            self.device.identifier,
+            self.name,
+            self.installed_device.identifier if self.installed_device else None,
+        )
+
     def clean(self):
 
         # Validate that the parent Device can have DeviceBays
@@ -2407,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(
@@ -2434,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.
@@ -2456,6 +2544,21 @@ class Cable(ChangeLoggedModel):
                 self.termination_a_type, self.termination_b_type
             ))
 
+        # A termination point cannot be connected to itself
+        if self.termination_a == self.termination_b:
+            raise ValidationError("Cannot connect {} to itself".format(self.termination_a_type))
+
+        # A front port cannot be connected to its corresponding rear port
+        if (
+            type_a in ['frontport', 'rearport'] and
+            type_b in ['frontport', 'rearport'] and
+            (
+                getattr(self.termination_a, 'rear_port', None) == self.termination_b or
+                getattr(self.termination_b, 'rear_port', None) == self.termination_a
+            )
+        ):
+            raise ValidationError("A front port cannot be connected to it corresponding rear port")
+
         # Check for an existing Cable connected to either termination object
         if self.termination_a.cable not in (None, self):
             raise ValidationError("{} already has a cable attached (#{})".format(
@@ -2466,11 +2569,25 @@ class Cable(ChangeLoggedModel):
                 self.termination_b, self.termination_b.cable_id
             ))
 
+        # Virtual interfaces cannot be connected
+        endpoint_a, endpoint_b, _ = self.get_path_endpoints()
+        if (
+            (
+                isinstance(endpoint_a, Interface) and
+                endpoint_a.form_factor == IFACE_FF_VIRTUAL
+            ) or
+            (
+                isinstance(endpoint_b, Interface) and
+                endpoint_b.form_factor == IFACE_FF_VIRTUAL
+            )
+        ):
+            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):
 
@@ -2478,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 (
@@ -2499,39 +2616,18 @@ class Cable(ChangeLoggedModel):
         Traverse both ends of a cable path and return its connected endpoints. Note that one or both endpoints may be
         None.
         """
-        def trace_cable(termination, position=1):
+        a_path = self.termination_b.trace()
+        b_path = self.termination_a.trace()
 
-            # Given a front port, follow the cable connected to the corresponding rear port/position
-            if isinstance(termination, FrontPort):
-                peer_port = termination.rear_port
-                position = termination.rear_port_position
+        # Determine overall path status (connected or planned)
+        if self.status == CONNECTION_STATUS_PLANNED:
+            path_status = CONNECTION_STATUS_PLANNED
+        else:
+            path_status = CONNECTION_STATUS_CONNECTED
+            for segment in a_path[1:] + b_path[1:]:
+                if segment[1] is None or segment[1].status == CONNECTION_STATUS_PLANNED:
+                    path_status = CONNECTION_STATUS_PLANNED
+                    break
 
-            # Given a rear port/position, follow the cable connected to the corresponding front port
-            elif isinstance(termination, RearPort):
-                if position not in range(1, termination.positions + 1):
-                    raise Exception("Invalid position for {} ({} positions): {})".format(
-                        termination, termination.positions, position
-                    ))
-                peer_port = FrontPort.objects.get(
-                    rear_port=termination,
-                    rear_port_position=position,
-                )
-                position = 1
-
-            # Termination is not a pass-through port, so we've reached the end of the path
-            else:
-                return termination
-
-            # Find the cable (if any) attached to the peer port
-            next_cable = peer_port.cable
-
-            # If no cable exists, return None
-            if next_cable is None:
-                return None
-
-            far_end = next_cable.termination_b if next_cable.termination_a == peer_port else next_cable.termination_a
-
-            # Return the far side termination of the cable
-            return trace_cable(far_end, position)
-
-        return trace_cable(self.termination_a), trace_cable(self.termination_b)
+        # (A path end, B path end, connected/planned)
+        return a_path[-1][2], b_path[-1][2], path_status

netbox/dcim/signals.py

@@ -23,35 +23,45 @@ def clear_virtualchassis_members(instance, **kwargs):
 
 @receiver(post_save, sender=Cable)
 def update_connected_endpoints(instance, **kwargs):
+    """
+    When a Cable is saved, check for and update its two connected endpoints
+    """
 
     # Cache the Cable on its two termination points
-    instance.termination_a.cable = instance
-    instance.termination_a.save()
-    instance.termination_b.cable = instance
-    instance.termination_b.save()
+    if instance.termination_a.cable != instance:
+        instance.termination_a.cable = instance
+        instance.termination_a.save()
+    if instance.termination_b.cable != instance:
+        instance.termination_b.cable = instance
+        instance.termination_b.save()
 
     # Check if this Cable has formed a complete path. If so, update both endpoints.
-    endpoint_a, endpoint_b = instance.get_path_endpoints()
+    endpoint_a, endpoint_b, path_status = instance.get_path_endpoints()
     if endpoint_a is not None and endpoint_b is not None:
         endpoint_a.connected_endpoint = endpoint_b
-        endpoint_a.connection_status = True
+        endpoint_a.connection_status = path_status
         endpoint_a.save()
         endpoint_b.connected_endpoint = endpoint_a
-        endpoint_b.connection_status = True
+        endpoint_b.connection_status = path_status
         endpoint_b.save()
 
 
 @receiver(pre_delete, sender=Cable)
 def nullify_connected_endpoints(instance, **kwargs):
+    """
+    When a Cable is deleted, check for and update its two connected endpoints
+    """
+    endpoint_a, endpoint_b, _ = instance.get_path_endpoints()
 
     # Disassociate the Cable from its termination points
-    instance.termination_a.cable = None
-    instance.termination_a.save()
-    instance.termination_b.cable = None
-    instance.termination_b.save()
+    if instance.termination_a is not None:
+        instance.termination_a.cable = None
+        instance.termination_a.save()
+    if instance.termination_b is not None:
+        instance.termination_b.cable = None
+        instance.termination_b.save()
 
     # If this Cable was part of a complete path, tear it down
-    endpoint_a, endpoint_b = instance.get_path_endpoints()
     if endpoint_a is not None and endpoint_b is not None:
         endpoint_a.connected_endpoint = None
         endpoint_a.connection_status = None

netbox/dcim/tables.py

@@ -7,7 +7,7 @@ from .models import (
     Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
     DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate,
     InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack,
-    RackGroup, RackReservation, RearPort, RearPortTemplate, Region, Site, VirtualChassis,
+    RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis,
 )
 
 REGION_LINK = """
@@ -260,7 +260,7 @@ class RackRoleTable(BaseTable):
                                     verbose_name='')
 
     class Meta(BaseTable.Meta):
-        model = RackGroup
+        model = RackRole
         fields = ('pk', 'name', 'rack_count', 'color', 'slug', 'actions')
 
 
@@ -593,7 +593,7 @@ class FrontPortTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = FrontPort
-        fields = ('name', 'type', 'rear_port', 'rear_port_position')
+        fields = ('name', 'type', 'rear_port', 'rear_port_position', 'description')
         empty_text = "None"
 
 
@@ -601,7 +601,7 @@ class RearPortTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = RearPort
-        fields = ('name', 'type', 'positions')
+        fields = ('name', 'type', 'positions', 'description')
         empty_text = "None"
 
 
@@ -668,19 +668,22 @@ class ConsoleConnectionTable(BaseTable):
         viewname='dcim:device',
         accessor=Accessor('connected_endpoint.device'),
         args=[Accessor('connected_endpoint.device.pk')],
-        verbose_name='Console server'
+        verbose_name='Console Server'
     )
-    connected_endpoint = tables.Column(verbose_name='Port')
-    device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device')
-    name = tables.Column(verbose_name='Console port')
-    cable = tables.LinkColumn(
-        viewname='dcim:cable',
-        args=[Accessor('cable.pk')]
+    connected_endpoint = tables.Column(
+        verbose_name='Port'
+    )
+    device = tables.LinkColumn(
+        viewname='dcim:device',
+        args=[Accessor('device.pk')]
+    )
+    name = tables.Column(
+        verbose_name='Console Port'
     )
 
     class Meta(BaseTable.Meta):
         model = ConsolePort
-        fields = ('console_server', 'connected_endpoint', 'device', 'name', 'cable')
+        fields = ('console_server', 'connected_endpoint', 'device', 'name', 'connection_status')
 
 
 class PowerConnectionTable(BaseTable):
@@ -690,17 +693,20 @@ class PowerConnectionTable(BaseTable):
         args=[Accessor('connected_endpoint.device.pk')],
         verbose_name='PDU'
     )
-    connected_endpoint = tables.Column(verbose_name='Outlet')
-    device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device')
-    name = tables.Column(verbose_name='Power Port')
-    cable = tables.LinkColumn(
-        viewname='dcim:cable',
-        args=[Accessor('cable.pk')]
+    connected_endpoint = tables.Column(
+        verbose_name='Outlet'
+    )
+    device = tables.LinkColumn(
+        viewname='dcim:device',
+        args=[Accessor('device.pk')]
+    )
+    name = tables.Column(
+        verbose_name='Power Port'
     )
 
     class Meta(BaseTable.Meta):
         model = PowerPort
-        fields = ('pdu', 'connected_endpoint', 'device', 'name', 'cable')
+        fields = ('pdu', 'connected_endpoint', 'device', 'name', 'connection_status')
 
 
 class InterfaceConnectionTable(BaseTable):
@@ -736,14 +742,12 @@ class InterfaceConnectionTable(BaseTable):
         accessor=Accessor('connected_endpoint.description'),
         verbose_name='Description'
     )
-    cable = tables.LinkColumn(
-        viewname='dcim:cable',
-        args=[Accessor('cable.pk')]
-    )
 
     class Meta(BaseTable.Meta):
         model = Interface
-        fields = ('device_a', 'interface_a', 'description_a', 'device_b', 'interface_b', 'description_b', 'cable')
+        fields = (
+            'device_a', 'interface_a', 'description_a', 'device_b', 'interface_b', 'description_b', 'connection_status',
+        )
 
 
 #

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')
@@ -3433,7 +3433,7 @@ class VirtualChassisTest(APITestCase):
 
         self.assertEqual(
             sorted(response.data['results'][0]),
-            ['id', 'url']
+            ['id', 'master', 'url']
         )
 
     def test_create_virtualchassis(self):

netbox/dcim/tests/test_models.py

@@ -1,5 +1,6 @@
 from django.test import TestCase
 
+from dcim.constants import *
 from dcim.models import *
 
 
@@ -149,3 +150,198 @@ class RackTestCase(TestCase):
             face=None,
         )
         self.assertTrue(pdu)
+
+
+class CableTestCase(TestCase):
+
+    def setUp(self):
+
+        site = Site.objects.create(name='Test Site 1', slug='test-site-1')
+        manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
+        devicetype = DeviceType.objects.create(
+            manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1'
+        )
+        devicerole = DeviceRole.objects.create(
+            name='Test Device Role 1', slug='test-device-role-1', color='ff0000'
+        )
+        self.device1 = Device.objects.create(
+            device_type=devicetype, device_role=devicerole, name='TestDevice1', site=site
+        )
+        self.device2 = Device.objects.create(
+            device_type=devicetype, device_role=devicerole, name='TestDevice2', site=site
+        )
+        self.interface1 = Interface.objects.create(device=self.device1, name='eth0')
+        self.interface2 = Interface.objects.create(device=self.device2, name='eth0')
+        self.cable = Cable(termination_a=self.interface1, termination_b=self.interface2)
+        self.cable.save()
+
+        self.power_port1 = PowerPort.objects.create(device=self.device2, name='psu1')
+        self.patch_pannel = Device.objects.create(
+            device_type=devicetype, device_role=devicerole, name='TestPatchPannel', site=site
+        )
+        self.rear_port = RearPort.objects.create(device=self.patch_pannel, name='R1', type=1000)
+        self.front_port = FrontPort.objects.create(
+            device=self.patch_pannel, name='F1', type=1000, rear_port=self.rear_port
+        )
+
+    def test_cable_creation(self):
+        """
+        When a new Cable is created, it must be cached on either termination point.
+        """
+        interface1 = Interface.objects.get(pk=self.interface1.pk)
+        self.assertEqual(self.cable.termination_a, interface1)
+        interface2 = Interface.objects.get(pk=self.interface2.pk)
+        self.assertEqual(self.cable.termination_b, interface2)
+
+    def test_cable_deletion(self):
+        """
+        When a Cable is deleted, the `cable` field on its termination points must be nullified.
+        """
+        self.cable.delete()
+        interface1 = Interface.objects.get(pk=self.interface1.pk)
+        self.assertIsNone(interface1.cable)
+        interface2 = Interface.objects.get(pk=self.interface2.pk)
+        self.assertIsNone(interface2.cable)
+
+    def test_cabletermination_deletion(self):
+        """
+        When a CableTermination object is deleted, its attached Cable (if any) must also be deleted.
+        """
+        self.interface1.delete()
+        cable = Cable.objects.filter(pk=self.cable.pk).first()
+        self.assertIsNone(cable)
+
+    def test_cable_validates_compatibale_types(self):
+        """
+        The clean method should have a check to ensure only compatiable port types can be connected by a cable
+        """
+        # An interface cannot be connected to a power port
+        cable = Cable(termination_a=self.interface1, termination_b=self.power_port1)
+        with self.assertRaises(ValidationError):
+            cable.clean()
+
+    def test_cable_cannot_have_the_same_terminination_on_both_ends(self):
+        """
+        A cable cannot be made with the same A and B side terminations
+        """
+        cable = Cable(termination_a=self.interface1, termination_b=self.interface1)
+        with self.assertRaises(ValidationError):
+            cable.clean()
+
+    def test_cable_front_port_cannot_connect_to_corresponding_rear_port(self):
+        """
+        A cable cannot connect a front port to its sorresponding rear port
+        """
+        cable = Cable(termination_a=self.front_port, termination_b=self.rear_port)
+        with self.assertRaises(ValidationError):
+            cable.clean()
+
+    def test_cable_cannot_be_connected_to_an_existing_connection(self):
+        """
+        Either side of a cable cannot be terminated when that side aready has a connection
+        """
+        # Try to create a cable with the same interface terminations
+        cable = Cable(termination_a=self.interface2, termination_b=self.interface1)
+        with self.assertRaises(ValidationError):
+            cable.clean()
+
+    def test_cable_cannot_connect_to_a_virtual_inteface(self):
+        """
+        A cable connection cannot include a virtual interface
+        """
+        virtual_interface = Interface(device=self.device1, name="V1", form_factor=0)
+        cable = Cable(termination_a=self.interface2, termination_b=virtual_interface)
+        with self.assertRaises(ValidationError):
+            cable.clean()
+
+
+class CablePathTestCase(TestCase):
+
+    def setUp(self):
+
+        site = Site.objects.create(name='Test Site 1', slug='test-site-1')
+        manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
+        devicetype = DeviceType.objects.create(
+            manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1'
+        )
+        devicerole = DeviceRole.objects.create(
+            name='Test Device Role 1', slug='test-device-role-1', color='ff0000'
+        )
+        self.device1 = Device.objects.create(
+            device_type=devicetype, device_role=devicerole, name='Test Device 1', site=site
+        )
+        self.device2 = Device.objects.create(
+            device_type=devicetype, device_role=devicerole, name='Test Device 2', site=site
+        )
+        self.interface1 = Interface.objects.create(device=self.device1, name='eth0')
+        self.interface2 = Interface.objects.create(device=self.device2, name='eth0')
+        self.panel1 = Device.objects.create(
+            device_type=devicetype, device_role=devicerole, name='Test Panel 1', site=site
+        )
+        self.panel2 = Device.objects.create(
+            device_type=devicetype, device_role=devicerole, name='Test Panel 2', site=site
+        )
+        self.rear_port1 = RearPort.objects.create(
+            device=self.panel1, name='Rear Port 1', type=PORT_TYPE_8P8C
+        )
+        self.front_port1 = FrontPort.objects.create(
+            device=self.panel1, name='Front Port 1', type=PORT_TYPE_8P8C, rear_port=self.rear_port1
+        )
+        self.rear_port2 = RearPort.objects.create(
+            device=self.panel2, name='Rear Port 2', type=PORT_TYPE_8P8C
+        )
+        self.front_port2 = FrontPort.objects.create(
+            device=self.panel2, name='Front Port 2', type=PORT_TYPE_8P8C, rear_port=self.rear_port2
+        )
+
+    def test_path_completion(self):
+
+        # First segment
+        cable1 = Cable(termination_a=self.interface1, termination_b=self.front_port1)
+        cable1.save()
+        interface1 = Interface.objects.get(pk=self.interface1.pk)
+        self.assertIsNone(interface1.connected_endpoint)
+        self.assertIsNone(interface1.connection_status)
+
+        # Second segment
+        cable2 = Cable(termination_a=self.rear_port1, termination_b=self.rear_port2)
+        cable2.save()
+        interface1 = Interface.objects.get(pk=self.interface1.pk)
+        self.assertIsNone(interface1.connected_endpoint)
+        self.assertIsNone(interface1.connection_status)
+
+        # Third segment
+        cable3 = Cable(termination_a=self.front_port2, termination_b=self.interface2, status=CONNECTION_STATUS_PLANNED)
+        cable3.save()
+        interface1 = Interface.objects.get(pk=self.interface1.pk)
+        self.assertEqual(interface1.connected_endpoint, self.interface2)
+        self.assertEqual(interface1.connection_status, CONNECTION_STATUS_PLANNED)
+
+        # Switch third segment from planned to connected
+        cable3.status = CONNECTION_STATUS_CONNECTED
+        cable3.save()
+        interface1 = Interface.objects.get(pk=self.interface1.pk)
+        self.assertEqual(interface1.connected_endpoint, self.interface2)
+        self.assertEqual(interface1.connection_status, CONNECTION_STATUS_CONNECTED)
+
+    def test_path_teardown(self):
+
+        # Build the path
+        cable1 = Cable(termination_a=self.interface1, termination_b=self.front_port1)
+        cable1.save()
+        cable2 = Cable(termination_a=self.rear_port1, termination_b=self.rear_port2)
+        cable2.save()
+        cable3 = Cable(termination_a=self.front_port2, termination_b=self.interface2)
+        cable3.save()
+        interface1 = Interface.objects.get(pk=self.interface1.pk)
+        self.assertEqual(interface1.connected_endpoint, self.interface2)
+        self.assertEqual(interface1.connection_status, CONNECTION_STATUS_CONNECTED)
+
+        # Remove a cable
+        cable2.delete()
+        interface1 = Interface.objects.get(pk=self.interface1.pk)
+        self.assertIsNone(interface1.connected_endpoint)
+        self.assertIsNone(interface1.connection_status)
+        interface2 = Interface.objects.get(pk=self.interface2.pk)
+        self.assertIsNone(interface2.connected_endpoint)
+        self.assertIsNone(interface2.connection_status)

netbox/dcim/urls.py

@@ -169,13 +169,13 @@ urlpatterns = [
     # Console server ports
     url(r'^devices/console-server-ports/add/$', views.DeviceBulkAddConsoleServerPortView.as_view(), name='device_bulk_add_consoleserverport'),
     url(r'^devices/(?P<pk>\d+)/console-server-ports/add/$', views.ConsoleServerPortCreateView.as_view(), name='consoleserverport_add'),
-    url(r'^devices/(?P<pk>\d+)/console-server-ports/disconnect/$', views.ConsoleServerPortBulkDisconnectView.as_view(), name='consoleserverport_bulk_disconnect'),
     url(r'^devices/(?P<pk>\d+)/console-server-ports/delete/$', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'),
     url(r'^console-server-ports/(?P<termination_a_id>\d+)/connect/$', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'termination_a_type': ConsoleServerPort}),
     url(r'^console-server-ports/(?P<pk>\d+)/edit/$', views.ConsoleServerPortEditView.as_view(), name='consoleserverport_edit'),
     url(r'^console-server-ports/(?P<pk>\d+)/delete/$', views.ConsoleServerPortDeleteView.as_view(), name='consoleserverport_delete'),
     url(r'^console-server-ports/(?P<pk>\d+)/trace/$', views.CableTraceView.as_view(), name='consoleserverport_trace', kwargs={'model': ConsoleServerPort}),
     url(r'^console-server-ports/rename/$', views.ConsoleServerPortBulkRenameView.as_view(), name='consoleserverport_bulk_rename'),
+    url(r'^console-server-ports/disconnect/$', views.ConsoleServerPortBulkDisconnectView.as_view(), name='consoleserverport_bulk_disconnect'),
 
     # Power ports
     url(r'^devices/power-ports/add/$', views.DeviceBulkAddPowerPortView.as_view(), name='device_bulk_add_powerport'),
@@ -189,19 +189,18 @@ urlpatterns = [
     # Power outlets
     url(r'^devices/power-outlets/add/$', views.DeviceBulkAddPowerOutletView.as_view(), name='device_bulk_add_poweroutlet'),
     url(r'^devices/(?P<pk>\d+)/power-outlets/add/$', views.PowerOutletCreateView.as_view(), name='poweroutlet_add'),
-    url(r'^devices/(?P<pk>\d+)/power-outlets/disconnect/$', views.PowerOutletBulkDisconnectView.as_view(), name='poweroutlet_bulk_disconnect'),
     url(r'^devices/(?P<pk>\d+)/power-outlets/delete/$', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'),
     url(r'^power-outlets/(?P<termination_a_id>\d+)/connect/$', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'termination_a_type': PowerOutlet}),
     url(r'^power-outlets/(?P<pk>\d+)/edit/$', views.PowerOutletEditView.as_view(), name='poweroutlet_edit'),
     url(r'^power-outlets/(?P<pk>\d+)/delete/$', views.PowerOutletDeleteView.as_view(), name='poweroutlet_delete'),
     url(r'^power-outlets/(?P<pk>\d+)/trace/$', views.CableTraceView.as_view(), name='poweroutlet_trace', kwargs={'model': PowerOutlet}),
     url(r'^power-outlets/rename/$', views.PowerOutletBulkRenameView.as_view(), name='poweroutlet_bulk_rename'),
+    url(r'^power-outlets/disconnect/$', views.PowerOutletBulkDisconnectView.as_view(), name='poweroutlet_bulk_disconnect'),
 
     # Interfaces
     url(r'^devices/interfaces/add/$', views.DeviceBulkAddInterfaceView.as_view(), name='device_bulk_add_interface'),
     url(r'^devices/(?P<pk>\d+)/interfaces/add/$', views.InterfaceCreateView.as_view(), name='interface_add'),
     url(r'^devices/(?P<pk>\d+)/interfaces/edit/$', views.InterfaceBulkEditView.as_view(), name='interface_bulk_edit'),
-    url(r'^devices/(?P<pk>\d+)/interfaces/disconnect/$', views.InterfaceBulkDisconnectView.as_view(), name='interface_bulk_disconnect'),
     url(r'^devices/(?P<pk>\d+)/interfaces/delete/$', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'),
     url(r'^interfaces/(?P<termination_a_id>\d+)/connect/$', views.CableCreateView.as_view(), name='interface_connect', kwargs={'termination_a_type': Interface}),
     url(r'^interfaces/(?P<pk>\d+)/$', views.InterfaceView.as_view(), name='interface'),
@@ -211,6 +210,7 @@ urlpatterns = [
     url(r'^interfaces/(?P<pk>\d+)/changelog/$', ObjectChangeLogView.as_view(), name='interface_changelog', kwargs={'model': Interface}),
     url(r'^interfaces/(?P<pk>\d+)/trace/$', views.CableTraceView.as_view(), name='interface_trace', kwargs={'model': Interface}),
     url(r'^interfaces/rename/$', views.InterfaceBulkRenameView.as_view(), name='interface_bulk_rename'),
+    url(r'^interfaces/disconnect/$', views.InterfaceBulkDisconnectView.as_view(), name='interface_bulk_disconnect'),
 
     # Front ports
     # url(r'^devices/front-ports/add/$', views.DeviceBulkAddFrontPortView.as_view(), name='device_bulk_add_frontport'),
@@ -221,6 +221,7 @@ urlpatterns = [
     url(r'^front-ports/(?P<pk>\d+)/delete/$', views.FrontPortDeleteView.as_view(), name='frontport_delete'),
     url(r'^front-ports/(?P<pk>\d+)/trace/$', views.CableTraceView.as_view(), name='frontport_trace', kwargs={'model': FrontPort}),
     url(r'^front-ports/rename/$', views.FrontPortBulkRenameView.as_view(), name='frontport_bulk_rename'),
+    url(r'^front-ports/disconnect/$', views.FrontPortBulkDisconnectView.as_view(), name='frontport_bulk_disconnect'),
 
     # Rear ports
     # url(r'^devices/rear-ports/add/$', views.DeviceBulkAddRearPortView.as_view(), name='device_bulk_add_rearport'),
@@ -231,6 +232,7 @@ urlpatterns = [
     url(r'^rear-ports/(?P<pk>\d+)/delete/$', views.RearPortDeleteView.as_view(), name='rearport_delete'),
     url(r'^rear-ports/(?P<pk>\d+)/trace/$', views.CableTraceView.as_view(), name='rearport_trace', kwargs={'model': RearPort}),
     url(r'^rear-ports/rename/$', views.RearPortBulkRenameView.as_view(), name='rearport_bulk_rename'),
+    url(r'^rear-ports/disconnect/$', views.RearPortBulkDisconnectView.as_view(), name='rearport_bulk_disconnect'),
 
     # Device bays
     url(r'^devices/device-bays/add/$', views.DeviceBulkAddDeviceBayView.as_view(), name='device_bulk_add_devicebay'),

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,
@@ -26,7 +27,7 @@ from . import filters, forms, tables
 from .models import (
     Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
     DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate,
-    Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack,
+    InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack,
     RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis,
 )
 
@@ -73,7 +74,7 @@ class BulkRenameView(GetReturnURLMixin, View):
         })
 
 
-class BulkDisconnectView(View):
+class BulkDisconnectView(GetReturnURLMixin, View):
     """
     An extendable view for disconnection console/power/interface components in bulk.
     """
@@ -81,22 +82,30 @@ class BulkDisconnectView(View):
     form = None
     template_name = 'dcim/bulk_disconnect.html'
 
-    def disconnect_objects(self, objects):
-        raise NotImplementedError()
+    def post(self, request):
 
-    def post(self, request, pk):
-
-        device = get_object_or_404(Device, pk=pk)
         selected_objects = []
+        return_url = self.get_return_url(request)
 
         if '_confirm' in request.POST:
             form = self.form(request.POST)
+
             if form.is_valid():
-                count = self.disconnect_objects(form.cleaned_data['pk'])
-                messages.success(request, "Disconnected {} {} on {}".format(
-                    count, self.model._meta.verbose_name_plural, device
+
+                with transaction.atomic():
+
+                    count = 0
+                    for obj in self.model.objects.filter(pk__in=form.cleaned_data['pk']):
+                        if obj.cable is None:
+                            continue
+                        obj.cable.delete()
+                        count += 1
+
+                messages.success(request, "Disconnected {} {}".format(
+                    count, self.model._meta.verbose_name_plural
                 ))
-                return redirect(device.get_absolute_url())
+
+                return redirect(return_url)
 
         else:
             form = self.form(initial={'pk': request.POST.getlist('pk')})
@@ -104,10 +113,9 @@ class BulkDisconnectView(View):
 
         return render(request, self.template_name, {
             'form': form,
-            'device': device,
             'obj_type_plural': self.model._meta.verbose_name_plural,
             'selected_objects': selected_objects,
-            'return_url': device.get_absolute_url(),
+            'return_url': return_url,
         })
 
 
@@ -892,7 +900,7 @@ class DeviceView(View):
         interfaces = device.vc_interfaces.select_related(
             'lag', '_connected_interface__device', '_connected_circuittermination__circuit', 'cable'
         ).prefetch_related(
-            'cable__termination_a', 'cable__termination_b', 'ip_addresses'
+            'cable__termination_a', 'cable__termination_b', 'ip_addresses', 'tags'
         )
 
         # Front ports
@@ -1138,14 +1146,6 @@ class ConsoleServerPortBulkDisconnectView(PermissionRequiredMixin, BulkDisconnec
     model = ConsoleServerPort
     form = forms.ConsoleServerPortBulkDisconnectForm
 
-    def disconnect_objects(self, consoleserverports):
-        return ConsolePort.objects.filter(
-            connected_endpoint__in=consoleserverports
-        ).update(
-            connected_endpoint=None,
-            connection_status=None
-        )
-
 
 class ConsoleServerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
     permission_required = 'dcim.delete_consoleserverport'
@@ -1222,11 +1222,6 @@ class PowerOutletBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView)
     model = PowerOutlet
     form = forms.PowerOutletBulkDisconnectForm
 
-    def disconnect_objects(self, poweroutlets):
-        return PowerPort.objects.filter(connected_endpoint__in=poweroutlets).update(
-            connected_endpoint=None, connection_status=None
-        )
-
 
 class PowerOutletBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
     permission_required = 'dcim.delete_poweroutlet'
@@ -1302,17 +1297,6 @@ class InterfaceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     model = Interface
 
 
-class InterfaceBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView):
-    permission_required = 'dcim.change_interface'
-    model = Interface
-    form = forms.InterfaceBulkDisconnectForm
-
-    def disconnect_objects(self, interfaces):
-        return Interface.objects.filter(_connected_interface__in=interfaces).update(
-            _connected_interface=None, connection_status=None
-        )
-
-
 class InterfaceBulkEditView(PermissionRequiredMixin, BulkEditView):
     permission_required = 'dcim.change_interface'
     queryset = Interface.objects.all()
@@ -1327,6 +1311,12 @@ class InterfaceBulkRenameView(PermissionRequiredMixin, BulkRenameView):
     form = forms.InterfaceBulkRenameForm
 
 
+class InterfaceBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView):
+    permission_required = 'dcim.change_interface'
+    model = Interface
+    form = forms.InterfaceBulkDisconnectForm
+
+
 class InterfaceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
     permission_required = 'dcim.delete_interface'
     queryset = Interface.objects.all()
@@ -1365,6 +1355,12 @@ class FrontPortBulkRenameView(PermissionRequiredMixin, BulkRenameView):
     form = forms.FrontPortBulkRenameForm
 
 
+class FrontPortBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView):
+    permission_required = 'dcim.change_frontport'
+    model = FrontPort
+    form = forms.FrontPortBulkDisconnectForm
+
+
 class FrontPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
     permission_required = 'dcim.delete_frontport'
     queryset = FrontPort.objects.all()
@@ -1403,6 +1399,12 @@ class RearPortBulkRenameView(PermissionRequiredMixin, BulkRenameView):
     form = forms.RearPortBulkRenameForm
 
 
+class RearPortBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView):
+    permission_required = 'dcim.change_rearport'
+    model = RearPort
+    form = forms.RearPortBulkDisconnectForm
+
+
 class RearPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
     permission_required = 'dcim.delete_rearport'
     queryset = RearPort.objects.all()
@@ -1623,7 +1625,7 @@ class CableTraceView(View):
 
         return render(request, 'dcim/cable_trace.html', {
             'obj': obj,
-            'trace': obj.trace(),
+            'trace': obj.trace(follow_circuits=True),
         })
 
 
@@ -1698,6 +1700,22 @@ 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 = PowerPort.objects.select_related(
@@ -1712,6 +1730,22 @@ 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 = Interface.objects.select_related(
@@ -1728,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

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'])

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:

netbox/extras/api/nested_serializers.py

@@ -0,0 +1,23 @@
+from rest_framework import serializers
+
+from extras.models import ReportResult
+
+__all__ = [
+    'NestedReportResultSerializer',
+]
+
+
+#
+# Reports
+#
+
+class NestedReportResultSerializer(serializers.ModelSerializer):
+    url = serializers.HyperlinkedIdentityField(
+        view_name='extras-api:report-detail',
+        lookup_field='report',
+        lookup_url_kwarg='pk'
+    )
+
+    class Meta:
+        model = ReportResult
+        fields = ['url', 'created', 'user', 'failed']

netbox/extras/api/serializers.py

@@ -2,7 +2,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from rest_framework import serializers
 from taggit.models import Tag
 
-from dcim.api.serializers import (
+from dcim.api.nested_serializers import (
     NestedDeviceSerializer, NestedDeviceRoleSerializer, NestedPlatformSerializer, NestedRackSerializer,
     NestedRegionSerializer, NestedSiteSerializer,
 )
@@ -11,12 +11,13 @@ from extras.constants import *
 from extras.models import (
     ConfigContext, ExportTemplate, Graph, ImageAttachment, ObjectChange, ReportResult, TopologyMap,
 )
-from tenancy.api.serializers import NestedTenantSerializer, NestedTenantGroupSerializer
+from tenancy.api.nested_serializers import NestedTenantSerializer, NestedTenantGroupSerializer
 from tenancy.models import Tenant, TenantGroup
-from users.api.serializers import NestedUserSerializer
+from users.api.nested_serializers import NestedUserSerializer
 from utilities.api import (
     ChoiceField, ContentTypeField, get_serializer_for_model, SerializedPKRelatedField, ValidatedModelSerializer,
 )
+from .nested_serializers import *
 
 
 #
@@ -107,7 +108,7 @@ class ImageAttachmentSerializer(ValidatedModelSerializer):
             )
 
         # Enforce model validation
-        super(ImageAttachmentSerializer, self).validate(data)
+        super().validate(data)
 
         return data
 
@@ -187,18 +188,6 @@ class ReportResultSerializer(serializers.ModelSerializer):
         fields = ['created', 'user', 'failed', 'data']
 
 
-class NestedReportResultSerializer(serializers.ModelSerializer):
-    url = serializers.HyperlinkedIdentityField(
-        view_name='extras-api:report-detail',
-        lookup_field='report',
-        lookup_url_kwarg='pk'
-    )
-
-    class Meta:
-        model = ReportResult
-        fields = ['url', 'created', 'user', 'failed']
-
-
 class ReportSerializer(serializers.Serializer):
     module = serializers.CharField(max_length=255)
     name = serializers.CharField(max_length=255)

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')
 
 
 #

netbox/extras/constants.py

@@ -49,7 +49,7 @@ GRAPH_TYPE_CHOICES = (
 EXPORTTEMPLATE_MODELS = [
     'provider', 'circuit',                                                          # Circuits
     'site', 'region', 'rack', 'rackgroup', 'manufacturer', 'devicetype', 'device',  # DCIM
-    'consoleport', 'powerport', 'interface', 'virtualchassis',                      # DCIM
+    'consoleport', 'powerport', 'interface', 'cable', 'virtualchassis',             # DCIM
     'aggregate', 'prefix', 'ipaddress', 'vlan', 'vrf', 'service',                   # IPAM
     'secret',                                                                       # Secrets
     'tenant',                                                                       # Tenancy

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)

netbox/extras/forms.py

@@ -11,8 +11,8 @@ from taggit.models import Tag
 from dcim.models import DeviceRole, Platform, Region, Site
 from tenancy.models import Tenant, TenantGroup
 from utilities.forms import (
-    add_blank_choice, BootstrapMixin, BulkEditForm, FilterChoiceField, FilterTreeNodeMultipleChoiceField, LaxURLField,
-    JSONField, SlugField,
+    add_blank_choice, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect, FilterChoiceField,
+    FilterTreeNodeMultipleChoiceField, LaxURLField, JSONField, SlugField,
 )
 from .constants import (
     CF_FILTER_DISABLED, CF_TYPE_BOOLEAN, CF_TYPE_DATE, CF_TYPE_INTEGER, CF_TYPE_SELECT, CF_TYPE_URL,
@@ -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,19 +193,29 @@ 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)
         self.fields['remove_tags'] = TagField(required=False)
 
 
+class TagFilterForm(BootstrapMixin, forms.Form):
+    model = Tag
+    q = forms.CharField(
+        required=False,
+        label='Search'
+    )
+
+
 #
 # Config contexts
 #
@@ -225,6 +235,30 @@ class ConfigContextForm(BootstrapMixin, forms.ModelForm):
         ]
 
 
+class ConfigContextBulkEditForm(BootstrapMixin, BulkEditForm):
+    pk = forms.ModelMultipleChoiceField(
+        queryset=ConfigContext.objects.all(),
+        widget=forms.MultipleHiddenInput
+    )
+    weight = forms.IntegerField(
+        required=False,
+        min_value=0
+    )
+    is_active = forms.NullBooleanField(
+        required=False,
+        widget=BulkEditNullBooleanSelect()
+    )
+    description = forms.CharField(
+        required=False,
+        max_length=100
+    )
+
+    class Meta:
+        nullable_fields = [
+            'description',
+        ]
+
+
 class ConfigContextFilterForm(BootstrapMixin, forms.Form):
     q = forms.CharField(
         required=False,
@@ -264,7 +298,9 @@ class ImageAttachmentForm(BootstrapMixin, forms.ModelForm):
 
     class Meta:
         model = ImageAttachment
-        fields = ['name', 'image']
+        fields = [
+            'name', 'image',
+        ]
 
 
 #

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:

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:

netbox/extras/migrations/0016_exporttemplate_add_cable.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.0.9 on 2018-11-01 18:39
+# Generated by Django 2.1.3 on 2018-11-07 20:46
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -14,6 +14,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='exporttemplate',
             name='content_type',
-            field=models.ForeignKey(limit_choices_to={'model__in': ['provider', 'circuit', 'site', 'region', 'rack', 'rackgroup', 'manufacturer', 'devicetype', 'device', 'consoleport', 'powerport', 'interface', 'virtualchassis', 'aggregate', 'prefix', 'ipaddress', 'vlan', 'vrf', 'service', 'secret', 'tenant', 'cluster', 'virtualmachine']}, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'),
+            field=models.ForeignKey(limit_choices_to={'model__in': ['provider', 'circuit', 'site', 'region', 'rack', 'rackgroup', 'manufacturer', 'devicetype', 'device', 'consoleport', 'powerport', 'interface', 'cable', 'virtualchassis', 'aggregate', 'prefix', 'ipaddress', 'vlan', 'vrf', 'service', 'secret', 'tenant', 'cluster', 'virtualmachine']}, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'),
         ),
     ]

netbox/extras/models.py

@@ -8,13 +8,13 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.postgres.fields import JSONField
 from django.core.validators import ValidationError
 from django.db import models
-from django.db.models import Q
+from django.db.models import F, Q
 from django.http import HttpResponse
 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()
 
 
@@ -512,6 +512,7 @@ class TopologyMap(models.Model):
         ).filter(
             Q(device__in=devices) | Q(_connected_interface__device__in=devices),
             _connected_interface__isnull=False,
+            pk__lt=F('_connected_interface')
         )
         for interface in connected_interfaces:
             style = 'solid' if interface.connection_status == CONNECTION_STATUS_CONNECTED else 'dashed'
@@ -602,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)
@@ -716,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
 
@@ -840,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])

netbox/extras/tables.py

@@ -1,5 +1,6 @@
 import django_tables2 as tables
-from taggit.models import Tag
+from django_tables2.utils import Accessor
+from taggit.models import Tag, TaggedItem
 
 from utilities.tables import BaseTable, BooleanColumn, ToggleColumn
 from .models import ConfigContext, ObjectChange
@@ -13,6 +14,14 @@ TAG_ACTIONS = """
 {% endif %}
 """
 
+TAGGED_ITEM = """
+{% if value.get_absolute_url %}
+    <a href="{{ value.get_absolute_url }}">{{ value }}</a>
+{% else %}
+    {{ value }}
+{% endif %}
+"""
+
 CONFIGCONTEXT_ACTIONS = """
 {% if perms.extras.change_configcontext %}
     <a href="{% url 'extras:configcontext_edit' pk=record.pk %}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
@@ -53,6 +62,10 @@ OBJECTCHANGE_REQUEST_ID = """
 
 class TagTable(BaseTable):
     pk = ToggleColumn()
+    name = tables.LinkColumn(
+        viewname='extras:tag',
+        args=[Accessor('slug')]
+    )
     actions = tables.TemplateColumn(
         template_code=TAG_ACTIONS,
         attrs={'td': {'class': 'text-right'}},
@@ -64,6 +77,21 @@ class TagTable(BaseTable):
         fields = ('pk', 'name', 'items', 'slug', 'actions')
 
 
+class TaggedItemTable(BaseTable):
+    content_object = tables.TemplateColumn(
+        template_code=TAGGED_ITEM,
+        orderable=False,
+        verbose_name='Object'
+    )
+    content_type = tables.Column(
+        verbose_name='Type'
+    )
+
+    class Meta(BaseTable.Meta):
+        model = TaggedItem
+        fields = ('content_object', 'content_type')
+
+
 class ConfigContextTable(BaseTable):
     pk = ToggleColumn()
     name = tables.LinkColumn()

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',

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)
 

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):
 

netbox/extras/urls.py

@@ -7,6 +7,7 @@ urlpatterns = [
 
     # Tags
     url(r'^tags/$', views.TagListView.as_view(), name='tag_list'),
+    url(r'^tags/(?P<slug>[\w-]+)/$', views.TagView.as_view(), name='tag'),
     url(r'^tags/(?P<slug>[\w-]+)/edit/$', views.TagEditView.as_view(), name='tag_edit'),
     url(r'^tags/(?P<slug>[\w-]+)/delete/$', views.TagDeleteView.as_view(), name='tag_delete'),
     url(r'^tags/delete/$', views.TagBulkDeleteView.as_view(), name='tag_bulk_delete'),
@@ -14,6 +15,7 @@ urlpatterns = [
     # Config contexts
     url(r'^config-contexts/$', views.ConfigContextListView.as_view(), name='configcontext_list'),
     url(r'^config-contexts/add/$', views.ConfigContextCreateView.as_view(), name='configcontext_add'),
+    url(r'^config-contexts/edit/$', views.ConfigContextBulkEditView.as_view(), name='configcontext_bulk_edit'),
     url(r'^config-contexts/(?P<pk>\d+)/$', views.ConfigContextView.as_view(), name='configcontext'),
     url(r'^config-contexts/(?P<pk>\d+)/edit/$', views.ConfigContextEditView.as_view(), name='configcontext_edit'),
     url(r'^config-contexts/(?P<pk>\d+)/delete/$', views.ConfigContextDeleteView.as_view(), name='configcontext_delete'),

netbox/extras/views.py

@@ -1,4 +1,5 @@
 from django import template
+from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.contrib.contenttypes.models import ContentType
@@ -7,15 +8,20 @@ from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.safestring import mark_safe
 from django.views.generic import View
-from taggit.models import Tag
+from django_tables2 import RequestConfig
+from taggit.models import Tag, TaggedItem
 
 from utilities.forms import ConfirmationForm
-from utilities.views import BulkDeleteView, ObjectDeleteView, ObjectEditView, ObjectListView
+from utilities.paginator import EnhancedPaginator
+from utilities.views import BulkDeleteView, BulkEditView, ObjectDeleteView, ObjectEditView, ObjectListView
 from . import filters
-from .forms import ConfigContextForm, ConfigContextFilterForm, ImageAttachmentForm, ObjectChangeFilterForm, TagForm
+from .forms import (
+    ConfigContextForm, ConfigContextBulkEditForm, ConfigContextFilterForm, ImageAttachmentForm, ObjectChangeFilterForm,
+    TagFilterForm, TagForm,
+)
 from .models import ConfigContext, ImageAttachment, ObjectChange, ReportResult
 from .reports import get_report, get_reports
-from .tables import ConfigContextTable, ObjectChangeTable, TagTable
+from .tables import ConfigContextTable, ObjectChangeTable, TagTable, TaggedItemTable
 
 
 #
@@ -23,11 +29,45 @@ from .tables import ConfigContextTable, ObjectChangeTable, TagTable
 #
 
 class TagListView(ObjectListView):
-    queryset = Tag.objects.annotate(items=Count('taggit_taggeditem_items')).order_by('name')
+    queryset = Tag.objects.annotate(
+        items=Count('taggit_taggeditem_items')
+    ).order_by(
+        'name'
+    )
+    filter = filters.TagFilter
+    filter_form = TagFilterForm
     table = TagTable
     template_name = 'extras/tag_list.html'
 
 
+class TagView(View):
+
+    def get(self, request, slug):
+
+        tag = get_object_or_404(Tag, slug=slug)
+        tagged_items = TaggedItem.objects.filter(
+            tag=tag
+        ).select_related(
+            'content_type'
+        ).prefetch_related(
+            'content_object'
+        )
+
+        # Generate a table of all items tagged with this Tag
+        items_table = TaggedItemTable(tagged_items)
+        paginate = {
+            'paginator_class': EnhancedPaginator,
+            'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT)
+        }
+        RequestConfig(request, paginate).configure(items_table)
+
+        return render(request, 'extras/tag.html', {
+            'tag': tag,
+            'items_count': tagged_items.count(),
+            'items_table': items_table,
+        })
+
+
 class TagEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'taggit.change_tag'
     model = Tag
@@ -43,7 +83,11 @@ class TagDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class TagBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
     permission_required = 'circuits.delete_circuittype'
-    queryset = Tag.objects.annotate(items=Count('taggit_taggeditem_items')).order_by('name')
+    queryset = Tag.objects.annotate(
+        items=Count('taggit_taggeditem_items')
+    ).order_by(
+        'name'
+    )
     table = TagTable
     default_return_url = 'extras:tag_list'
 
@@ -83,6 +127,15 @@ class ConfigContextEditView(ConfigContextCreateView):
     permission_required = 'extras.change_configcontext'
 
 
+class ConfigContextBulkEditView(PermissionRequiredMixin, BulkEditView):
+    permission_required = 'extras.change_configcontext'
+    queryset = ConfigContext.objects.all()
+    filter = filters.ConfigContextFilter
+    table = ConfigContextTable
+    form = ConfigContextBulkEditForm
+    default_return_url = 'extras:configcontext_list'
+
+
 class ConfigContextDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'extras.delete_configcontext'
     model = ConfigContext

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())
             )

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 = {

netbox/ipam/api/nested_serializers.py

@@ -0,0 +1,100 @@
+from rest_framework import serializers
+
+from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, VLAN, VLANGroup, VRF
+from utilities.api import WritableNestedSerializer
+
+__all__ = [
+    'NestedAggregateSerializer',
+    'NestedIPAddressSerializer',
+    'NestedPrefixSerializer',
+    'NestedRIRSerializer',
+    'NestedRoleSerializer',
+    'NestedVLANGroupSerializer',
+    'NestedVLANSerializer',
+    'NestedVRFSerializer',
+]
+
+
+#
+# VRFs
+#
+
+class NestedVRFSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vrf-detail')
+
+    class Meta:
+        model = VRF
+        fields = ['id', 'url', 'name', 'rd']
+
+
+#
+# RIRs/aggregates
+#
+
+class NestedRIRSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:rir-detail')
+
+    class Meta:
+        model = RIR
+        fields = ['id', 'url', 'name', 'slug']
+
+
+class NestedAggregateSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:aggregate-detail')
+
+    class Meta:
+        model = Aggregate
+        fields = ['id', 'url', 'family', 'prefix']
+
+
+#
+# VLANs
+#
+
+class NestedRoleSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:role-detail')
+
+    class Meta:
+        model = Role
+        fields = ['id', 'url', 'name', 'slug']
+
+
+class NestedVLANGroupSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlangroup-detail')
+
+    class Meta:
+        model = VLANGroup
+        fields = ['id', 'url', 'name', 'slug']
+
+
+class NestedVLANSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlan-detail')
+
+    class Meta:
+        model = VLAN
+        fields = ['id', 'url', 'vid', 'name', 'display_name']
+
+
+#
+# Prefixes
+#
+
+class NestedPrefixSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:prefix-detail')
+
+    class Meta:
+        model = Prefix
+        fields = ['id', 'url', 'family', 'prefix']
+
+
+#
+# IP addresses
+#
+
+
+class NestedIPAddressSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:ipaddress-detail')
+
+    class Meta:
+        model = IPAddress
+        fields = ['id', 'url', 'family', 'address']

netbox/ipam/api/serializers.py

@@ -5,18 +5,17 @@ from rest_framework.reverse import reverse
 from rest_framework.validators import UniqueTogetherValidator
 from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField
 
-from dcim.api.serializers import NestedDeviceSerializer, InterfaceSerializer, NestedSiteSerializer
+from dcim.api.nested_serializers import NestedDeviceSerializer, NestedSiteSerializer
 from dcim.models import Interface
 from extras.api.customfields import CustomFieldModelSerializer
-from ipam.constants import (
-    IPADDRESS_ROLE_CHOICES, IPADDRESS_STATUS_CHOICES, IP_PROTOCOL_CHOICES, PREFIX_STATUS_CHOICES, VLAN_STATUS_CHOICES,
-)
+from ipam.constants import *
 from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
-from tenancy.api.serializers import NestedTenantSerializer
+from tenancy.api.nested_serializers import NestedTenantSerializer
 from utilities.api import (
     ChoiceField, SerializedPKRelatedField, ValidatedModelSerializer, WritableNestedSerializer,
 )
-from virtualization.api.serializers import NestedVirtualMachineSerializer
+from virtualization.api.nested_serializers import NestedVirtualMachineSerializer
+from .nested_serializers import *
 
 
 #
@@ -35,35 +34,8 @@ class VRFSerializer(TaggitSerializer, CustomFieldModelSerializer):
         ]
 
 
-class NestedVRFSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vrf-detail')
-
-    class Meta:
-        model = VRF
-        fields = ['id', 'url', 'name', 'rd']
-
-
 #
-# Roles
-#
-
-class RoleSerializer(ValidatedModelSerializer):
-
-    class Meta:
-        model = Role
-        fields = ['id', 'name', 'slug', 'weight']
-
-
-class NestedRoleSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:role-detail')
-
-    class Meta:
-        model = Role
-        fields = ['id', 'url', 'name', 'slug']
-
-
-#
-# RIRs
+# RIRs/aggregates
 #
 
 class RIRSerializer(ValidatedModelSerializer):
@@ -73,18 +45,6 @@ class RIRSerializer(ValidatedModelSerializer):
         fields = ['id', 'name', 'slug', 'is_private']
 
 
-class NestedRIRSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:rir-detail')
-
-    class Meta:
-        model = RIR
-        fields = ['id', 'url', 'name', 'slug']
-
-
-#
-# Aggregates
-#
-
 class AggregateSerializer(TaggitSerializer, CustomFieldModelSerializer):
     rir = NestedRIRSerializer()
     tags = TagListSerializerField(required=False)
@@ -98,18 +58,17 @@ class AggregateSerializer(TaggitSerializer, CustomFieldModelSerializer):
         read_only_fields = ['family']
 
 
-class NestedAggregateSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:aggregate-detail')
-
-    class Meta(AggregateSerializer.Meta):
-        model = Aggregate
-        fields = ['id', 'url', 'family', 'prefix']
-
-
 #
-# VLAN groups
+# VLANs
 #
 
+class RoleSerializer(ValidatedModelSerializer):
+
+    class Meta:
+        model = Role
+        fields = ['id', 'name', 'slug', 'weight']
+
+
 class VLANGroupSerializer(ValidatedModelSerializer):
     site = NestedSiteSerializer(required=False, allow_null=True)
 
@@ -128,23 +87,11 @@ class VLANGroupSerializer(ValidatedModelSerializer):
                 validator(data)
 
         # Enforce model validation
-        super(VLANGroupSerializer, self).validate(data)
+        super().validate(data)
 
         return data
 
 
-class NestedVLANGroupSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlangroup-detail')
-
-    class Meta:
-        model = VLANGroup
-        fields = ['id', 'url', 'name', 'slug']
-
-
-#
-# VLANs
-#
-
 class VLANSerializer(TaggitSerializer, CustomFieldModelSerializer):
     site = NestedSiteSerializer(required=False, allow_null=True)
     group = NestedVLANGroupSerializer(required=False, allow_null=True)
@@ -171,19 +118,11 @@ class VLANSerializer(TaggitSerializer, CustomFieldModelSerializer):
                 validator(data)
 
         # Enforce model validation
-        super(VLANSerializer, self).validate(data)
+        super().validate(data)
 
         return data
 
 
-class NestedVLANSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlan-detail')
-
-    class Meta:
-        model = VLAN
-        fields = ['id', 'url', 'vid', 'name', 'display_name']
-
-
 #
 # Prefixes
 #
@@ -206,16 +145,10 @@ class PrefixSerializer(TaggitSerializer, CustomFieldModelSerializer):
         read_only_fields = ['family']
 
 
-class NestedPrefixSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:prefix-detail')
-
-    class Meta:
-        model = Prefix
-        fields = ['id', 'url', 'family', 'prefix']
-
-
 class AvailablePrefixSerializer(serializers.Serializer):
-
+    """
+    Representation of a prefix which does not exist in the database.
+    """
     def to_representation(self, instance):
         if self.context.get('vrf'):
             vrf = NestedVRFSerializer(self.context['vrf'], context={'request': self.context['request']}).data
@@ -233,11 +166,14 @@ class AvailablePrefixSerializer(serializers.Serializer):
 #
 
 class IPAddressInterfaceSerializer(WritableNestedSerializer):
+    """
+    Nested representation of an Interface which may belong to a Device *or* a VirtualMachine.
+    """
     url = serializers.SerializerMethodField()  # We're imitating a HyperlinkedIdentityField here
     device = NestedDeviceSerializer(read_only=True)
     virtual_machine = NestedVirtualMachineSerializer(read_only=True)
 
-    class Meta(InterfaceSerializer.Meta):
+    class Meta:
         model = Interface
         fields = [
             'id', 'url', 'device', 'virtual_machine', 'name',
@@ -258,6 +194,8 @@ class IPAddressSerializer(TaggitSerializer, CustomFieldModelSerializer):
     status = ChoiceField(choices=IPADDRESS_STATUS_CHOICES, required=False)
     role = ChoiceField(choices=IPADDRESS_ROLE_CHOICES, required=False, allow_null=True)
     interface = IPAddressInterfaceSerializer(required=False, allow_null=True)
+    nat_inside = NestedIPAddressSerializer(required=False, allow_null=True)
+    nat_outside = NestedIPAddressSerializer(read_only=True)
     tags = TagListSerializerField(required=False)
 
     class Meta:
@@ -269,20 +207,10 @@ class IPAddressSerializer(TaggitSerializer, CustomFieldModelSerializer):
         read_only_fields = ['family']
 
 
-class NestedIPAddressSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:ipaddress-detail')
-
-    class Meta:
-        model = IPAddress
-        fields = ['id', 'url', 'family', 'address']
-
-
-IPAddressSerializer._declared_fields['nat_inside'] = NestedIPAddressSerializer(required=False, allow_null=True)
-IPAddressSerializer._declared_fields['nat_outside'] = NestedIPAddressSerializer(read_only=True)
-
-
 class AvailableIPSerializer(serializers.Serializer):
-
+    """
+    Representation of an IP address which does not exist in the database.
+    """
     def to_representation(self, instance):
         if self.context.get('vrf'):
             vrf = NestedVRFSerializer(self.context['vrf'], context={'request': self.context['request']}).data

netbox/ipam/api/views.py

@@ -96,25 +96,34 @@ class PrefixViewSet(CustomFieldModelViewSet):
             for i, requested_prefix in enumerate(requested_prefixes):
 
                 # Validate requested prefix size
-                error_msg = None
-                if 'prefix_length' not in requested_prefix:
-                    error_msg = "Item {}: prefix_length field missing".format(i)
-                elif not isinstance(requested_prefix['prefix_length'], int):
-                    error_msg = "Item {}: Invalid prefix length ({})".format(
-                        i, requested_prefix['prefix_length']
-                    )
-                elif prefix.family == 4 and requested_prefix['prefix_length'] > 32:
-                    error_msg = "Item {}: Invalid prefix length ({}) for IPv4".format(
-                        i, requested_prefix['prefix_length']
-                    )
-                elif prefix.family == 6 and requested_prefix['prefix_length'] > 128:
-                    error_msg = "Item {}: Invalid prefix length ({}) for IPv6".format(
-                        i, requested_prefix['prefix_length']
-                    )
-                if error_msg:
+                prefix_length = requested_prefix.get('prefix_length')
+                if prefix_length is None:
                     return Response(
                         {
-                            "detail": error_msg
+                            "detail": "Item {}: prefix_length field missing".format(i)
+                        },
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+                try:
+                    prefix_length = int(prefix_length)
+                except ValueError:
+                    return Response(
+                        {
+                            "detail": "Item {}: Invalid prefix length ({})".format(i, prefix_length),
+                        },
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+                if prefix.family == 4 and prefix_length > 32:
+                    return Response(
+                        {
+                            "detail": "Item {}: Invalid prefix length ({}) for IPv4".format(i, prefix_length),
+                        },
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+                elif prefix.family == 6 and prefix_length > 128:
+                    return Response(
+                        {
+                            "detail": "Item {}: Invalid prefix length ({}) for IPv6".format(i, prefix_length),
                         },
                         status=status.HTTP_400_BAD_REQUEST
                     )
@@ -131,7 +140,7 @@ class PrefixViewSet(CustomFieldModelViewSet):
                         {
                             "detail": "Insufficient space is available to accommodate the requested prefix size(s)"
                         },
-                        status=status.HTTP_400_BAD_REQUEST
+                        status=status.HTTP_204_NO_CONTENT
                     )
 
                 # Remove the allocated prefix from the list of available prefixes
@@ -187,7 +196,7 @@ class PrefixViewSet(CustomFieldModelViewSet):
                         "detail": "An insufficient number of IP addresses are available within the prefix {} ({} "
                                   "requested, {} available)".format(prefix, len(requested_ips), len(available_ips))
                     },
-                    status=status.HTTP_400_BAD_REQUEST
+                    status=status.HTTP_204_NO_CONTENT
                 )
 
             # Assign addresses from the list of available IPs and copy VRF assignment from the parent prefix

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):

netbox/ipam/filters.py

@@ -7,7 +7,7 @@ from netaddr.core import AddrFormatError
 from dcim.models import Site, Device, Interface
 from extras.filters import CustomFieldFilterSet
 from tenancy.models import Tenant
-from utilities.filters import NumericInFilter
+from utilities.filters import NumericInFilter, TagFilter
 from virtualization.models import VirtualMachine
 from .constants import IPADDRESS_ROLE_CHOICES, IPADDRESS_STATUS_CHOICES, PREFIX_STATUS_CHOICES, VLAN_STATUS_CHOICES
 from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
@@ -32,9 +32,7 @@ class VRFFilter(CustomFieldFilterSet, django_filters.FilterSet):
         to_field_name='slug',
         label='Tenant (slug)',
     )
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
-    )
+    tag = TagFilter()
 
     def search(self, queryset, name, value):
         if not value.strip():
@@ -80,9 +78,7 @@ class AggregateFilter(CustomFieldFilterSet, django_filters.FilterSet):
         to_field_name='slug',
         label='RIR (slug)',
     )
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
-    )
+    tag = TagFilter()
 
     class Meta:
         model = Aggregate
@@ -184,9 +180,7 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet):
         choices=PREFIX_STATUS_CHOICES,
         null_value=None
     )
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
-    )
+    tag = TagFilter()
 
     class Meta:
         model = Prefix
@@ -316,9 +310,7 @@ class IPAddressFilter(CustomFieldFilterSet, django_filters.FilterSet):
     role = django_filters.MultipleChoiceFilter(
         choices=IPADDRESS_ROLE_CHOICES
     )
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
-    )
+    tag = TagFilter()
 
     class Meta:
         model = IPAddress
@@ -438,9 +430,7 @@ class VLANFilter(CustomFieldFilterSet, django_filters.FilterSet):
         choices=VLAN_STATUS_CHOICES,
         null_value=None
     )
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
-    )
+    tag = TagFilter()
 
     class Meta:
         model = VLAN
@@ -482,9 +472,7 @@ class ServiceFilter(django_filters.FilterSet):
         to_field_name='name',
         label='Virtual machine (name)',
     )
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
-    )
+    tag = TagFilter()
 
     class Meta:
         model = Service

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',
+        ]

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])

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)
 
 
 #

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')
@@ -566,7 +566,7 @@ class PrefixTest(APITestCase):
 
         # Try to create one more prefix
         response = self.client.post(url, {'prefix_length': 30}, **self.header)
-        self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
+        self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
         self.assertIn('detail', response.data)
 
     def test_create_multiple_available_prefixes(self):
@@ -583,7 +583,7 @@ class PrefixTest(APITestCase):
             {'prefix_length': 30, 'description': 'Test Prefix 5'},
         ]
         response = self.client.post(url, data, format='json', **self.header)
-        self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
+        self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
         self.assertIn('detail', response.data)
 
         # Verify that no prefixes were created (the entire /28 is still available)
@@ -628,7 +628,7 @@ class PrefixTest(APITestCase):
 
         # Try to create one more IP
         response = self.client.post(url, {}, **self.header)
-        self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
+        self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
         self.assertIn('detail', response.data)
 
     def test_create_multiple_available_ips(self):
@@ -639,7 +639,7 @@ class PrefixTest(APITestCase):
         # Try to create nine IPs (only eight are available)
         data = [{'description': 'Test IP {}'.format(i)} for i in range(1, 10)]  # 9 IPs
         response = self.client.post(url, data, format='json', **self.header)
-        self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
+        self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
         self.assertIn('detail', response.data)
 
         # Verify that no IPs were created (eight are still available)
@@ -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')

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):
 

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)
 
 
 #
@@ -81,10 +81,17 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination):
 
     def paginate_queryset(self, queryset, request, view=None):
 
-        try:
-            self.count = queryset.count()
-        except (AttributeError, TypeError):
+        if hasattr(queryset, 'all'):
+            # TODO: This breaks filtering by annotated values
+            # Make a clone of the queryset with any annotations stripped (performance hack)
+            qs = queryset.all()
+            qs.query.annotations.clear()
+            self.count = qs.count()
+
+        else:
+            # We're dealing with an iterable, not a QuerySet
             self.count = len(queryset)
+
         self.limit = self.get_limit(request)
         self.offset = self.get_offset(request)
         self.request = request
@@ -125,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):
 
@@ -133,7 +140,7 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination):
         if not self.limit:
             return None
 
-        return super(OptionalLimitOffsetPagination, self).get_previous_link()
+        return super().get_previous_link()
 
 
 #

netbox/netbox/configuration.example.py

@@ -91,6 +91,10 @@ LOGGING = {}
 # are permitted to access most data in NetBox (excluding secrets) but not make any changes.
 LOGIN_REQUIRED = False
 
+# The length of time (in seconds) for which a user will remain logged into the web UI before being prompted to
+# re-authenticate. (Default: 1209600 [14 days])
+LOGIN_TIMEOUT = None
+
 # Setting this to True will display a "maintenance mode" banner at the top of every page.
 MAINTENANCE_MODE = False
 
@@ -121,10 +125,6 @@ PAGINATE_COUNT = 50
 # prefer IPv4 instead.
 PREFER_IPV4 = False
 
-# The Webhook event backend is disabled by default. Set this to True to enable it. Note that this requires a Redis
-# database be configured and accessible by NetBox (see `REDIS` below).
-WEBHOOKS_ENABLED = False
-
 # Redis database settings (optional). A Redis database is required only if the webhooks backend is enabled.
 REDIS = {
     'HOST': 'localhost',
@@ -138,9 +138,18 @@ REDIS = {
 # this setting is derived from the installed location.
 # REPORTS_ROOT = '/opt/netbox/netbox/reports'
 
+# By default, NetBox will store session data in the database. Alternatively, a file path can be specified here to use
+# local file storage instead. (This can be useful for enabling authentication on a standby instance with read-only
+# database access.) Note that the user as which NetBox runs must have read and write permissions to this path.
+SESSION_FILE_PATH = None
+
 # Time zone (default: UTC)
 TIME_ZONE = 'UTC'
 
+# The webhooks backend is disabled by default. Set this to True to enable it. Note that this requires a Redis
+# database be configured and accessible by NetBox.
+WEBHOOKS_ENABLED = False
+
 # Date/time formatting. See the following link for supported formats:
 # https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'N j, Y'

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-beta1'
+
+VERSION = '2.5.0'
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -54,6 +55,7 @@ ENFORCE_GLOBAL_UNIQUE = getattr(configuration, 'ENFORCE_GLOBAL_UNIQUE', False)
 EMAIL = getattr(configuration, 'EMAIL', {})
 LOGGING = getattr(configuration, 'LOGGING', {})
 LOGIN_REQUIRED = getattr(configuration, 'LOGIN_REQUIRED', False)
+LOGIN_TIMEOUT = getattr(configuration, 'LOGIN_TIMEOUT', None)
 MAINTENANCE_MODE = getattr(configuration, 'MAINTENANCE_MODE', False)
 MAX_PAGE_SIZE = getattr(configuration, 'MAX_PAGE_SIZE', 1000)
 MEDIA_ROOT = getattr(configuration, 'MEDIA_ROOT', os.path.join(BASE_DIR, 'media')).rstrip('/')
@@ -65,6 +67,7 @@ PAGINATE_COUNT = getattr(configuration, 'PAGINATE_COUNT', 50)
 PREFER_IPV4 = getattr(configuration, 'PREFER_IPV4', False)
 REPORTS_ROOT = getattr(configuration, 'REPORTS_ROOT', os.path.join(BASE_DIR, 'reports')).rstrip('/')
 REDIS = getattr(configuration, 'REDIS', {})
+SESSION_FILE_PATH = getattr(configuration, 'SESSION_FILE_PATH', None)
 SHORT_DATE_FORMAT = getattr(configuration, 'SHORT_DATE_FORMAT', 'Y-m-d')
 SHORT_DATETIME_FORMAT = getattr(configuration, 'SHORT_DATETIME_FORMAT', 'Y-m-d H:i')
 SHORT_TIME_FORMAT = getattr(configuration, 'SHORT_TIME_FORMAT', 'H:i:s')
@@ -111,6 +114,17 @@ DATABASES = {
     'default': configuration.DATABASE,
 }
 
+# Sessions
+if LOGIN_TIMEOUT is not None:
+    if type(LOGIN_TIMEOUT) is not int or LOGIN_TIMEOUT < 0:
+        raise ImproperlyConfigured(
+            "LOGIN_TIMEOUT must be a positive integer (value: {})".format(LOGIN_TIMEOUT)
+        )
+    # Django default is 1209600 seconds (14 days)
+    SESSION_COOKIE_AGE = LOGIN_TIMEOUT
+if SESSION_FILE_PATH is not None:
+    SESSION_ENGINE = 'django.contrib.sessions.backends.file'
+
 # Redis
 REDIS_HOST = REDIS.get('HOST', 'localhost')
 REDIS_PORT = REDIS.get('PORT', 6379)
@@ -234,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
@@ -274,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',

netbox/netbox/views.py

@@ -14,7 +14,7 @@ from dcim.filters import (
     DeviceFilter, DeviceTypeFilter, RackFilter, RackGroupFilter, SiteFilter, VirtualChassisFilter
 )
 from dcim.models import (
-    ConsolePort, Device, DeviceType, Interface, PowerPort, Rack, RackGroup, Site, VirtualChassis
+    Cable, ConsolePort, Device, DeviceType, Interface, PowerPort, Rack, RackGroup, Site, VirtualChassis
 )
 from dcim.tables import (
     DeviceDetailTable, DeviceTypeTable, RackTable, RackGroupTable, SiteTable, VirtualChassisTable
@@ -166,6 +166,7 @@ class HomeView(View):
             _connected_interface__isnull=False,
             pk__lt=F('_connected_interface')
         )
+        cables = Cable.objects.all()
 
         stats = {
 
@@ -177,6 +178,7 @@ class HomeView(View):
             'rack_count': Rack.objects.count(),
             'device_count': Device.objects.count(),
             'interface_connections_count': connected_interfaces.count(),
+            'cable_count': cables.count(),
             'console_connections_count': connected_consoleports.count(),
             'power_connections_count': connected_powerports.count(),
 
@@ -205,7 +207,7 @@ class HomeView(View):
             'stats': stats,
             'topology_maps': TopologyMap.objects.filter(site__isnull=True),
             'report_results': ReportResult.objects.order_by('-created')[:10],
-            'changelog': ObjectChange.objects.select_related('user')[:50]
+            'changelog': ObjectChange.objects.select_related('user', 'changed_object_type')[:50]
         })
 
 

netbox/project-static/css/base.css

@@ -390,6 +390,19 @@ table.report th a {
     top: -51px;
 }
 
+/* Rendered Markdown */
+.rendered-markdown table {
+    width: 100%;
+}
+.rendered-markdown th {
+    border-bottom: 2px solid #dddddd;
+    padding: 8px;
+}
+.rendered-markdown td {
+    border-top: 1px solid #dddddd;
+    padding: 8px;
+}
+
 /* AJAX loader */
 .loading {
     position: fixed;

netbox/project-static/js/forms.js

@@ -91,8 +91,9 @@ $(document).ready(function() {
                 var filter_regex = /\{\{([a-z_]+)\}\}/g;
                 var match;
                 var rendered_url = api_url;
+                var filter_field;
                 while (match = filter_regex.exec(api_url)) {
-                    var filter_field = $('#id_' + match[1]);
+                    filter_field = $('#id_' + match[1]);
                     var custom_attr = $('option:selected', filter_field).attr('api-value');
                     if (custom_attr) {
                         rendered_url = rendered_url.replace(match[0], custom_attr);
@@ -103,6 +104,18 @@ $(document).ready(function() {
                     }
                 }
 
+                // Account for any conditional URL append strings
+                $.each(child_field[0].attributes, function(index, attr){
+                    if (attr.name.includes("data-url-conditional-append-")){
+                        var conditional = attr.name.split("data-url-conditional-append-")[1].split("__");
+                        var field = $("#id_" + conditional[0]);
+                        var field_value = conditional[1];
+                        if ($('option:selected', field).attr('api-value') === field_value){
+                            rendered_url = rendered_url + attr.value;
+                        }
+                    }
+                })
+
                 // If all URL variables have been replaced, make the API call
                 if (rendered_url.search('{{') < 0) {
                     console.log(child_name + ": Fetching " + rendered_url);

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 = [];
@@ -42,14 +42,14 @@ $(document).ready(function() {
             event.preventDefault();
             search_field.val(ui.item.label);
             select_fields.val('');
-            select_fields.attr('disabled', 'disabled');
             real_field.empty();
+            select_fields.attr('disabled', 'disabled');
             real_field.append($("<option></option>").attr('value', ui.item.value).text(ui.item.label));
             real_field.change();
             // Disable parent selection fields
             // $('select[filter-for="' + real_field.attr('name') + '"]').val('');
         },
-        minLength: 4,
+        minLength: 3,
         delay: 500
     });
 

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'):

netbox/secrets/api/nested_serializers.py

@@ -0,0 +1,16 @@
+from rest_framework import serializers
+
+from secrets.models import SecretRole
+from utilities.api import WritableNestedSerializer
+
+__all__ = [
+    'NestedSecretRoleSerializer'
+]
+
+
+class NestedSecretRoleSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='secrets-api:secretrole-detail')
+
+    class Meta:
+        model = SecretRole
+        fields = ['id', 'url', 'name', 'slug']

netbox/secrets/api/serializers.py

@@ -2,14 +2,15 @@ from rest_framework import serializers
 from rest_framework.validators import UniqueTogetherValidator
 from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField
 
-from dcim.api.serializers import NestedDeviceSerializer
+from dcim.api.nested_serializers import NestedDeviceSerializer
 from extras.api.customfields import CustomFieldModelSerializer
 from secrets.models import Secret, SecretRole
-from utilities.api import ValidatedModelSerializer, WritableNestedSerializer
+from utilities.api import ValidatedModelSerializer
+from .nested_serializers import *
 
 
 #
-# SecretRoles
+# Secrets
 #
 
 class SecretRoleSerializer(ValidatedModelSerializer):
@@ -19,18 +20,6 @@ class SecretRoleSerializer(ValidatedModelSerializer):
         fields = ['id', 'name', 'slug']
 
 
-class NestedSecretRoleSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='secrets-api:secretrole-detail')
-
-    class Meta:
-        model = SecretRole
-        fields = ['id', 'url', 'name', 'slug']
-
-
-#
-# Secrets
-#
-
 class SecretSerializer(TaggitSerializer, CustomFieldModelSerializer):
     device = NestedDeviceSerializer()
     role = NestedSecretRoleSerializer()
@@ -60,6 +49,6 @@ class SecretSerializer(TaggitSerializer, CustomFieldModelSerializer):
             validator(data)
 
         # Enforce model validation
-        super(SecretSerializer, self).validate(data)
+        super().validate(data)
 
         return data

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:
 

netbox/secrets/filters.py

@@ -3,7 +3,7 @@ from django.db.models import Q
 
 from dcim.models import Device
 from extras.filters import CustomFieldFilterSet
-from utilities.filters import NumericInFilter
+from utilities.filters import NumericInFilter, TagFilter
 from .models import Secret, SecretRole
 
 
@@ -43,9 +43,7 @@ class SecretFilter(CustomFieldFilterSet, django_filters.FilterSet):
         to_field_name='name',
         label='Device (name)',
     )
-    tag = django_filters.CharFilter(
-        field_name='tags__slug',
-    )
+    tag = TagFilter()
 
     class Meta:
         model = Secret

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'
+    )

netbox/secrets/models.py

@@ -1,4 +1,5 @@
 import os
+import sys
 
 from Crypto.Cipher import AES, PKCS1_OAEP
 from Crypto.PublicKey import RSA
@@ -84,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
@@ -124,7 +125,7 @@ class UserKey(models.Model):
                     )
                 })
 
-        super(UserKey, self).clean()
+        super().clean()
 
     def save(self, *args, **kwargs):
 
@@ -137,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):
 
@@ -147,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):
         """
@@ -229,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):
 
@@ -355,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:
@@ -386,6 +387,7 @@ class Secret(ChangeLoggedModel, CustomFieldModel):
         s = s.encode('utf8')
         if len(s) > 65535:
             raise ValueError("Maximum plaintext size is 65535 bytes.")
+
         # Minimum ciphertext size is 64 bytes to conceal the length of short secrets.
         if len(s) <= 62:
             pad_length = 62 - len(s)
@@ -393,12 +395,14 @@ class Secret(ChangeLoggedModel, CustomFieldModel):
             pad_length = 16 - ((len(s) + 2) % 16)
         else:
             pad_length = 0
-        return (
-            chr(len(s) >> 8).encode() +
-            chr(len(s) % 256).encode() +
-            s +
-            os.urandom(pad_length)
-        )
+
+        # Python 2 compatibility
+        if sys.version_info[0] < 3:
+            header = chr(len(s) >> 8) + chr(len(s) % 256)
+        else:
+            header = bytes([len(s) >> 8]) + bytes([len(s) % 256])
+
+        return header + s + os.urandom(pad_length)
 
     def _unpad(self, s):
         """

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()

netbox/secrets/tests/test_models.py

@@ -1,3 +1,5 @@
+import string
+
 from Crypto.PublicKey import RSA
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -86,7 +88,7 @@ class SecretTestCase(TestCase):
         """
         Test basic encryption and decryption functionality using a random master key.
         """
-        plaintext = "FooBar123"
+        plaintext = string.printable * 2
         secret_key = generate_random_key()
         s = Secret(plaintext=plaintext)
         s.encrypt(secret_key)

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.")
 

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>

netbox/templates/circuits/circuit.html

@@ -113,7 +113,7 @@
             <div class="panel-heading">
                 <strong>Comments</strong>
             </div>
-            <div class="panel-body">
+            <div class="panel-body rendered-markdown">
                 {% if circuit.comments %}
                     {{ circuit.comments|gfm }}
                 {% else %}

netbox/templates/circuits/inc/circuit_termination.html

@@ -40,13 +40,20 @@
                 <td>Termination</td>
                 <td>
                     {% if termination.cable %}
+                        {% if perms.dcim.delete_cable %}
+                            <div class="pull-right">
+                                <a href="{% url 'dcim:cable_delete' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="Remove cable" class="btn btn-danger btn-xs">
+                                    <i class="glyphicon glyphicon-resize-full" aria-hidden="true"></i> Disconnect
+                                </a>
+                            </div>
+                        {% endif %}
                         <a href="{{ termination.cable.get_absolute_url }}">{{ termination.cable }}</a>
                         {% if termination.connected_endpoint %}
                             to <a href="{% url 'dcim:device' pk=termination.connected_endpoint.device.pk %}">{{ termination.connected_endpoint.device }}</a>
                             <i class="fa fa-angle-right"></i> {{ termination.connected_endpoint }}
                         {% endif %}
                     {% else %}
-                        {% if perms.circuits.change_circuittermination %}
+                        {% if perms.circuits.add_cable %}
                             <div class="pull-right">
                                 <a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk %}?return_url={{ circuit.get_absolute_url }}" class="btn btn-success btn-xs" title="Connect">
                                     <i class="glyphicon glyphicon-resize-small" aria-hidden="true"></i> Connect

netbox/templates/circuits/provider.html

@@ -105,7 +105,7 @@
             <div class="panel-heading">
                 <strong>Comments</strong>
             </div>
-            <div class="panel-body">
+            <div class="panel-body rendered-markdown">
                 {% if provider.comments %}
                     {{ provider.comments|gfm }}
                 {% else %}

netbox/templates/dcim/bulk_disconnect.html

@@ -4,7 +4,7 @@
 {% block title %}Disconnect {{ obj_type_plural|bettertitle }}{% endblock %}
 
 {% block message %}
-    <p>Are you sure you want to disconnect all {{ selected_objects|length }} of these {{ obj_type_plural }} on <strong>{{ device }}</strong>?</p>
+    <p>Are you sure you want to disconnect these {{ selected_objects|length }} {{ obj_type_plural }}?</p>
     <ul>
         {% for obj in selected_objects %}
             <li>{{ obj }}</li>

netbox/templates/dcim/cable_connect.html

@@ -1,5 +1,6 @@
 {% extends '_base.html' %}
 {% load static %}
+{% load helpers %}
 {% load form_helpers %}
 
 {% block content %}
@@ -49,6 +50,12 @@
                                     <p class="form-control-static">{{ termination_a.device }}</p>
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <label class="col-md-3 control-label required">Type</label>
+                                <div class="col-md-9">
+                                    <p class="form-control-static">{{ termination_a|model_name|capfirst }}</p>
+                                </div>
+                            </div>
                             <div class="form-group">
                                 <label class="col-md-3 control-label required">Name</label>
                                 <div class="col-md-9">

netbox/templates/dcim/cable_list.html

@@ -3,6 +3,9 @@
 
 {% block content %}
 <div class="pull-right">
+    {% if perms.dcim.add_cable %}
+        {% import_button 'dcim:cable_import' %}
+    {% endif %}
     {% export_button content_type %}
 </div>
 <h1>{% block title %}Cables{% endblock %}</h1>

netbox/templates/dcim/cable_trace.html

@@ -23,18 +23,24 @@
                 {% include 'dcim/inc/cable_trace_end.html' with end=near_end %}
             </div>
             <div class="col-md-3 text-center">
-                <h4>
-                    <a href="{% url 'dcim:cable' pk=cable.pk %}">
-                        {% if cable.label %}<code>{{ cable.label }}</code>{% else %}Cable #{{ cable.pk }}{% endif %}
-                    </a>
-                </h4>
-                {{ cable.get_status_display }}<br />
-                {{ cable.get_type_display|default:"" }}
-                {% if cable.length %}- {{ cable.length }}{{ cable.length_unit }}{% endif %}
-                <span class="label color-block center-block" style="background-color: #{{ cable.color }}">&nbsp;</span>
+                {% if cable %}
+                    <h4>
+                        <a href="{% url 'dcim:cable' pk=cable.pk %}">
+                            {% if cable.label %}<code>{{ cable.label }}</code>{% else %}Cable #{{ cable.pk }}{% endif %}
+                        </a>
+                    </h4>
+                    {{ cable.get_status_display }}<br />
+                    {{ cable.get_type_display|default:"" }}
+                    {% 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>
+                {% endif %}
             </div>
             <div class="col-md-4">
-                {% include 'dcim/inc/cable_trace_end.html' with end=far_end %}
+                {% if far_end %}
+                    {% include 'dcim/inc/cable_trace_end.html' with end=far_end %}
+                {% endif %}
             </div>
         </div>
         {% if not forloop.last %}<hr />{% endif %}

netbox/templates/dcim/device.html

@@ -36,7 +36,7 @@
     <div class="pull-right">
         {% if perms.dcim.change_device %}
             <div class="btn-group">
-                <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add Components <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu">
@@ -293,7 +293,7 @@
                 <div class="panel-heading">
                     <strong>Comments</strong>
                 </div>
-                <div class="panel-body">
+                <div class="panel-body rendered-markdown">
                     {% if device.comments %}
                         {{ device.comments|gfm }}
                     {% else %}
@@ -508,6 +508,7 @@
                                 <th>Name</th>
                                 <th>LAG</th>
                                 <th>Description</th>
+                                <th>MTU</th>
                                 <th>Mode</th>
                                 <th>Cable</th>
                                 <th colspan="2">Connection</th>
@@ -530,7 +531,7 @@
                             </button>
                         {% endif %}
                         {% if interfaces and perms.dcim.change_interface %}
-                            <button type="submit" name="_disconnect" formaction="{% url 'dcim:interface_bulk_disconnect' pk=device.pk %}" class="btn btn-danger btn-xs">
+                            <button type="submit" name="_disconnect" formaction="{% url 'dcim:interface_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
                                 <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
                             </button>
                         {% endif %}
@@ -585,7 +586,7 @@
                             <button type="submit" name="_rename" formaction="{% url 'dcim:consoleserverport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
                                 <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
                             </button>
-                            <button type="submit" name="_disconnect" formaction="{% url 'dcim:consoleserverport_bulk_disconnect' pk=device.pk %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                            <button type="submit" name="_disconnect" formaction="{% url 'dcim:consoleserverport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
                                 <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
                             </button>
                         {% endif %}
@@ -640,7 +641,7 @@
                             <button type="submit" name="_rename" formaction="{% url 'dcim:poweroutlet_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
                                 <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
                             </button>
-                            <button type="submit" name="_disconnect" formaction="{% url 'dcim:poweroutlet_bulk_disconnect' pk=device.pk %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                            <button type="submit" name="_disconnect" formaction="{% url 'dcim:poweroutlet_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
                                 <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
                             </button>
                         {% endif %}
@@ -680,6 +681,7 @@
                                     <th>Type</th>
                                     <th>Rear Port</th>
                                     <th>Position</th>
+                                    <th>Description</th>
                                     <th>Connected Cable</th>
                                     <th></th>
                                 </tr>
@@ -695,6 +697,9 @@
                                 <button type="submit" name="_rename" formaction="{% url 'dcim:frontport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
                                     <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
                                 </button>
+                                <button type="submit" name="_disconnect" formaction="{% url 'dcim:frontport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
+                                </button>
                             {% endif %}
                             {% if front_ports and perms.dcim.delete_frontport %}
                                 <button type="submit" formaction="{% url 'dcim:frontport_bulk_delete' pk=device.pk %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
@@ -729,6 +734,7 @@
                                     <th>Name</th>
                                     <th>Type</th>
                                     <th>Positions</th>
+                                    <th>Description</th>
                                     <th>Connected Cable</th>
                                     <th></th>
                                 </tr>
@@ -744,6 +750,9 @@
                                 <button type="submit" name="_rename" formaction="{% url 'dcim:rearport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
                                     <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
                                 </button>
+                                <button type="submit" name="_disconnect" formaction="{% url 'dcim:rearport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
+                                </button>
                             {% endif %}
                             {% if rear_ports and perms.dcim.delete_rearport %}
                                 <button type="submit" formaction="{% url 'dcim:rearport_bulk_delete' pk=device.pk %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
@@ -770,8 +779,8 @@
 
 {% block javascript %}
 <script type="text/javascript">
-function toggleConnection(elem, api_url) {
-    var url = netbox_api_path + api_url + elem.attr('data') + "/";
+function toggleConnection(elem) {
+    var url = netbox_api_path + "dcim/cables/" + elem.attr('data') + "/";
     if (elem.hasClass('connected')) {
         $.ajax({
             url: url,
@@ -781,7 +790,7 @@ function toggleConnection(elem, api_url) {
                 xhr.setRequestHeader("X-CSRFToken", "{{ csrf_token }}");
             },
             data: {
-                'connection_status': 'False'
+                'status': 'False'
             },
             context: this,
             success: function() {
@@ -800,7 +809,7 @@ function toggleConnection(elem, api_url) {
                 xhr.setRequestHeader("X-CSRFToken", "{{ csrf_token }}");
             },
             data: {
-                'connection_status': 'True'
+                'status': 'True'
             },
             context: this,
             success: function() {
@@ -813,14 +822,8 @@ function toggleConnection(elem, api_url) {
     }
     return false;
 }
-$(".consoleport-toggle").click(function() {
-    return toggleConnection($(this), "dcim/console-ports/");
-});
-$(".powerport-toggle").click(function() {
-    return toggleConnection($(this), "dcim/power-ports/");
-});
-$(".interface-toggle").click(function() {
-    return toggleConnection($(this), "dcim/interface-connections/");
+$(".cable-toggle").click(function() {
+    return toggleConnection($(this));
 });
 // Toggle the display of IP addresses under interfaces
 $('button.toggle-ips').click(function() {

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">

netbox/templates/dcim/devicetype.html

@@ -17,7 +17,7 @@
         <div class="pull-right">
             {% if perms.dcim.change_devicetype %}
                 <div class="btn-group">
-                    <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add Components <span class="caret"></span>
                     </button>
                     <ul class="dropdown-menu">
@@ -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>
@@ -116,7 +119,7 @@
             <div class="panel-heading">
                 <strong>Comments</strong>
             </div>
-            <div class="panel-body">
+            <div class="panel-body rendered-markdown">
                 {% if devicetype.comments %}
                     {{ devicetype.comments|gfm }}
                 {% else %}
@@ -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 %}

netbox/templates/dcim/inc/cable_termination.html

@@ -1,3 +1,4 @@
+{% load helpers %}
 <table class="table table-hover panel-body attr-table">
     {% if termination.device %}
         {# Device component #}
@@ -7,6 +8,12 @@
                 <a href="{{ termination.device.get_absolute_url }}">{{ termination.device }}</a>
             </td>
         </tr>
+        <tr>
+            <td>Type</td>
+            <td>
+                {{ termination|model_name|capfirst }}
+            </td>
+        </tr>
         <tr>
             <td>Component</td>
             <td>{{ termination }}</td>

netbox/templates/dcim/inc/cable_toggle_buttons.html

@@ -0,0 +1,16 @@
+{% if perms.dcim.change_cable %}
+    {% if cable.status %}
+        <a href="#" class="btn btn-warning btn-xs cable-toggle connected" title="Mark planned" data="{{ cable.pk }}">
+            <i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>
+        </a>
+    {% else %}
+        <a href="#" class="btn btn-success btn-xs cable-toggle" title="Mark installed" data="{{ cable.pk }}">
+            <i class="fa fa-plug" aria-hidden="true"></i>
+        </a>
+    {% endif %}
+{% endif %}
+{% if perms.dcim.delete_cable %}
+    <a href="{% url 'dcim:cable_delete' pk=cable.pk %}?return_url={{ device.get_absolute_url }}" title="Remove cable" class="btn btn-danger btn-xs">
+        <i class="glyphicon glyphicon-resize-full" aria-hidden="true"></i>
+    </a>
+{% endif %}

netbox/templates/dcim/inc/consoleport.html

@@ -1,4 +1,4 @@
-<tr class="consoleport{% if cp.connected_endpoint %} {% if cp.connection_status %}success{% else %}info{% endif %}{% endif %}">
+<tr class="consoleport{% if cp.cable.status %} success{% elif cp.cable %} info{% endif %}">
 
     {# Name #}
     <td>
@@ -30,25 +30,14 @@
 
     {# Actions #}
     <td class="text-right">
+        {% if cp.cable %}
+            {% include 'dcim/inc/cable_toggle_buttons.html' with cable=cp.cable %}
+        {% elif perms.dcim.add_cable %}
+            <a href="{% url 'dcim:consoleport_connect' termination_a_id=cp.pk %}?return_url={{ device.get_absolute_url }}" title="Connect" class="btn btn-success btn-xs">
+                <i class="glyphicon glyphicon-resize-small" aria-hidden="true"></i>
+            </a>
+        {% endif %}
         {% if perms.dcim.change_consoleport %}
-            {% if cp.connected_endpoint %}
-                {% if cp.connection_status %}
-                    <a href="#" class="btn btn-warning btn-xs consoleport-toggle connected" title="Mark planned" data="{{ cp.pk }}">
-                        <i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>
-                    </a>
-                {% else %}
-                    <a href="#" class="btn btn-success btn-xs consoleport-toggle" title="Mark installed" data="{{ cp.pk }}">
-                        <i class="fa fa-plug" aria-hidden="true"></i>
-                    </a>
-                {% endif %}
-                <a href="{% url 'dcim:cable_delete' pk=cp.cable.pk %}" title="Remove cable" class="btn btn-danger btn-xs">
-                    <i class="glyphicon glyphicon-resize-full" aria-hidden="true"></i>
-                </a>
-            {% else %}
-                <a href="{% url 'dcim:consoleport_connect' termination_a_id=cp.pk %}" title="Connect" class="btn btn-success btn-xs">
-                    <i class="glyphicon glyphicon-resize-small" aria-hidden="true"></i>
-                </a>
-            {% endif %}
             <a href="{% url 'dcim:consoleport_edit' pk=cp.pk %}" title="Edit port" class="btn btn-info btn-xs">
                 <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
             </a>