Merge pull request #2332 from digitalocean/develop

Release v2.4.2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -17,20 +17,15 @@ about: Report a reproducible bug in the current release of NetBox
 -->
 ### Environment
 * Python version:  <!-- Example: 3.5.4 -->
-* NetBox version:  <!-- Example: 2.5.2 -->
+* NetBox version:  <!-- Example: 2.3.6 -->
 
 <!--
-    Describe in detail the exact steps that someone else can take to reproduce
-    this bug using the current stable release of NetBox (or the current beta
-    release where applicable). Begin with the creation of any necessary
-    database objects and call out every operation being performed explicitly.
-    If reporting a bug in the REST API, be sure to reconstruct the raw HTTP
-    request(s) being made: Don't rely on a wrapper like pynetbox.
+    Describe in detail the steps that someone else can take to reproduce this
+    bug using the current stable release of NetBox (or the current beta release
+    where applicable).
 -->
 ### Steps to Reproduce
-1.
-2.
-3.
+
 
 <!-- What did you expect to happen? -->
 ### Expected Behavior

.gitignore

@@ -10,5 +10,3 @@
 fabfile.py
 *.swp
 gunicorn_config.py
-.DS_Store
-.vscode

.travis.yml

@@ -1,11 +1,11 @@
 sudo: required
 services:
   - postgresql
-  - redis-server
 addons:
   postgresql: "9.4"
 language: python
 python:
+  - "2.7"
   - "3.5"
 install:
   - pip install -r requirements.txt

README.md

@@ -16,6 +16,8 @@ or join us in the #netbox Slack channel on [NetworkToCode](https://networktocode
 
 ### Build Status
 
+NetBox is built against both Python 2.7 and 3.5. Python 3.5 or higher is strongly recommended.
+
 |             | status |
 |-------------|------------|
 | **master** | [![Build Status](https://travis-ci.org/digitalocean/netbox.svg?branch=master)](https://travis-ci.org/digitalocean/netbox) |
@@ -37,21 +39,6 @@ and run `upgrade.sh`.
 
 ## Alternative Installations
 
-* [Docker container](https://github.com/netbox-community/netbox-docker) (via [@cimnine](https://github.com/cimnine))
+* [Docker container](https://github.com/ninech/netbox-docker) (via [@cimnine](https://github.com/cimnine))
 * [Vagrant deployment](https://github.com/ryanmerolle/netbox-vagrant) (via [@ryanmerolle](https://github.com/ryanmerolle))
 * [Ansible deployment](https://github.com/lae/ansible-role-netbox) (via [@lae](https://github.com/lae))
-
-# Related projects
-
-## Supported SDK
-
-- [pynetbox](https://github.com/digitalocean/pynetbox) - A Python API client library for Netbox
-
-## Community SDK
-
-- [netbox-client-ruby](https://github.com/ninech/netbox-client-ruby) - A Ruby client library for Netbox
-- [powerbox](https://github.com/BatmanAMA/powerbox) - A PowerShell library for Netbox
-
-## Ansible Inventory
-
-- [netbox-as-ansible-inventory](https://github.com/AAbouZaid/netbox-as-ansible-inventory) - Ansible dynamic inventory script for Netbox

base_requirements.txt

@@ -1,84 +1,25 @@
-# The Python web framework on which NetBox is built
-# https://github.com/django/django
-Django
-
-# Django caching using Redis
-# https://github.com/Suor/django-cacheops
-django-cacheops
-
-# Django middleware which permits cross-domain API requests
-# https://github.com/OttoYiu/django-cors-headers
+# django-filter-1.1.0 breaks with Django-2.1
+Django>=1.11,<2.1
 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-filter-2.0.0 drops Python 2 support (blocked by #2000)
+django-filter==1.1.0
 django-mptt
-
-# Django integration for RQ (Reqis queuing)
-# https://github.com/rq/django-rq
-django-rq
-
-# Prometheus metrics library for Django
-# https://github.com/korfuri/django-prometheus
-django-prometheus
-
-# 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
+# https://github.com/encode/django-rest-framework/issues/6053
+djangorestframework==3.8.1
 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
+Markdown
+natsort
+ncclient
 netaddr
-
-# Fork of PIL (Python Imaging Library) for image processing
-# https://github.com/python-pillow/Pillow
+paramiko
 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
+xmltodict

docs/additional-features/caching.md

@@ -1,21 +0,0 @@
-# Caching
-
-To improve performance, NetBox supports caching for most object and list views. Caching is implemented using Redis,
-and [django-cacheops](https://github.com/Suor/django-cacheops)
-
-Several management commands are avaliable for administrators to manaully invalidate cache entries in extenuating circumstances.
-
-To invalidate a specifc model instance (for example a Device with ID 34):
-```
-python netbox/manage.py invalidate dcim.Device.34
-```
-
-To invalidate all instance of a model:
-```
-python netbox/manage.py invalidate dcim.Device
-```
-
-To flush the entire cache database:
-```
-python netbox/manage.py invalidate all
-```

docs/additional-features/context-data.md

@@ -1,5 +1,3 @@
 # Contextual Configuration Data
 
 Sometimes it is desirable to associate arbitrary data with a group of devices to aid in their configuration. For example, you might want to associate a set of syslog servers for all devices at a particular site. Context data enables the association of arbitrary data to devices and virtual machines grouped by region, site, role, platform, and/or tenant. Context data is arranged hierarchically, so that data with a higher weight can be entered to override more general lower-weight data. Multiple instances of data are automatically merged by NetBox to present a single dictionary for each object.
-
-Devices and Virtual Machines may also have a local config context defined. This local context will always overwrite the rendered config context objects for the Device/VM. This is useful in situations were the device requires a one-off value different from the rest of the environment.

docs/additional-features/netbox-shell.md

@@ -9,7 +9,7 @@ This will launch a customized version of [the built-in Django shell](https://doc
 ```
 $ ./manage.py nbshell
 ### NetBox interactive shell (jstretch-laptop)
-### Python 3.5.2 | Django 2.0.8 | NetBox 2.4.3
+### Python 2.7.6 | Django 1.11.3 | NetBox 2.1.0-dev
 ### lsmodels() will show available models. Use help(<model>) for more info.
 ```
 

docs/additional-features/prometheus-metrics.md

@@ -1,22 +0,0 @@
-# Prometheus Metrics
-
-NetBox supports optionally exposing native Prometheus metrics from the application. [Prometheus](https://prometheus.io/) is a popular time series metric platform used for monitoring.
-
-NetBox exposes metrics at the `/metrics` HTTP endpoint, e.g. `https://netbox.local/metrics`. Metric exposition can be toggled with the `METRICS_ENABLED` configuration setting. Metrics are exposed by default.
-
-## Metric Types
-
-NetBox makes use of the [django-prometheus](https://github.com/korfuri/django-prometheus) library to export a number of different types of metrics, including:
-
-- Per model insert, update, and delete counters
-- Per view request counters
-- Per view request latency histograms
-- Request body size histograms
-- Response body size histograms
-- Response code counters
-- Database connection, execution, and error counters
-- Cache hit, miss, and invalidation counters
-- Django middleware latency histograms
-- Other Django related metadata metrics
-
-For the exhaustive list of exposed metrics, visit the `/metrics` endpoint on your NetBox instance.

docs/additional-features/reports.md

@@ -44,7 +44,7 @@ class DeviceConnectionsReport(Report):
 
         # Check that every console port for every active device has a connection defined.
         for console_port in ConsolePort.objects.select_related('device').filter(device__status=DEVICE_STATUS_ACTIVE):
-            if console_port.connected_endpoint is None:
+            if console_port.cs_port is None:
                 self.log_failure(
                     console_port.device,
                     "No console connection defined for {}".format(console_port.name)
@@ -63,7 +63,7 @@ class DeviceConnectionsReport(Report):
         for device in Device.objects.filter(status=DEVICE_STATUS_ACTIVE):
             connected_ports = 0
             for power_port in PowerPort.objects.filter(device=device):
-                if power_port.connected_endpoint is not None:
+                if power_port.power_outlet is not None:
                     connected_ports += 1
                     if power_port.connection_status == CONNECTION_STATUS_PLANNED:
                         self.log_warning(
@@ -128,4 +128,4 @@ Reports can be run on the CLI by invoking the management command:
 python3 manage.py runreport <module>
 ```
 
-where ``<module>`` is the name of the python file in the ``reports`` directory without the ``.py`` extension.  One or more report modules may be specified.
+One or more report modules may be specified.

docs/additional-features/tags.md

@@ -1,6 +1,6 @@
 # Tags
 
-Tags are free-form text labels which can be applied to a variety of objects within NetBox. Tags are created on-demand as they are assigned to objects. Use commas to separate tags when adding multiple tags to an object (for example: `Inventoried, Monitored`). Use double quotes around a multi-word tag when adding only one tag, e.g. `"Core Switch"`.
+Tags are free-form text labels which can be applied to a variety of objects within NetBox. Tags are created on-demand as they are assigned to objects. Use commas to separate tags when adding multiple tags to an object 9for example: `Inventoried, Monitored`). Use double quotes around a multi-word tag when adding only one tag, e.g. `"Core Switch"`.
 
 Each tag has a label and a URL-friendly slug. For example, the slug for a tag named "Dunder Mifflin, Inc." would be `dunder-mifflin-inc`. The slug is generated automatically and makes tags easier to work with as URL parameters.
 

docs/api/authentication.md

@@ -4,9 +4,6 @@ The NetBox API employs token-based authentication. For convenience, cookie authe
 
 A token is a unique identifier that identifies a user to the API. Each user in NetBox may have one or more tokens which he or she can use to authenticate to the API. To create a token, navigate to the API tokens page at `/user/api-tokens/`.
 
-!!! note
-    The creation and modification of API tokens can be restricted per user by an administrator. If you don't see an option to create an API token, ask an administrator to grant you access.
-
 Each token contains a 160-bit key represented as 40 hexadecimal characters. When creating a token, you'll typically leave the key field blank so that a random key will be automatically generated. However, NetBox allows you to specify a key in case you need to restore a previously deleted token to operation.
 
 By default, a token can be used for all operations available via the API. Deselecting the "write enabled" option will restrict API requests made with the token to read operations (e.g. GET) only.

docs/api/overview.md

@@ -104,83 +104,24 @@ The base serializer is used to represent the default view of a model. This inclu
 }
 ```
 
-## Related Objects
+Related objects (e.g. `ForeignKey` fields) are represented using a nested serializer. A nested serializer provides a minimal representation of an object, including only its URL and enough information to construct its name. When performing write api actions (`POST`, `PUT`, and `PATCH`), any `ForeignKey` relationships do not use the nested serializer, instead you will pass just the integer ID of the related model.  
 
-Related objects (e.g. `ForeignKey` fields) are represented using a nested serializer. A nested serializer provides a minimal representation of an object, including only its URL and enough information to display the object to a user. When performing write API actions (`POST`, `PUT`, and `PATCH`), related objects may be specified by either numeric ID (primary key), or by a set of attributes sufficiently unique to return the desired object.
-
-For example, when creating a new device, its rack can be specified by NetBox ID (PK):
+When a base serializer includes one or more nested serializers, the hierarchical structure precludes it from being used for write operations. Thus, a flat representation of an object may be provided using a writable serializer. This serializer includes only raw database values and is not typically used for retrieval, except as part of the response to the creation or updating of an object.
 
 ```
 {
-    "name": "MyNewDevice",
-    "rack": 123,
-    ...
-}
-```
-
-Or by a set of nested attributes used to identify the rack:
-
-```
-{
-    "name": "MyNewDevice",
-    "rack": {
-        "site": {
-            "name": "Equinix DC6"
-        },
-        "name": "R204"
-    },
-    ...
-}
-```
-
-Note that if the provided parameters do not return exactly one object, a validation error is raised.
-
-## Brief Format
-
-Most API endpoints support an optional "brief" format, which returns only a minimal representation of each object in the response. This is useful when you need only a list of the objects themselves without any related data, such as when populating a drop-down list in a form.
-
-For example, the default (complete) format of an IP address looks like this:
-
-```
-GET /api/ipam/prefixes/13980/
-
-{
-    "id": 13980,
-    "family": 4,
-    "prefix": "192.0.2.0/24",
-    "site": null,
-    "vrf": null,
+    "id": 1201,
+    "site": 7,
+    "group": 4,
+    "vid": 102,
+    "name": "Users-Floor2",
     "tenant": null,
-    "vlan": null,
-    "status": {
-        "value": 1,
-        "label": "Active"
-    },
-    "role": null,
-    "is_pool": false,
-    "description": "",
-    "tags": [],
-    "custom_fields": {},
-    "created": "2018-12-11",
-    "last_updated": "2018-12-11T16:27:55.073174-05:00"
+    "status": 1,
+    "role": 9,
+    "description": ""
 }
 ```
 
-The brief format is much more terse, but includes a link to the object's full representation:
-
-```
-GET /api/ipam/prefixes/13980/?brief=1
-
-{
-    "id": 13980,
-    "url": "https://netbox/api/ipam/prefixes/13980/",
-    "family": 4,
-    "prefix": "192.0.2.0/24"
-}
-```
-
-The brief format is supported for both lists and individual objects.
-
 ## Static Choice Fields
 
 Some model fields, such as the `status` field in the above example, utilize static integers corresponding to static choices. The available choices can be retrieved from the read-only `_choices` endpoint within each app. A specific `model:field` tuple may optionally be specified in the URL.
@@ -274,7 +215,7 @@ A list of objects retrieved via the API can be filtered by passing one or more q
 GET /api/ipam/prefixes/?status=1
 ```
 
-Certain filters can be included multiple times within a single request. These will effect a logical OR and return objects matching any of the given values. For example, the following will return all active and reserved prefixes:
+The same filter can be incldued multiple times. These will effect a logical OR and return objects matching any of the given values. For example, the following will return all active and reserved prefixes:
 
 ```
 GET /api/ipam/prefixes/?status=1&status=2

docs/configuration/index.md

@@ -12,5 +12,5 @@ While NetBox has many configuration settings, only a few of them must be defined
 Configuration settings may be changed at any time. However, the NetBox service must be restarted before the changes will take effect:
 
 ```no-highlight
-# sudo supervisorctl restart netbox
+# sudo supervsiorctl restart netbox
 ```

docs/configuration/optional-settings.md

@@ -44,14 +44,6 @@ BASE_PATH = 'netbox/'
 
 ---
 
-## CACHE_TIMEOUT
-
-Default: 900
-
-The number of seconds to retain cache entries before automatically invalidating them.
-
----
-
 ## CHANGELOG_RETENTION
 
 Default: 90
@@ -97,30 +89,6 @@ In order to send email, NetBox needs an email server configured. The following i
 
 ---
 
-## EXEMPT_VIEW_PERMISSIONS
-
-Default: Empty list
-
-A list of models to exempt from the enforcement of view permissions. Models listed here will be viewable by all users and by anonymous users.
-
-List models in the form `<app>.<model>`. For example:
-
-```
-EXEMPT_VIEW_PERMISSIONS = [
-    'dcim.site',
-    'dcim.region',
-    'ipam.prefix',
-]
-```
-
-To exempt _all_ models from view permission enforcement, set the following. (Note that `EXEMPT_VIEW_PERMISSIONS` must be an iterable.)
-
-```
-EXEMPT_VIEW_PERMISSIONS = ['*']
-```
-
----
-
 # ENFORCE_GLOBAL_UNIQUE
 
 Default: False
@@ -165,14 +133,6 @@ 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
@@ -197,14 +157,6 @@ The file path to the location where media files (such as image attachments) are
 
 ---
 
-## METRICS_ENABLED
-
-Default: True
-
-Toggle exposing Prometheus metrics at `/metrics`. See the [Prometheus Metrics](../additional-features/prometheus-metrics/) documentation for more details.
-
----
-
 ## NAPALM_USERNAME
 
 ## NAPALM_PASSWORD
@@ -271,14 +223,6 @@ 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
@@ -291,7 +235,7 @@ The time zone NetBox will use when dealing with dates and times. It is recommend
 
 Default: False
 
-Enable this option to run the webhook backend. See the docs section on the webhook backend [here](../additional-features/webhooks/) for more information on setup and use.
+Enable this option to run the webhook backend. See the docs section on the webhook backend [here](../miscellaneous/webhooks/) for more information on setup and use.
 
 ---
 
@@ -309,3 +253,49 @@ SHORT_TIME_FORMAT = 'H:i:s'          # 13:23:00
 DATETIME_FORMAT = 'N j, Y g:i a'     # June 26, 2016 1:23 p.m.
 SHORT_DATETIME_FORMAT = 'Y-m-d H:i'  # 2016-06-27 13:23
 ```
+
+---
+
+## Redis Connection Settings
+
+[Redis](https://redis.io/) is a key-value store which functions as a very lightweight database. It is required when enabling NetBox [webhooks](../miscellaneous/webhooks/). A Redis connection is configured using a dictionary similar to the following:
+
+```
+REDIS = {
+    'HOST': 'localhost',
+    'PORT': 6379,
+    'PASSWORD': '',
+    'DATABASE': 0,
+    'DEFAULT_TIMEOUT': 300,
+}
+```
+
+### DATABASE
+
+Default: 0
+
+The Redis database ID.
+
+### DEFAULT_TIMEOUT
+
+Default: 300
+
+The timeout value to use when connecting to the Redis server (in seconds).
+
+### HOST
+
+Default: localhost
+
+The hostname or IP address of the Redis server.
+
+### PORT
+
+Default: 6379
+
+The TCP port to use when connecting to the Redis server.
+
+### PASSWORD
+
+Default: None
+
+The password to use when authenticating to the Redis server (optional).

docs/configuration/required-settings.md

@@ -43,44 +43,3 @@ This is a secret cryptographic key is used to improve the security of cookies an
 Please note that this key is **not** used for hashing user passwords or for the encrypted storage of secret data in NetBox.
 
 `SECRET_KEY` should be at least 50 characters in length and contain a random mix of letters, digits, and symbols. The script located at `netbox/generate_secret_key.py` may be used to generate a suitable key.
-
----
-
-## REDIS
-
-[Redis](https://redis.io/) is an in-memory data store similar to memcached. While Redis has been an optional component of
-NetBox since the introduction of webhooks in version 2.4, it is required starting in 2.6 to support NetBox's caching
-functionality (as well as other planned features).
-
-Redis is configured using a configuration setting similar to `DATABASE`:
-
-* HOST - Name or IP address of the Redis server (use `localhost` if running locally)
-* PORT - TCP port of the Redis service; leave blank for default port (6379)
-* PASSWORD - Redis password (if set)
-* DATABASE - Numeric database ID for webhooks
-* CACHE_DATABASE - Numeric database ID for caching
-* DEFAULT_TIMEOUT - Connection timeout in seconds
-* SSL - Use SSL connection to Redis
-
-Example:
-
-```
-REDIS = {
-    'HOST': 'localhost',
-    'PORT': 6379,
-    'PASSWORD': '',
-    'DATABASE': 0,
-    'CACHE_DATABASE': 1,
-    'DEFAULT_TIMEOUT': 300,
-    'SSL': False,
-}
-```
-
-!!! note:
-    If you were using these settings in a prior release with webhooks, the `DATABASE` setting remains the same but
-    an additional `CACHE_DATABASE` setting has been added with a default value of 1 to support the caching backend. The
-    `DATABASE` setting will be renamed in a future release of NetBox to better relay the meaning of the setting. 
-
-!!! warning:
-    It is highly recommended to keep the webhook and cache databases seperate. Using the same database number for both may result in webhook
-    processing data being lost in cache flushing events.

docs/core-functionality/circuits.md

@@ -25,7 +25,7 @@ Circuit types are fully customizable.
 
 A circuit may have one or two terminations, annotated as the "A" and "Z" sides of the circuit. A single-termination circuit can be used when you don't know (or care) about the far end of a circuit (for example, an Internet access circuit which connects to a transit provider). A dual-termination circuit is useful for tracking circuits which connect two sites.
 
-Each circuit termination is tied to a site, and may optionally be connected via a cable to a specific device interface or pass-through port. Each termination can be assigned a separate downstream and upstream speed independent from one another. Fields are also available to track cross-connect and patch panel details.
+Each circuit termination is tied to a site, and optionally to a specific device and interface within that site. Each termination can be assigned a separate downstream and upstream speed independent from one another. Fields are also available to track cross-connect and patch panel details.
 
 !!! note
     A circuit represents a physical link, and cannot have more than two endpoints. When modeling a multi-point topology, each leg of the topology must be defined as a discrete circuit.

docs/core-functionality/devices.md

@@ -4,6 +4,12 @@ A device type represents a particular make and model of hardware that exists in
 
 Device types are instantiated as devices installed within racks. For example, you might define a device type to represent a Juniper EX4300-48T network switch with 48 Ethernet interfaces. You can then create multiple devices of this type named "switch1," "switch2," and so on. Each device will inherit the components (such as interfaces) of its device type at the time of creation. (However, changes made to a device type will **not** apply to instances of that device type retroactively.)
 
+The device type model includes three flags which inform what type of components may be added to it:
+
+* `is_console_server`: This device type has console server ports
+* `is_pdu`: This device type has power outlets
+* `is_network_device`: This device type has network interfaces
+
 Some devices house child devices which share physical resources, like space and power, but which functional independently from one another. A common example of this is blade server chassis. Each device type is designated as one of the following:
 
 * A parent device (which has device bays)
@@ -13,10 +19,6 @@ Some devices house child devices which share physical resources, like space and
 !!! note
     This parent/child relationship is **not** suitable for modeling chassis-based devices, wherein child members share a common control plane.
 
-    For that application you should create a single Device for the chassis, and add Interfaces directly to it.  Interfaces can be created in bulk using range patterns, e.g. "Gi1/[1-24]".
-
-    Add Inventory Items if you want to record the line cards themselves as separate entities.  There is no explicit relationship between each interface and its line card, but it may be implied by the naming (e.g. interfaces "Gi1/x" are on line card 1)
-
 ## Manufacturers
 
 Each device type must be assigned to a manufacturer. The model number of a device type must be unique to its manufacturer.
@@ -30,8 +32,6 @@ Each device type is assigned a number of component templates which define the ph
 * Power ports
 * Power outlets
 * Network interfaces
-* Front ports
-* Rear ports
 * Device bays (which house child devices)
 
 Whenever a new device is created, its components are automatically created per the templates assigned to its device type. For example, a Juniper EX4300-48T device type might have the following component templates defined:
@@ -56,62 +56,52 @@ When assigning a multi-U device to a rack, it is considered to be mounted in the
 
 A device is said to be full depth if its installation on one rack face prevents the installation of any other device on the opposite face within the same rack unit(s). This could be either because the device is physically too deep to allow a device behind it, or because the installation of an opposing device would impede airflow.
 
-## Device Components
+## Device Roles
 
-There are eight types of device components which comprise all of the interconnection logic with NetBox:
+Devices can be organized by functional roles. These roles are fully cusomizable. For example, you might create roles for core switches, distribution switches, and access switches.
+
+---
+
+# Device Components
+
+There are six types of device components which comprise all of the interconnection logic with NetBox:
 
 * Console ports
 * Console server ports
 * Power ports
 * Power outlets
 * Network interfaces
-* Front ports
-* Rear ports
 * Device bays
 
-### Console
+## Console
 
 Console ports connect only to console server ports. Console connections can be marked as either *planned* or *connected*.
 
-### Power
+## Power
 
 Power ports connect only to power outlets. Power connections can be marked as either *planned* or *connected*.
 
-### Interfaces
+## Interfaces
 
 Interfaces connect to one another in a symmetric manner: If interface A connects to interface B, interface B therefore connects to interface A. Each type of connection can be classified as either *planned* or *connected*.
 
-Each interface is a assigned a type denoting its physical properties. Two special types exist: the "virtual" type can be used to designate logical interfaces (such as SVIs), and the "LAG" type can be used to desinate link aggregation groups to which physical interfaces can be assigned.
+Each interface is a assigned a form factor denoting its physical properties. Two special form factors exist: the "virtual" form factor can be used to designate logical interfaces (such as SVIs), and the "LAG" form factor can be used to desinate link aggregation groups to which physical interfaces can be assigned.
 
 Each interface can also be enabled or disabled, and optionally designated as management-only (for out-of-band management). Fields are also provided to store an interface's MTU and MAC address.
 
 VLANs can be assigned to each interface as either tagged or untagged. (An interface may have only one untagged VLAN.)
 
-### Pass-through Ports
-
-Pass-through ports are used to model physical terminations which comprise part of a longer path, such as a cable terminated to a patch panel. Each front port maps to a position on a rear port. A 24-port UTP patch panel, for instance, would have 24 front ports and 24 rear ports. Although this relationship is typically one-to-one, a rear port may have multiple front ports mapped to it. This can be useful for modeling instances where multiple paths share a common cable (for example, six different fiber connections sharing a 12-strand MPO cable).
-
-Pass-through ports can also be used to model "bump in the wire" devices, such as a media convertor or passive tap.
-
-### Device Bays
+## Device Bays
 
 Device bays represent the ability of a device to house child devices. For example, you might install four blade servers into a 2U chassis. The chassis would appear in the rack elevation as a 2U device with four device bays. Each server within it would be defined as a 0U device installed in one of the device bays. Child devices do not appear within rack elevations, but they are included in the "Non-Racked Devices" list within the rack view.
 
-Child devices are first-class Devices in their own right: that is, fully independent managed entities which don't share any control plane with the parent.  Just like normal devices, child devices have their own platform (OS), role, tags, and interfaces.  You cannot create a LAG between interfaces in different child devices.
-
-Therefore, Device bays are **not** suitable for modeling chassis-based switches and routers.  These should instead be modeled as a single Device, with the line cards as Inventory Items.
-
-## Device Roles
-
-Devices can be organized by functional roles. These roles are fully customizable. For example, you might create roles for core switches, distribution switches, and access switches.
-
 ---
 
 # Platforms
 
-A platform defines the type of software running on a device or virtual machine. This can be helpful when it is necessary to distinguish between, for instance, different feature sets. Note that two devices of the same type may be assigned different platforms: for example, one Juniper MX240 running Junos 14 and another running Junos 15.
+A platform defines the type of software running on a device or virtual machine. This can be helpful when it is necessary to distinguish between, for instance, different feature sets. Note that two devices of same type may be assigned different platforms: for example, one Juniper MX240 running Junos 14 and another running Junos 15.
 
-The platform model is also used to indicate which [NAPALM](https://napalm-automation.net/) driver NetBox should use when connecting to a remote device. The name of the driver along with optional parameters are stored with the platform.
+The platform model is also used to indicate which [NAPALM](https://napalm-automation.net/) driver NetBox should use when connecting to a remote device. The name of the driver along with optional parameters are stored with the platform. See the [API documentation](api/napalm-integration.md) for more information on NAPALM integration.
 
 The assignment of platforms to devices is an optional feature, and may be disregarded if not desired.
 
@@ -119,7 +109,7 @@ The assignment of platforms to devices is an optional feature, and may be disreg
 
 # Inventory Items
 
-Inventory items represent hardware components installed within a device, such as a power supply or CPU or line card. Currently, these are used merely for inventory tracking, although future development might see their functionality expand. Like device types, each item can optionally be assigned a manufacturer.
+Inventory items represent hardware components installed within a device, such as a power supply or CPU. Currently, these are used merely for inventory tracking, although future development might see their functionality expand. Like device types, each item can optionally be assigned a manufacturer.
 
 ---
 
@@ -128,25 +118,3 @@ Inventory items represent hardware components installed within a device, such as
 A virtual chassis represents a set of devices which share a single control plane: a stack of switches which are managed as a single device, for example. Each device in the virtual chassis is assigned a position and (optionally) a priority. Exactly one device is designated the virtual chassis master: This device will typically be assigned a name, secrets, services, and other attributes related to its management.
 
 It's important to recognize the distinction between a virtual chassis and a chassis-based device. For instance, a virtual chassis is not used to model a chassis switch with removable line cards such as the Juniper EX9208, as its line cards are _not_ physically separate devices capable of operating independently.
-
----
-
-# Cables
-
-A cable represents a physical connection between two termination points, such as between a console port and a patch panel port, or between two network interfaces. Cables can be traced through pass-through ports to form a complete path between two endpoints. In the example below, three individual cables comprise a path between the two connected endpoints.
-
-```
-|<------------------------------------------ Cable Path ------------------------------------------->|
-
-  Device A                   Patch Panel A                 Patch Panel B                  Device B
-+-----------+               +-------------+               +-------------+               +-----------+
-| Interface | --- Cable --- | Front Port  |               | Front Port  | --- Cable --- | Interface |
-+-----------+               +-------------+               +-------------+               +-----------+
-                            +-------------+               +-------------+
-                            |  Rear Port  | --- Cable --- |  Rear Port  |
-                            +-------------+               +-------------+
-```
-
-All connections between device components in NetBox are represented using cables. However, defining the actual cable plant is optional: Components can be be directly connected using cables with no type or other attributes assigned.
-
-Cables are also used to associated ports and interfaces with circuit terminations. To do this, first create the circuit termination, then navigate the desired component and connect a cable between the two.

docs/core-functionality/ipam.md

@@ -4,7 +4,7 @@ The first step to documenting your IP space is to define its scope by creating a
 
 * 10.0.0.0/8 (RFC 1918)
 * 100.64.0.0/10 (RFC 6598)
-* 172.16.0.0/12 (RFC 1918)
+* 172.16.0.0/20 (RFC 1918)
 * 192.168.0.0/16 (RFC 1918)
 * One or more /48s within fd00::/8 (IPv6 unique local addressing)
 
@@ -83,7 +83,7 @@ An IP address can be designated as the network address translation (NAT) inside
 
 A VRF object in NetBox represents a virtual routing and forwarding (VRF) domain. Each VRF is essentially a separate routing table. VRFs are commonly used to isolate customers or organizations from one another within a network, or to route overlapping address space (e.g. multiple instances of the 10.0.0.0/8 space).
 
-Each VRF is assigned a unique name and an optional route distinguisher (RD). The RD is expected to take one of the forms prescribed in [RFC 4364](https://tools.ietf.org/html/rfc4364#section-4.2), however its formatting is not strictly enforced.
+Each VRF is assigned a unique name and route distinguisher (RD). The RD is expected to take one of the forms prescribed in [RFC 4364](https://tools.ietf.org/html/rfc4364#section-4.2), however its formatting is not strictly enforced.
 
 Each prefix and IP address may be assigned to one (and only one) VRF. If you have a prefix or IP address which exists in multiple VRFs, you will need to create a separate instance of it in NetBox for each VRF. Any IP prefix or address not assigned to a VRF is said to belong to the "global" table.
 

docs/development/extending-models.md

@@ -1,74 +0,0 @@
-# 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,3 +28,10 @@ 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/release-checklist.md

@@ -29,7 +29,6 @@ Update the following static libraries to their most recent stable release:
 
 * Bootstrap 3
 * Font Awesome 4
-* Select2
 * jQuery
 * jQuery UI
 
@@ -49,9 +48,9 @@ Close the release milestone on GitHub. Ensure that there are no remaining open i
 
 Ensure that continuous integration testing on the `develop` branch is completing successfully.
 
-## Update Version and Changelog
+## Update VERSION
 
-Update the `VERSION` constant in `settings.py` to the new release version and add the current date to the release notes in `CHANGELOG.md`.
+Update the `VERSION` constant in `settings.py` to the new release.
 
 ## Submit a Pull Request
 

docs/development/style-guide.md

@@ -1,54 +0,0 @@
-# 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 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.
+    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.
 
 !!! 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.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.
+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.
 
 ```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

@@ -1,20 +1,20 @@
 # Installation
 
-This section of the documentation discusses installing and configuring the NetBox application. Begin by installing all system packages required by NetBox and its dependencies:
+This section of the documentation discusses installing and configuring the NetBox application.
 
 **Ubuntu**
 
 ```no-highlight
-# apt-get install -y python3 python3-pip python3-dev build-essential libxml2-dev libxslt1-dev libffi-dev graphviz libpq-dev libssl-dev redis-server zlib1g-dev
+# 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
 ```
 
 **CentOS**
 
 ```no-highlight
 # yum install -y epel-release
-# yum install -y gcc python36 python36-devel python36-setuptools libxml2-devel libxslt-devel libffi-devel graphviz openssl-devel redhat-rpm-config redis
-# easy_install-3.6 pip
-# ln -s /usr/bin/python36 /usr/bin/python3
+# 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
 ```
 
 You may opt to install NetBox either from a numbered release or by cloning the master branch of its repository on GitHub.
@@ -71,7 +71,7 @@ Checking connectivity... done.
 
     `# chown -R netbox:netbox /opt/netbox/netbox/media/`
 
-# Install Python Packages
+## Install Python Packages
 
 Install the required Python packages using pip. (If you encounter any compilation errors during this step, ensure that you've installed all of the system dependencies listed above.)
 
@@ -82,7 +82,7 @@ Install the required Python packages using pip. (If you encounter any compilatio
 !!! note
     If you encounter errors while installing the required packages, check that you're running a recent version of pip (v9.0.1 or higher) with the command `pip3 -V`.
 
-## NAPALM Automation (Optional)
+### NAPALM Automation (Optional)
 
 NetBox supports integration with the [NAPALM automation](https://napalm-automation.net/) library. NAPALM allows NetBox to fetch live data from devices and return it to a requester via its REST API. Installation of NAPALM is optional. To enable it, install the `napalm` package using pip or pip3:
 
@@ -90,6 +90,28 @@ NetBox supports integration with the [NAPALM automation](https://napalm-automati
 # pip3 install napalm
 ```
 
+### Webhooks (Optional)
+
+[Webhooks](../data-model/extras/#webhooks) allow NetBox to integrate with external services by pushing out a notification each time a relevant object is created, updated, or deleted. Enabling the webhooks feature requires [Redis](https://redis.io/), a lightweight in-memory database. You may opt to install a Redis sevice locally (see below) or connect to an external one.
+
+**Ubuntu**
+
+```no-highlight
+# apt-get install -y redis-server
+```
+
+**CentOS**
+
+```no-highlight
+# yum install -y redis
+```
+
+Enabling webhooks also requires installing the [`django-rq`](https://github.com/ui/django-rq) package. This allows NetBox to use the Redis database as a queue for outgoing webhooks.
+
+```no-highlight
+# pip3 install django-rq
+```
+
 # Configuration
 
 Move into the NetBox configuration directory and make a copy of `configuration.example.py` named `configuration.py`.
@@ -224,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).
-November 28, 2018 - 09:33:45
-Django version 2.0.9, using settings 'netbox.settings'
+June 17, 2016 - 16:17:36
+Django version 1.9.7, using settings 'netbox.settings'
 Starting development server at http://0.0.0.0:8000/
 Quit the server with CONTROL-C.
 ```
 
-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.**
+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.**
 
 !!! 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 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.
+    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.
 
 # Web Server Installation
 
@@ -56,7 +56,7 @@ To enable SSL, consider this guide on [securing nginx with Let's Encrypt](https:
 ## Option B: Apache
 
 ```no-highlight
-# apt-get install -y apache2 libapache2-mod-wsgi-py3
+# apt-get install -y apache2
 ```
 
 Once Apache is installed, proceed with the following configuration (Be sure to modify the `ServerName` appropriately):

docs/installation/4-ldap.md

@@ -19,7 +19,7 @@ sudo yum install -y openldap-devel
 ## Install django-auth-ldap
 
 ```no-highlight
-pip3 install django-auth-ldap
+sudo pip install django-auth-ldap
 ```
 
 # Configuration
@@ -95,9 +95,6 @@ AUTH_LDAP_GROUP_TYPE = GroupOfNamesType()
 # Define a group required to login.
 AUTH_LDAP_REQUIRE_GROUP = "CN=NETBOX_USERS,DC=example,DC=com"
 
-# Mirror LDAP group assignments.
-AUTH_LDAP_MIRROR_GROUPS = True
-
 # Define special user types using groups. Exercise great caution when assigning superuser status.
 AUTH_LDAP_USER_FLAGS_BY_GROUP = {
     "is_active": "cn=active,ou=groups,dc=example,dc=com",
@@ -116,21 +113,3 @@ AUTH_LDAP_GROUP_CACHE_TIMEOUT = 3600
 * `is_active` - All users must be mapped to at least this group to enable authentication. Without this, users cannot log in.
 * `is_staff` - Users mapped to this group are enabled for access to the administration tools; this is the equivalent of checking the "staff status" box on a manually created user. This doesn't grant any specific permissions.
 * `is_superuser` - Users mapped to this group will be granted superuser status. Superusers are implicitly granted all permissions.
-
-# Troubleshooting LDAP
-
-`supervisorctl restart netbox` restarts the Netbox service, and initiates any changes made to `ldap_config.py`. If there are syntax errors present, the NetBox process will not spawn an instance, and errors should be logged to `/var/log/supervisor/`.
-
-For troubleshooting LDAP user/group queries, add the following lines to the start of `ldap_config.py` after `import ldap`.
-
-```python
-import logging, logging.handlers
-logfile = "/opt/netbox/logs/django-ldap-debug.log"
-my_logger = logging.getLogger('django_auth_ldap')
-my_logger.setLevel(logging.DEBUG)
-handler = logging.handlers.RotatingFileHandler(
-   logfile, maxBytes=1024 * 500, backupCount=5)
-my_logger.addHandler(handler)
-```
-
-Ensure the file and path specified in logfile exist and are writable and executable by the application service account. Restart the netbox service and attempt to log into the site to trigger log entries to this file.

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.5 or higher. Please see the instructions for [migrating to Python 3](migrating-to-python3.md) if you are still using Python 2.
+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.

docs/installation/migrating-to-python3.md

@@ -1,7 +1,7 @@
 # Migration
 
 !!! warning
-    As of version 2.5, NetBox no longer supports Python 2. Python 3 is required to run any 2.5 release or later.
+    Beginning with v2.5, NetBox will no longer support Python 2. It is strongly recommended that you upgrade to Python 3 as soon as possible.
 
 ## Ubuntu
 

docs/installation/upgrading.md

@@ -64,6 +64,13 @@ Once the new code is in place, run the upgrade script (which may need to be run
 # ./upgrade.sh
 ```
 
+!!! warning
+    The upgrade script will prefer Python3 and pip3 if both executables are available. To force it to use Python2 and pip, use the `-2` argument as below. Note that Python 2 will no longer be supported in NetBox v2.5.
+
+```no-highlight
+# ./upgrade.sh -2
+```
+
 This script:
 
 * Installs or upgrades any new required Python packages

mkdocs.yml

@@ -1,5 +1,4 @@
 site_name: NetBox
-theme: readthedocs
 repo_url: https://github.com/digitalocean/netbox
 
 pages:
@@ -36,11 +35,8 @@ pages:
         - Reports: 'additional-features/reports.md'
         - Webhooks: 'additional-features/webhooks.md'
         - Change Logging: 'additional-features/change-logging.md'
-        - Caching: 'additional-features/caching.md'
-        - Prometheus Metrics: 'additional-features/prometheus-metrics.md'
     - Administration:
         - Replicating NetBox: 'administration/replicating-netbox.md'
-        - NetBox Shell: 'administration/netbox-shell.md'
     - API:
         - Overview: 'api/overview.md'
         - Authentication: 'api/authentication.md'
@@ -48,9 +44,7 @@ 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

@@ -1,54 +0,0 @@
-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')
-    circuit_count = serializers.IntegerField(read_only=True)
-
-    class Meta:
-        model = Provider
-        fields = ['id', 'url', 'name', 'slug', 'circuit_count']
-
-
-#
-# Circuits
-#
-
-class NestedCircuitTypeSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittype-detail')
-    circuit_count = serializers.IntegerField(read_only=True)
-
-    class Meta:
-        model = CircuitType
-        fields = ['id', 'url', 'name', 'slug', 'circuit_count']
-
-
-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,14 +1,14 @@
+from __future__ import unicode_literals
+
 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.nested_serializers import NestedCableSerializer, NestedSiteSerializer
-from dcim.api.serializers import ConnectedEndpointSerializer
+from dcim.api.serializers import NestedSiteSerializer, InterfaceSerializer
 from extras.api.customfields import CustomFieldModelSerializer
-from tenancy.api.nested_serializers import NestedTenantSerializer
-from utilities.api import ChoiceField, ValidatedModelSerializer
-from .nested_serializers import *
+from tenancy.api.serializers import NestedTenantSerializer
+from utilities.api import ChoiceField, ValidatedModelSerializer, WritableNestedSerializer
 
 
 #
@@ -17,28 +17,46 @@ from .nested_serializers import *
 
 class ProviderSerializer(TaggitSerializer, CustomFieldModelSerializer):
     tags = TagListSerializerField(required=False)
-    circuit_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = Provider
         fields = [
             'id', 'name', 'slug', 'asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', 'comments', 'tags',
-            'custom_fields', 'created', 'last_updated', 'circuit_count',
+            'custom_fields', 'created', 'last_updated',
         ]
 
 
+class NestedProviderSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='circuits-api:provider-detail')
+
+    class Meta:
+        model = Provider
+        fields = ['id', 'url', 'name', 'slug']
+
+
+#
+# Circuit types
+#
+
+class CircuitTypeSerializer(ValidatedModelSerializer):
+
+    class Meta:
+        model = CircuitType
+        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 CircuitTypeSerializer(ValidatedModelSerializer):
-    circuit_count = serializers.IntegerField(read_only=True)
-
-    class Meta:
-        model = CircuitType
-        fields = ['id', 'name', 'slug', 'circuit_count']
-
-
 class CircuitSerializer(TaggitSerializer, CustomFieldModelSerializer):
     provider = NestedProviderSerializer()
     status = ChoiceField(choices=CIRCUIT_STATUS_CHOICES, required=False)
@@ -54,14 +72,25 @@ class CircuitSerializer(TaggitSerializer, CustomFieldModelSerializer):
         ]
 
 
-class CircuitTerminationSerializer(ConnectedEndpointSerializer):
+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):
     circuit = NestedCircuitSerializer()
     site = NestedSiteSerializer()
-    cable = NestedCableSerializer(read_only=True)
+    interface = InterfaceSerializer(required=False, allow_null=True)
 
     class Meta:
         model = CircuitTermination
         fields = [
-            'id', 'circuit', 'term_side', 'site', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info',
-            'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable',
+            'id', 'circuit', 'term_side', 'site', 'interface', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info',
         ]

netbox/circuits/api/urls.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from rest_framework import routers
 
 from . import views
@@ -15,7 +17,7 @@ router = routers.DefaultRouter()
 router.APIRootView = CircuitsRootView
 
 # Field choices
-router.register(r'_choices', views.CircuitsFieldChoicesViewSet, basename='field-choice')
+router.register(r'_choices', views.CircuitsFieldChoicesViewSet, base_name='field-choice')
 
 # Providers
 router.register(r'providers', views.ProviderViewSet)

netbox/circuits/api/views.py

@@ -1,4 +1,5 @@
-from django.db.models import Count
+from __future__ import unicode_literals
+
 from django.shortcuts import get_object_or_404
 from rest_framework.decorators import action
 from rest_framework.response import Response
@@ -28,11 +29,9 @@ class CircuitsFieldChoicesViewSet(FieldChoicesViewSet):
 #
 
 class ProviderViewSet(CustomFieldModelViewSet):
-    queryset = Provider.objects.prefetch_related('tags').annotate(
-        circuit_count=Count('circuits')
-    )
+    queryset = Provider.objects.all()
     serializer_class = serializers.ProviderSerializer
-    filterset_class = filters.ProviderFilter
+    filter_class = filters.ProviderFilter
 
     @action(detail=True)
     def graphs(self, request, pk=None):
@@ -50,11 +49,9 @@ class ProviderViewSet(CustomFieldModelViewSet):
 #
 
 class CircuitTypeViewSet(ModelViewSet):
-    queryset = CircuitType.objects.annotate(
-        circuit_count=Count('circuits')
-    )
+    queryset = CircuitType.objects.all()
     serializer_class = serializers.CircuitTypeSerializer
-    filterset_class = filters.CircuitTypeFilter
+    filter_class = filters.CircuitTypeFilter
 
 
 #
@@ -62,9 +59,9 @@ class CircuitTypeViewSet(ModelViewSet):
 #
 
 class CircuitViewSet(CustomFieldModelViewSet):
-    queryset = Circuit.objects.select_related('type', 'tenant', 'provider').prefetch_related('tags')
+    queryset = Circuit.objects.select_related('type', 'tenant', 'provider')
     serializer_class = serializers.CircuitSerializer
-    filterset_class = filters.CircuitFilter
+    filter_class = filters.CircuitFilter
 
 
 #
@@ -72,8 +69,6 @@ class CircuitViewSet(CustomFieldModelViewSet):
 #
 
 class CircuitTerminationViewSet(ModelViewSet):
-    queryset = CircuitTermination.objects.select_related(
-        'circuit', 'site', 'connected_endpoint__device', 'cable'
-    )
+    queryset = CircuitTermination.objects.select_related('circuit', 'site', 'interface__device')
     serializer_class = serializers.CircuitTerminationSerializer
-    filterset_class = filters.CircuitTerminationFilter
+    filter_class = filters.CircuitTerminationFilter

netbox/circuits/apps.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.apps import AppConfig
 
 

netbox/circuits/constants.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 
 # Circuit statuses
 CIRCUIT_STATUS_DEPROVISIONING = 0

netbox/circuits/filters.py

@@ -1,35 +1,36 @@
+from __future__ import unicode_literals
+
 import django_filters
 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 NameSlugSearchFilterSet, NumericInFilter, TagFilter
+from utilities.filters import NumericInFilter
 from .constants import CIRCUIT_STATUS_CHOICES
 from .models import Provider, Circuit, CircuitTermination, CircuitType
 
 
 class ProviderFilter(CustomFieldFilterSet, django_filters.FilterSet):
-    id__in = NumericInFilter(
-        field_name='id',
-        lookup_expr='in'
-    )
+    id__in = NumericInFilter(name='id', lookup_expr='in')
     q = django_filters.CharFilter(
         method='search',
         label='Search',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        field_name='circuits__terminations__site',
+        name='circuits__terminations__site',
         queryset=Site.objects.all(),
         label='Site',
     )
     site = django_filters.ModelMultipleChoiceFilter(
-        field_name='circuits__terminations__site__slug',
+        name='circuits__terminations__site__slug',
         queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
     )
-    tag = TagFilter()
+    tag = django_filters.CharFilter(
+        name='tags__slug',
+    )
 
     class Meta:
         model = Provider
@@ -47,7 +48,7 @@ class ProviderFilter(CustomFieldFilterSet, django_filters.FilterSet):
         )
 
 
-class CircuitTypeFilter(NameSlugSearchFilterSet):
+class CircuitTypeFilter(django_filters.FilterSet):
 
     class Meta:
         model = CircuitType
@@ -55,10 +56,7 @@ class CircuitTypeFilter(NameSlugSearchFilterSet):
 
 
 class CircuitFilter(CustomFieldFilterSet, django_filters.FilterSet):
-    id__in = NumericInFilter(
-        field_name='id',
-        lookup_expr='in'
-    )
+    id__in = NumericInFilter(name='id', lookup_expr='in')
     q = django_filters.CharFilter(
         method='search',
         label='Search',
@@ -68,7 +66,7 @@ class CircuitFilter(CustomFieldFilterSet, django_filters.FilterSet):
         label='Provider (ID)',
     )
     provider = django_filters.ModelMultipleChoiceFilter(
-        field_name='provider__slug',
+        name='provider__slug',
         queryset=Provider.objects.all(),
         to_field_name='slug',
         label='Provider (slug)',
@@ -78,7 +76,7 @@ class CircuitFilter(CustomFieldFilterSet, django_filters.FilterSet):
         label='Circuit type (ID)',
     )
     type = django_filters.ModelMultipleChoiceFilter(
-        field_name='type__slug',
+        name='type__slug',
         queryset=CircuitType.objects.all(),
         to_field_name='slug',
         label='Circuit type (slug)',
@@ -92,23 +90,25 @@ class CircuitFilter(CustomFieldFilterSet, django_filters.FilterSet):
         label='Tenant (ID)',
     )
     tenant = django_filters.ModelMultipleChoiceFilter(
-        field_name='tenant__slug',
+        name='tenant__slug',
         queryset=Tenant.objects.all(),
         to_field_name='slug',
         label='Tenant (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        field_name='terminations__site',
+        name='terminations__site',
         queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
-        field_name='terminations__site__slug',
+        name='terminations__site__slug',
         queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
     )
-    tag = TagFilter()
+    tag = django_filters.CharFilter(
+        name='tags__slug',
+    )
 
     class Meta:
         model = Circuit
@@ -121,7 +121,6 @@ class CircuitFilter(CustomFieldFilterSet, django_filters.FilterSet):
             Q(cid__icontains=value) |
             Q(terminations__xconnect_id__icontains=value) |
             Q(terminations__pp_info__icontains=value) |
-            Q(terminations__description__icontains=value) |
             Q(description__icontains=value) |
             Q(comments__icontains=value)
         ).distinct()
@@ -141,7 +140,7 @@ class CircuitTerminationFilter(django_filters.FilterSet):
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
-        field_name='site__slug',
+        name='site__slug',
         queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
@@ -157,6 +156,5 @@ class CircuitTerminationFilter(django_filters.FilterSet):
         return queryset.filter(
             Q(circuit__cid__icontains=value) |
             Q(xconnect_id__icontains=value) |
-            Q(pp_info__icontains=value) |
-            Q(description__icontains=value)
+            Q(pp_info__icontains=value)
         ).distinct()

netbox/circuits/forms.py

@@ -1,13 +1,16 @@
+from __future__ import unicode_literals
+
 from django import forms
+from django.db.models import Count
 from taggit.forms import TagField
 
-from dcim.models import Site
+from dcim.models import Site, Device, Interface, Rack
 from extras.forms import AddRemoveTagsForm, CustomFieldForm, CustomFieldBulkEditForm, CustomFieldFilterForm
 from tenancy.forms import TenancyForm
 from tenancy.models import Tenant
 from utilities.forms import (
-    APISelect, APISelectMultiple, add_blank_choice, BootstrapMixin, CommentField, CSVChoiceField,
-    FilterChoiceField, SmallTextarea, SlugField, StaticSelect2, StaticSelect2Multiple
+    AnnotatedMultipleChoiceField, APISelect, add_blank_choice, BootstrapMixin, ChainedFieldsMixin,
+    ChainedModelChoiceField, CommentField, CSVChoiceField, FilterChoiceField, SmallTextarea, SlugField,
 )
 from .constants import CIRCUIT_STATUS_CHOICES
 from .models import Circuit, CircuitTermination, CircuitType, Provider
@@ -20,22 +23,14 @@ 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",
@@ -61,61 +56,23 @@ 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',
-        widget=APISelectMultiple(
-            api_url="/api/dcim/sites/",
-            value_field="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')
 
 
 #
@@ -127,9 +84,7 @@ class CircuitTypeForm(BootstrapMixin, forms.ModelForm):
 
     class Meta:
         model = CircuitType
-        fields = [
-            'name', 'slug',
-        ]
+        fields = ['name', 'slug']
 
 
 class CircuitTypeCSVForm(forms.ModelForm):
@@ -149,9 +104,7 @@ class CircuitTypeCSVForm(forms.ModelForm):
 
 class CircuitForm(BootstrapMixin, TenancyForm, CustomFieldForm):
     comments = CommentField()
-    tags = TagField(
-        required=False
-    )
+    tags = TagField(required=False)
 
     class Meta:
         model = Circuit
@@ -164,16 +117,6 @@ class CircuitForm(BootstrapMixin, TenancyForm, CustomFieldForm):
             'install_date': "Format: YYYY-MM-DD",
             'commit_rate': "Committed rate",
         }
-        widgets = {
-            'provider': APISelect(
-                api_url="/api/circuits/providers/"
-            ),
-            'type': APISelect(
-                api_url="/api/circuits/circuit-types/"
-            ),
-            'status': StaticSelect2(),
-
-        }
 
 
 class CircuitCSVForm(forms.ModelForm):
@@ -216,117 +159,105 @@ 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,
-        widget=APISelect(
-            api_url="/api/circuits/circuit-types/"
-        )
-    )
-    provider = forms.ModelChoiceField(
-        queryset=Provider.objects.all(),
-        required=False,
-        widget=APISelect(
-            api_url="/api/circuits/providers/"
-        )
-    )
-    status = forms.ChoiceField(
-        choices=add_blank_choice(CIRCUIT_STATUS_CHOICES),
-        required=False,
-        initial='',
-        widget=StaticSelect2()
-    )
-    tenant = forms.ModelChoiceField(
-        queryset=Tenant.objects.all(),
-        required=False,
-        widget=APISelect(
-            api_url="/api/tenancy/tenants/"
-        )
-    )
-    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.all(),
-        to_field_name='slug',
-        widget=APISelectMultiple(
-            api_url="/api/circuits/circuit-types/",
-            value_field="slug",
-        )
+        queryset=CircuitType.objects.annotate(filter_count=Count('circuits')),
+        to_field_name='slug'
     )
     provider = FilterChoiceField(
-        queryset=Provider.objects.all(),
-        to_field_name='slug',
-        widget=APISelectMultiple(
-            api_url="/api/circuits/providers/",
-            value_field="slug",
-        )
+        queryset=Provider.objects.annotate(filter_count=Count('circuits')),
+        to_field_name='slug'
     )
-    status = forms.MultipleChoiceField(
+    status = AnnotatedMultipleChoiceField(
         choices=CIRCUIT_STATUS_CHOICES,
-        required=False,
-        widget=StaticSelect2Multiple()
+        annotate=Circuit.objects.all(),
+        annotate_field='status',
+        required=False
     )
     tenant = FilterChoiceField(
-        queryset=Tenant.objects.all(),
+        queryset=Tenant.objects.annotate(filter_count=Count('circuits')),
         to_field_name='slug',
-        null_label='-- None --',
-        widget=APISelectMultiple(
-            api_url="/api/tenancy/tenants/",
-            value_field="slug",
-            null_option=True,
-        )
+        null_label='-- None --'
     )
     site = FilterChoiceField(
-        queryset=Site.objects.all(),
-        to_field_name='slug',
-        widget=APISelectMultiple(
-            api_url="/api/dcim/sites/",
-            value_field="slug",
-        )
-    )
-    commit_rate = forms.IntegerField(
-        required=False,
-        min_value=0,
-        label='Commit rate (Kbps)'
+        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)')
 
 
 #
 # Circuit terminations
 #
 
-class CircuitTerminationForm(BootstrapMixin, forms.ModelForm):
+class CircuitTerminationForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm):
+    site = forms.ModelChoiceField(
+        queryset=Site.objects.all(),
+        widget=forms.Select(
+            attrs={'filter-for': 'rack'}
+        )
+    )
+    rack = ChainedModelChoiceField(
+        queryset=Rack.objects.all(),
+        chains=(
+            ('site', 'site'),
+        ),
+        required=False,
+        label='Rack',
+        widget=APISelect(
+            api_url='/api/dcim/racks/?site_id={{site}}',
+            attrs={'filter-for': 'device', 'nullable': 'true'}
+        )
+    )
+    device = ChainedModelChoiceField(
+        queryset=Device.objects.all(),
+        chains=(
+            ('site', 'site'),
+            ('rack', 'rack'),
+        ),
+        required=False,
+        label='Device',
+        widget=APISelect(
+            api_url='/api/dcim/devices/?site_id={{site}}&rack_id={{rack}}',
+            display_field='display_name',
+            attrs={'filter-for': 'interface'}
+        )
+    )
+    interface = ChainedModelChoiceField(
+        queryset=Interface.objects.connectable().select_related(
+            'circuit_termination', 'connected_as_a', 'connected_as_b'
+        ),
+        chains=(
+            ('device', 'device'),
+        ),
+        required=False,
+        label='Interface',
+        widget=APISelect(
+            api_url='/api/dcim/interfaces/?device_id={{device}}&type=physical',
+            disabled_indicator='is_connected'
+        )
+    )
 
     class Meta:
         model = CircuitTermination
         fields = [
-            'term_side', 'site', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'description',
+            'term_side', 'site', 'rack', 'device', 'interface', 'port_speed', 'upstream_speed', 'xconnect_id',
+            'pp_info',
         ]
         help_texts = {
             'port_speed': "Physical circuit speed",
@@ -335,7 +266,26 @@ class CircuitTerminationForm(BootstrapMixin, forms.ModelForm):
         }
         widgets = {
             'term_side': forms.HiddenInput(),
-            'site': APISelect(
-                api_url="/api/dcim/sites/"
-            )
         }
+
+    def __init__(self, *args, **kwargs):
+
+        # Initialize helper selectors
+        instance = kwargs.get('instance')
+        if instance and instance.interface is not None:
+            initial = kwargs.get('initial', {}).copy()
+            initial['rack'] = instance.interface.device.rack
+            initial['device'] = instance.interface.device
+            kwargs['initial'] = initial
+
+        super(CircuitTerminationForm, self).__init__(*args, **kwargs)
+
+        # Mark connected interfaces as disabled
+        self.fields['interface'].choices = []
+        for iface in self.fields['interface'].queryset:
+            self.fields['interface'].choices.append(
+                (iface.id, {
+                    'label': iface.name,
+                    'disabled': iface.is_connected and iface.pk != self.initial.get('interface'),
+                })
+            )

netbox/circuits/migrations/0001_initial.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-06-22 18:21
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 
 

netbox/circuits/migrations/0001_initial_squashed_0010_circuit_status.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.14 on 2018-07-31 02:25
+from __future__ import unicode_literals
+
 import dcim.fields
 from django.db import migrations, models
 import django.db.models.deletion

netbox/circuits/migrations/0002_auto_20160622_1821.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-06-22 18:21
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/circuits/migrations/0003_provider_32bit_asn_support.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-13 19:24
+from __future__ import unicode_literals
+
 import dcim.fields
 from django.db import migrations
 

netbox/circuits/migrations/0004_circuit_add_tenant.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-07-26 21:59
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/circuits/migrations/0005_circuit_add_upstream_speed.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-08-08 20:24
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 
 

netbox/circuits/migrations/0006_terminations.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-12-13 16:30
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/circuits/migrations/0007_circuit_add_description.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.4 on 2017-01-17 20:08
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 
 

netbox/circuits/migrations/0008_circuittermination_interface_protect_on_delete.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11 on 2017-04-19 17:17
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/circuits/migrations/0009_unicode_literals.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11 on 2017-05-24 15:34
+from __future__ import unicode_literals
+
 import dcim.fields
 from django.db import migrations, models
 

netbox/circuits/migrations/0010_circuit_status.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.9 on 2018-02-06 18:48
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 
 

netbox/circuits/migrations/0011_tags.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.12 on 2018-05-22 19:04
+from __future__ import unicode_literals
+
 from django.db import migrations
 import taggit.managers
 

netbox/circuits/migrations/0012_change_logging.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.12 on 2018-06-13 17:14
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 
 

netbox/circuits/migrations/0013_cables.py

@@ -1,89 +0,0 @@
-import sys
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-from dcim.constants import CONNECTION_STATUS_CONNECTED
-
-
-def circuit_terminations_to_cables(apps, schema_editor):
-    """
-    Copy all existing CircuitTermination Interface associations as Cables
-    """
-    ContentType = apps.get_model('contenttypes', 'ContentType')
-    CircuitTermination = apps.get_model('circuits', 'CircuitTermination')
-    Interface = apps.get_model('dcim', 'Interface')
-    Cable = apps.get_model('dcim', 'Cable')
-
-    # Load content types
-    circuittermination_type = ContentType.objects.get_for_model(CircuitTermination)
-    interface_type = ContentType.objects.get_for_model(Interface)
-
-    # Create a new Cable instance from each console connection
-    if 'test' not in sys.argv:
-        print("\n    Adding circuit terminations... ", end='', flush=True)
-    for circuittermination in CircuitTermination.objects.filter(interface__isnull=False):
-
-        # Create the new Cable
-        cable = Cable.objects.create(
-            termination_a_type=circuittermination_type,
-            termination_a_id=circuittermination.id,
-            termination_b_type=interface_type,
-            termination_b_id=circuittermination.interface_id,
-            status=CONNECTION_STATUS_CONNECTED
-        )
-
-        # Cache the Cable on its two termination points
-        CircuitTermination.objects.filter(pk=circuittermination.pk).update(
-            cable=cable,
-            connected_endpoint=circuittermination.interface,
-            connection_status=CONNECTION_STATUS_CONNECTED
-        )
-        # Cache the connected Cable on the Interface
-        Interface.objects.filter(pk=circuittermination.interface_id).update(
-            cable=cable,
-            _connected_circuittermination=circuittermination,
-            connection_status=CONNECTION_STATUS_CONNECTED
-        )
-
-    cable_count = Cable.objects.filter(termination_a_type=circuittermination_type).count()
-    if 'test' not in sys.argv:
-        print("{} cables created".format(cable_count))
-
-
-class Migration(migrations.Migration):
-    atomic = False
-
-    dependencies = [
-        ('circuits', '0012_change_logging'),
-        ('dcim', '0066_cables'),
-    ]
-
-    operations = [
-
-        # Add new CircuitTermination fields
-        migrations.AddField(
-            model_name='circuittermination',
-            name='connected_endpoint',
-            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Interface'),
-        ),
-        migrations.AddField(
-            model_name='circuittermination',
-            name='connection_status',
-            field=models.NullBooleanField(),
-        ),
-        migrations.AddField(
-            model_name='circuittermination',
-            name='cable',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable'),
-        ),
-
-        # Copy CircuitTermination connections to Interfaces as Cables
-        migrations.RunPython(circuit_terminations_to_cables),
-
-        # Remove interface field from CircuitTermination
-        migrations.RemoveField(
-            model_name='circuittermination',
-            name='interface',
-        ),
-    ]

netbox/circuits/migrations/0014_circuittermination_description.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.1.3 on 2018-11-05 18:38
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('circuits', '0013_cables'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='circuittermination',
-            name='description',
-            field=models.CharField(blank=True, max_length=100),
-        ),
-    ]

netbox/circuits/migrations/0015_custom_tag_models.py

@@ -1,25 +0,0 @@
-# Generated by Django 2.1.4 on 2019-02-20 06:56
-
-from django.db import migrations
-import taggit.managers
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('circuits', '0014_circuittermination_description'),
-        ('extras', '0019_tag_taggeditem'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='circuit',
-            name='tags',
-            field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'),
-        ),
-        migrations.AlterField(
-            model_name='provider',
-            name='tags',
-            field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'),
-        ),
-    ]

netbox/circuits/models.py

@@ -1,17 +1,20 @@
+from __future__ import unicode_literals
+
 from django.contrib.contenttypes.fields import GenericRelation
 from django.db import models
 from django.urls import reverse
+from django.utils.encoding import python_2_unicode_compatible
 from taggit.managers import TaggableManager
 
-from dcim.constants import CONNECTION_STATUS_CHOICES, STATUS_CLASSES
+from dcim.constants import STATUS_CLASSES
 from dcim.fields import ASNField
-from dcim.models import CableTermination
-from extras.models import CustomFieldModel, ObjectChange, TaggedItem
+from extras.models import CustomFieldModel, ObjectChange
 from utilities.models import ChangeLoggedModel
 from utilities.utils import serialize_object
 from .constants import CIRCUIT_STATUS_ACTIVE, CIRCUIT_STATUS_CHOICES, TERM_SIDE_CHOICES
 
 
+@python_2_unicode_compatible
 class Provider(ChangeLoggedModel, CustomFieldModel):
     """
     Each Circuit belongs to a Provider. This is usually a telecommunications company or similar organization. This model
@@ -55,7 +58,7 @@ class Provider(ChangeLoggedModel, CustomFieldModel):
         object_id_field='obj_id'
     )
 
-    tags = TaggableManager(through=TaggedItem)
+    tags = TaggableManager()
 
     csv_headers = ['name', 'slug', 'asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', 'comments']
 
@@ -81,6 +84,7 @@ class Provider(ChangeLoggedModel, CustomFieldModel):
         )
 
 
+@python_2_unicode_compatible
 class CircuitType(ChangeLoggedModel):
     """
     Circuits can be organized by their functional role. For example, a user might wish to define CircuitTypes named
@@ -112,11 +116,12 @@ class CircuitType(ChangeLoggedModel):
         )
 
 
+@python_2_unicode_compatible
 class Circuit(ChangeLoggedModel, CustomFieldModel):
     """
     A communications circuit connects two points. Each Circuit belongs to a Provider; Providers may have multiple
-    circuits. Each circuit is also assigned a CircuitType and a Site.  Circuit port speed and commit rate are measured
-    in Kbps.
+    circuits. Each circuit is also assigned a CircuitType and a Site. A Circuit may be terminated to a specific device
+    interface, but this is not required. Circuit port speed and commit rate are measured in Kbps.
     """
     cid = models.CharField(
         max_length=50,
@@ -165,7 +170,7 @@ class Circuit(ChangeLoggedModel, CustomFieldModel):
         object_id_field='obj_id'
     )
 
-    tags = TaggableManager(through=TaggedItem)
+    tags = TaggableManager()
 
     csv_headers = [
         'cid', 'provider', 'type', 'status', 'tenant', 'install_date', 'commit_rate', 'description', 'comments',
@@ -176,7 +181,7 @@ class Circuit(ChangeLoggedModel, CustomFieldModel):
         unique_together = ['provider', 'cid']
 
     def __str__(self):
-        return self.cid
+        return '{} {}'.format(self.provider, self.cid)
 
     def get_absolute_url(self):
         return reverse('circuits:circuit', args=[self.pk])
@@ -212,7 +217,8 @@ class Circuit(ChangeLoggedModel, CustomFieldModel):
         return self._get_termination('Z')
 
 
-class CircuitTermination(CableTermination):
+@python_2_unicode_compatible
+class CircuitTermination(models.Model):
     circuit = models.ForeignKey(
         to='circuits.Circuit',
         on_delete=models.CASCADE,
@@ -228,17 +234,13 @@ class CircuitTermination(CableTermination):
         on_delete=models.PROTECT,
         related_name='circuit_terminations'
     )
-    connected_endpoint = models.OneToOneField(
+    interface = models.OneToOneField(
         to='dcim.Interface',
-        on_delete=models.SET_NULL,
-        related_name='+',
+        on_delete=models.PROTECT,
+        related_name='circuit_termination',
         blank=True,
         null=True
     )
-    connection_status = models.NullBooleanField(
-        choices=CONNECTION_STATUS_CHOICES,
-        blank=True
-    )
     port_speed = models.PositiveIntegerField(
         verbose_name='Port speed (Kbps)'
     )
@@ -258,17 +260,13 @@ class CircuitTermination(CableTermination):
         blank=True,
         verbose_name='Patch panel/port(s)'
     )
-    description = models.CharField(
-        max_length=100,
-        blank=True
-    )
 
     class Meta:
         ordering = ['circuit', 'term_side']
         unique_together = ['circuit', 'term_side']
 
     def __str__(self):
-        return 'Side {}'.format(self.get_term_side_display())
+        return '{} (Side {})'.format(self.circuit, self.get_term_side_display())
 
     def log_change(self, user, request_id, action):
         """
@@ -283,10 +281,6 @@ class CircuitTermination(CableTermination):
             object_data=serialize_object(self)
         ).save()
 
-    @property
-    def parent(self):
-        return self.circuit
-
     def get_peer_termination(self):
         peer_side = 'Z' if self.term_side == 'A' else 'A'
         try:

netbox/circuits/signals.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver
 from django.utils import timezone

netbox/circuits/tables.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import django_tables2 as tables
 from django.utils.safestring import mark_safe
 from django_tables2.utils import Accessor
@@ -11,7 +13,7 @@ CIRCUITTYPE_ACTIONS = """
     <i class="fa fa-history"></i>
 </a>
 {% if perms.circuit.change_circuittype %}
-    <a href="{% url 'circuits:circuittype_edit' slug=record.slug %}?return_url={{ request.path }}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
+    <a href="{% url 'circuits:circuittype_edit' slug=record.slug %}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
 {% endif %}
 """
 
@@ -23,6 +25,12 @@ STATUS_LABEL = """
 class CircuitTerminationColumn(tables.Column):
 
     def render(self, value):
+        if value.interface:
+            return mark_safe('<a href="{}" title="{}">{}</a>'.format(
+                value.interface.device.get_absolute_url(),
+                value.site,
+                value.interface.device
+            ))
         return mark_safe('<a href="{}">{}</a>'.format(
             value.site.get_absolute_url(),
             value.site
@@ -59,7 +67,7 @@ class CircuitTypeTable(BaseTable):
     name = tables.LinkColumn()
     circuit_count = tables.Column(verbose_name='Circuits')
     actions = tables.TemplateColumn(
-        template_code=CIRCUITTYPE_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name=''
+        template_code=CIRCUITTYPE_ACTIONS, attrs={'td': {'class': 'text-right'}}, verbose_name=''
     )
 
     class Meta(BaseTable.Meta):

netbox/circuits/tests/test_api.py

@@ -1,9 +1,11 @@
+from __future__ import unicode_literals
+
 from django.urls import reverse
 from rest_framework import status
 
 from circuits.constants import CIRCUIT_STATUS_ACTIVE, TERM_SIDE_A, TERM_SIDE_Z
 from circuits.models import Circuit, CircuitTermination, CircuitType, Provider
-from dcim.models import Device, DeviceRole, DeviceType, Interface, Manufacturer, Site
+from dcim.models import Site
 from extras.constants import GRAPH_TYPE_PROVIDER
 from extras.models import Graph
 from utilities.testing import APITestCase
@@ -13,7 +15,7 @@ class ProviderTest(APITestCase):
 
     def setUp(self):
 
-        super().setUp()
+        super(ProviderTest, self).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')
@@ -54,16 +56,6 @@ class ProviderTest(APITestCase):
 
         self.assertEqual(response.data['count'], 3)
 
-    def test_list_providers_brief(self):
-
-        url = reverse('circuits-api:provider-list')
-        response = self.client.get('{}?brief=1'.format(url), **self.header)
-
-        self.assertEqual(
-            sorted(response.data['results'][0]),
-            ['circuit_count', 'id', 'name', 'slug', 'url']
-        )
-
     def test_create_provider(self):
 
         data = {
@@ -135,7 +127,7 @@ class CircuitTypeTest(APITestCase):
 
     def setUp(self):
 
-        super().setUp()
+        super(CircuitTypeTest, self).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')
@@ -155,16 +147,6 @@ class CircuitTypeTest(APITestCase):
 
         self.assertEqual(response.data['count'], 3)
 
-    def test_list_circuittypes_brief(self):
-
-        url = reverse('circuits-api:circuittype-list')
-        response = self.client.get('{}?brief=1'.format(url), **self.header)
-
-        self.assertEqual(
-            sorted(response.data['results'][0]),
-            ['circuit_count', 'id', 'name', 'slug', 'url']
-        )
-
     def test_create_circuittype(self):
 
         data = {
@@ -210,7 +192,7 @@ class CircuitTest(APITestCase):
 
     def setUp(self):
 
-        super().setUp()
+        super(CircuitTest, self).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')
@@ -234,16 +216,6 @@ class CircuitTest(APITestCase):
 
         self.assertEqual(response.data['count'], 3)
 
-    def test_list_circuits_brief(self):
-
-        url = reverse('circuits-api:circuit-list')
-        response = self.client.get('{}?brief=1'.format(url), **self.header)
-
-        self.assertEqual(
-            sorted(response.data['results'][0]),
-            ['cid', 'id', 'url']
-        )
-
     def test_create_circuit(self):
 
         data = {
@@ -326,26 +298,23 @@ class CircuitTerminationTest(APITestCase):
 
     def setUp(self):
 
-        super().setUp()
+        super(CircuitTerminationTest, self).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')
         provider = Provider.objects.create(name='Test Provider', slug='test-provider')
         circuittype = CircuitType.objects.create(name='Test Circuit Type', slug='test-circuit-type')
         self.circuit1 = Circuit.objects.create(cid='TEST0001', provider=provider, type=circuittype)
         self.circuit2 = Circuit.objects.create(cid='TEST0002', provider=provider, type=circuittype)
         self.circuit3 = Circuit.objects.create(cid='TEST0003', provider=provider, type=circuittype)
+        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')
         self.circuittermination1 = CircuitTermination.objects.create(
             circuit=self.circuit1, term_side=TERM_SIDE_A, site=self.site1, port_speed=1000000
         )
         self.circuittermination2 = CircuitTermination.objects.create(
-            circuit=self.circuit1, term_side=TERM_SIDE_Z, site=self.site2, port_speed=1000000
-        )
-        self.circuittermination3 = CircuitTermination.objects.create(
             circuit=self.circuit2, term_side=TERM_SIDE_A, site=self.site1, port_speed=1000000
         )
-        self.circuittermination4 = CircuitTermination.objects.create(
-            circuit=self.circuit2, term_side=TERM_SIDE_Z, site=self.site2, port_speed=1000000
+        self.circuittermination3 = CircuitTermination.objects.create(
+            circuit=self.circuit3, term_side=TERM_SIDE_A, site=self.site1, port_speed=1000000
         )
 
     def test_get_circuittermination(self):
@@ -360,14 +329,14 @@ class CircuitTerminationTest(APITestCase):
         url = reverse('circuits-api:circuittermination-list')
         response = self.client.get(url, **self.header)
 
-        self.assertEqual(response.data['count'], 4)
+        self.assertEqual(response.data['count'], 3)
 
     def test_create_circuittermination(self):
 
         data = {
-            'circuit': self.circuit3.pk,
-            'term_side': TERM_SIDE_A,
-            'site': self.site1.pk,
+            'circuit': self.circuit1.pk,
+            'term_side': TERM_SIDE_Z,
+            'site': self.site2.pk,
             'port_speed': 1000000,
         }
 
@@ -375,7 +344,7 @@ class CircuitTerminationTest(APITestCase):
         response = self.client.post(url, data, format='json', **self.header)
 
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(CircuitTermination.objects.count(), 5)
+        self.assertEqual(CircuitTermination.objects.count(), 4)
         circuittermination4 = CircuitTermination.objects.get(pk=response.data['id'])
         self.assertEqual(circuittermination4.circuit_id, data['circuit'])
         self.assertEqual(circuittermination4.term_side, data['term_side'])
@@ -384,23 +353,20 @@ class CircuitTerminationTest(APITestCase):
 
     def test_update_circuittermination(self):
 
-        circuittermination5 = CircuitTermination.objects.create(
-            circuit=self.circuit3, term_side=TERM_SIDE_A, site=self.site1, port_speed=1000000
-        )
-
         data = {
-            'circuit': self.circuit3.pk,
+            'circuit': self.circuit1.pk,
             'term_side': TERM_SIDE_Z,
             'site': self.site2.pk,
             'port_speed': 1000000,
         }
 
-        url = reverse('circuits-api:circuittermination-detail', kwargs={'pk': circuittermination5.pk})
+        url = reverse('circuits-api:circuittermination-detail', kwargs={'pk': self.circuittermination1.pk})
         response = self.client.put(url, data, format='json', **self.header)
 
         self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(CircuitTermination.objects.count(), 5)
+        self.assertEqual(CircuitTermination.objects.count(), 3)
         circuittermination1 = CircuitTermination.objects.get(pk=response.data['id'])
+        self.assertEqual(circuittermination1.circuit_id, data['circuit'])
         self.assertEqual(circuittermination1.term_side, data['term_side'])
         self.assertEqual(circuittermination1.site_id, data['site'])
         self.assertEqual(circuittermination1.port_speed, data['port_speed'])
@@ -411,4 +377,4 @@ class CircuitTerminationTest(APITestCase):
         response = self.client.delete(url, **self.header)
 
         self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
-        self.assertEqual(CircuitTermination.objects.count(), 3)
+        self.assertEqual(CircuitTermination.objects.count(), 2)

netbox/circuits/tests/test_views.py

@@ -1,95 +0,0 @@
-import urllib.parse
-
-from django.test import Client, TestCase
-from django.urls import reverse
-
-from circuits.models import Circuit, CircuitType, Provider
-from utilities.testing import create_test_user
-
-
-class ProviderTestCase(TestCase):
-
-    def setUp(self):
-        user = create_test_user(permissions=['circuits.view_provider'])
-        self.client = Client()
-        self.client.force_login(user)
-
-        Provider.objects.bulk_create([
-            Provider(name='Provider 1', slug='provider-1', asn=65001),
-            Provider(name='Provider 2', slug='provider-2', asn=65002),
-            Provider(name='Provider 3', slug='provider-3', asn=65003),
-        ])
-
-    def test_provider_list(self):
-
-        url = reverse('circuits:provider_list')
-        params = {
-            "q": "test",
-        }
-
-        response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
-
-    def test_provider(self):
-
-        provider = Provider.objects.first()
-        response = self.client.get(provider.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
-
-
-class CircuitTypeTestCase(TestCase):
-
-    def setUp(self):
-        user = create_test_user(permissions=['circuits.view_circuittype'])
-        self.client = Client()
-        self.client.force_login(user)
-
-        CircuitType.objects.bulk_create([
-            CircuitType(name='Circuit Type 1', slug='circuit-type-1'),
-            CircuitType(name='Circuit Type 2', slug='circuit-type-2'),
-            CircuitType(name='Circuit Type 3', slug='circuit-type-3'),
-        ])
-
-    def test_circuittype_list(self):
-
-        url = reverse('circuits:circuittype_list')
-
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-
-class CircuitTestCase(TestCase):
-
-    def setUp(self):
-        user = create_test_user(permissions=['circuits.view_circuit'])
-        self.client = Client()
-        self.client.force_login(user)
-
-        provider = Provider(name='Provider 1', slug='provider-1', asn=65001)
-        provider.save()
-
-        circuittype = CircuitType(name='Circuit Type 1', slug='circuit-type-1')
-        circuittype.save()
-
-        Circuit.objects.bulk_create([
-            Circuit(cid='Circuit 1', provider=provider, type=circuittype),
-            Circuit(cid='Circuit 2', provider=provider, type=circuittype),
-            Circuit(cid='Circuit 3', provider=provider, type=circuittype),
-        ])
-
-    def test_circuit_list(self):
-
-        url = reverse('circuits:circuit_list')
-        params = {
-            "provider": Provider.objects.first().slug,
-            "type": CircuitType.objects.first().slug,
-        }
-
-        response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
-
-    def test_circuit(self):
-
-        circuit = Circuit.objects.first()
-        response = self.client.get(circuit.get_absolute_url())
-        self.assertEqual(response.status_code, 200)

netbox/circuits/urls.py

@@ -1,9 +1,10 @@
+from __future__ import unicode_literals
+
 from django.conf.urls import url
 
-from dcim.views import CableCreateView, CableTraceView
 from extras.views import ObjectChangeLogView
 from . import views
-from .models import Circuit, CircuitTermination, CircuitType, Provider
+from .models import Circuit, CircuitType, Provider
 
 app_name = 'circuits'
 urlpatterns = [
@@ -43,7 +44,5 @@ urlpatterns = [
     url(r'^circuits/(?P<circuit>\d+)/terminations/add/$', views.CircuitTerminationCreateView.as_view(), name='circuittermination_add'),
     url(r'^circuit-terminations/(?P<pk>\d+)/edit/$', views.CircuitTerminationEditView.as_view(), name='circuittermination_edit'),
     url(r'^circuit-terminations/(?P<pk>\d+)/delete/$', views.CircuitTerminationDeleteView.as_view(), name='circuittermination_delete'),
-    url(r'^circuit-terminations/(?P<termination_a_id>\d+)/connect/(?P<termination_b_type>[\w-]+)/$', CableCreateView.as_view(), name='circuittermination_connect', kwargs={'termination_a_type': CircuitTermination}),
-    url(r'^circuit-terminations/(?P<pk>\d+)/trace/$', CableTraceView.as_view(), name='circuittermination_trace', kwargs={'model': CircuitTermination}),
 
 ]

netbox/circuits/views.py

@@ -1,11 +1,11 @@
-from django.conf import settings
+from __future__ import unicode_literals
+
 from django.contrib import messages
 from django.contrib.auth.decorators import permission_required
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db import transaction
 from django.db.models import Count
 from django.shortcuts import get_object_or_404, redirect, render
-from django.utils.decorators import method_decorator
 from django.views.generic import View
 
 from extras.models import Graph, GRAPH_TYPE_PROVIDER
@@ -22,8 +22,7 @@ from .models import Circuit, CircuitTermination, CircuitType, Provider
 # Providers
 #
 
-class ProviderListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'circuits.view_provider'
+class ProviderListView(ObjectListView):
     queryset = Provider.objects.annotate(count_circuits=Count('circuits'))
     filter = filters.ProviderFilter
     filter_form = forms.ProviderFilterForm
@@ -31,8 +30,7 @@ class ProviderListView(PermissionRequiredMixin, ObjectListView):
     template_name = 'circuits/provider_list.html'
 
 
-class ProviderView(PermissionRequiredMixin, View):
-    permission_required = 'circuits.view_provider'
+class ProviderView(View):
 
     def get(self, request, slug):
 
@@ -97,8 +95,7 @@ class ProviderBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Circuit Types
 #
 
-class CircuitTypeListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'circuits.view_circuittype'
+class CircuitTypeListView(ObjectListView):
     queryset = CircuitType.objects.annotate(circuit_count=Count('circuits'))
     table = tables.CircuitTypeTable
     template_name = 'circuits/circuittype_list.html'
@@ -133,12 +130,11 @@ class CircuitTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Circuits
 #
 
-class CircuitListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'circuits.view_circuit'
+class CircuitListView(ObjectListView):
     queryset = Circuit.objects.select_related(
         'provider', 'type', 'tenant'
     ).prefetch_related(
-        'terminations__site'
+        'terminations__site', 'terminations__interface__device'
     )
     filter = filters.CircuitFilter
     filter_form = forms.CircuitFilterForm
@@ -146,19 +142,18 @@ class CircuitListView(PermissionRequiredMixin, ObjectListView):
     template_name = 'circuits/circuit_list.html'
 
 
-class CircuitView(PermissionRequiredMixin, View):
-    permission_required = 'circuits.view_circuit'
+class CircuitView(View):
 
     def get(self, request, pk):
 
         circuit = get_object_or_404(Circuit.objects.select_related('provider', 'type', 'tenant__group'), pk=pk)
         termination_a = CircuitTermination.objects.select_related(
-            'site__region', 'connected_endpoint__device'
+            'site__region', 'interface__device'
         ).filter(
             circuit=circuit, term_side=TERM_SIDE_A
         ).first()
         termination_z = CircuitTermination.objects.select_related(
-            'site__region', 'connected_endpoint__device'
+            'site__region', 'interface__device'
         ).filter(
             circuit=circuit, term_side=TERM_SIDE_Z
         ).first()

netbox/dcim/api/exceptions.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from rest_framework.exceptions import APIException
 
 

netbox/dcim/api/nested_serializers.py

@@ -1,283 +0,0 @@
-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, PowerFeed, PowerOutlet, PowerPanel, 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',
-    'NestedPowerFeedSerializer',
-    'NestedPowerOutletSerializer',
-    'NestedPowerPanelSerializer',
-    'NestedPowerPortSerializer',
-    'NestedRackGroupSerializer',
-    'NestedRackRoleSerializer',
-    'NestedRackSerializer',
-    'NestedRearPortSerializer',
-    'NestedRearPortTemplateSerializer',
-    'NestedRegionSerializer',
-    'NestedSiteSerializer',
-    'NestedVirtualChassisSerializer',
-]
-
-
-#
-# Regions/sites
-#
-
-class NestedRegionSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:region-detail')
-    site_count = serializers.IntegerField(read_only=True)
-
-    class Meta:
-        model = Region
-        fields = ['id', 'url', 'name', 'slug', 'site_count']
-
-
-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')
-    rack_count = serializers.IntegerField(read_only=True)
-
-    class Meta:
-        model = RackGroup
-        fields = ['id', 'url', 'name', 'slug', 'rack_count']
-
-
-class NestedRackRoleSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackrole-detail')
-    rack_count = serializers.IntegerField(read_only=True)
-
-    class Meta:
-        model = RackRole
-        fields = ['id', 'url', 'name', 'slug', 'rack_count']
-
-
-class NestedRackSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rack-detail')
-    device_count = serializers.IntegerField(read_only=True)
-
-    class Meta:
-        model = Rack
-        fields = ['id', 'url', 'name', 'display_name', 'device_count']
-
-
-#
-# Device types
-#
-
-class NestedManufacturerSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:manufacturer-detail')
-    devicetype_count = serializers.IntegerField(read_only=True)
-
-    class Meta:
-        model = Manufacturer
-        fields = ['id', 'url', 'name', 'slug', 'devicetype_count']
-
-
-class NestedDeviceTypeSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicetype-detail')
-    manufacturer = NestedManufacturerSerializer(read_only=True)
-    device_count = serializers.IntegerField(read_only=True)
-
-    class Meta:
-        model = DeviceType
-        fields = ['id', 'url', 'manufacturer', 'model', 'slug', 'display_name', 'device_count']
-
-
-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')
-    device_count = serializers.IntegerField(read_only=True)
-    virtualmachine_count = serializers.IntegerField(read_only=True)
-
-    class Meta:
-        model = DeviceRole
-        fields = ['id', 'url', 'name', 'slug', 'device_count', 'virtualmachine_count']
-
-
-class NestedPlatformSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:platform-detail')
-    device_count = serializers.IntegerField(read_only=True)
-    virtualmachine_count = serializers.IntegerField(read_only=True)
-
-    class Meta:
-        model = Platform
-        fields = ['id', 'url', 'name', 'slug', 'device_count', 'virtualmachine_count']
-
-
-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()
-    member_count = serializers.IntegerField(read_only=True)
-
-    class Meta:
-        model = VirtualChassis
-        fields = ['id', 'url', 'master', 'member_count']
-
-
-#
-# Power panels/feeds
-#
-
-class NestedPowerPanelSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerpanel-detail')
-    powerfeed_count = serializers.IntegerField(read_only=True)
-
-    class Meta:
-        model = PowerPanel
-        fields = ['id', 'url', 'name', 'powerfeed_count']
-
-
-class NestedPowerFeedSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerfeed-detail')
-
-    class Meta:
-        model = PowerFeed
-        fields = ['id', 'url', 'name']

netbox/dcim/api/urls.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from rest_framework import routers
 
 from . import views
@@ -15,7 +17,7 @@ router = routers.DefaultRouter()
 router.APIRootView = DCIMRootView
 
 # Field choices
-router.register(r'_choices', views.DCIMFieldChoicesViewSet, basename='field-choice')
+router.register(r'_choices', views.DCIMFieldChoicesViewSet, base_name='field-choice')
 
 # Sites
 router.register(r'regions', views.RegionViewSet)
@@ -37,8 +39,6 @@ router.register(r'console-server-port-templates', views.ConsoleServerPortTemplat
 router.register(r'power-port-templates', views.PowerPortTemplateViewSet)
 router.register(r'power-outlet-templates', views.PowerOutletTemplateViewSet)
 router.register(r'interface-templates', views.InterfaceTemplateViewSet)
-router.register(r'front-port-templates', views.FrontPortTemplateViewSet)
-router.register(r'rear-port-templates', views.RearPortTemplateViewSet)
 router.register(r'device-bay-templates', views.DeviceBayTemplateViewSet)
 
 # Devices
@@ -52,28 +52,19 @@ router.register(r'console-server-ports', views.ConsoleServerPortViewSet)
 router.register(r'power-ports', views.PowerPortViewSet)
 router.register(r'power-outlets', views.PowerOutletViewSet)
 router.register(r'interfaces', views.InterfaceViewSet)
-router.register(r'front-ports', views.FrontPortViewSet)
-router.register(r'rear-ports', views.RearPortViewSet)
 router.register(r'device-bays', views.DeviceBayViewSet)
 router.register(r'inventory-items', views.InventoryItemViewSet)
 
 # Connections
-router.register(r'console-connections', views.ConsoleConnectionViewSet, basename='consoleconnections')
-router.register(r'power-connections', views.PowerConnectionViewSet, basename='powerconnections')
-router.register(r'interface-connections', views.InterfaceConnectionViewSet, basename='interfaceconnections')
-
-# Cables
-router.register(r'cables', views.CableViewSet)
+router.register(r'console-connections', views.ConsoleConnectionViewSet, base_name='consoleconnections')
+router.register(r'power-connections', views.PowerConnectionViewSet, base_name='powerconnections')
+router.register(r'interface-connections', views.InterfaceConnectionViewSet)
 
 # Virtual chassis
 router.register(r'virtual-chassis', views.VirtualChassisViewSet)
 
-# Power
-router.register(r'power-panels', views.PowerPanelViewSet)
-router.register(r'power-feeds', views.PowerFeedViewSet)
-
 # Miscellaneous
-router.register(r'connected-device', views.ConnectedDeviceViewSet, basename='connected-device')
+router.register(r'connected-device', views.ConnectedDeviceViewSet, base_name='connected-device')
 
 app_name = 'dcim-api'
 urlpatterns = router.urls

netbox/dcim/api/views.py

@@ -1,8 +1,9 @@
+from __future__ import unicode_literals
+
 from collections import OrderedDict
 
 from django.conf import settings
-from django.db.models import Count, F
-from django.http import HttpResponseForbidden
+from django.http import HttpResponseBadRequest, HttpResponseForbidden
 from django.shortcuts import get_object_or_404
 from drf_yasg import openapi
 from drf_yasg.openapi import Parameter
@@ -12,24 +13,17 @@ from rest_framework.mixins import ListModelMixin
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet, ViewSet
 
-from circuits.models import Circuit
 from dcim import filters
 from dcim.models import (
-    Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
-    DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate,
-    Manufacturer, InventoryItem, Platform, PowerFeed, PowerOutlet, PowerOutletTemplate, PowerPanel, PowerPort,
-    PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site,
-    VirtualChassis,
+    ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
+    DeviceBayTemplate, DeviceRole, DeviceType, Interface, InterfaceConnection, InterfaceTemplate, Manufacturer,
+    InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup,
+    RackReservation, RackRole, Region, Site, VirtualChassis,
 )
 from extras.api.serializers import RenderedGraphSerializer
 from extras.api.views import CustomFieldModelViewSet
 from extras.models import Graph, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE
-from ipam.models import Prefix, VLAN
-from utilities.api import (
-    get_serializer_for_model, IsAuthenticatedOrLoginNotRequired, FieldChoicesViewSet, ModelViewSet, ServiceUnavailable,
-)
-from utilities.utils import get_subquery
-from virtualization.models import VirtualMachine
+from utilities.api import IsAuthenticatedOrLoginNotRequired, FieldChoicesViewSet, ModelViewSet, ServiceUnavailable
 from . import serializers
 from .exceptions import MissingFilterException
 
@@ -40,68 +34,25 @@ from .exceptions import MissingFilterException
 
 class DCIMFieldChoicesViewSet(FieldChoicesViewSet):
     fields = (
-        (Cable, ['length_unit', 'status', 'termination_a_type', 'termination_b_type', 'type']),
-        (ConsolePort, ['connection_status']),
         (Device, ['face', 'status']),
-        (DeviceType, ['subdevice_role']),
-        (FrontPort, ['type']),
-        (FrontPortTemplate, ['type']),
-        (Interface, ['type', 'mode']),
-        (InterfaceTemplate, ['type']),
-        (PowerOutlet, ['feed_leg']),
-        (PowerOutletTemplate, ['feed_leg']),
+        (ConsolePort, ['connection_status']),
+        (Interface, ['form_factor', 'mode']),
+        (InterfaceConnection, ['connection_status']),
+        (InterfaceTemplate, ['form_factor']),
         (PowerPort, ['connection_status']),
-        (Rack, ['outer_unit', 'status', 'type', 'width']),
-        (RearPort, ['type']),
-        (RearPortTemplate, ['type']),
+        (Rack, ['type', 'width']),
         (Site, ['status']),
     )
 
 
-# Mixins
-
-class CableTraceMixin(object):
-
-    @action(detail=True, url_path='trace')
-    def trace(self, request, pk):
-        """
-        Trace a complete cable path and return each segment as a three-tuple of (termination, cable, termination).
-        """
-        obj = get_object_or_404(self.queryset.model, pk=pk)
-
-        # Initialize the path array
-        path = []
-
-        for near_end, cable, far_end in obj.trace(follow_circuits=True):
-
-            # Serialize each object
-            serializer_a = get_serializer_for_model(near_end, prefix='Nested')
-            x = serializer_a(near_end, context={'request': request}).data
-            if cable is not None:
-                y = serializers.TracedCableSerializer(cable, context={'request': request}).data
-            else:
-                y = None
-            if far_end is not None:
-                serializer_b = get_serializer_for_model(far_end, prefix='Nested')
-                z = serializer_b(far_end, context={'request': request}).data
-            else:
-                z = None
-
-            path.append((x, y, z))
-
-        return Response(path)
-
-
 #
 # Regions
 #
 
 class RegionViewSet(ModelViewSet):
-    queryset = Region.objects.annotate(
-        site_count=Count('sites')
-    )
+    queryset = Region.objects.all()
     serializer_class = serializers.RegionSerializer
-    filterset_class = filters.RegionFilter
+    filter_class = filters.RegionFilter
 
 
 #
@@ -109,20 +60,9 @@ class RegionViewSet(ModelViewSet):
 #
 
 class SiteViewSet(CustomFieldModelViewSet):
-    queryset = Site.objects.select_related(
-        'region', 'tenant'
-    ).prefetch_related(
-        'tags'
-    ).annotate(
-        device_count=get_subquery(Device, 'site'),
-        rack_count=get_subquery(Rack, 'site'),
-        prefix_count=get_subquery(Prefix, 'site'),
-        vlan_count=get_subquery(VLAN, 'site'),
-        circuit_count=get_subquery(Circuit, 'terminations__site'),
-        virtualmachine_count=get_subquery(VirtualMachine, 'cluster__site'),
-    )
+    queryset = Site.objects.select_related('region', 'tenant')
     serializer_class = serializers.SiteSerializer
-    filterset_class = filters.SiteFilter
+    filter_class = filters.SiteFilter
 
     @action(detail=True)
     def graphs(self, request, pk=None):
@@ -140,11 +80,9 @@ class SiteViewSet(CustomFieldModelViewSet):
 #
 
 class RackGroupViewSet(ModelViewSet):
-    queryset = RackGroup.objects.select_related('site').annotate(
-        rack_count=Count('racks')
-    )
+    queryset = RackGroup.objects.select_related('site')
     serializer_class = serializers.RackGroupSerializer
-    filterset_class = filters.RackGroupFilter
+    filter_class = filters.RackGroupFilter
 
 
 #
@@ -152,11 +90,9 @@ class RackGroupViewSet(ModelViewSet):
 #
 
 class RackRoleViewSet(ModelViewSet):
-    queryset = RackRole.objects.annotate(
-        rack_count=Count('racks')
-    )
+    queryset = RackRole.objects.all()
     serializer_class = serializers.RackRoleSerializer
-    filterset_class = filters.RackRoleFilter
+    filter_class = filters.RackRoleFilter
 
 
 #
@@ -164,16 +100,9 @@ class RackRoleViewSet(ModelViewSet):
 #
 
 class RackViewSet(CustomFieldModelViewSet):
-    queryset = Rack.objects.select_related(
-        'site', 'group__site', 'role', 'tenant'
-    ).prefetch_related(
-        'tags'
-    ).annotate(
-        device_count=get_subquery(Device, 'rack'),
-        powerfeed_count=get_subquery(PowerFeed, 'rack')
-    )
+    queryset = Rack.objects.select_related('site', 'group__site', 'tenant')
     serializer_class = serializers.RackSerializer
-    filterset_class = filters.RackFilter
+    filter_class = filters.RackFilter
 
     @action(detail=True)
     def units(self, request, pk=None):
@@ -190,11 +119,6 @@ class RackViewSet(CustomFieldModelViewSet):
                 exclude_pk = None
         elevation = rack.get_rack_units(face, exclude_pk)
 
-        # Enable filtering rack units by ID
-        q = request.GET.get('q', None)
-        if q:
-            elevation = [u for u in elevation if q in str(u['id'])]
-
         page = self.paginate_queryset(elevation)
         if page is not None:
             rack_units = serializers.RackUnitSerializer(page, many=True, context={'request': request})
@@ -208,7 +132,7 @@ class RackViewSet(CustomFieldModelViewSet):
 class RackReservationViewSet(ModelViewSet):
     queryset = RackReservation.objects.select_related('rack', 'user', 'tenant')
     serializer_class = serializers.RackReservationSerializer
-    filterset_class = filters.RackReservationFilter
+    filter_class = filters.RackReservationFilter
 
     # Assign user from request
     def perform_create(self, serializer):
@@ -220,13 +144,9 @@ class RackReservationViewSet(ModelViewSet):
 #
 
 class ManufacturerViewSet(ModelViewSet):
-    queryset = Manufacturer.objects.annotate(
-        devicetype_count=get_subquery(DeviceType, 'manufacturer'),
-        inventoryitem_count=get_subquery(InventoryItem, 'manufacturer'),
-        platform_count=get_subquery(Platform, 'manufacturer')
-    )
+    queryset = Manufacturer.objects.all()
     serializer_class = serializers.ManufacturerSerializer
-    filterset_class = filters.ManufacturerFilter
+    filter_class = filters.ManufacturerFilter
 
 
 #
@@ -234,11 +154,9 @@ class ManufacturerViewSet(ModelViewSet):
 #
 
 class DeviceTypeViewSet(CustomFieldModelViewSet):
-    queryset = DeviceType.objects.select_related('manufacturer').prefetch_related('tags').annotate(
-        device_count=Count('instances')
-    )
+    queryset = DeviceType.objects.select_related('manufacturer')
     serializer_class = serializers.DeviceTypeSerializer
-    filterset_class = filters.DeviceTypeFilter
+    filter_class = filters.DeviceTypeFilter
 
 
 #
@@ -248,49 +166,37 @@ class DeviceTypeViewSet(CustomFieldModelViewSet):
 class ConsolePortTemplateViewSet(ModelViewSet):
     queryset = ConsolePortTemplate.objects.select_related('device_type__manufacturer')
     serializer_class = serializers.ConsolePortTemplateSerializer
-    filterset_class = filters.ConsolePortTemplateFilter
+    filter_class = filters.ConsolePortTemplateFilter
 
 
 class ConsoleServerPortTemplateViewSet(ModelViewSet):
     queryset = ConsoleServerPortTemplate.objects.select_related('device_type__manufacturer')
     serializer_class = serializers.ConsoleServerPortTemplateSerializer
-    filterset_class = filters.ConsoleServerPortTemplateFilter
+    filter_class = filters.ConsoleServerPortTemplateFilter
 
 
 class PowerPortTemplateViewSet(ModelViewSet):
     queryset = PowerPortTemplate.objects.select_related('device_type__manufacturer')
     serializer_class = serializers.PowerPortTemplateSerializer
-    filterset_class = filters.PowerPortTemplateFilter
+    filter_class = filters.PowerPortTemplateFilter
 
 
 class PowerOutletTemplateViewSet(ModelViewSet):
     queryset = PowerOutletTemplate.objects.select_related('device_type__manufacturer')
     serializer_class = serializers.PowerOutletTemplateSerializer
-    filterset_class = filters.PowerOutletTemplateFilter
+    filter_class = filters.PowerOutletTemplateFilter
 
 
 class InterfaceTemplateViewSet(ModelViewSet):
     queryset = InterfaceTemplate.objects.select_related('device_type__manufacturer')
     serializer_class = serializers.InterfaceTemplateSerializer
-    filterset_class = filters.InterfaceTemplateFilter
-
-
-class FrontPortTemplateViewSet(ModelViewSet):
-    queryset = FrontPortTemplate.objects.select_related('device_type__manufacturer')
-    serializer_class = serializers.FrontPortTemplateSerializer
-    filterset_class = filters.FrontPortTemplateFilter
-
-
-class RearPortTemplateViewSet(ModelViewSet):
-    queryset = RearPortTemplate.objects.select_related('device_type__manufacturer')
-    serializer_class = serializers.RearPortTemplateSerializer
-    filterset_class = filters.RearPortTemplateFilter
+    filter_class = filters.InterfaceTemplateFilter
 
 
 class DeviceBayTemplateViewSet(ModelViewSet):
     queryset = DeviceBayTemplate.objects.select_related('device_type__manufacturer')
     serializer_class = serializers.DeviceBayTemplateSerializer
-    filterset_class = filters.DeviceBayTemplateFilter
+    filter_class = filters.DeviceBayTemplateFilter
 
 
 #
@@ -298,12 +204,9 @@ class DeviceBayTemplateViewSet(ModelViewSet):
 #
 
 class DeviceRoleViewSet(ModelViewSet):
-    queryset = DeviceRole.objects.annotate(
-        device_count=get_subquery(Device, 'device_role'),
-        virtualmachine_count=get_subquery(VirtualMachine, 'role')
-    )
+    queryset = DeviceRole.objects.all()
     serializer_class = serializers.DeviceRoleSerializer
-    filterset_class = filters.DeviceRoleFilter
+    filter_class = filters.DeviceRoleFilter
 
 
 #
@@ -311,12 +214,9 @@ class DeviceRoleViewSet(ModelViewSet):
 #
 
 class PlatformViewSet(ModelViewSet):
-    queryset = Platform.objects.annotate(
-        device_count=get_subquery(Device, 'platform'),
-        virtualmachine_count=get_subquery(VirtualMachine, 'platform')
-    )
+    queryset = Platform.objects.all()
     serializer_class = serializers.PlatformSerializer
-    filterset_class = filters.PlatformFilter
+    filter_class = filters.PlatformFilter
 
 
 #
@@ -328,29 +228,17 @@ class DeviceViewSet(CustomFieldModelViewSet):
         'device_type__manufacturer', 'device_role', 'tenant', 'platform', 'site', 'rack', 'parent_bay',
         'virtual_chassis__master',
     ).prefetch_related(
-        'primary_ip4__nat_outside', 'primary_ip6__nat_outside', 'tags',
+        'primary_ip4__nat_outside', 'primary_ip6__nat_outside',
     )
-    filterset_class = filters.DeviceFilter
+    filter_class = filters.DeviceFilter
 
     def get_serializer_class(self):
         """
-        Select the specific serializer based on the request context.
-
-        If the `brief` query param equates to True, return the NestedDeviceSerializer
-
-        If the `exclude` query param includes `config_context` as a value, return the DeviceSerializer
-
-        Else, return the DeviceWithConfigContextSerializer
+        Include rendered config context when retrieving a single Device.
         """
-
-        request = self.get_serializer_context()['request']
-        if request.query_params.get('brief', False):
-            return serializers.NestedDeviceSerializer
-
-        elif 'config_context' in request.query_params.get('exclude', []):
-            return serializers.DeviceSerializer
-
-        return serializers.DeviceWithConfigContextSerializer
+        if self.action == 'retrieve':
+            return serializers.DeviceWithConfigContextSerializer
+        return serializers.DeviceSerializer
 
     @action(detail=True, url_path='napalm')
     def napalm(self, request, pk):
@@ -370,9 +258,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:
@@ -416,9 +304,7 @@ class DeviceViewSet(CustomFieldModelViewSet):
             try:
                 response[method] = getattr(d, method)()
             except NotImplementedError:
-                response[method] = {'error': 'Method {} not implemented for NAPALM driver {}'.format(method, driver)}
-            except Exception as e:
-                response[method] = {'error': 'Method {} failed: {}'.format(method, e)}
+                response[method] = {'error': 'Method not implemented for NAPALM driver {}'.format(driver)}
         d.close()
 
         return Response(response)
@@ -428,56 +314,34 @@ class DeviceViewSet(CustomFieldModelViewSet):
 # Device components
 #
 
-class ConsolePortViewSet(CableTraceMixin, ModelViewSet):
-    queryset = ConsolePort.objects.select_related(
-        'device', 'connected_endpoint__device', 'cable'
-    ).prefetch_related(
-        'tags'
-    )
+class ConsolePortViewSet(ModelViewSet):
+    queryset = ConsolePort.objects.select_related('device', 'cs_port__device')
     serializer_class = serializers.ConsolePortSerializer
-    filterset_class = filters.ConsolePortFilter
+    filter_class = filters.ConsolePortFilter
 
 
-class ConsoleServerPortViewSet(CableTraceMixin, ModelViewSet):
-    queryset = ConsoleServerPort.objects.select_related(
-        'device', 'connected_endpoint__device', 'cable'
-    ).prefetch_related(
-        'tags'
-    )
+class ConsoleServerPortViewSet(ModelViewSet):
+    queryset = ConsoleServerPort.objects.select_related('device', 'connected_console__device')
     serializer_class = serializers.ConsoleServerPortSerializer
-    filterset_class = filters.ConsoleServerPortFilter
+    filter_class = filters.ConsoleServerPortFilter
 
 
-class PowerPortViewSet(CableTraceMixin, ModelViewSet):
-    queryset = PowerPort.objects.select_related(
-        'device', '_connected_poweroutlet__device', '_connected_powerfeed', 'cable'
-    ).prefetch_related(
-        'tags'
-    )
+class PowerPortViewSet(ModelViewSet):
+    queryset = PowerPort.objects.select_related('device', 'power_outlet__device')
     serializer_class = serializers.PowerPortSerializer
-    filterset_class = filters.PowerPortFilter
+    filter_class = filters.PowerPortFilter
 
 
-class PowerOutletViewSet(CableTraceMixin, ModelViewSet):
-    queryset = PowerOutlet.objects.select_related(
-        'device', 'connected_endpoint__device', 'cable'
-    ).prefetch_related(
-        'tags'
-    )
+class PowerOutletViewSet(ModelViewSet):
+    queryset = PowerOutlet.objects.select_related('device', 'connected_port__device')
     serializer_class = serializers.PowerOutletSerializer
-    filterset_class = filters.PowerOutletFilter
+    filter_class = filters.PowerOutletFilter
 
 
-class InterfaceViewSet(CableTraceMixin, ModelViewSet):
-    queryset = Interface.objects.filter(
-        device__isnull=False
-    ).select_related(
-        'device', '_connected_interface', '_connected_circuittermination', 'cable'
-    ).prefetch_related(
-        'ip_addresses', 'tags'
-    )
+class InterfaceViewSet(ModelViewSet):
+    queryset = Interface.objects.select_related('device')
     serializer_class = serializers.InterfaceSerializer
-    filterset_class = filters.InterfaceFilter
+    filter_class = filters.InterfaceFilter
 
     @action(detail=True)
     def graphs(self, request, pk=None):
@@ -490,36 +354,16 @@ class InterfaceViewSet(CableTraceMixin, ModelViewSet):
         return Response(serializer.data)
 
 
-class FrontPortViewSet(ModelViewSet):
-    queryset = FrontPort.objects.select_related(
-        'device__device_type__manufacturer', 'rear_port', 'cable'
-    ).prefetch_related(
-        'tags'
-    )
-    serializer_class = serializers.FrontPortSerializer
-    filterset_class = filters.FrontPortFilter
-
-
-class RearPortViewSet(ModelViewSet):
-    queryset = RearPort.objects.select_related(
-        'device__device_type__manufacturer', 'cable'
-    ).prefetch_related(
-        'tags'
-    )
-    serializer_class = serializers.RearPortSerializer
-    filterset_class = filters.RearPortFilter
-
-
 class DeviceBayViewSet(ModelViewSet):
-    queryset = DeviceBay.objects.select_related('installed_device').prefetch_related('tags')
+    queryset = DeviceBay.objects.select_related('installed_device')
     serializer_class = serializers.DeviceBaySerializer
-    filterset_class = filters.DeviceBayFilter
+    filter_class = filters.DeviceBayFilter
 
 
 class InventoryItemViewSet(ModelViewSet):
-    queryset = InventoryItem.objects.select_related('device', 'manufacturer').prefetch_related('tags')
+    queryset = InventoryItem.objects.select_related('device', 'manufacturer')
     serializer_class = serializers.InventoryItemSerializer
-    filterset_class = filters.InventoryItemFilter
+    filter_class = filters.InventoryItemFilter
 
 
 #
@@ -527,47 +371,21 @@ class InventoryItemViewSet(ModelViewSet):
 #
 
 class ConsoleConnectionViewSet(ListModelMixin, GenericViewSet):
-    queryset = ConsolePort.objects.select_related(
-        'device', 'connected_endpoint__device'
-    ).filter(
-        connected_endpoint__isnull=False
-    )
+    queryset = ConsolePort.objects.select_related('device', 'cs_port__device').filter(cs_port__isnull=False)
     serializer_class = serializers.ConsolePortSerializer
-    filterset_class = filters.ConsoleConnectionFilter
+    filter_class = filters.ConsoleConnectionFilter
 
 
 class PowerConnectionViewSet(ListModelMixin, GenericViewSet):
-    queryset = PowerPort.objects.select_related(
-        'device', 'connected_endpoint__device'
-    ).filter(
-        _connected_poweroutlet__isnull=False
-    )
+    queryset = PowerPort.objects.select_related('device', 'power_outlet__device').filter(power_outlet__isnull=False)
     serializer_class = serializers.PowerPortSerializer
-    filterset_class = filters.PowerConnectionFilter
+    filter_class = filters.PowerConnectionFilter
 
 
-class InterfaceConnectionViewSet(ListModelMixin, GenericViewSet):
-    queryset = Interface.objects.select_related(
-        'device', '_connected_interface__device'
-    ).filter(
-        # Avoid duplicate connections by only selecting the lower PK in a connected pair
-        _connected_interface__isnull=False,
-        pk__lt=F('_connected_interface')
-    )
+class InterfaceConnectionViewSet(ModelViewSet):
+    queryset = InterfaceConnection.objects.select_related('interface_a__device', 'interface_b__device')
     serializer_class = serializers.InterfaceConnectionSerializer
-    filterset_class = filters.InterfaceConnectionFilter
-
-
-#
-# Cables
-#
-
-class CableViewSet(ModelViewSet):
-    queryset = Cable.objects.prefetch_related(
-        'termination_a', 'termination_b'
-    )
-    serializer_class = serializers.CableSerializer
-    filterset_class = filters.CableFilter
+    filter_class = filters.InterfaceConnectionFilter
 
 
 #
@@ -575,40 +393,10 @@ class CableViewSet(ModelViewSet):
 #
 
 class VirtualChassisViewSet(ModelViewSet):
-    queryset = VirtualChassis.objects.prefetch_related('tags').annotate(
-        member_count=Count('members')
-    )
+    queryset = VirtualChassis.objects.all()
     serializer_class = serializers.VirtualChassisSerializer
 
 
-#
-# Power panels
-#
-
-class PowerPanelViewSet(ModelViewSet):
-    queryset = PowerPanel.objects.select_related(
-        'site', 'rack_group'
-    ).annotate(
-        powerfeed_count=Count('powerfeeds')
-    )
-    serializer_class = serializers.PowerPanelSerializer
-    filterset_class = filters.PowerPanelFilter
-
-
-#
-# Power feeds
-#
-
-class PowerFeedViewSet(CustomFieldModelViewSet):
-    queryset = PowerFeed.objects.select_related(
-        'power_panel', 'rack'
-    ).prefetch_related(
-        'tags'
-    )
-    serializer_class = serializers.PowerFeedSerializer
-    filterset_class = filters.PowerFeedFilter
-
-
 #
 # Miscellaneous
 #
@@ -619,43 +407,30 @@ class ConnectedDeviceViewSet(ViewSet):
     interface. This is useful in a situation where a device boots with no configuration, but can detect its neighbors
     via a protocol such as LLDP. Two query parameters must be included in the request:
 
-    * `peer_device`: The name of the peer device
-    * `peer_interface`: The name of the peer interface
+    * `peer-device`: The name of the peer device
+    * `peer-interface`: The name of the peer interface
     """
     permission_classes = [IsAuthenticatedOrLoginNotRequired]
-    _device_param = Parameter(
-        name='peer_device',
-        in_='query',
-        description='The name of the peer device',
-        required=True,
-        type=openapi.TYPE_STRING
-    )
-    _interface_param = Parameter(
-        name='peer_interface',
-        in_='query',
-        description='The name of the peer interface',
-        required=True,
-        type=openapi.TYPE_STRING
-    )
+    _device_param = Parameter('peer-device', 'query',
+                              description='The name of the peer device', required=True, type=openapi.TYPE_STRING)
+    _interface_param = Parameter('peer-interface', 'query',
+                                 description='The name of the peer interface', required=True, type=openapi.TYPE_STRING)
 
     def get_view_name(self):
         return "Connected Device Locator"
 
     @swagger_auto_schema(
-        manual_parameters=[_device_param, _interface_param],
-        responses={'200': serializers.DeviceSerializer}
-    )
+        manual_parameters=[_device_param, _interface_param], responses={'200': serializers.DeviceSerializer})
     def list(self, request):
 
         peer_device_name = request.query_params.get(self._device_param.name)
         peer_interface_name = request.query_params.get(self._interface_param.name)
-
         if not peer_device_name or not peer_interface_name:
-            raise MissingFilterException(detail='Request must include "peer_device" and "peer_interface" filters.')
+            raise MissingFilterException(detail='Request must include "peer-device" and "peer-interface" filters.')
 
         # Determine local interface from peer interface's connection
         peer_interface = get_object_or_404(Interface, device__name=peer_device_name, name=peer_interface_name)
-        local_interface = peer_interface._connected_interface
+        local_interface = peer_interface.connected_interface
 
         if local_interface is None:
             return Response()

netbox/dcim/apps.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.apps import AppConfig
 
 

netbox/dcim/constants.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 
 # Rack types
 RACK_TYPE_2POST = 100
@@ -29,26 +31,6 @@ RACK_FACE_CHOICES = [
     [RACK_FACE_REAR, 'Rear'],
 ]
 
-# Rack statuses
-RACK_STATUS_RESERVED = 0
-RACK_STATUS_AVAILABLE = 1
-RACK_STATUS_PLANNED = 2
-RACK_STATUS_ACTIVE = 3
-RACK_STATUS_DEPRECATED = 4
-RACK_STATUS_CHOICES = [
-    [RACK_STATUS_ACTIVE, 'Active'],
-    [RACK_STATUS_PLANNED, 'Planned'],
-    [RACK_STATUS_RESERVED, 'Reserved'],
-    [RACK_STATUS_AVAILABLE, 'Available'],
-    [RACK_STATUS_DEPRECATED, 'Deprecated'],
-]
-
-# Device rack position
-DEVICE_POSITION_CHOICES = [
-    # Rack.u_height is limited to 100
-    (i, 'Unit {}'.format(i)) for i in range(1, 101)
-]
-
 # Parent/child device roles
 SUBDEVICE_ROLE_PARENT = True
 SUBDEVICE_ROLE_CHILD = False
@@ -66,200 +48,147 @@ IFACE_ORDERING_CHOICES = [
     [IFACE_ORDERING_NAME, 'Name (alphabetically)']
 ]
 
-# Interface types
+# Interface form factors
 # Virtual
-IFACE_TYPE_VIRTUAL = 0
-IFACE_TYPE_LAG = 200
+IFACE_FF_VIRTUAL = 0
+IFACE_FF_LAG = 200
 # Ethernet
-IFACE_TYPE_100ME_FIXED = 800
-IFACE_TYPE_1GE_FIXED = 1000
-IFACE_TYPE_1GE_GBIC = 1050
-IFACE_TYPE_1GE_SFP = 1100
-IFACE_TYPE_10GE_FIXED = 1150
-IFACE_TYPE_10GE_CX4 = 1170
-IFACE_TYPE_10GE_SFP_PLUS = 1200
-IFACE_TYPE_10GE_XFP = 1300
-IFACE_TYPE_10GE_XENPAK = 1310
-IFACE_TYPE_10GE_X2 = 1320
-IFACE_TYPE_25GE_SFP28 = 1350
-IFACE_TYPE_40GE_QSFP_PLUS = 1400
-IFACE_TYPE_50GE_QSFP28 = 1420
-IFACE_TYPE_100GE_CFP = 1500
-IFACE_TYPE_100GE_CFP2 = 1510
-IFACE_TYPE_100GE_CFP4 = 1520
-IFACE_TYPE_100GE_CPAK = 1550
-IFACE_TYPE_100GE_QSFP28 = 1600
-IFACE_TYPE_200GE_CFP2 = 1650
-IFACE_TYPE_200GE_QSFP56 = 1700
-IFACE_TYPE_400GE_QSFP_DD = 1750
+IFACE_FF_100ME_FIXED = 800
+IFACE_FF_1GE_FIXED = 1000
+IFACE_FF_1GE_GBIC = 1050
+IFACE_FF_1GE_SFP = 1100
+IFACE_FF_10GE_FIXED = 1150
+IFACE_FF_10GE_CX4 = 1170
+IFACE_FF_10GE_SFP_PLUS = 1200
+IFACE_FF_10GE_XFP = 1300
+IFACE_FF_10GE_XENPAK = 1310
+IFACE_FF_10GE_X2 = 1320
+IFACE_FF_25GE_SFP28 = 1350
+IFACE_FF_40GE_QSFP_PLUS = 1400
+IFACE_FF_100GE_CFP = 1500
+IFACE_FF_100GE_CFP2 = 1510
+IFACE_FF_100GE_CFP4 = 1520
+IFACE_FF_100GE_CPAK = 1550
+IFACE_FF_100GE_QSFP28 = 1600
 # Wireless
-IFACE_TYPE_80211A = 2600
-IFACE_TYPE_80211G = 2610
-IFACE_TYPE_80211N = 2620
-IFACE_TYPE_80211AC = 2630
-IFACE_TYPE_80211AD = 2640
-# Cellular
-IFACE_TYPE_GSM = 2810
-IFACE_TYPE_CDMA = 2820
-IFACE_TYPE_LTE = 2830
-# SONET
-IFACE_TYPE_SONET_OC3 = 6100
-IFACE_TYPE_SONET_OC12 = 6200
-IFACE_TYPE_SONET_OC48 = 6300
-IFACE_TYPE_SONET_OC192 = 6400
-IFACE_TYPE_SONET_OC768 = 6500
-IFACE_TYPE_SONET_OC1920 = 6600
-IFACE_TYPE_SONET_OC3840 = 6700
+IFACE_FF_80211A = 2600
+IFACE_FF_80211G = 2610
+IFACE_FF_80211N = 2620
+IFACE_FF_80211AC = 2630
+IFACE_FF_80211AD = 2640
 # Fibrechannel
-IFACE_TYPE_1GFC_SFP = 3010
-IFACE_TYPE_2GFC_SFP = 3020
-IFACE_TYPE_4GFC_SFP = 3040
-IFACE_TYPE_8GFC_SFP_PLUS = 3080
-IFACE_TYPE_16GFC_SFP_PLUS = 3160
-IFACE_TYPE_32GFC_SFP28 = 3320
-IFACE_TYPE_128GFC_QSFP28 = 3400
+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
 # Serial
-IFACE_TYPE_T1 = 4000
-IFACE_TYPE_E1 = 4010
-IFACE_TYPE_T3 = 4040
-IFACE_TYPE_E3 = 4050
+IFACE_FF_T1 = 4000
+IFACE_FF_E1 = 4010
+IFACE_FF_T3 = 4040
+IFACE_FF_E3 = 4050
 # Stacking
-IFACE_TYPE_STACKWISE = 5000
-IFACE_TYPE_STACKWISE_PLUS = 5050
-IFACE_TYPE_FLEXSTACK = 5100
-IFACE_TYPE_FLEXSTACK_PLUS = 5150
-IFACE_TYPE_JUNIPER_VCP = 5200
-IFACE_TYPE_SUMMITSTACK = 5300
-IFACE_TYPE_SUMMITSTACK128 = 5310
-IFACE_TYPE_SUMMITSTACK256 = 5320
-IFACE_TYPE_SUMMITSTACK512 = 5330
-
+IFACE_FF_STACKWISE = 5000
+IFACE_FF_STACKWISE_PLUS = 5050
+IFACE_FF_FLEXSTACK = 5100
+IFACE_FF_FLEXSTACK_PLUS = 5150
+IFACE_FF_JUNIPER_VCP = 5200
 # Other
-IFACE_TYPE_OTHER = 32767
+IFACE_FF_OTHER = 32767
 
-IFACE_TYPE_CHOICES = [
+IFACE_FF_CHOICES = [
     [
         'Virtual interfaces',
         [
-            [IFACE_TYPE_VIRTUAL, 'Virtual'],
-            [IFACE_TYPE_LAG, 'Link Aggregation Group (LAG)'],
+            [IFACE_FF_VIRTUAL, 'Virtual'],
+            [IFACE_FF_LAG, 'Link Aggregation Group (LAG)'],
         ],
     ],
     [
         'Ethernet (fixed)',
         [
-            [IFACE_TYPE_100ME_FIXED, '100BASE-TX (10/100ME)'],
-            [IFACE_TYPE_1GE_FIXED, '1000BASE-T (1GE)'],
-            [IFACE_TYPE_10GE_FIXED, '10GBASE-T (10GE)'],
-            [IFACE_TYPE_10GE_CX4, '10GBASE-CX4 (10GE)'],
+            [IFACE_FF_100ME_FIXED, '100BASE-TX (10/100ME)'],
+            [IFACE_FF_1GE_FIXED, '1000BASE-T (1GE)'],
+            [IFACE_FF_10GE_FIXED, '10GBASE-T (10GE)'],
+            [IFACE_FF_10GE_CX4, '10GBASE-CX4 (10GE)'],
         ]
     ],
     [
         'Ethernet (modular)',
         [
-            [IFACE_TYPE_1GE_GBIC, 'GBIC (1GE)'],
-            [IFACE_TYPE_1GE_SFP, 'SFP (1GE)'],
-            [IFACE_TYPE_10GE_SFP_PLUS, 'SFP+ (10GE)'],
-            [IFACE_TYPE_10GE_XFP, 'XFP (10GE)'],
-            [IFACE_TYPE_10GE_XENPAK, 'XENPAK (10GE)'],
-            [IFACE_TYPE_10GE_X2, 'X2 (10GE)'],
-            [IFACE_TYPE_25GE_SFP28, 'SFP28 (25GE)'],
-            [IFACE_TYPE_40GE_QSFP_PLUS, 'QSFP+ (40GE)'],
-            [IFACE_TYPE_50GE_QSFP28, 'QSFP28 (50GE)'],
-            [IFACE_TYPE_100GE_CFP, 'CFP (100GE)'],
-            [IFACE_TYPE_100GE_CFP2, 'CFP2 (100GE)'],
-            [IFACE_TYPE_200GE_CFP2, 'CFP2 (200GE)'],
-            [IFACE_TYPE_100GE_CFP4, 'CFP4 (100GE)'],
-            [IFACE_TYPE_100GE_CPAK, 'Cisco CPAK (100GE)'],
-            [IFACE_TYPE_100GE_QSFP28, 'QSFP28 (100GE)'],
-            [IFACE_TYPE_200GE_QSFP56, 'QSFP56 (200GE)'],
-            [IFACE_TYPE_400GE_QSFP_DD, 'QSFP-DD (400GE)'],
+            [IFACE_FF_1GE_GBIC, 'GBIC (1GE)'],
+            [IFACE_FF_1GE_SFP, 'SFP (1GE)'],
+            [IFACE_FF_10GE_SFP_PLUS, 'SFP+ (10GE)'],
+            [IFACE_FF_10GE_XFP, 'XFP (10GE)'],
+            [IFACE_FF_10GE_XENPAK, 'XENPAK (10GE)'],
+            [IFACE_FF_10GE_X2, 'X2 (10GE)'],
+            [IFACE_FF_25GE_SFP28, 'SFP28 (25GE)'],
+            [IFACE_FF_40GE_QSFP_PLUS, 'QSFP+ (40GE)'],
+            [IFACE_FF_100GE_CFP, 'CFP (100GE)'],
+            [IFACE_FF_100GE_CFP2, 'CFP2 (100GE)'],
+            [IFACE_FF_100GE_CFP4, 'CFP4 (100GE)'],
+            [IFACE_FF_100GE_CPAK, 'Cisco CPAK (100GE)'],
+            [IFACE_FF_100GE_QSFP28, 'QSFP28 (100GE)'],
         ]
     ],
     [
         'Wireless',
         [
-            [IFACE_TYPE_80211A, 'IEEE 802.11a'],
-            [IFACE_TYPE_80211G, 'IEEE 802.11b/g'],
-            [IFACE_TYPE_80211N, 'IEEE 802.11n'],
-            [IFACE_TYPE_80211AC, 'IEEE 802.11ac'],
-            [IFACE_TYPE_80211AD, 'IEEE 802.11ad'],
-        ]
-    ],
-    [
-        'Cellular',
-        [
-            [IFACE_TYPE_GSM, 'GSM'],
-            [IFACE_TYPE_CDMA, 'CDMA'],
-            [IFACE_TYPE_LTE, 'LTE'],
-        ]
-    ],
-    [
-        'SONET',
-        [
-            [IFACE_TYPE_SONET_OC3, 'OC-3/STM-1'],
-            [IFACE_TYPE_SONET_OC12, 'OC-12/STM-4'],
-            [IFACE_TYPE_SONET_OC48, 'OC-48/STM-16'],
-            [IFACE_TYPE_SONET_OC192, 'OC-192/STM-64'],
-            [IFACE_TYPE_SONET_OC768, 'OC-768/STM-256'],
-            [IFACE_TYPE_SONET_OC1920, 'OC-1920/STM-640'],
-            [IFACE_TYPE_SONET_OC3840, 'OC-3840/STM-1234'],
+            [IFACE_FF_80211A, 'IEEE 802.11a'],
+            [IFACE_FF_80211G, 'IEEE 802.11b/g'],
+            [IFACE_FF_80211N, 'IEEE 802.11n'],
+            [IFACE_FF_80211AC, 'IEEE 802.11ac'],
+            [IFACE_FF_80211AD, 'IEEE 802.11ad'],
         ]
     ],
     [
         'FibreChannel',
         [
-            [IFACE_TYPE_1GFC_SFP, 'SFP (1GFC)'],
-            [IFACE_TYPE_2GFC_SFP, 'SFP (2GFC)'],
-            [IFACE_TYPE_4GFC_SFP, 'SFP (4GFC)'],
-            [IFACE_TYPE_8GFC_SFP_PLUS, 'SFP+ (8GFC)'],
-            [IFACE_TYPE_16GFC_SFP_PLUS, 'SFP+ (16GFC)'],
-            [IFACE_TYPE_32GFC_SFP28, 'SFP28 (32GFC)'],
-            [IFACE_TYPE_128GFC_QSFP28, 'QSFP28 (128GFC)'],
+            [IFACE_FF_1GFC_SFP, 'SFP (1GFC)'],
+            [IFACE_FF_2GFC_SFP, 'SFP (2GFC)'],
+            [IFACE_FF_4GFC_SFP, 'SFP (4GFC)'],
+            [IFACE_FF_8GFC_SFP_PLUS, 'SFP+ (8GFC)'],
+            [IFACE_FF_16GFC_SFP_PLUS, 'SFP+ (16GFC)'],
         ]
     ],
     [
         'Serial',
         [
-            [IFACE_TYPE_T1, 'T1 (1.544 Mbps)'],
-            [IFACE_TYPE_E1, 'E1 (2.048 Mbps)'],
-            [IFACE_TYPE_T3, 'T3 (45 Mbps)'],
-            [IFACE_TYPE_E3, 'E3 (34 Mbps)'],
+            [IFACE_FF_T1, 'T1 (1.544 Mbps)'],
+            [IFACE_FF_E1, 'E1 (2.048 Mbps)'],
+            [IFACE_FF_T3, 'T3 (45 Mbps)'],
+            [IFACE_FF_E3, 'E3 (34 Mbps)'],
         ]
     ],
     [
         'Stacking',
         [
-            [IFACE_TYPE_STACKWISE, 'Cisco StackWise'],
-            [IFACE_TYPE_STACKWISE_PLUS, 'Cisco StackWise Plus'],
-            [IFACE_TYPE_FLEXSTACK, 'Cisco FlexStack'],
-            [IFACE_TYPE_FLEXSTACK_PLUS, 'Cisco FlexStack Plus'],
-            [IFACE_TYPE_JUNIPER_VCP, 'Juniper VCP'],
-            [IFACE_TYPE_SUMMITSTACK, 'Extreme SummitStack'],
-            [IFACE_TYPE_SUMMITSTACK128, 'Extreme SummitStack-128'],
-            [IFACE_TYPE_SUMMITSTACK256, 'Extreme SummitStack-256'],
-            [IFACE_TYPE_SUMMITSTACK512, 'Extreme SummitStack-512'],
+            [IFACE_FF_STACKWISE, 'Cisco StackWise'],
+            [IFACE_FF_STACKWISE_PLUS, 'Cisco StackWise Plus'],
+            [IFACE_FF_FLEXSTACK, 'Cisco FlexStack'],
+            [IFACE_FF_FLEXSTACK_PLUS, 'Cisco FlexStack Plus'],
+            [IFACE_FF_JUNIPER_VCP, 'Juniper VCP'],
         ]
     ],
     [
         'Other',
         [
-            [IFACE_TYPE_OTHER, 'Other'],
+            [IFACE_FF_OTHER, 'Other'],
         ]
     ],
 ]
 
 VIRTUAL_IFACE_TYPES = [
-    IFACE_TYPE_VIRTUAL,
-    IFACE_TYPE_LAG,
+    IFACE_FF_VIRTUAL,
+    IFACE_FF_LAG,
 ]
 
 WIRELESS_IFACE_TYPES = [
-    IFACE_TYPE_80211A,
-    IFACE_TYPE_80211G,
-    IFACE_TYPE_80211N,
-    IFACE_TYPE_80211AC,
-    IFACE_TYPE_80211AD,
+    IFACE_FF_80211A,
+    IFACE_FF_80211G,
+    IFACE_FF_80211N,
+    IFACE_FF_80211AC,
+    IFACE_FF_80211AD,
 ]
 
 NONCONNECTABLE_IFACE_TYPES = VIRTUAL_IFACE_TYPES + WIRELESS_IFACE_TYPES
@@ -273,44 +202,6 @@ IFACE_MODE_CHOICES = [
     [IFACE_MODE_TAGGED_ALL, 'Tagged All'],
 ]
 
-# Pass-through port types
-PORT_TYPE_8P8C = 1000
-PORT_TYPE_110_PUNCH = 1100
-PORT_TYPE_ST = 2000
-PORT_TYPE_SC = 2100
-PORT_TYPE_SC_APC = 2110
-PORT_TYPE_FC = 2200
-PORT_TYPE_LC = 2300
-PORT_TYPE_LC_APC = 2310
-PORT_TYPE_MTRJ = 2400
-PORT_TYPE_MPO = 2500
-PORT_TYPE_LSH = 2600
-PORT_TYPE_LSH_APC = 2610
-PORT_TYPE_CHOICES = [
-    [
-        'Copper',
-        [
-            [PORT_TYPE_8P8C, '8P8C'],
-            [PORT_TYPE_110_PUNCH, '110 Punch'],
-        ],
-    ],
-    [
-        'Fiber Optic',
-        [
-            [PORT_TYPE_FC, 'FC'],
-            [PORT_TYPE_LC, 'LC'],
-            [PORT_TYPE_LC_APC, 'LC/APC'],
-            [PORT_TYPE_LSH, 'LSH'],
-            [PORT_TYPE_LSH_APC, 'LSH/APC'],
-            [PORT_TYPE_MPO, 'MPO'],
-            [PORT_TYPE_MTRJ, 'MTRJ'],
-            [PORT_TYPE_SC, 'SC'],
-            [PORT_TYPE_SC_APC, 'SC/APC'],
-            [PORT_TYPE_ST, 'ST'],
-        ]
-    ]
-]
-
 # Device statuses
 DEVICE_STATUS_OFFLINE = 0
 DEVICE_STATUS_ACTIVE = 1
@@ -318,7 +209,6 @@ DEVICE_STATUS_PLANNED = 2
 DEVICE_STATUS_STAGED = 3
 DEVICE_STATUS_FAILED = 4
 DEVICE_STATUS_INVENTORY = 5
-DEVICE_STATUS_DECOMMISSIONING = 6
 DEVICE_STATUS_CHOICES = [
     [DEVICE_STATUS_ACTIVE, 'Active'],
     [DEVICE_STATUS_OFFLINE, 'Offline'],
@@ -326,7 +216,6 @@ DEVICE_STATUS_CHOICES = [
     [DEVICE_STATUS_STAGED, 'Staged'],
     [DEVICE_STATUS_FAILED, 'Failed'],
     [DEVICE_STATUS_INVENTORY, 'Inventory'],
-    [DEVICE_STATUS_DECOMMISSIONING, 'Decommissioning'],
 ]
 
 # Site statuses
@@ -339,7 +228,7 @@ SITE_STATUS_CHOICES = [
     [SITE_STATUS_RETIRED, 'Retired'],
 ]
 
-# Bootstrap CSS classes for device/rack statuses
+# Bootstrap CSS classes for device statuses
 STATUS_CLASSES = {
     0: 'warning',
     1: 'success',
@@ -347,7 +236,6 @@ STATUS_CLASSES = {
     3: 'primary',
     4: 'danger',
     5: 'default',
-    6: 'warning',
 }
 
 # Console/power/interface connection statuses
@@ -358,131 +246,12 @@ CONNECTION_STATUS_CHOICES = [
     [CONNECTION_STATUS_CONNECTED, 'Connected'],
 ]
 
-# Cable endpoint types
-CABLE_TERMINATION_TYPES = [
-    'consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport',
+# Platform -> RPC client mappings
+RPC_CLIENT_JUNIPER_JUNOS = 'juniper-junos'
+RPC_CLIENT_CISCO_IOS = 'cisco-ios'
+RPC_CLIENT_OPENGEAR = 'opengear'
+RPC_CLIENT_CHOICES = [
+    [RPC_CLIENT_JUNIPER_JUNOS, 'Juniper Junos (NETCONF)'],
+    [RPC_CLIENT_CISCO_IOS, 'Cisco IOS (SSH)'],
+    [RPC_CLIENT_OPENGEAR, 'Opengear (SSH)'],
 ]
-
-# Cable types
-CABLE_TYPE_CAT3 = 1300
-CABLE_TYPE_CAT5 = 1500
-CABLE_TYPE_CAT5E = 1510
-CABLE_TYPE_CAT6 = 1600
-CABLE_TYPE_CAT6A = 1610
-CABLE_TYPE_CAT7 = 1700
-CABLE_TYPE_DAC_ACTIVE = 1800
-CABLE_TYPE_DAC_PASSIVE = 1810
-CABLE_TYPE_MMF = 3000
-CABLE_TYPE_MMF_OM1 = 3010
-CABLE_TYPE_MMF_OM2 = 3020
-CABLE_TYPE_MMF_OM3 = 3030
-CABLE_TYPE_MMF_OM4 = 3040
-CABLE_TYPE_SMF = 3500
-CABLE_TYPE_SMF_OS1 = 3510
-CABLE_TYPE_SMF_OS2 = 3520
-CABLE_TYPE_AOC = 3800
-CABLE_TYPE_POWER = 5000
-CABLE_TYPE_CHOICES = (
-    (
-        'Copper', (
-            (CABLE_TYPE_CAT3, 'CAT3'),
-            (CABLE_TYPE_CAT5, 'CAT5'),
-            (CABLE_TYPE_CAT5E, 'CAT5e'),
-            (CABLE_TYPE_CAT6, 'CAT6'),
-            (CABLE_TYPE_CAT6A, 'CAT6a'),
-            (CABLE_TYPE_CAT7, 'CAT7'),
-            (CABLE_TYPE_DAC_ACTIVE, 'Direct Attach Copper (Active)'),
-            (CABLE_TYPE_DAC_PASSIVE, 'Direct Attach Copper (Passive)'),
-        ),
-    ),
-    (
-        'Fiber', (
-            (CABLE_TYPE_MMF, 'Multimode Fiber'),
-            (CABLE_TYPE_MMF_OM1, 'Multimode Fiber (OM1)'),
-            (CABLE_TYPE_MMF_OM2, 'Multimode Fiber (OM2)'),
-            (CABLE_TYPE_MMF_OM3, 'Multimode Fiber (OM3)'),
-            (CABLE_TYPE_MMF_OM4, 'Multimode Fiber (OM4)'),
-            (CABLE_TYPE_SMF, 'Singlemode Fiber'),
-            (CABLE_TYPE_SMF_OS1, 'Singlemode Fiber (OS1)'),
-            (CABLE_TYPE_SMF_OS2, 'Singlemode Fiber (OS2)'),
-            (CABLE_TYPE_AOC, 'Active Optical Cabling (AOC)'),
-        ),
-    ),
-    (CABLE_TYPE_POWER, 'Power'),
-)
-
-CABLE_TERMINATION_TYPE_CHOICES = {
-    # (API endpoint, human-friendly name)
-    'consoleport': ('console-ports', 'Console port'),
-    'consoleserverport': ('console-server-ports', 'Console server port'),
-    'powerport': ('power-ports', 'Power port'),
-    'poweroutlet': ('power-outlets', 'Power outlet'),
-    'interface': ('interfaces', 'Interface'),
-    'frontport': ('front-ports', 'Front panel port'),
-    'rearport': ('rear-ports', 'Rear panel port'),
-}
-
-COMPATIBLE_TERMINATION_TYPES = {
-    'consoleport': ['consoleserverport', 'frontport', 'rearport'],
-    'consoleserverport': ['consoleport', 'frontport', 'rearport'],
-    'powerport': ['poweroutlet', 'powerfeed'],
-    'poweroutlet': ['powerport'],
-    'interface': ['interface', 'circuittermination', 'frontport', 'rearport'],
-    'frontport': ['consoleport', 'consoleserverport', 'interface', 'frontport', 'rearport', 'circuittermination'],
-    'rearport': ['consoleport', 'consoleserverport', 'interface', 'frontport', 'rearport', 'circuittermination'],
-    'circuittermination': ['interface', 'frontport', 'rearport'],
-}
-
-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'),
-    (LENGTH_UNIT_FOOT, 'Feet'),
-    (LENGTH_UNIT_INCH, 'Inches'),
-)
-RACK_DIMENSION_UNIT_CHOICES = (
-    (LENGTH_UNIT_MILLIMETER, 'Millimeters'),
-    (LENGTH_UNIT_INCH, 'Inches'),
-)
-
-# Power feeds
-POWERFEED_TYPE_PRIMARY = 1
-POWERFEED_TYPE_REDUNDANT = 2
-POWERFEED_TYPE_CHOICES = (
-    (POWERFEED_TYPE_PRIMARY, 'Primary'),
-    (POWERFEED_TYPE_REDUNDANT, 'Redundant'),
-)
-POWERFEED_SUPPLY_AC = 1
-POWERFEED_SUPPLY_DC = 2
-POWERFEED_SUPPLY_CHOICES = (
-    (POWERFEED_SUPPLY_AC, 'AC'),
-    (POWERFEED_SUPPLY_DC, 'DC'),
-)
-POWERFEED_PHASE_SINGLE = 1
-POWERFEED_PHASE_3PHASE = 3
-POWERFEED_PHASE_CHOICES = (
-    (POWERFEED_PHASE_SINGLE, 'Single phase'),
-    (POWERFEED_PHASE_3PHASE, 'Three-phase'),
-)
-POWERFEED_STATUS_OFFLINE = 0
-POWERFEED_STATUS_ACTIVE = 1
-POWERFEED_STATUS_PLANNED = 2
-POWERFEED_STATUS_FAILED = 4
-POWERFEED_STATUS_CHOICES = (
-    (POWERFEED_STATUS_ACTIVE, 'Active'),
-    (POWERFEED_STATUS_OFFLINE, 'Offline'),
-    (POWERFEED_STATUS_PLANNED, 'Planned'),
-    (POWERFEED_STATUS_FAILED, 'Failed'),
-)
-POWERFEED_LEG_A = 1
-POWERFEED_LEG_B = 2
-POWERFEED_LEG_C = 3
-POWERFEED_LEG_CHOICES = (
-    (POWERFEED_LEG_A, 'A'),
-    (POWERFEED_LEG_B, 'B'),
-    (POWERFEED_LEG_C, 'C'),
-)

netbox/dcim/exceptions.py

@@ -1,5 +0,0 @@
-class LoopDetected(Exception):
-    """
-    A loop has been detected while tracing a cable path.
-    """
-    pass

netbox/dcim/fields.py

@@ -1,7 +1,12 @@
+from __future__ import unicode_literals
+
+from netaddr import EUI, mac_unix_expanded
+
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator, MaxValueValidator
 from django.db import models
-from netaddr import AddrFormatError, EUI, mac_unix_expanded
+
+from .formfields import MACAddressFormField
 
 
 class ASNField(models.BigIntegerField):
@@ -30,8 +35,8 @@ class MACAddressField(models.Field):
             return value
         try:
             return EUI(value, version=48, dialect=mac_unix_expanded_uppercase)
-        except AddrFormatError as e:
-            raise ValidationError("Invalid MAC address format: {}".format(value))
+        except ValueError as e:
+            raise ValidationError(e)
 
     def db_type(self, connection):
         return 'macaddr'
@@ -40,3 +45,11 @@ class MACAddressField(models.Field):
         if not value:
             return None
         return str(self.to_python(value))
+
+    def form_class(self):
+        return MACAddressFormField
+
+    def formfield(self, **kwargs):
+        defaults = {'form_class': self.form_class()}
+        defaults.update(kwargs)
+        return super(MACAddressField, self).formfield(**defaults)

netbox/dcim/fixtures/initial_data.json

@@ -149,7 +149,8 @@
     "pk": 1,
     "fields": {
         "name": "Cisco IOS",
-        "slug": "cisco-ios"
+        "slug": "cisco-ios",
+        "rpc_client": "cisco-ios"
     }
 },
 {
@@ -157,7 +158,8 @@
     "pk": 2,
     "fields": {
         "name": "Cisco NX-OS",
-        "slug": "cisco-nx-os"
+        "slug": "cisco-nx-os",
+        "rpc_client": ""
     }
 },
 {
@@ -165,7 +167,8 @@
     "pk": 3,
     "fields": {
         "name": "Juniper Junos",
-        "slug": "juniper-junos"
+        "slug": "juniper-junos",
+        "rpc_client": "juniper-junos"
     }
 },
 {
@@ -173,7 +176,8 @@
     "pk": 4,
     "fields": {
         "name": "Arista EOS",
-        "slug": "arista-eos"
+        "slug": "arista-eos",
+        "rpc_client": ""
     }
 },
 {
@@ -181,7 +185,8 @@
     "pk": 5,
     "fields": {
         "name": "Linux",
-        "slug": "linux"
+        "slug": "linux",
+        "rpc_client": ""
     }
 },
 {
@@ -189,7 +194,8 @@
     "pk": 6,
     "fields": {
         "name": "Opengear",
-        "slug": "opengear"
+        "slug": "opengear",
+        "rpc_client": "opengear"
     }
 }
 ]

netbox/dcim/formfields.py

@@ -0,0 +1,27 @@
+from __future__ import unicode_literals
+
+from django import forms
+from django.core.exceptions import ValidationError
+from netaddr import EUI, AddrFormatError
+
+
+#
+# Form fields
+#
+
+class MACAddressFormField(forms.Field):
+    default_error_messages = {
+        'invalid': "Enter a valid MAC address.",
+    }
+
+    def to_python(self, value):
+        if not value:
+            return None
+
+        if isinstance(value, EUI):
+            return value
+
+        try:
+            return EUI(value, version=48)
+        except AddrFormatError:
+            raise ValidationError("Please specify a valid MAC address.")

netbox/dcim/managers.py

@@ -1,73 +0,0 @@
-from django.db.models import Manager, QuerySet
-from django.db.models.expressions import RawSQL
-
-from .constants import NONCONNECTABLE_IFACE_TYPES
-
-# Regular expressions for parsing Interface names
-TYPE_RE = r"SUBSTRING({} FROM '^([^0-9\.:]+)')"
-SLOT_RE = r"COALESCE(CAST(SUBSTRING({} FROM '^(?:[^0-9]+)?(\d{{1,9}})/') AS integer), NULL)"
-SUBSLOT_RE = r"COALESCE(CAST(SUBSTRING({} FROM '^(?:[^0-9\.:]+)?\d{{1,9}}/(\d{{1,9}})') AS integer), NULL)"
-POSITION_RE = r"COALESCE(CAST(SUBSTRING({} FROM '^(?:[^0-9]+)?(?:\d{{1,9}}/){{2}}(\d{{1,9}})') AS integer), NULL)"
-SUBPOSITION_RE = r"COALESCE(CAST(SUBSTRING({} FROM '^(?:[^0-9]+)?(?:\d{{1,9}}/){{3}}(\d{{1,9}})') AS integer), NULL)"
-ID_RE = r"CAST(SUBSTRING({} FROM '^(?:[^0-9\.:]+)?(\d{{1,9}})([^/]|$)') AS integer)"
-CHANNEL_RE = r"COALESCE(CAST(SUBSTRING({} FROM '^.*:(\d{{1,9}})(\.\d{{1,9}})?$') AS integer), 0)"
-VC_RE = r"COALESCE(CAST(SUBSTRING({} FROM '^.*\.(\d{{1,9}})$') AS integer), 0)"
-
-
-class InterfaceQuerySet(QuerySet):
-
-    def connectable(self):
-        """
-        Return only physical interfaces which are capable of being connected to other interfaces (i.e. not virtual or
-        wireless).
-        """
-        return self.exclude(type__in=NONCONNECTABLE_IFACE_TYPES)
-
-
-class InterfaceManager(Manager):
-
-    def get_queryset(self):
-        """
-        Naturally order interfaces by their type and numeric position. To order interfaces naturally, the `name` field
-        is split into eight distinct components: leading text (type), slot, subslot, position, subposition, ID, channel,
-        and virtual circuit:
-
-            {type}{slot or ID}/{subslot}/{position}/{subposition}:{channel}.{vc}
-
-        Components absent from the interface name are coalesced to zero or null. For example, an interface named
-        GigabitEthernet1/2/3 would be parsed as follows:
-
-            type = 'GigabitEthernet'
-            slot =  1
-            subslot = 2
-            position = 3
-            subposition = None
-            id = None
-            channel = 0
-            vc = 0
-
-        The original `name` field is considered in its entirety to serve as a fallback in the event interfaces do not
-        match any of the prescribed fields.
-
-        The `id` field is included to enforce deterministic ordering of interfaces in similar vein of other device
-        components.
-        """
-
-        sql_col = '{}.name'.format(self.model._meta.db_table)
-        ordering = [
-            '_slot', '_subslot', '_position', '_subposition', '_type', '_id', '_channel', '_vc', 'name', 'pk'
-
-        ]
-
-        fields = {
-            '_type': RawSQL(TYPE_RE.format(sql_col), []),
-            '_id': RawSQL(ID_RE.format(sql_col), []),
-            '_slot': RawSQL(SLOT_RE.format(sql_col), []),
-            '_subslot': RawSQL(SUBSLOT_RE.format(sql_col), []),
-            '_position': RawSQL(POSITION_RE.format(sql_col), []),
-            '_subposition': RawSQL(SUBPOSITION_RE.format(sql_col), []),
-            '_channel': RawSQL(CHANNEL_RE.format(sql_col), []),
-            '_vc': RawSQL(VC_RE.format(sql_col), []),
-        }
-
-        return InterfaceQuerySet(self.model, using=self._db).annotate(**fields).order_by(*ordering)

netbox/dcim/migrations/0001_initial.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-06-22 18:21
+from __future__ import unicode_literals
+
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion

netbox/dcim/migrations/0002_auto_20160622_1821.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-06-22 18:21
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0002_auto_20160622_1821_squashed_0022_color_names_to_rgb.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.14 on 2018-07-31 02:06
+from __future__ import unicode_literals
+
 import dcim.fields
 import django.core.validators
 from django.db import migrations, models

netbox/dcim/migrations/0003_auto_20160628_1721.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-06-28 17:21
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0004_auto_20160701_2049.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-01 20:49
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0005_auto_20160706_1722.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-06 17:22
+from __future__ import unicode_literals
+
 import dcim.fields
 from django.db import migrations, models
 

netbox/dcim/migrations/0006_add_device_primary_ip4_ip6.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-11 18:40
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0007_device_copy_primary_ip.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-11 18:40
+from __future__ import unicode_literals
+
 from django.db import migrations
 
 

netbox/dcim/migrations/0008_device_remove_primary_ip.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-11 19:01
+from __future__ import unicode_literals
+
 from django.db import migrations
 
 

netbox/dcim/migrations/0009_site_32bit_asn_support.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-13 19:24
+from __future__ import unicode_literals
+
 import dcim.fields
 from django.db import migrations
 

netbox/dcim/migrations/0010_devicebay_installed_device_set_null.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-14 21:38
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0011_devicetype_part_number.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-07-26 15:05
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0012_site_rack_device_add_tenant.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-07-26 21:59
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0013_add_interface_form_factors.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-08-06 20:24
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0014_rack_add_type_width.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-08-08 21:11
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0015_rack_add_u_height_validator.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-08-09 21:18
+from __future__ import unicode_literals
+
 import django.core.validators
 from django.db import migrations, models
 

netbox/dcim/migrations/0016_module_add_manufacturer.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-08-10 13:45
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0017_rack_add_role.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-08-10 14:58
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0018_device_add_asset_tag.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-08-11 15:42
+from __future__ import unicode_literals
+
 from django.db import migrations
 import utilities.fields
 

netbox/dcim/migrations/0019_new_iface_form_factors.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-09-13 15:20
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0020_rack_desc_units.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-10-28 15:01
+from __future__ import unicode_literals
+
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0021_add_ff_flexstack.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-10-31 18:47
+from __future__ import unicode_literals
+
 import django.core.validators
 from django.db import migrations, models