Release v2.2-beta2

2025-12-30 17:17:46 -06:00 · 2017-09-29 14:39:06 -04:00
177 changed files with 1456 additions and 2577 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -4,30 +4,23 @@
    remove the "is:open" filter from the search bar to include closed issues.

    Check the appropriate type for your issue below by placing an x between the
-    brackets. For assistance with installation issues, or for any other issues
-    other than those listed below, please raise your topic for discussion on
-    our mailing list:
+    brackets. If none of the below apply, please raise your issue for
+    discussion on our mailing list:

        https://groups.google.com/forum/#!forum/netbox-discuss

    Please note that issues which do not fall under any of the below categories
-    will be closed. Due to an excessive backlog of feature requests, we are
-    not currently accepting any proposals which extend NetBox's feature scope.
-
-    Do not prepend any sort of tag to your issue's title. An administrator will
-    review your issue and assign labels as appropriate.
+    will be closed.
 --->
 ### Issue type
-[ ] Feature request <!-- An enhancement of existing functionality -->
-[ ] Bug report      <!-- Unexpected or erroneous behavior -->
-[ ] Documentation   <!-- A modification to the documentation -->
+[ ] Feature request <!-- Requesting the implementation of a new feature -->
+[ ] Bug report      <!-- Reporting unexpected or erroneous behavior -->
+[ ] Documentation   <!-- Proposing a modification to the documentation -->

 <!--
    Please describe the environment in which you are running NetBox. (Be sure
    to verify that you are running the latest stable release of NetBox before
-    submitting a bug report.) If you are submitting a bug report and have made
-    any changes to the code base, please first validate that your bug can be
-    recreated while running an official release.
+    submitting a bug report.)
 -->
 ### Environment
 * Python version:  <!-- Example: 3.5.4 -->
@@ -35,8 +28,8 @@

 <!--
    BUG REPORTS must include:
-        * A list of the steps needed for someone else to reproduce the bug
-        * A description of the expected and observed behavior
+        * A list of the steps needed to reproduce the bug
+        * A description of the expected behavior
        * Any relevant error messages (screenshots may also help)

    FEATURE REQUESTS must include:
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,8 +1,8 @@
 ## Getting Help

 If you encounter any issues installing or using NetBox, try one of the
-following resources to get assistance. Please **do not** open a GitHub issue
-except to report bugs or request features.
+following resources to get assistance. Please **do not** open a GitHub
+issue except to report bugs or request features.

 ### Mailing List

@@ -13,32 +13,35 @@ installation. You can find us [here](https://groups.google.com/forum/#!forum/net
 ### Freenode IRC

 For real-time discussion, you can join the #netbox channel on [Freenode](https://freenode.net/).
-You can connect to Freenode at irc.freenode.net using an IRC client, or you can
-use their [webchat client](https://webchat.freenode.net/).
+You can connect to Freenode at irc.freenode.net using an IRC client, or
+you can use their [webchat client](https://webchat.freenode.net/).

 ## Reporting Bugs

 * First, ensure that you've installed the [latest stable version](https://github.com/digitalocean/netbox/releases) of
-NetBox. If you're running an older version, it's possible that the bug has
-already been fixed.
+NetBox. If you're running an older version, it's possible that the bug
+has already been fixed.

-* Next, check the GitHub [issues list](https://github.com/digitalocean/netbox/issues) to see if the bug you've found has already
-been reported. If you think you may be experiencing a reported issue that
-hasn't already been resolved, please click "add a reaction" in the top right
-corner of the issue and add a thumbs up (+1). You mightalso want to add a
-comment describing how it's affecting your installation. This will allow us to
-prioritize bugs based on how many users are affected.
+* Next, check the GitHub [issues list](https://github.com/digitalocean/netbox/issues) to see if the bug you've found has
+already been reported. If you think you may be experiencing a reported
+issue that hasn't already been resolved, please click "add a reaction"
+in the top right corner of the issue and add a thumbs up (+1). You might
+also want to add a comment describing how it's affecting your
+installation. This will allow us to prioritize bugs based on how many
+users are affected.

-* If you haven't found an existing issue that describes your suspected bug,
-please inquire about it on the mailing list. **Do not** file an issue until you
-have received confirmation that it is in fact a bug. Invalid issues are very
-distracting and slow the pace at which NetBox is developed.
+* If you haven't found an existing issue that describes your suspected
+bug, please inquire about it on the mailing list. **Do not** file an
+issue until you have received confirmation that it is in fact a bug.
+Invalid issues are very distracting and slow the pace at which NetBox is
+developed.

-* When submitting an issue, please be as descriptive as possible. Be sure to
-include:
+* When submitting an issue, please be as descriptive as possible. Be
+sure to include:

    * The environment in which NetBox is running
-    * The exact steps that can be taken to reproduce the issue (if applicable)
+    * The exact steps that can be taken to reproduce the issue (if
+      applicable)
    * Any error messages generated
    * Screenshots (if applicable)

@@ -46,64 +49,71 @@ include:
 The issue will be reviewed by a moderator after submission and the appropriate
 labels will be applied.

-* Keep in mind that we prioritize bugs based on their severity and how much
-work is required to resolve them. It may take some time for someone to address
-your issue.
+* Keep in mind that we prioritize bugs based on their severity and how
+much work is required to resolve them. It may take some time for someone
+to address your issue.

 ## Feature Requests

-* First, check the GitHub [issues list](https://github.com/digitalocean/netbox/issues) to see if the feature you're requesting
-is already listed. (Be sure to search closed issues as well, since some
-feature requests have been rejected.) If the feature you'd like to see has
-already been requested and is open, click "add a reaction" in the top right
-corner of the issue and add a thumbs up (+1). This ensures that the issue has
-a better chance of receiving attention. Also feel free to add a comment with
-any additional justification for the feature. (However, note that comments with
-no substance other than a "+1" will be deleted. Please use GitHub's reactions
-feature to indicate your support.)
+* First, check the GitHub [issues list](https://github.com/digitalocean/netbox/issues) to see if the feature you're
+requesting is already listed. (Be sure to search closed issues as well,
+since some feature requests are rejected.) If the feature you'd like to
+see has already been requested, click "add a reaction" in the top right
+corner of the issue and add a thumbs up (+1). This ensures that the
+issue has a better chance of making it onto the roadmap. Also feel free
+to add a comment with any additional justification for the feature.
+(However, note that comments with no substance other than a "+1" will be
+deleted. Please use GitHub's reactions feature to indicate your
+support.)

-* Due to an excessive backlog of feature requests, we are not currently
-accepting any proposals which substantially extend NetBox's functionality
-beyond its current feature set. This includes the introduction of any new views
-or models which have not already been proposed in an existing feature request.
+* While suggestions for new features are welcome, it's important to
+limit the scope of NetBox's feature set to avoid feature creep. For
+example, the following features would be firmly out of scope for NetBox:
+
+    * Ticket management
+    * Network state monitoring
+    * Acting as a DNS server
+    * Acting as an authentication server

 * Before filing a new feature request, consider raising your idea on the
-mailing list first. Feedback you receive there will help validate and shape the
-proposed feature before filing a formal issue.
+mailing list first. Feedback you receive there will help validate and
+shape the proposed feature before filing a formal issue.

-* Good feature requests are very narrowly defined. Be sure to thoroughly
-describe the functionality and data model(s) being proposed. The more effort
-you put into writing a feature request, the better its chance is of being
+* Good feature requests are very narrowly defined. Be sure to enumerate
+specific functionality and data schema. The more effort you put into
+writing a feature request, the better its chance is of being
 implemented. Overly broad feature requests will be closed.

 * When submitting a feature request on GitHub, be sure to include the
 following:

    * A detailed description of the proposed functionality
-    * A use case for the feature; who would use it and what value it would add
-      to NetBox
-    * A rough description of changes necessary to the database schema (if
-      applicable)
-    * Any third-party libraries or other resources which would be involved
+    * A use case for the feature; who would use it and what value it
+      would add to NetBox
+    * A rough description of changes necessary to the database schema
+      (if applicable)
+    * Any third-party libraries or other resources which would be
+      involved

-* Please avoid prepending any sort of tag (e.g. "[Feature]") to the issue
-title. The issue will be reviewed by a moderator after submission and the
-appropriate labels will be applied.
+* Please avoid prepending any sort of tag (e.g. "[Feature]") to the issue title.
+The issue will be reviewed by a moderator after submission and the appropriate
+labels will be applied.

 ## Submitting Pull Requests

-* Be sure to open an issue before starting work on a pull request, and discuss
-your idea with the NetBox maintainers before beginning work. This will help
-prevent wasting time on something that might we might not be able to implement.
-When suggesting a new feature, also make sure it won't conflict with any work
-that's already in progress.
+* Be sure to open an issue before starting work on a pull request, and
+discuss your idea with the NetBox maintainers before beginning work.
+This will help prevent wasting time on something that might we might not
+be able to implement. When suggesting a new feature, also make sure it
+won't conflict with any work that's already in progress.

-* When submitting a pull request, please be sure to work off of the `develop`
-branch, rather than `master`. The `develop` branch is used for ongoing
-development, while `master` is used for tagging new stable releases.
+* When submitting a pull request, please be sure to work off of the
+`develop` branch, rather than `master`. In NetBox, the `develop` branch
+is used for ongoing development, while `master` is used for tagging new
+stable releases.

-* All code submissions should meet the following criteria (CI will enforce
-these checks):
+* All code submissions should meet the following criteria (CI will
+enforce these checks):

    * Python syntax is valid
    * All tests pass when run with `./manage.py test`
--- a/README.md
+++ b/README.md
@@ -31,5 +31,6 @@ Please see [the documentation](http://netbox.readthedocs.io/en/stable/) for inst

 ## Alternative Installations

-* [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))
+* [Docker container](https://github.com/digitalocean/netbox-docker)
+* [Heroku deployment](https://heroku.com/deploy?template=https://github.com/BILDQUADRAT/netbox/tree/heroku) (via [@mraerino](https://github.com/BILDQUADRAT/netbox/tree/heroku))
+* [Vagrant deployment](https://github.com/ryanmerolle/netbox-vagrant)
--- a/docs/api/overview.md
+++ b/docs/api/overview.md
@@ -88,10 +88,10 @@ The base serializer is used to represent the default view of a model. This inclu
    "vid": 101,
    "name": "Users-Floor1",
    "tenant": null,
-    "status": {
-        "value": 1,
-        "label": "Active"
-    },
+    "status": [
+        1,
+        "Active"
+    ],
    "role": {
        "id": 9,
        "url": "http://localhost:8000/api/ipam/roles/9/",
@@ -122,37 +122,6 @@ When a base serializer includes one or more nested serializers, the hierarchical
 }
 ```

-## 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.
-
-Each choice includes a human-friendly label and its corresponding numeric value. For example, `GET /api/ipam/_choices/prefix:status/` will return:
-
-```
-[
-    {
-        "value": 0,
-        "label": "Container"
-    },
-    {
-        "value": 1,
-        "label": "Active"
-    },
-    {
-        "value": 2,
-        "label": "Reserved"
-    },
-    {
-        "value": 3,
-        "label": "Deprecated"
-    }
-]
-```
-
-Thus, to set a prefix's status to "Reserved," it would be assigned the integer `2`.
-
-A request for `GET /api/ipam/_choices/` will return choices for _all_ fields belonging to models within the IPAM app.
-
 # Pagination

 API responses which contain a list of objects (for example, a request to `/api/dcim/devices/`) will be paginated to avoid unnecessary overhead. The root JSON object will contain the following attributes:
--- a/docs/configuration/optional-settings.md
+++ b/docs/configuration/optional-settings.md
@@ -145,7 +145,7 @@ An API consumer can request an arbitrary number of objects by appending the "lim

 Default: $BASE_DIR/netbox/media/

-The file path to the location where media files (such as image attachments) are stored. By default, this is the `netbox/media/` directory within the base NetBox installation path.
+The file path to the location where media files (such as image attachments) are stored. By default, this is the `netbox/media` directory within the base NetBox installation path.

 ---

@@ -207,14 +207,6 @@ When determining the primary IP address for a device, IPv6 is preferred over IPv

 ---

-## REPORTS_ROOT
-
-Default: $BASE_DIR/netbox/reports/
-
-The file path to the location where custom reports will be kept. By default, this is the `netbox/reports/` directory within the base NetBox installation path.
-
---
-
 ## TIME_ZONE

 Default: UTC
--- a/docs/index.md
+++ b/docs/index.md
@@ -6,7 +6,6 @@ NetBox is an open source web application designed to help manage and document co
 * **Equipment racks** - Organized by group and site
 * **Devices** - Types of devices and where they are installed
 * **Connections** - Network, console, and power connections among devices
-* **Virtualization** - Virtual machines and clusters
 * **Data circuits** - Long-haul communications circuits and providers
 * **Secrets** - Encrypted storage of sensitive credentials

@@ -47,7 +46,7 @@ NetBox is built on the [Django](https://djangoproject.com/) Python framework and
 | HTTP Service | nginx or Apache   |
 | WSGI Service | gunicorn or uWSGI |
 | Application  | Django/Python     |
-| Database     | PostgreSQL 9.4+   |
+| Database     | PostgreSQL        |

 # Getting Started

--- a/docs/installation/ldap.md
+++ b/docs/installation/ldap.md
@@ -55,7 +55,7 @@ LDAP_IGNORE_CERT_ERRORS = True
 ## User Authentication

 !!! info
-    When using Windows Server 2012, `AUTH_LDAP_USER_DN_TEMPLATE` should be set to None.
+    When using Windows Server, `2012 AUTH_LDAP_USER_DN_TEMPLATE` should be set to None.

 ```python
 from django_auth_ldap.config import LDAPSearch
@@ -79,7 +79,7 @@ AUTH_LDAP_USER_ATTR_MAP = {

 # User Groups for Permissions
 !!! Info
-    When using Microsoft Active Directory, Support for nested Groups can be activated by using `GroupOfNamesType()` instead of `NestedGroupOfNamesType()` for `AUTH_LDAP_GROUP_TYPE`.
+    When using Microsoft Active Directory, Support for nested Groups can be activated by using `GroupOfNamesType()` instead of `NestedGroupOfNamesType()` for AUTH_LDAP_GROUP_TYPE.

 ```python
 from django_auth_ldap.config import LDAPSearch, GroupOfNamesType
--- a/docs/installation/netbox.md
+++ b/docs/installation/netbox.md
@@ -1,24 +1,17 @@
 # Installation

-This section of the documentation discusses installing and configuring the NetBox application.
-
-!!! note
-    Python 3 is strongly encouraged for new installations. Support for Python 2 will be discontinued in the near future. This documentation includes a guide on [migrating from Python 2 to Python 3](migrating-to-python3).
-
 **Ubuntu**

 Python 3:

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

 Python 2:

 ```no-highlight
-# apt-get install -y python2.7 python-dev python-setuptools build-essential libxml2-dev libxslt1-dev libffi-dev graphviz libpq-dev libssl-dev zlib1g-dev
-# easy_install pip
+# apt-get install -y python2.7 python-dev python-pip libxml2-dev libxslt1-dev libffi-dev graphviz libpq-dev libssl-dev zlib1g-dev
 ```

 **CentOS**
@@ -29,14 +22,14 @@ Python 3:
 # yum install -y epel-release
 # yum install -y gcc python34 python34-devel python34-setuptools libxml2-devel libxslt-devel libffi-devel graphviz openssl-devel redhat-rpm-config
 # easy_install-3.4 pip
+# ln -s -f python3.4 /usr/bin/python
 ```

 Python 2:

 ```no-highlight
 # yum install -y epel-release
-# yum install -y gcc python2 python-devel python-setuptools libxml2-devel libxslt-devel libffi-devel graphviz openssl-devel redhat-rpm-config
-# easy_install pip
+# yum install -y gcc python2 python-devel python-pip libxml2-devel libxslt-devel libffi-devel graphviz openssl-devel redhat-rpm-config
 ```

 You may opt to install NetBox either from a numbered release or by cloning the master branch of its repository on GitHub.
@@ -104,9 +97,6 @@ Python 2:
 # pip install -r requirements.txt
 ```

-!!! 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 `pip -V` or `pip3 -V`.
-
 ### NAPALM Automation

 As of v2.1.0, NetBox supports integration with the [NAPALM automation](https://napalm-automation.net/) library. NAPALM allows NetBox to fetch live data from devices and return it to a requester via its REST API. Installation of NAPALM is optional. To enable it, install the `napalm` package using pip or pip3:
@@ -168,13 +158,13 @@ You may use the script located at `netbox/generate_secret_key.py` to generate a
 # Run Database Migrations

 !!! warning
-    The examples on the rest of this page call the `python3` executable. Replace this with `python2` or `python` if you're using Python 2.
+    The examples on the rest of this page call the `python` executable, which will be Python2 on most systems. Replace this with `python3` if you're running NetBox on Python3.

-Before NetBox can run, we need to install the database schema. This is done by running `python3 manage.py migrate` from the `netbox` directory (`/opt/netbox/netbox/` in our example):
+Before NetBox can run, we need to install the database schema. This is done by running `python manage.py migrate` from the `netbox` directory (`/opt/netbox/netbox/` in our example):

 ```no-highlight
 # cd /opt/netbox/netbox/
-# python3 manage.py migrate
+# python manage.py migrate
 Operations to perform:
  Apply all migrations: dcim, sessions, admin, ipam, utilities, auth, circuits, contenttypes, extras, secrets, users
 Running migrations:
@@ -192,7 +182,7 @@ If this step results in a PostgreSQL authentication error, ensure that the usern
 NetBox does not come with any predefined user accounts. You'll need to create a super user to be able to log into NetBox:

 ```no-highlight
-# python3 manage.py createsuperuser
+# python manage.py createsuperuser
 Username: admin
 Email address: admin@example.com
 Password:
@@ -203,7 +193,7 @@ Superuser created successfully.
 # Collect Static Files

 ```no-highlight
-# python3 manage.py collectstatic --no-input
+# python manage.py collectstatic --no-input

 You have requested to collect static files at the destination
 location as specified in your settings:
@@ -224,7 +214,7 @@ NetBox ships with some initial data to help you get started: RIR definitions, co
    This step is optional. It's perfectly fine to start using NetBox without using this initial data if you'd rather create everything from scratch.

 ```no-highlight
-# python3 manage.py loaddata initial_data
+# python manage.py loaddata initial_data
 Installed 43 object(s) from 4 fixture(s)
 ```

@@ -233,7 +223,7 @@ Installed 43 object(s) from 4 fixture(s)
 At this point, NetBox should be able to run. We can verify this by starting a development instance:

 ```no-highlight
-# python3 manage.py runserver 0.0.0.0:8000 --insecure
+# python manage.py runserver 0.0.0.0:8000 --insecure
 Performing system checks...

 System check identified no issues (0 silenced).
--- a/docs/installation/postgresql.md
+++ b/docs/installation/postgresql.md
@@ -1,16 +1,15 @@
-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).)
+NetBox requires a PostgreSQL 9.4 or higher database to store data. (Please note that MySQL is not supported, as NetBox leverages PostgreSQL's built-in [network address types](https://www.postgresql.org/docs/9.6/static/datatype-net-types.html).)

 !!! note
-    The installation instructions provided here have been tested to work on Ubuntu 16.04 and CentOS 7.4. The particular commands needed to install dependencies on other distributions may vary significantly. Unfortunately, this is outside the control of the NetBox maintainers. Please consult your distribution's documentation for assistance with any errors.
-
-!!! warning
-    NetBox v2.2 and later requires PostgreSQL 9.4 or higher.
+    The installation instructions provided here have been tested to work on Ubuntu 16.04 and CentOS 6.9. 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.

 # Installation

+NetBox v2.2 or later requires PostgreSQL 9.4 or higher.
+
 **Ubuntu**

-If a recent enough version of PostgreSQL is not available through your distribution's package manager, you'll need to install it from an official [PostgreSQL repository](https://wiki.postgresql.org/wiki/Apt).
+If a recent enough version of PostgreSQL is not available through your distribution's package manager, consider installing from an official [PostgreSQL repository](https://wiki.postgresql.org/wiki/Apt).

 ```no-highlight
 # apt-get update
@@ -19,26 +18,22 @@ If a recent enough version of PostgreSQL is not available through your distribut

 **CentOS**

-CentOS 7.4 does not ship with a recent enough version of PostgreSQL, so it will need to be installed from an external repository. The instructions below show the installation of PostgreSQL 9.6.
-
 ```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
-# yum install postgresql96 postgresql96-server postgresql96-devel
-# /usr/pgsql-9.6/bin/postgresql96-setup initdb
+# yum install -y postgresql postgresql-server postgresql-devel
+# postgresql-setup initdb
 ```

-CentOS users should modify the PostgreSQL configuration to accept password-based authentication by replacing `ident` with `md5` for all host entries within `/var/lib/pgsql/9.6/data/pg_hba.conf`. For example:
+CentOS users should modify the PostgreSQL configuration to accept password-based authentication by replacing `ident` with `md5` for all host entries within `/var/lib/pgsql/data/pg_hba.conf`. For example:

 ```no-highlight
 host    all             all             127.0.0.1/32            md5
 host    all             all             ::1/128                 md5
 ```

-Then, start the service and enable it to run at boot:
+Then, start the service:

 ```no-highlight
-# systemctl start postgresql-9.6
-# systemctl enable postgresql-9.6
+# systemctl start postgresql
 ```

 # Database Creation
@@ -50,7 +45,7 @@ At a minimum, we need to create a database for NetBox and assign it a username a

 ```no-highlight
 # sudo -u postgres psql
-psql (9.4.5)
+psql (9.3.13)
 Type "help" for help.

 postgres=# CREATE DATABASE netbox;
@@ -62,10 +57,10 @@ GRANT
 postgres=# \q
 ```

-You can verify that authentication works issuing the following command and providing the configured password. (Replace `localhost` with your database server if using a remote database.)
+You can verify that authentication works issuing the following command and providing the configured password:

 ```no-highlight
-# psql -U netbox -W -h localhost netbox
+# psql -U netbox -h localhost -W
 ```

-If successful, you will enter a `netbox` prompt. Type `\q` to exit.
+If successful, you will enter a `postgres` prompt. Type `\q` to exit.
--- a/docs/miscellaneous/reports.md
+++ b/docs/miscellaneous/reports.md
@@ -12,7 +12,7 @@ A NetBox report is a mechanism for validating the integrity of data within NetBo

 ## Writing Reports

-Reports must be saved as files in the [`REPORTS_ROOT`](../configuration/optional-settings/#reports_root) path (which defaults to `netbox/reports/`). Each file created within this path is considered a separate module. Each module holds one or more reports (Python classes), each of which performs a certain function. The logic of each report is broken into discrete test methods, each of which applies a small portion of the logic comprising the overall test.
+Reports must be saved as files in the `netbox/reports/` path within the NetBox installation path. Each file created within this path is considered a separate module. Each module holds one or more reports, each of which performs a certain function. The logic of each report is broken into discrete test methods, each of which applies a small portion of the logic comprising the overall test.

 !!! warning
    The reports path includes a file named `__init__.py`, which registers the path as a Python module. Do not delete this file.
@@ -94,8 +94,6 @@ The following methods are available to log results within a report:

 The recording of one or more failure messages will automatically flag a report as failed. It is advised to log a success for each object that is evaluated so that the results will reflect how many objects are being reported on. (The inclusion of a log message is optional for successes.) Messages recorded with `log()` will appear in a report's results but are not associated with a particular object or status.

-To perform additional tasks, such as sending an email or calling a webhook, after a report has been run, extend the `post_run()` method. The status of the report is available as `self.failed` and the results object is `self.result`.
-
 Once you have created a report, it will appear in the reports list. Initially, reports will have no results associated with them. To generate results, run the report.

 ## Running Reports
@@ -108,24 +106,14 @@ Once a report has been run, its associated results will be included in the repor

 ### Via the API

-To run a report via the API, simply issue a POST request to its `run` endpoint. Reports are identified by their module and class name.
+To run a report via the API, simply issue a POST request. Reports are identified by their module and class name.

 ```
-    POST /api/extras/reports/<module>.<name>/run/
+    POST /api/extras/reports/<module>.<name>/
 ```

 Our example report above would be called as:

 ```
-    POST /api/extras/reports/devices.DeviceConnectionsReport/run/
+    POST /api/extras/reports/devices.DeviceConnectionsReport/
 ```
-
-### Via the CLI
-
-Reports can be run on the CLI by invoking the management command:
-
-```
-python3 manage.py runreport <module>
-```
-
-One or more report modules may be specified.
--- a/docs/miscellaneous/shell.md
+++ b/docs/miscellaneous/shell.md
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -25,9 +25,10 @@ pages:
        - 'Authentication': 'api/authentication.md'
        - 'Working with Secrets': 'api/working-with-secrets.md'
        - 'Examples': 'api/examples.md'
+    - 'Shell':
+        - 'Introduction': 'shell/intro.md'
    - 'Miscellaneous':
        - 'Reports': 'miscellaneous/reports.md'
-        - 'Shell': 'miscellaneous/shell.md'
    - 'Development':
        - 'Utility Views': 'development/utility-views.md'

--- a/netbox/circuits/api/urls.py
+++ b/netbox/circuits/api/urls.py
@@ -16,9 +16,6 @@ class CircuitsRootView(routers.APIRootView):
 router = routers.DefaultRouter()
 router.APIRootView = CircuitsRootView

-# Field choices
-router.register(r'_choices', views.CircuitsFieldChoicesViewSet, base_name='field-choice')
-
 # Providers
 router.register(r'providers', views.ProviderViewSet)

--- a/netbox/circuits/api/views.py
+++ b/netbox/circuits/api/views.py
@@ -1,29 +1,20 @@
 from __future__ import unicode_literals

-from django.shortcuts import get_object_or_404
 from rest_framework.decorators import detail_route
 from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet

+from django.shortcuts import get_object_or_404
+
 from circuits import filters
 from circuits.models import Provider, CircuitTermination, CircuitType, Circuit
+from extras.models import Graph, GRAPH_TYPE_PROVIDER
 from extras.api.serializers import RenderedGraphSerializer
 from extras.api.views import CustomFieldModelViewSet
-from extras.models import Graph, GRAPH_TYPE_PROVIDER
-from utilities.api import FieldChoicesViewSet, WritableSerializerMixin
+from utilities.api import WritableSerializerMixin
 from . import serializers


-#
-# Field choices
-#
-
-class CircuitsFieldChoicesViewSet(FieldChoicesViewSet):
-    fields = (
-        (CircuitTermination, ['term_side']),
-    )
-
-
 #
 # Providers
 #
--- a/netbox/circuits/filters.py
+++ b/netbox/circuits/filters.py
@@ -1,12 +1,13 @@
 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 NumericInFilter
+from utilities.filters import NullableModelMultipleChoiceFilter, NumericInFilter
 from .models import Provider, Circuit, CircuitTermination, CircuitType


@@ -77,12 +78,12 @@ class CircuitFilter(CustomFieldFilterSet, django_filters.FilterSet):
        to_field_name='slug',
        label='Circuit type (slug)',
    )
-    tenant_id = django_filters.ModelMultipleChoiceFilter(
+    tenant_id = NullableModelMultipleChoiceFilter(
        queryset=Tenant.objects.all(),
        label='Tenant (ID)',
    )
-    tenant = django_filters.ModelMultipleChoiceFilter(
-        name='tenant__slug',
+    tenant = NullableModelMultipleChoiceFilter(
+        name='tenant',
        queryset=Tenant.objects.all(),
        to_field_name='slug',
        label='Tenant (slug)',
--- a/netbox/circuits/forms.py
+++ b/netbox/circuits/forms.py
@@ -11,6 +11,7 @@ from utilities.forms import (
    APISelect, BootstrapMixin, ChainedFieldsMixin, ChainedModelChoiceField, CommentField, FilterChoiceField,
    SmallTextarea, SlugField,
 )
+
 from .models import Circuit, CircuitTermination, CircuitType, Provider


@@ -84,17 +85,6 @@ class CircuitTypeForm(BootstrapMixin, forms.ModelForm):
        fields = ['name', 'slug']


-class CircuitTypeCSVForm(forms.ModelForm):
-    slug = SlugField()
-
-    class Meta:
-        model = CircuitType
-        fields = ['name', 'slug']
-        help_texts = {
-            'name': 'Name of circuit type',
-        }
-
-
 #
 # Circuits
 #
--- a/netbox/circuits/models.py
+++ b/netbox/circuits/models.py
@@ -8,8 +8,8 @@ from django.utils.encoding import python_2_unicode_compatible
 from dcim.fields import ASNField
 from extras.models import CustomFieldModel, CustomFieldValue
 from tenancy.models import Tenant
-from utilities.models import CreatedUpdatedModel
 from utilities.utils import csv_format
+from utilities.models import CreatedUpdatedModel
 from .constants import *


--- a/netbox/circuits/tables.py
+++ b/netbox/circuits/tables.py
@@ -1,12 +1,12 @@
 from __future__ import unicode_literals

 import django_tables2 as tables
-from django.utils.safestring import mark_safe
 from django_tables2.utils import Accessor

 from utilities.tables import BaseTable, ToggleColumn
 from .models import Circuit, CircuitType, Provider

+
 CIRCUITTYPE_ACTIONS = """
 {% if perms.circuit.change_circuittype %}
    <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>
@@ -14,21 +14,6 @@ CIRCUITTYPE_ACTIONS = """
 """


-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
-        ))
-
-
 #
 # Providers
 #
@@ -76,9 +61,15 @@ class CircuitTable(BaseTable):
    cid = tables.LinkColumn(verbose_name='ID')
    provider = tables.LinkColumn('circuits:provider', args=[Accessor('provider.slug')])
    tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')])
-    termination_a = CircuitTerminationColumn(orderable=False, verbose_name='A Side')
-    termination_z = CircuitTerminationColumn(orderable=False, verbose_name='Z Side')
+    a_side = tables.LinkColumn(
+        'dcim:site', accessor=Accessor('termination_a.site'), orderable=False,
+        args=[Accessor('termination_a.site.slug')]
+    )
+    z_side = tables.LinkColumn(
+        'dcim:site', accessor=Accessor('termination_z.site'), orderable=False,
+        args=[Accessor('termination_z.site.slug')]
+    )

    class Meta(BaseTable.Meta):
        model = Circuit
-        fields = ('pk', 'cid', 'type', 'provider', 'tenant', 'termination_a', 'termination_z', 'description')
+        fields = ('pk', 'cid', 'type', 'provider', 'tenant', 'a_side', 'z_side', 'description')
--- a/netbox/circuits/tests/test_api.py
+++ b/netbox/circuits/tests/test_api.py
@@ -1,15 +1,14 @@
 from __future__ import unicode_literals

-from django.contrib.auth.models import User
-from django.urls import reverse
 from rest_framework import status
 from rest_framework.test import APITestCase

-from circuits.constants import TERM_SIDE_A, TERM_SIDE_Z
-from circuits.models import Circuit, CircuitTermination, CircuitType, Provider
+from django.contrib.auth.models import User
+from django.urls import reverse
+
 from dcim.models import Site
-from extras.constants import GRAPH_TYPE_PROVIDER
-from extras.models import Graph
+from extras.models import Graph, GRAPH_TYPE_PROVIDER
+from circuits.models import Circuit, CircuitTermination, CircuitType, Provider, TERM_SIDE_A, TERM_SIDE_Z
 from users.models import Token
 from utilities.tests import HttpStatusMixin

--- a/netbox/circuits/urls.py
+++ b/netbox/circuits/urls.py
@@ -4,6 +4,7 @@ from django.conf.urls import url

 from . import views

+
 app_name = 'circuits'
 urlpatterns = [

@@ -20,7 +21,6 @@ urlpatterns = [
    # Circuit types
    url(r'^circuit-types/$', views.CircuitTypeListView.as_view(), name='circuittype_list'),
    url(r'^circuit-types/add/$', views.CircuitTypeCreateView.as_view(), name='circuittype_add'),
-    url(r'^circuit-types/import/$', views.CircuitTypeBulkImportView.as_view(), name='circuittype_import'),
    url(r'^circuit-types/delete/$', views.CircuitTypeBulkDeleteView.as_view(), name='circuittype_bulk_delete'),
    url(r'^circuit-types/(?P<slug>[\w-]+)/edit/$', views.CircuitTypeEditView.as_view(), name='circuittype_edit'),

--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -15,8 +15,7 @@ from utilities.views import (
    BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView,
 )
 from . import filters, forms, tables
-from .constants import TERM_SIDE_A, TERM_SIDE_Z
-from .models import Circuit, CircuitTermination, CircuitType, Provider
+from .models import Circuit, CircuitTermination, CircuitType, Provider, TERM_SIDE_A, TERM_SIDE_Z


 #
@@ -115,13 +114,6 @@ class CircuitTypeEditView(CircuitTypeCreateView):
    permission_required = 'circuits.change_circuittype'


-class CircuitTypeBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'circuits.add_circuittype'
-    model_form = forms.CircuitTypeCSVForm
-    table = tables.CircuitTypeTable
-    default_return_url = 'circuits:circuittype_list'
-
-
 class CircuitTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
    permission_required = 'circuits.delete_circuittype'
    cls = CircuitType
@@ -135,11 +127,7 @@ class CircuitTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 #

 class CircuitListView(ObjectListView):
-    queryset = Circuit.objects.select_related(
-        'provider', 'type', 'tenant'
-    ).prefetch_related(
-        'terminations__site', 'terminations__interface__device'
-    )
+    queryset = Circuit.objects.select_related('provider', 'type', 'tenant').prefetch_related('terminations__site')
    filter = filters.CircuitFilter
    filter_form = forms.CircuitFilterForm
    table = tables.CircuitTable
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -1,23 +1,19 @@
 from __future__ import unicode_literals
-
 from collections import OrderedDict

 from rest_framework import serializers
 from rest_framework.validators import UniqueTogetherValidator

+from ipam.models import IPAddress
 from circuits.models import Circuit, CircuitTermination
-from dcim.constants import (
-    CONNECTION_STATUS_CHOICES, IFACE_FF_CHOICES, IFACE_ORDERING_CHOICES, RACK_FACE_CHOICES, RACK_TYPE_CHOICES,
-    RACK_WIDTH_CHOICES, STATUS_CHOICES, SUBDEVICE_ROLE_CHOICES,
-)
 from dcim.models import (
-    ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
-    DeviceBayTemplate, DeviceType, DeviceRole, Interface, InterfaceConnection, InterfaceTemplate, Manufacturer,
-    InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup,
-    RackReservation, RackRole, Region, Site,
+    CONNECTION_STATUS_CHOICES, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device,
+    DeviceBay, DeviceBayTemplate, DeviceType, DeviceRole, IFACE_FF_CHOICES, IFACE_ORDERING_CHOICES, Interface,
+    InterfaceConnection, InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate,
+    PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RACK_FACE_CHOICES, RACK_TYPE_CHOICES,
+    RACK_WIDTH_CHOICES, Region, Site, STATUS_CHOICES, SUBDEVICE_ROLE_CHOICES,
 )
 from extras.api.customfields import CustomFieldModelSerializer
-from ipam.models import IPAddress
 from tenancy.api.serializers import NestedTenantSerializer
 from utilities.api import ChoiceFieldSerializer, ValidatedModelSerializer
 from virtualization.models import Cluster
@@ -146,8 +142,8 @@ class RackSerializer(CustomFieldModelSerializer):
    class Meta:
        model = Rack
        fields = [
-            'id', 'name', 'facility_id', 'display_name', 'site', 'group', 'tenant', 'role', 'serial', 'type', 'width',
-            'u_height', 'desc_units', 'comments', 'custom_fields',
+            'id', 'name', 'facility_id', 'display_name', 'site', 'group', 'tenant', 'role', 'type', 'width', 'u_height',
+            'desc_units', 'comments', 'custom_fields',
        ]


@@ -164,8 +160,8 @@ class WritableRackSerializer(CustomFieldModelSerializer):
    class Meta:
        model = Rack
        fields = [
-            'id', 'name', 'facility_id', 'site', 'group', 'tenant', 'role', 'serial', 'type', 'width', 'u_height',
-            'desc_units', 'comments', 'custom_fields',
+            'id', 'name', 'facility_id', 'site', 'group', 'tenant', 'role', 'type', 'width', 'u_height', 'desc_units',
+            'comments', 'custom_fields',
        ]
        # Omit the UniqueTogetherValidator that would be automatically added to validate (site, facility_id). This
        # prevents facility_id from being interpreted as a required field.
@@ -225,7 +221,7 @@ class WritableRackReservationSerializer(ValidatedModelSerializer):

    class Meta:
        model = RackReservation
-        fields = ['id', 'rack', 'units', 'user', 'description']
+        fields = ['id', 'rack', 'units', 'description']


 #
--- a/netbox/dcim/api/urls.py
+++ b/netbox/dcim/api/urls.py
@@ -16,9 +16,6 @@ class DCIMRootView(routers.APIRootView):
 router = routers.DefaultRouter()
 router.APIRootView = DCIMRootView

-# Field choices
-router.register(r'_choices', views.DCIMFieldChoicesViewSet, base_name='field-choice')
-
 # Sites
 router.register(r'regions', views.RegionViewSet)
 router.register(r'sites', views.SiteViewSet)
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -1,46 +1,28 @@
 from __future__ import unicode_literals
-
 from collections import OrderedDict

-from django.conf import settings
-from django.http import HttpResponseBadRequest, HttpResponseForbidden
-from django.shortcuts import get_object_or_404
 from rest_framework.decorators import detail_route
 from rest_framework.mixins import ListModelMixin
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet, ModelViewSet, ViewSet

-from dcim import filters
+from django.conf import settings
+from django.http import HttpResponseBadRequest, HttpResponseForbidden
+from django.shortcuts import get_object_or_404
+
 from dcim.models import (
    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,
 )
+from dcim import filters
 from extras.api.serializers import RenderedGraphSerializer
 from extras.api.views import CustomFieldModelViewSet
 from extras.models import Graph, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE
-from utilities.api import (
-    IsAuthenticatedOrLoginNotRequired, FieldChoicesViewSet, ServiceUnavailable, WritableSerializerMixin,
-)
-from . import serializers
+from utilities.api import IsAuthenticatedOrLoginNotRequired, ServiceUnavailable, WritableSerializerMixin
 from .exceptions import MissingFilterException
-
-
-#
-# Field choices
-#
-
-class DCIMFieldChoicesViewSet(FieldChoicesViewSet):
-    fields = (
-        (Device, ['face', 'status']),
-        (ConsolePort, ['connection_status']),
-        (Interface, ['form_factor']),
-        (InterfaceConnection, ['connection_status']),
-        (InterfaceTemplate, ['form_factor']),
-        (PowerPort, ['connection_status']),
-        (Rack, ['type', 'width']),
-    )
+from . import serializers


 #
@@ -258,19 +240,12 @@ class DeviceViewSet(WritableSerializerMixin, CustomFieldModelViewSet):
                device.platform
            ))

-        # Check that NAPALM is installed
+        # Check that NAPALM is installed and verify the configured driver
        try:
            import napalm
+            from napalm_base.exceptions import ConnectAuthError, ModuleImportError
        except ImportError:
            raise ServiceUnavailable("NAPALM is not installed. Please see the documentation for instructions.")
-
-        # TODO: Remove support for NAPALM < 2.0
-        try:
-            from napalm.base.exceptions import ConnectAuthError, ModuleImportError
-        except ImportError:
-            from napalm_base.exceptions import ConnectAuthError, ModuleImportError
-
-        # Validate the configured driver
        try:
            driver = napalm.get_network_driver(device.platform.napalm_driver)
        except ModuleImportError:
--- a/netbox/dcim/constants.py
+++ b/netbox/dcim/constants.py
@@ -66,9 +66,6 @@ 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_FF_80211A = 2600
@@ -96,13 +93,15 @@ IFACE_FF_JUNIPER_VCP = 5200
 # Other
 IFACE_FF_OTHER = 32767

+VIFACE_FF_CHOICES = [
+    [IFACE_FF_VIRTUAL, 'Virtual'],
+    [IFACE_FF_LAG, 'Link Aggregation Group (LAG)'],
+]
+
 IFACE_FF_CHOICES = [
    [
        'Virtual interfaces',
-        [
-            [IFACE_FF_VIRTUAL, 'Virtual'],
-            [IFACE_FF_LAG, 'Link Aggregation Group (LAG)'],
-        ],
+        VIFACE_FF_CHOICES,
    ],
    [
        'Ethernet (fixed)',
@@ -125,9 +124,6 @@ IFACE_FF_CHOICES = [
            [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)'],
        ]
    ],
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -1,33 +1,31 @@
 from __future__ import unicode_literals

 import django_filters
-from django.contrib.auth.models import User
-from django.db.models import Q
 from netaddr import EUI
 from netaddr.core import AddrFormatError

+from django.contrib.auth.models import User
+from django.db.models import Q
+
 from extras.filters import CustomFieldFilterSet
 from tenancy.models import Tenant
-from utilities.filters import NullableCharFieldFilter, NumericInFilter
+from utilities.filters import NullableCharFieldFilter, NullableModelMultipleChoiceFilter, NumericInFilter
 from virtualization.models import Cluster
-from .constants import (
-    IFACE_FF_LAG, NONCONNECTABLE_IFACE_TYPES, STATUS_CHOICES, VIRTUAL_IFACE_TYPES, WIRELESS_IFACE_TYPES,
-)
 from .models import (
    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,
+    DeviceBayTemplate, DeviceRole, DeviceType, STATUS_CHOICES, IFACE_FF_LAG, Interface, InterfaceConnection,
+    InterfaceTemplate, Manufacturer, InventoryItem, NONCONNECTABLE_IFACE_TYPES, Platform, PowerOutlet,
+    PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, Region, Site,
+    VIRTUAL_IFACE_TYPES, WIRELESS_IFACE_TYPES,
 )


 class RegionFilter(django_filters.FilterSet):
-    parent_id = django_filters.ModelMultipleChoiceFilter(
+    parent_id = NullableModelMultipleChoiceFilter(
        queryset=Region.objects.all(),
        label='Parent region (ID)',
    )
-    parent = django_filters.ModelMultipleChoiceFilter(
-        name='parent__slug',
+    parent = NullableModelMultipleChoiceFilter(
        queryset=Region.objects.all(),
        to_field_name='slug',
        label='Parent region (slug)',
@@ -44,22 +42,20 @@ class SiteFilter(CustomFieldFilterSet, django_filters.FilterSet):
        method='search',
        label='Search',
    )
-    region_id = django_filters.ModelMultipleChoiceFilter(
+    region_id = NullableModelMultipleChoiceFilter(
        queryset=Region.objects.all(),
        label='Region (ID)',
    )
-    region = django_filters.ModelMultipleChoiceFilter(
-        name='region__slug',
+    region = NullableModelMultipleChoiceFilter(
        queryset=Region.objects.all(),
        to_field_name='slug',
        label='Region (slug)',
    )
-    tenant_id = django_filters.ModelMultipleChoiceFilter(
+    tenant_id = NullableModelMultipleChoiceFilter(
        queryset=Tenant.objects.all(),
        label='Tenant (ID)',
    )
-    tenant = django_filters.ModelMultipleChoiceFilter(
-        name='tenant__slug',
+    tenant = NullableModelMultipleChoiceFilter(
        queryset=Tenant.objects.all(),
        to_field_name='slug',
        label='Tenant (slug)',
@@ -130,32 +126,32 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet):
        to_field_name='slug',
        label='Site (slug)',
    )
-    group_id = django_filters.ModelMultipleChoiceFilter(
+    group_id = NullableModelMultipleChoiceFilter(
        queryset=RackGroup.objects.all(),
        label='Group (ID)',
    )
-    group = django_filters.ModelMultipleChoiceFilter(
-        name='group__slug',
+    group = NullableModelMultipleChoiceFilter(
+        name='group',
        queryset=RackGroup.objects.all(),
        to_field_name='slug',
        label='Group',
    )
-    tenant_id = django_filters.ModelMultipleChoiceFilter(
+    tenant_id = NullableModelMultipleChoiceFilter(
        queryset=Tenant.objects.all(),
        label='Tenant (ID)',
    )
-    tenant = django_filters.ModelMultipleChoiceFilter(
-        name='tenant__slug',
+    tenant = NullableModelMultipleChoiceFilter(
+        name='tenant',
        queryset=Tenant.objects.all(),
        to_field_name='slug',
        label='Tenant (slug)',
    )
-    role_id = django_filters.ModelMultipleChoiceFilter(
+    role_id = NullableModelMultipleChoiceFilter(
        queryset=RackRole.objects.all(),
        label='Role (ID)',
    )
-    role = django_filters.ModelMultipleChoiceFilter(
-        name='role__slug',
+    role = NullableModelMultipleChoiceFilter(
+        name='role',
        queryset=RackRole.objects.all(),
        to_field_name='slug',
        label='Role (slug)',
@@ -163,7 +159,7 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet):

    class Meta:
        model = Rack
-        fields = ['serial', 'type', 'width', 'u_height', 'desc_units']
+        fields = ['type', 'width', 'u_height', 'desc_units']

    def search(self, queryset, name, value):
        if not value.strip():
@@ -171,7 +167,6 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet):
        return queryset.filter(
            Q(name__icontains=value) |
            Q(facility_id__icontains=value) |
-            Q(serial__icontains=value.strip()) |
            Q(comments__icontains=value)
        )

@@ -197,13 +192,13 @@ class RackReservationFilter(django_filters.FilterSet):
        to_field_name='slug',
        label='Site (slug)',
    )
-    group_id = django_filters.ModelMultipleChoiceFilter(
+    group_id = NullableModelMultipleChoiceFilter(
        name='rack__group',
        queryset=RackGroup.objects.all(),
        label='Group (ID)',
    )
-    group = django_filters.ModelMultipleChoiceFilter(
-        name='rack__group__slug',
+    group = NullableModelMultipleChoiceFilter(
+        name='rack__group',
        queryset=RackGroup.objects.all(),
        to_field_name='slug',
        label='Group',
@@ -372,22 +367,22 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet):
        to_field_name='slug',
        label='Role (slug)',
    )
-    tenant_id = django_filters.ModelMultipleChoiceFilter(
+    tenant_id = NullableModelMultipleChoiceFilter(
        queryset=Tenant.objects.all(),
        label='Tenant (ID)',
    )
-    tenant = django_filters.ModelMultipleChoiceFilter(
-        name='tenant__slug',
+    tenant = NullableModelMultipleChoiceFilter(
+        name='tenant',
        queryset=Tenant.objects.all(),
        to_field_name='slug',
        label='Tenant (slug)',
    )
-    platform_id = django_filters.ModelMultipleChoiceFilter(
+    platform_id = NullableModelMultipleChoiceFilter(
        queryset=Platform.objects.all(),
        label='Platform (ID)',
    )
-    platform = django_filters.ModelMultipleChoiceFilter(
-        name='platform__slug',
+    platform = NullableModelMultipleChoiceFilter(
+        name='platform',
        queryset=Platform.objects.all(),
        to_field_name='slug',
        label='Platform (slug)',
@@ -409,12 +404,12 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet):
        queryset=RackGroup.objects.all(),
        label='Rack group (ID)',
    )
-    rack_id = django_filters.ModelMultipleChoiceFilter(
+    rack_id = NullableModelMultipleChoiceFilter(
        name='rack',
        queryset=Rack.objects.all(),
        label='Rack (ID)',
    )
-    cluster_id = django_filters.ModelMultipleChoiceFilter(
+    cluster_id = NullableModelMultipleChoiceFilter(
        queryset=Cluster.objects.all(),
        label='VM cluster (ID)',
    )
@@ -425,8 +420,7 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet):
        label='Device model (slug)',
    )
    status = django_filters.MultipleChoiceFilter(
-        choices=STATUS_CHOICES,
-        null_value=None
+        choices=STATUS_CHOICES
    )
    is_full_depth = django_filters.BooleanFilter(
        name='device_type__is_full_depth',
@@ -600,7 +594,7 @@ class DeviceBayFilter(DeviceComponentFilterSet):


 class InventoryItemFilter(DeviceComponentFilterSet):
-    parent_id = django_filters.ModelMultipleChoiceFilter(
+    parent_id = NullableModelMultipleChoiceFilter(
        queryset=InventoryItem.objects.all(),
        label='Parent inventory item (ID)',
    )
--- a/netbox/dcim/formfields.py
+++ b/netbox/dcim/formfields.py
@@ -1,8 +1,9 @@
 from __future__ import unicode_literals

+from netaddr import EUI, AddrFormatError
+
 from django import forms
 from django.core.exceptions import ValidationError
-from netaddr import EUI, AddrFormatError


 #
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1,12 +1,11 @@
 from __future__ import unicode_literals

+from mptt.forms import TreeNodeChoiceField
 import re

 from django import forms
-from django.contrib.auth.models import User
 from django.contrib.postgres.forms.array import SimpleArrayField
 from django.db.models import Count, Q
-from mptt.forms import TreeNodeChoiceField

 from extras.forms import CustomFieldForm, CustomFieldBulkEditForm, CustomFieldFilterForm
 from ipam.models import IPAddress
@@ -18,20 +17,17 @@ from utilities.forms import (
    ExpandableNameField, FilterChoiceField, FlexibleModelChoiceField, Livesearch, SelectWithDisabled, SmallTextarea,
    SlugField, FilterTreeNodeMultipleChoiceField,
 )
-from virtualization.models import Cluster
-from .constants import (
-    CONNECTION_STATUS_CHOICES, CONNECTION_STATUS_CONNECTED, IFACE_FF_CHOICES, IFACE_FF_LAG, IFACE_ORDERING_CHOICES,
-    RACK_FACE_CHOICES, RACK_TYPE_CHOICES, RACK_WIDTH_CHOICES, RACK_WIDTH_19IN, RACK_WIDTH_23IN, STATUS_CHOICES,
-    SUBDEVICE_ROLE_CHILD, SUBDEVICE_ROLE_PARENT, SUBDEVICE_ROLE_CHOICES,
-)
 from .formfields import MACAddressFormField
 from .models import (
-    DeviceBay, DeviceBayTemplate, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate,
-    Device, DeviceRole, DeviceType, Interface, InterfaceConnection, InterfaceTemplate, Manufacturer, InventoryItem,
-    Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation,
-    RackRole, Region, Site,
+    DeviceBay, DeviceBayTemplate, CONNECTION_STATUS_CHOICES, CONNECTION_STATUS_CONNECTED, ConsolePort,
+    ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceRole, DeviceType, Interface,
+    IFACE_FF_CHOICES, IFACE_FF_LAG, IFACE_ORDERING_CHOICES, InterfaceConnection, InterfaceTemplate, Manufacturer,
+    InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, RACK_FACE_CHOICES,
+    RACK_TYPE_CHOICES, RACK_WIDTH_CHOICES, Rack, RackGroup, RackReservation, RackRole, RACK_WIDTH_19IN, RACK_WIDTH_23IN,
+    Region, Site, STATUS_CHOICES, SUBDEVICE_ROLE_CHILD, SUBDEVICE_ROLE_PARENT, SUBDEVICE_ROLE_CHOICES,
 )

+
 DEVICE_BY_PK_RE = '{\d+\}'


@@ -216,18 +212,6 @@ class RackRoleForm(BootstrapMixin, forms.ModelForm):
        fields = ['name', 'slug', 'color']


-class RackRoleCSVForm(forms.ModelForm):
-    slug = SlugField()
-
-    class Meta:
-        model = RackRole
-        fields = ['name', 'slug', 'color']
-        help_texts = {
-            'name': 'Name of rack role',
-            'color': 'RGB color in hexadecimal (e.g. 00ff00)'
-        }
-
-
 #
 # Racks
 #
@@ -248,8 +232,8 @@ class RackForm(BootstrapMixin, TenancyForm, CustomFieldForm):
    class Meta:
        model = Rack
        fields = [
-            'site', 'group', 'name', 'facility_id', 'tenant_group', 'tenant', 'role', 'serial', 'type', 'width',
-            'u_height', 'desc_units', 'comments',
+            'site', 'group', 'name', 'facility_id', 'tenant_group', 'tenant', 'role', 'type', 'width', 'u_height',
+            'desc_units', 'comments',
        ]
        help_texts = {
            'site': "The site at which the rack exists",
@@ -309,8 +293,7 @@ class RackCSVForm(forms.ModelForm):
    class Meta:
        model = Rack
        fields = [
-            'site', 'group_name', 'name', 'facility_id', 'tenant', 'role', 'serial', 'type', 'width', 'u_height',
-            'desc_units',
+            'site', 'group_name', 'name', 'facility_id', 'tenant', 'role', 'type', 'width', 'u_height', 'desc_units',
        ]
        help_texts = {
            'name': 'Rack name',
@@ -338,7 +321,6 @@ class RackBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
    group = forms.ModelChoiceField(queryset=RackGroup.objects.all(), required=False, label='Group')
    tenant = forms.ModelChoiceField(queryset=Tenant.objects.all(), required=False)
    role = forms.ModelChoiceField(queryset=RackRole.objects.all(), required=False)
-    serial = forms.CharField(max_length=50, required=False, label='Serial Number')
    type = forms.ChoiceField(choices=add_blank_choice(RACK_TYPE_CHOICES), required=False, label='Type')
    width = forms.ChoiceField(choices=add_blank_choice(RACK_WIDTH_CHOICES), required=False, label='Width')
    u_height = forms.IntegerField(required=False, label='Height (U)')
@@ -346,7 +328,7 @@ class RackBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
    comments = CommentField(widget=SmallTextarea)

    class Meta:
-        nullable_fields = ['group', 'tenant', 'role', 'serial', 'comments']
+        nullable_fields = ['group', 'tenant', 'role', 'comments']


 class RackFilterForm(BootstrapMixin, CustomFieldFilterForm):
@@ -379,11 +361,10 @@ class RackFilterForm(BootstrapMixin, CustomFieldFilterForm):

 class RackReservationForm(BootstrapMixin, forms.ModelForm):
    units = SimpleArrayField(forms.IntegerField(), widget=ArrayFieldSelectMultiple(attrs={'size': 10}))
-    user = forms.ModelChoiceField(queryset=User.objects.order_by('username'))

    class Meta:
        model = RackReservation
-        fields = ['units', 'user', 'description']
+        fields = ['units', 'description']

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

@@ -415,15 +396,6 @@ class RackReservationFilterForm(BootstrapMixin, forms.Form):
    )


-class RackReservationBulkEditForm(BootstrapMixin, BulkEditForm):
-    pk = forms.ModelMultipleChoiceField(queryset=RackReservation.objects.all(), widget=forms.MultipleHiddenInput)
-    user = forms.ModelChoiceField(queryset=User.objects.order_by('username'), required=False)
-    description = forms.CharField(max_length=100, required=False)
-
-    class Meta:
-        nullable_fields = []
-
-
 #
 # Manufacturers
 #
@@ -648,18 +620,6 @@ class DeviceRoleForm(BootstrapMixin, forms.ModelForm):
        fields = ['name', 'slug', 'color', 'vm_role']


-class DeviceRoleCSVForm(forms.ModelForm):
-    slug = SlugField()
-
-    class Meta:
-        model = DeviceRole
-        fields = ['name', 'slug', 'color', 'vm_role']
-        help_texts = {
-            'name': 'Name of device role',
-            'color': 'RGB color in hexadecimal (e.g. 00ff00)'
-        }
-
-
 #
 # Platforms
 #
@@ -672,17 +632,6 @@ class PlatformForm(BootstrapMixin, forms.ModelForm):
        fields = ['name', 'slug', 'napalm_driver', 'rpc_client']


-class PlatformCSVForm(forms.ModelForm):
-    slug = SlugField()
-
-    class Meta:
-        model = Platform
-        fields = ['name', 'slug', 'napalm_driver']
-        help_texts = {
-            'name': 'Platform name',
-        }
-
-
 #
 # Devices
 #
@@ -914,20 +863,11 @@ class DeviceCSVForm(BaseDeviceCSVForm):
        required=False,
        help_text='Mounted rack face'
    )
-    cluster = forms.ModelChoiceField(
-        queryset=Cluster.objects.all(),
-        to_field_name='name',
-        required=False,
-        help_text='Virtualization cluster',
-        error_messages={
-            'invalid_choice': 'Invalid cluster name.',
-        }
-    )

    class Meta(BaseDeviceCSVForm.Meta):
        fields = [
            'name', 'device_role', 'tenant', 'manufacturer', 'model_name', 'platform', 'serial', 'asset_tag', 'status',
-            'site', 'rack_group', 'rack_name', 'position', 'face', 'cluster',
+            'site', 'rack_group', 'rack_name', 'position', 'face',
        ]

    def clean(self):
@@ -963,20 +903,11 @@ class ChildDeviceCSVForm(BaseDeviceCSVForm):
    device_bay_name = forms.CharField(
        help_text='Name of device bay',
    )
-    cluster = forms.ModelChoiceField(
-        queryset=Cluster.objects.all(),
-        to_field_name='name',
-        required=False,
-        help_text='Virtualization cluster',
-        error_messages={
-            'invalid_choice': 'Invalid cluster name.',
-        }
-    )

    class Meta(BaseDeviceCSVForm.Meta):
        fields = [
            'name', 'device_role', 'tenant', 'manufacturer', 'model_name', 'platform', 'serial', 'asset_tag', 'status',
-            'parent', 'device_bay_name', 'cluster',
+            'parent', 'device_bay_name',
        ]

    def clean(self):
@@ -1007,7 +938,7 @@ class DeviceBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
    serial = forms.CharField(max_length=50, required=False, label='Serial Number')

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


 def device_status_choices():
--- a/netbox/dcim/migrations/0046_rack_lengthen_facility_id.py
+++ b/netbox/dcim/migrations/0046_rack_lengthen_facility_id.py
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-09 17:43
-from __future__ import unicode_literals
-
-from django.db import migrations
-import utilities.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dcim', '0045_devicerole_vm_role'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='rack',
-            name='facility_id',
-            field=utilities.fields.NullableCharField(blank=True, max_length=50, null=True, verbose_name='Facility ID'),
-        ),
-    ]
--- a/netbox/dcim/migrations/0047_more_100ge_form_factors.py
+++ b/netbox/dcim/migrations/0047_more_100ge_form_factors.py
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-09 18:43
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dcim', '0046_rack_lengthen_facility_id'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='interface',
-            name='form_factor',
-            field=models.PositiveSmallIntegerField(choices=[['Virtual interfaces', [[0, 'Virtual'], [200, 'Link Aggregation Group (LAG)']]], ['Ethernet (fixed)', [[800, '100BASE-TX (10/100ME)'], [1000, '1000BASE-T (1GE)'], [1150, '10GBASE-T (10GE)'], [1170, '10GBASE-CX4 (10GE)']]], ['Ethernet (modular)', [[1050, 'GBIC (1GE)'], [1100, 'SFP (1GE)'], [1200, 'SFP+ (10GE)'], [1300, 'XFP (10GE)'], [1310, 'XENPAK (10GE)'], [1320, 'X2 (10GE)'], [1350, 'SFP28 (25GE)'], [1400, 'QSFP+ (40GE)'], [1500, 'CFP (100GE)'], [1510, 'CFP2 (100GE)'], [1520, 'CFP4 (100GE)'], [1550, 'Cisco CPAK (100GE)'], [1600, 'QSFP28 (100GE)']]], ['Wireless', [[2600, 'IEEE 802.11a'], [2610, 'IEEE 802.11b/g'], [2620, 'IEEE 802.11n'], [2630, 'IEEE 802.11ac'], [2640, 'IEEE 802.11ad']]], ['FibreChannel', [[3010, 'SFP (1GFC)'], [3020, 'SFP (2GFC)'], [3040, 'SFP (4GFC)'], [3080, 'SFP+ (8GFC)'], [3160, 'SFP+ (16GFC)']]], ['Serial', [[4000, 'T1 (1.544 Mbps)'], [4010, 'E1 (2.048 Mbps)'], [4040, 'T3 (45 Mbps)'], [4050, 'E3 (34 Mbps)']]], ['Stacking', [[5000, 'Cisco StackWise'], [5050, 'Cisco StackWise Plus'], [5100, 'Cisco FlexStack'], [5150, 'Cisco FlexStack Plus'], [5200, 'Juniper VCP']]], ['Other', [[32767, 'Other']]]], default=1200),
-        ),
-        migrations.AlterField(
-            model_name='interfacetemplate',
-            name='form_factor',
-            field=models.PositiveSmallIntegerField(choices=[['Virtual interfaces', [[0, 'Virtual'], [200, 'Link Aggregation Group (LAG)']]], ['Ethernet (fixed)', [[800, '100BASE-TX (10/100ME)'], [1000, '1000BASE-T (1GE)'], [1150, '10GBASE-T (10GE)'], [1170, '10GBASE-CX4 (10GE)']]], ['Ethernet (modular)', [[1050, 'GBIC (1GE)'], [1100, 'SFP (1GE)'], [1200, 'SFP+ (10GE)'], [1300, 'XFP (10GE)'], [1310, 'XENPAK (10GE)'], [1320, 'X2 (10GE)'], [1350, 'SFP28 (25GE)'], [1400, 'QSFP+ (40GE)'], [1500, 'CFP (100GE)'], [1510, 'CFP2 (100GE)'], [1520, 'CFP4 (100GE)'], [1550, 'Cisco CPAK (100GE)'], [1600, 'QSFP28 (100GE)']]], ['Wireless', [[2600, 'IEEE 802.11a'], [2610, 'IEEE 802.11b/g'], [2620, 'IEEE 802.11n'], [2630, 'IEEE 802.11ac'], [2640, 'IEEE 802.11ad']]], ['FibreChannel', [[3010, 'SFP (1GFC)'], [3020, 'SFP (2GFC)'], [3040, 'SFP (4GFC)'], [3080, 'SFP+ (8GFC)'], [3160, 'SFP+ (16GFC)']]], ['Serial', [[4000, 'T1 (1.544 Mbps)'], [4010, 'E1 (2.048 Mbps)'], [4040, 'T3 (45 Mbps)'], [4050, 'E3 (34 Mbps)']]], ['Stacking', [[5000, 'Cisco StackWise'], [5050, 'Cisco StackWise Plus'], [5100, 'Cisco FlexStack'], [5150, 'Cisco FlexStack Plus'], [5200, 'Juniper VCP']]], ['Other', [[32767, 'Other']]]], default=1200),
-        ),
-    ]
--- a/netbox/dcim/migrations/0048_rack_serial.py
+++ b/netbox/dcim/migrations/0048_rack_serial.py
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-09 18:50
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dcim', '0047_more_100ge_form_factors'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='rack',
-            name='serial',
-            field=models.CharField(blank=True, max_length=50, verbose_name='Serial number'),
-        ),
-    ]
--- a/netbox/dcim/migrations/0049_rackreservation_change_user.py
+++ b/netbox/dcim/migrations/0049_rackreservation_change_user.py
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.6 on 2017-10-31 17:32
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dcim', '0048_rack_serial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='rackreservation',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
-        ),
-    ]
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -1,22 +1,24 @@
 from __future__ import unicode_literals
-
 from collections import OrderedDict
 from itertools import count, groupby

+from mptt.models import MPTTModel, TreeForeignKey
+
 from django.conf import settings
 from django.contrib.auth.models import User
+from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.fields import GenericRelation
 from django.contrib.postgres.fields import ArrayField
 from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.db.models import Count, Q, ObjectDoesNotExist
+from django.db.models.expressions import RawSQL
 from django.urls import reverse
 from django.utils.encoding import python_2_unicode_compatible
-from mptt.models import MPTTModel, TreeForeignKey

 from circuits.models import Circuit
-from extras.models import CustomFieldModel, CustomFieldValue, ImageAttachment
+from extras.models import CustomFieldModel, CustomField, CustomFieldValue, ImageAttachment
 from extras.rpc import RPC_CLIENTS
 from tenancy.models import Tenant
 from utilities.fields import ColorField, NullableCharField
@@ -25,7 +27,6 @@ from utilities.models import CreatedUpdatedModel
 from utilities.utils import csv_format
 from .constants import *
 from .fields import ASNField, MACAddressField
-from .querysets import InterfaceQuerySet


 #
@@ -216,12 +217,11 @@ class Rack(CreatedUpdatedModel, CustomFieldModel):
    Each Rack is assigned to a Site and (optionally) a RackGroup.
    """
    name = models.CharField(max_length=50)
-    facility_id = NullableCharField(max_length=50, blank=True, null=True, verbose_name='Facility ID')
+    facility_id = NullableCharField(max_length=30, blank=True, null=True, verbose_name='Facility ID')
    site = models.ForeignKey('Site', related_name='racks', on_delete=models.PROTECT)
    group = models.ForeignKey('RackGroup', related_name='racks', blank=True, null=True, on_delete=models.SET_NULL)
    tenant = models.ForeignKey(Tenant, blank=True, null=True, related_name='racks', on_delete=models.PROTECT)
    role = models.ForeignKey('RackRole', related_name='racks', blank=True, null=True, on_delete=models.PROTECT)
-    serial = models.CharField(max_length=50, blank=True, verbose_name='Serial number')
    type = models.PositiveSmallIntegerField(choices=RACK_TYPE_CHOICES, blank=True, null=True, verbose_name='Type')
    width = models.PositiveSmallIntegerField(choices=RACK_WIDTH_CHOICES, default=RACK_WIDTH_19IN, verbose_name='Width',
                                             help_text='Rail-to-rail width')
@@ -236,8 +236,7 @@ class Rack(CreatedUpdatedModel, CustomFieldModel):
    objects = RackManager()

    csv_headers = [
-        'site', 'group_name', 'name', 'facility_id', 'tenant', 'role', 'type', 'serial', 'width', 'u_height',
-        'desc_units',
+        'site', 'group_name', 'name', 'facility_id', 'tenant', 'role', 'type', 'width', 'u_height', 'desc_units',
    ]

    class Meta:
@@ -255,8 +254,8 @@ class Rack(CreatedUpdatedModel, CustomFieldModel):

    def clean(self):

+        # Validate that Rack is tall enough to house the installed Devices
        if self.pk:
-            # Validate that Rack is tall enough to house the installed Devices
            top_device = Device.objects.filter(rack=self).exclude(position__isnull=True).order_by('-position').first()
            if top_device:
                min_height = top_device.position + top_device.device_type.u_height - 1
@@ -266,12 +265,6 @@ class Rack(CreatedUpdatedModel, CustomFieldModel):
                            min_height
                        )
                    })
-            # Validate that Rack was assigned a group of its same site, if applicable
-            if self.group:
-                if self.group.site != self.site:
-                    raise ValidationError({
-                        'group': "Rack group must be from the same site, {}.".format(self.site)
-                    })

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

@@ -295,7 +288,6 @@ class Rack(CreatedUpdatedModel, CustomFieldModel):
            self.tenant.name if self.tenant else None,
            self.role.name if self.role else None,
            self.get_type_display() if self.type else None,
-            self.serial,
            self.width,
            self.u_height,
            self.desc_units,
@@ -417,7 +409,7 @@ class RackReservation(models.Model):
    rack = models.ForeignKey('Rack', related_name='reservations', on_delete=models.CASCADE)
    units = ArrayField(models.PositiveSmallIntegerField())
    created = models.DateTimeField(auto_now_add=True)
-    user = models.ForeignKey(User, on_delete=models.PROTECT)
+    user = models.ForeignKey(User, editable=False, on_delete=models.PROTECT)
    description = models.CharField(max_length=100)

    class Meta:
@@ -693,6 +685,72 @@ class PowerOutletTemplate(models.Model):
        return self.name


+class InterfaceQuerySet(models.QuerySet):
+
+    def order_naturally(self, method=IFACE_ORDERING_POSITION):
+        """
+        Naturally order interfaces by their type and numeric position. The sort method must be one of the defined
+        IFACE_ORDERING_CHOICES (typically indicated by a parent Device's DeviceType).
+
+        To order interfaces naturally, the `name` field is split into six distinct components: leading text (type),
+        slot, subslot, position, channel, and virtual circuit:
+
+            {type}{slot}/{subslot}/{position}/{subposition}:{channel}.{vc}
+
+        Components absent from the interface name are ignored. For example, an interface named GigabitEthernet1/2/3
+        would be parsed as follows:
+
+            name = 'GigabitEthernet'
+            slot =  1
+            subslot = 2
+            position = 3
+            subposition = 0
+            channel = None
+            vc = 0
+
+        The original `name` field is taken as a whole to serve as a fallback in the event interfaces do not match any of
+        the prescribed fields.
+        """
+        sql_col = '{}.name'.format(self.model._meta.db_table)
+        ordering = {
+            IFACE_ORDERING_POSITION: (
+                '_slot', '_subslot', '_position', '_subposition', '_channel', '_vc', '_type', '_id', 'name',
+            ),
+            IFACE_ORDERING_NAME: (
+                '_type', '_slot', '_subslot', '_position', '_subposition', '_channel', '_vc', '_id', 'name',
+            ),
+        }[method]
+
+        TYPE_RE = r"SUBSTRING({} FROM '^([^0-9]+)')"
+        ID_RE = r"CAST(SUBSTRING({} FROM '^(?:[^0-9]+)([0-9]+)$') AS integer)"
+        SLOT_RE = r"CAST(SUBSTRING({} FROM '^(?:[^0-9]+)([0-9]+)\/') AS integer)"
+        SUBSLOT_RE = r"CAST(SUBSTRING({} FROM '^(?:[^0-9]+)(?:[0-9]+\/)([0-9]+)') AS integer)"
+        POSITION_RE = r"CAST(SUBSTRING({} FROM '^(?:[^0-9]+)(?:[0-9]+\/){{2}}([0-9]+)') AS integer)"
+        SUBPOSITION_RE = r"CAST(SUBSTRING({} FROM '^(?:[^0-9]+)(?:[0-9]+\/){{3}}([0-9]+)') AS integer)"
+        CHANNEL_RE = r"COALESCE(CAST(SUBSTRING({} FROM ':([0-9]+)(\.[0-9]+)?$') AS integer), 0)"
+        VC_RE = r"COALESCE(CAST(SUBSTRING({} FROM '\.([0-9]+)$') AS integer), 0)"
+
+        fields = {
+            '_type': RawSQL(TYPE_RE.format(sql_col), []),
+            '_id': RawSQL(ID_RE.format(sql_col), []),
+            '_slot': RawSQL(SLOT_RE.format(sql_col), []),
+            '_subslot': RawSQL(SUBSLOT_RE.format(sql_col), []),
+            '_position': RawSQL(POSITION_RE.format(sql_col), []),
+            '_subposition': RawSQL(SUBPOSITION_RE.format(sql_col), []),
+            '_channel': RawSQL(CHANNEL_RE.format(sql_col), []),
+            '_vc': RawSQL(VC_RE.format(sql_col), []),
+        }
+
+        return self.annotate(**fields).order_by(*ordering)
+
+    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(form_factor__in=NONCONNECTABLE_IFACE_TYPES)
+
+
@python_2_unicode_compatible
 class InterfaceTemplate(models.Model):
    """
@@ -1117,17 +1175,6 @@ class ConsoleServerPort(models.Model):
    def __str__(self):
        return self.name

-    def clean(self):
-
-        # Check that the parent device's DeviceType is a console server
-        if self.device is None:
-            raise ValidationError("Console server ports must be assigned to devices.")
-        device_type = self.device.device_type
-        if not device_type.is_console_server:
-            raise ValidationError("The {} {} device type not support assignment of console server ports.".format(
-                device_type.manufacturer, device_type
-            ))
-

 #
 # Power ports
@@ -1193,17 +1240,6 @@ class PowerOutlet(models.Model):
    def __str__(self):
        return self.name

-    def clean(self):
-
-        # Check that the parent device's DeviceType is a PDU
-        if self.device is None:
-            raise ValidationError("Power outlets must be assigned to devices.")
-        device_type = self.device.device_type
-        if not device_type.is_pdu:
-            raise ValidationError("The {} {} device type not support assignment of power outlets.".format(
-                device_type.manufacturer, device_type
-            ))
-

 #
 # Interfaces
@@ -1260,14 +1296,6 @@ class Interface(models.Model):

    def clean(self):

-        # Check that the parent device's DeviceType is a network device
-        if self.device is not None:
-            device_type = self.device.device_type
-            if not device_type.is_network_device:
-                raise ValidationError("The {} {} device type not support assignment of network interfaces.".format(
-                    device_type.manufacturer, device_type
-                ))
-
        # An Interface must belong to a Device *or* to a VirtualMachine
        if self.device and self.virtual_machine:
            raise ValidationError("An interface cannot belong to both a device and a virtual machine.")
@@ -1275,9 +1303,9 @@ class Interface(models.Model):
            raise ValidationError("An interface must belong to either a device or a virtual machine.")

        # VM interfaces must be virtual
-        if self.virtual_machine and self.form_factor is not IFACE_FF_VIRTUAL:
+        if self.virtual_machine and self.form_factor not in VIRTUAL_IFACE_TYPES:
            raise ValidationError({
-                'form_factor': "Virtual machines can only have virtual interfaces."
+                'form_factor': "Virtual machines cannot have physical interfaces."
            })

        # Virtual interfaces cannot be connected
--- a/netbox/dcim/querysets.py
+++ b/netbox/dcim/querysets.py
@@ -1,72 +0,0 @@
-from __future__ import unicode_literals
-
-from django.db.models import QuerySet
-from django.db.models.expressions import RawSQL
-
-from .constants import IFACE_ORDERING_NAME, IFACE_ORDERING_POSITION, NONCONNECTABLE_IFACE_TYPES
-
-
-class InterfaceQuerySet(QuerySet):
-
-    def order_naturally(self, method=IFACE_ORDERING_POSITION):
-        """
-        Naturally order interfaces by their type and numeric position. The sort method must be one of the defined
-        IFACE_ORDERING_CHOICES (typically indicated by a parent Device's DeviceType).
-
-        To order interfaces naturally, the `name` field is split into six distinct components: leading text (type),
-        slot, subslot, position, channel, and virtual circuit:
-
-            {type}{slot}/{subslot}/{position}/{subposition}:{channel}.{vc}
-
-        Components absent from the interface name are ignored. For example, an interface named GigabitEthernet1/2/3
-        would be parsed as follows:
-
-            name = 'GigabitEthernet'
-            slot =  1
-            subslot = 2
-            position = 3
-            subposition = 0
-            channel = None
-            vc = 0
-
-        The original `name` field is taken as a whole to serve as a fallback in the event interfaces do not match any of
-        the prescribed fields.
-        """
-        sql_col = '{}.name'.format(self.model._meta.db_table)
-        ordering = {
-            IFACE_ORDERING_POSITION: (
-                '_slot', '_subslot', '_position', '_subposition', '_channel', '_type', '_vc', '_id', 'name',
-            ),
-            IFACE_ORDERING_NAME: (
-                '_type', '_slot', '_subslot', '_position', '_subposition', '_channel', '_vc', '_id', 'name',
-            ),
-        }[method]
-
-        TYPE_RE = r"SUBSTRING({} FROM '^([^0-9]+)')"
-        ID_RE = r"CAST(SUBSTRING({} FROM '^(?:[^0-9]+)([0-9]+)$') AS integer)"
-        SLOT_RE = r"CAST(SUBSTRING({} FROM '^(?:[^0-9]+)?([0-9]+)\/') AS integer)"
-        SUBSLOT_RE = r"COALESCE(CAST(SUBSTRING({} FROM '^(?:[^0-9]+)?(?:[0-9]+\/)([0-9]+)') AS integer), 0)"
-        POSITION_RE = r"COALESCE(CAST(SUBSTRING({} FROM '^(?:[^0-9]+)?(?:[0-9]+\/){{2}}([0-9]+)') AS integer), 0)"
-        SUBPOSITION_RE = r"COALESCE(CAST(SUBSTRING({} FROM '^(?:[^0-9]+)?(?:[0-9]+\/){{3}}([0-9]+)') AS integer), 0)"
-        CHANNEL_RE = r"COALESCE(CAST(SUBSTRING({} FROM ':([0-9]+)(\.[0-9]+)?$') AS integer), 0)"
-        VC_RE = r"COALESCE(CAST(SUBSTRING({} FROM '\.([0-9]+)$') AS integer), 0)"
-
-        fields = {
-            '_type': RawSQL(TYPE_RE.format(sql_col), []),
-            '_id': RawSQL(ID_RE.format(sql_col), []),
-            '_slot': RawSQL(SLOT_RE.format(sql_col), []),
-            '_subslot': RawSQL(SUBSLOT_RE.format(sql_col), []),
-            '_position': RawSQL(POSITION_RE.format(sql_col), []),
-            '_subposition': RawSQL(SUBPOSITION_RE.format(sql_col), []),
-            '_channel': RawSQL(CHANNEL_RE.format(sql_col), []),
-            '_vc': RawSQL(VC_RE.format(sql_col), []),
-        }
-
-        return self.annotate(**fields).order_by(*ordering)
-
-    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(form_factor__in=NONCONNECTABLE_IFACE_TYPES)
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -10,6 +10,7 @@ from .models import (
    PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, Region, Site,
 )

+
 REGION_LINK = """
 {% if record.get_children %}
    <span style="padding-left: {{ record.get_ancestors|length }}0px "><i class="fa fa-caret-right"></i>
@@ -361,7 +362,6 @@ class DeviceRoleTable(BaseTable):
    pk = ToggleColumn()
    name = tables.LinkColumn(verbose_name='Name')
    device_count = tables.Column(verbose_name='Devices')
-    vm_count = tables.Column(verbose_name='VMs')
    color = tables.TemplateColumn(COLOR_LABEL, verbose_name='Label')
    slug = tables.Column(verbose_name='Slug')
    actions = tables.TemplateColumn(template_code=DEVICEROLE_ACTIONS, attrs={'td': {'class': 'text-right'}},
@@ -369,7 +369,7 @@ class DeviceRoleTable(BaseTable):

    class Meta(BaseTable.Meta):
        model = DeviceRole
-        fields = ('pk', 'name', 'device_count', 'vm_count', 'color', 'vm_role', 'slug', 'actions')
+        fields = ('pk', 'name', 'device_count', 'color', 'vm_role', 'slug', 'actions')


 #
@@ -381,12 +381,13 @@ class PlatformTable(BaseTable):
    name = tables.LinkColumn(verbose_name='Name')
    device_count = tables.Column(verbose_name='Devices')
    slug = tables.Column(verbose_name='Slug')
+    rpc_client = tables.Column(accessor='get_rpc_client_display', orderable=False, verbose_name='RPC Client')
    actions = tables.TemplateColumn(template_code=PLATFORM_ACTIONS, attrs={'td': {'class': 'text-right'}},
                                    verbose_name='')

    class Meta(BaseTable.Meta):
        model = Platform
-        fields = ('pk', 'name', 'device_count', 'slug', 'napalm_driver', 'actions')
+        fields = ('pk', 'name', 'device_count', 'slug', 'rpc_client', 'actions')


 #
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -1,16 +1,16 @@
 from __future__ import unicode_literals

-from django.contrib.auth.models import User
-from django.urls import reverse
 from rest_framework import status
 from rest_framework.test import APITestCase

-from dcim.constants import IFACE_FF_LAG, SUBDEVICE_ROLE_CHILD, SUBDEVICE_ROLE_PARENT
+from django.contrib.auth.models import User
+from django.urls import reverse
+
 from dcim.models import (
    ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
-    DeviceBayTemplate, DeviceRole, DeviceType, Interface, InterfaceConnection, InterfaceTemplate, Manufacturer,
-    InventoryItem, Platform, PowerPort, PowerPortTemplate, PowerOutlet, PowerOutletTemplate, Rack, RackGroup,
-    RackReservation, RackRole, Region, Site,
+    DeviceBayTemplate, DeviceRole, DeviceType, IFACE_FF_LAG, Interface, InterfaceConnection, InterfaceTemplate,
+    Manufacturer, InventoryItem, Platform, PowerPort, PowerPortTemplate, PowerOutlet, PowerOutletTemplate, Rack, RackGroup,
+    RackReservation, RackRole, Region, Site, SUBDEVICE_ROLE_CHILD, SUBDEVICE_ROLE_PARENT,
 )
 from extras.models import Graph, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE
 from users.models import Token
@@ -1432,7 +1432,7 @@ class ConsoleServerPortTest(HttpStatusMixin, APITestCase):
        site = Site.objects.create(name='Test Site 1', slug='test-site-1')
        manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
        devicetype = DeviceType.objects.create(
-            manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1', is_console_server=True
+            manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1'
        )
        devicerole = DeviceRole.objects.create(
            name='Test Device Role 1', slug='test-device-role-1', color='ff0000'
@@ -1590,7 +1590,7 @@ class PowerOutletTest(HttpStatusMixin, APITestCase):
        site = Site.objects.create(name='Test Site 1', slug='test-site-1')
        manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
        devicetype = DeviceType.objects.create(
-            manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1', is_pdu=True
+            manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1'
        )
        devicerole = DeviceRole.objects.create(
            name='Test Device Role 1', slug='test-device-role-1', color='ff0000'
@@ -1667,7 +1667,7 @@ class InterfaceTest(HttpStatusMixin, APITestCase):
        site = Site.objects.create(name='Test Site 1', slug='test-site-1')
        manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
        devicetype = DeviceType.objects.create(
-            manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1', is_network_device=True
+            manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1'
        )
        devicerole = DeviceRole.objects.create(
            name='Test Device Role 1', slug='test-device-role-1', color='ff0000'
--- a/netbox/dcim/tests/test_models.py
+++ b/netbox/dcim/tests/test_models.py
@@ -9,29 +9,14 @@ class RackTestCase(TestCase):

    def setUp(self):

-        self.site1 = Site.objects.create(
+        self.site = Site.objects.create(
            name='TestSite1',
-            slug='test-site-1'
-        )
-        self.site2 = Site.objects.create(
-            name='TestSite2',
-            slug='test-site-2'
-        )
-        self.group1 = RackGroup.objects.create(
-            name='TestGroup1',
-            slug='test-group-1',
-            site=self.site1
-        )
-        self.group2 = RackGroup.objects.create(
-            name='TestGroup2',
-            slug='test-group-2',
-            site=self.site2
+            slug='my-test-site'
        )
        self.rack = Rack.objects.create(
            name='TestRack1',
            facility_id='A101',
-            site=self.site1,
-            group=self.group1,
+            site=self.site,
            u_height=42
        )
        self.manufacturer = Manufacturer.objects.create(
@@ -72,51 +57,13 @@ class RackTestCase(TestCase):

        }

-    def test_rack_device_outside_height(self):
-
-        rack1 = Rack(
-            name='TestRack2',
-            facility_id='A102',
-            site=self.site1,
-            u_height=42
-        )
-        rack1.save()
-
-        device1 = Device(
-            name='TestSwitch1',
-            device_type=DeviceType.objects.get(manufacturer__slug='acme', slug='ff2048'),
-            device_role=DeviceRole.objects.get(slug='switch'),
-            site=self.site1,
-            rack=rack1,
-            position=43,
-            face=RACK_FACE_FRONT,
-        )
-        device1.save()
-
-        with self.assertRaises(ValidationError):
-            rack1.clean()
-
-    def test_rack_group_site(self):
-
-        rack_invalid_group = Rack(
-            name='TestRack2',
-            facility_id='A102',
-            site=self.site1,
-            u_height=42,
-            group=self.group2
-        )
-        rack_invalid_group.save()
-
-        with self.assertRaises(ValidationError):
-            rack_invalid_group.clean()
-
    def test_mount_single_device(self):

        device1 = Device(
            name='TestSwitch1',
            device_type=DeviceType.objects.get(manufacturer__slug='acme', slug='ff2048'),
            device_role=DeviceRole.objects.get(slug='switch'),
-            site=self.site1,
+            site=self.site,
            rack=self.rack,
            position=10,
            face=RACK_FACE_REAR,
@@ -145,7 +92,7 @@ class RackTestCase(TestCase):
            name='TestPDU',
            device_role=self.role.get('PDU'),
            device_type=self.device_type.get('cc5000'),
-            site=self.site1,
+            site=self.site,
            rack=self.rack,
            position=None,
            face=None,
--- a/netbox/dcim/urls.py
+++ b/netbox/dcim/urls.py
@@ -5,8 +5,9 @@ from django.conf.urls import url
 from extras.views import ImageAttachmentEditView
 from ipam.views import ServiceCreateView
 from secrets.views import secret_add
-from . import views
 from .models import Device, Rack, Site
+from . import views
+

 app_name = 'dcim'
 urlpatterns = [
@@ -38,13 +39,11 @@ urlpatterns = [
    # Rack roles
    url(r'^rack-roles/$', views.RackRoleListView.as_view(), name='rackrole_list'),
    url(r'^rack-roles/add/$', views.RackRoleCreateView.as_view(), name='rackrole_add'),
-    url(r'^rack-roles/import/$', views.RackRoleBulkImportView.as_view(), name='rackrole_import'),
    url(r'^rack-roles/delete/$', views.RackRoleBulkDeleteView.as_view(), name='rackrole_bulk_delete'),
    url(r'^rack-roles/(?P<pk>\d+)/edit/$', views.RackRoleEditView.as_view(), name='rackrole_edit'),

    # Rack reservations
    url(r'^rack-reservations/$', views.RackReservationListView.as_view(), name='rackreservation_list'),
-    url(r'^rack-reservations/edit/$', views.RackReservationBulkEditView.as_view(), name='rackreservation_bulk_edit'),
    url(r'^rack-reservations/delete/$', views.RackReservationBulkDeleteView.as_view(), name='rackreservation_bulk_delete'),
    url(r'^rack-reservations/(?P<pk>\d+)/edit/$', views.RackReservationEditView.as_view(), name='rackreservation_edit'),
    url(r'^rack-reservations/(?P<pk>\d+)/delete/$', views.RackReservationDeleteView.as_view(), name='rackreservation_delete'),
@@ -107,14 +106,12 @@ urlpatterns = [
    # Device roles
    url(r'^device-roles/$', views.DeviceRoleListView.as_view(), name='devicerole_list'),
    url(r'^device-roles/add/$', views.DeviceRoleCreateView.as_view(), name='devicerole_add'),
-    url(r'^device-roles/import/$', views.DeviceRoleBulkImportView.as_view(), name='devicerole_import'),
    url(r'^device-roles/delete/$', views.DeviceRoleBulkDeleteView.as_view(), name='devicerole_bulk_delete'),
    url(r'^device-roles/(?P<slug>[\w-]+)/edit/$', views.DeviceRoleEditView.as_view(), name='devicerole_edit'),

    # Platforms
    url(r'^platforms/$', views.PlatformListView.as_view(), name='platform_list'),
    url(r'^platforms/add/$', views.PlatformCreateView.as_view(), name='platform_add'),
-    url(r'^platforms/import/$', views.PlatformBulkImportView.as_view(), name='platform_import'),
    url(r'^platforms/delete/$', views.PlatformBulkDeleteView.as_view(), name='platform_bulk_delete'),
    url(r'^platforms/(?P<slug>[\w-]+)/edit/$', views.PlatformEditView.as_view(), name='platform_edit'),

--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1,5 +1,7 @@
 from __future__ import unicode_literals
-
+from copy import deepcopy
+import re
+from natsort import natsorted
 from operator import attrgetter

 from django.contrib import messages
@@ -14,11 +16,10 @@ from django.utils.html import escape
 from django.utils.http import urlencode
 from django.utils.safestring import mark_safe
 from django.views.generic import View
-from natsort import natsorted

+from ipam.models import Prefix, Service, VLAN
 from circuits.models import Circuit
 from extras.models import Graph, TopologyMap, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE, UserAction
-from ipam.models import Prefix, Service, VLAN
 from utilities.forms import ConfirmationForm
 from utilities.paginator import EnhancedPaginator
 from utilities.views import (
@@ -26,15 +27,40 @@ from utilities.views import (
    ComponentEditView, ObjectDeleteView, ObjectEditView, ObjectListView,
 )
 from . import filters, forms, tables
-from .constants import CONNECTION_STATUS_CONNECTED
 from .models import (
-    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,
+    CONNECTION_STATUS_CONNECTED, 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,
 )


+EXPANSION_PATTERN = '\[(\d+-\d+)\]'
+
+
+def xstr(s):
+    """
+    Replace None with an empty string (for CSV export)
+    """
+    return '' if s is None else str(s)
+
+
+def expand_pattern(string):
+    """
+    Expand a numeric pattern into a list of strings. Examples:
+      'ge-0/0/[0-3]' => ['ge-0/0/0', 'ge-0/0/1', 'ge-0/0/2', 'ge-0/0/3']
+      'xe-0/[0-3]/[0-7]' => ['xe-0/0/0', 'xe-0/0/1', 'xe-0/0/2', ... 'xe-0/3/5', 'xe-0/3/6', 'xe-0/3/7']
+    """
+    lead, pattern, remnant = re.split(EXPANSION_PATTERN, string, maxsplit=1)
+    x, y = pattern.split('-')
+    for i in range(int(x), int(y) + 1):
+        if remnant:
+            for string in expand_pattern(remnant):
+                yield "{0}{1}{2}".format(lead, i, string)
+        else:
+            yield "{0}{1}".format(lead, i)
+
+
 class BulkDisconnectView(View):
    """
    An extendable view for disconnection console/power/interface components in bulk.
@@ -247,13 +273,6 @@ class RackRoleEditView(RackRoleCreateView):
    permission_required = 'dcim.change_rackrole'


-class RackRoleBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_rackrole'
-    model_form = forms.RackRoleCSVForm
-    table = tables.RackRoleTable
-    default_return_url = 'dcim:rackrole_list'
-
-
 class RackRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
    permission_required = 'dcim.delete_rackrole'
    cls = RackRole
@@ -427,16 +446,6 @@ class RackReservationDeleteView(PermissionRequiredMixin, ObjectDeleteView):
        return obj.rack.get_absolute_url()


-class RackReservationBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_rackreservation'
-    cls = RackReservation
-    queryset = RackReservation.objects.select_related('rack', 'user')
-    filter = filters.RackReservationFilter
-    table = tables.RackReservationTable
-    form = forms.RackReservationBulkEditForm
-    default_return_url = 'dcim:rackreservation_list'
-
-
 class RackReservationBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
    permission_required = 'dcim.delete_rackreservation'
    cls = RackReservation
@@ -528,12 +537,12 @@ class DeviceTypeView(View):
            show_header=False
        )
        if request.user.has_perm('dcim.change_devicetype'):
-            consoleport_table.columns.show('pk')
-            consoleserverport_table.columns.show('pk')
-            powerport_table.columns.show('pk')
-            poweroutlet_table.columns.show('pk')
-            interface_table.columns.show('pk')
-            devicebay_table.columns.show('pk')
+            consoleport_table.base_columns['pk'].visible = True
+            consoleserverport_table.base_columns['pk'].visible = True
+            powerport_table.base_columns['pk'].visible = True
+            poweroutlet_table.base_columns['pk'].visible = True
+            interface_table.base_columns['pk'].visible = True
+            devicebay_table.base_columns['pk'].visible = True

        return render(request, 'dcim/devicetype.html', {
            'devicetype': devicetype,
@@ -711,10 +720,7 @@ class DeviceBayTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 #

 class DeviceRoleListView(ObjectListView):
-    queryset = DeviceRole.objects.annotate(
-        device_count=Count('devices', distinct=True),
-        vm_count=Count('virtual_machines', distinct=True)
-    )
+    queryset = DeviceRole.objects.annotate(device_count=Count('devices'))
    table = tables.DeviceRoleTable
    template_name = 'dcim/devicerole_list.html'

@@ -732,13 +738,6 @@ class DeviceRoleEditView(DeviceRoleCreateView):
    permission_required = 'dcim.change_devicerole'


-class DeviceRoleBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_devicerole'
-    model_form = forms.DeviceRoleCSVForm
-    table = tables.DeviceRoleTable
-    default_return_url = 'dcim:devicerole_list'
-
-
 class DeviceRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
    permission_required = 'dcim.delete_devicerole'
    cls = DeviceRole
@@ -770,13 +769,6 @@ class PlatformEditView(PlatformCreateView):
    permission_required = 'dcim.change_platform'


-class PlatformBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_platform'
-    model_form = forms.PlatformCSVForm
-    table = tables.PlatformTable
-    default_return_url = 'dcim:platform_list'
-
-
 class PlatformBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
    permission_required = 'dcim.delete_platform'
    cls = Platform
--- a/netbox/extras/api/customfields.py
+++ b/netbox/extras/api/customfields.py
@@ -1,14 +1,15 @@
 from __future__ import unicode_literals
-
 from datetime import datetime

-from django.contrib.contenttypes.models import ContentType
-from django.db import transaction
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError

-from extras.constants import CF_TYPE_BOOLEAN, CF_TYPE_DATE, CF_TYPE_INTEGER, CF_TYPE_SELECT
-from extras.models import CustomField, CustomFieldChoice, CustomFieldValue
+from django.contrib.contenttypes.models import ContentType
+from django.db import transaction
+
+from extras.models import (
+    CF_TYPE_BOOLEAN, CF_TYPE_DATE, CF_TYPE_SELECT, CustomField, CustomFieldChoice, CustomFieldValue,
+)
 from utilities.api import ValidatedModelSerializer


@@ -38,15 +39,6 @@ class CustomFieldsSerializer(serializers.BaseSerializer):
            # Data validation
            if value not in [None, '']:

-                # Validate integer
-                if cf.type == CF_TYPE_INTEGER:
-                    try:
-                        int(value)
-                    except ValueError:
-                        raise ValidationError(
-                            "Invalid value for integer field {}: {}".format(field_name, value)
-                        )
-
                # Validate boolean
                if cf.type == CF_TYPE_BOOLEAN and value not in [True, False, 1, 0]:
                    raise ValidationError(
--- a/netbox/extras/api/serializers.py
+++ b/netbox/extras/api/serializers.py
@@ -1,12 +1,14 @@
 from __future__ import unicode_literals

 from django.core.exceptions import ObjectDoesNotExist
+
 from rest_framework import serializers

 from dcim.api.serializers import NestedDeviceSerializer, NestedRackSerializer, NestedSiteSerializer
 from dcim.models import Device, Rack, Site
-from extras.constants import ACTION_CHOICES, GRAPH_TYPE_CHOICES
-from extras.models import ExportTemplate, Graph, ImageAttachment, ReportResult, TopologyMap, UserAction
+from extras.models import (
+    ACTION_CHOICES, ExportTemplate, Graph, GRAPH_TYPE_CHOICES, ImageAttachment, ReportResult, TopologyMap, UserAction,
+)
 from users.api.serializers import NestedUserSerializer
 from utilities.api import ChoiceFieldSerializer, ContentTypeFieldSerializer, ValidatedModelSerializer

--- a/netbox/extras/api/urls.py
+++ b/netbox/extras/api/urls.py
@@ -16,9 +16,6 @@ class ExtrasRootView(routers.APIRootView):
 router = routers.DefaultRouter()
 router.APIRootView = ExtrasRootView

-# Field choices
-router.register(r'_choices', views.ExtrasFieldChoicesViewSet, base_name='field-choice')
-
 # Graphs
 router.register(r'graphs', views.GraphViewSet)

--- a/netbox/extras/api/views.py
+++ b/netbox/extras/api/views.py
@@ -1,35 +1,21 @@
 from __future__ import unicode_literals

-from django.contrib.contenttypes.models import ContentType
-from django.http import Http404, HttpResponse
-from django.shortcuts import get_object_or_404
 from rest_framework.decorators import detail_route
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet, ReadOnlyModelViewSet, ViewSet

+from django.contrib.contenttypes.models import ContentType
+from django.http import Http404, HttpResponse
+from django.shortcuts import get_object_or_404
+
 from extras import filters
-from extras.models import CustomField, ExportTemplate, Graph, ImageAttachment, ReportResult, TopologyMap, UserAction
+from extras.models import ExportTemplate, Graph, ImageAttachment, ReportResult, TopologyMap, UserAction
 from extras.reports import get_report, get_reports
-from utilities.api import FieldChoicesViewSet, IsAuthenticatedOrLoginNotRequired, WritableSerializerMixin
+from utilities.api import WritableSerializerMixin
 from . import serializers


-#
-# Field choices
-#
-
-class ExtrasFieldChoicesViewSet(FieldChoicesViewSet):
-    fields = (
-        (CustomField, ['type']),
-        (Graph, ['type']),
-    )
-
-
-#
-# Custom fields
-#
-
 class CustomFieldModelViewSet(ModelViewSet):
    """
    Include the applicable set of CustomFields in the ModelViewSet context.
@@ -60,10 +46,6 @@ class CustomFieldModelViewSet(ModelViewSet):
        return super(CustomFieldModelViewSet, self).get_queryset().prefetch_related('custom_field_values__field')


-#
-# Graphs
-#
-
 class GraphViewSet(WritableSerializerMixin, ModelViewSet):
    queryset = Graph.objects.all()
    serializer_class = serializers.GraphSerializer
@@ -71,20 +53,12 @@ class GraphViewSet(WritableSerializerMixin, ModelViewSet):
    filter_class = filters.GraphFilter


-#
-# Export templates
-#
-
 class ExportTemplateViewSet(WritableSerializerMixin, ModelViewSet):
    queryset = ExportTemplate.objects.all()
    serializer_class = serializers.ExportTemplateSerializer
    filter_class = filters.ExportTemplateFilter


-#
-# Topology maps
-#
-
 class TopologyMapViewSet(WritableSerializerMixin, ModelViewSet):
    queryset = TopologyMap.objects.select_related('site')
    serializer_class = serializers.TopologyMapSerializer
@@ -111,22 +85,13 @@ class TopologyMapViewSet(WritableSerializerMixin, ModelViewSet):
        return response


-#
-# Image attachments
-#
-
 class ImageAttachmentViewSet(WritableSerializerMixin, ModelViewSet):
    queryset = ImageAttachment.objects.all()
    serializer_class = serializers.ImageAttachmentSerializer
    write_serializer_class = serializers.WritableImageAttachmentSerializer


-#
-# Reports
-#
-
 class ReportViewSet(ViewSet):
-    permission_classes = [IsAuthenticatedOrLoginNotRequired]
    _ignore_model_permissions = True
    exclude_from_schema = True
    lookup_value_regex = '[^/]+'  # Allow dots
@@ -197,10 +162,6 @@ class ReportViewSet(ViewSet):
        return Response(serializer.data)


-#
-# User activity
-#
-
 class RecentActivityViewSet(ReadOnlyModelViewSet):
    """
    List all UserActions to provide a log of recent activity.
--- a/netbox/extras/filters.py
+++ b/netbox/extras/filters.py
@@ -1,12 +1,12 @@
 from __future__ import unicode_literals

 import django_filters
+
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType

 from dcim.models import Site
-from .constants import CF_TYPE_SELECT
-from .models import CustomField, Graph, ExportTemplate, TopologyMap, UserAction
+from .models import CF_TYPE_SELECT, CustomField, Graph, ExportTemplate, TopologyMap, UserAction


 class CustomFieldFilter(django_filters.Filter):
@@ -19,28 +19,17 @@ class CustomFieldFilter(django_filters.Filter):
        super(CustomFieldFilter, self).__init__(*args, **kwargs)

    def filter(self, queryset, value):
-
        # Skip filter on empty value
        if not value.strip():
            return queryset
-
-        # Selection fields get special treatment (values must be integers)
-        if self.cf_type == CF_TYPE_SELECT:
-            try:
-                # Treat 0 as None
-                if int(value) == 0:
-                    return queryset.exclude(
-                        custom_field_values__field__name=self.name,
-                    )
-                # Match on exact CustomFieldChoice PK
-                else:
-                    return queryset.filter(
-                        custom_field_values__field__name=self.name,
-                        custom_field_values__serialized_value=value,
-                    )
-            except ValueError:
-                return queryset.none()
-
+        # Treat 0 as None for Select fields
+        try:
+            if self.cf_type == CF_TYPE_SELECT and int(value) == 0:
+                return queryset.exclude(
+                    custom_field_values__field__name=self.name,
+                )
+        except ValueError:
+            pass
        return queryset.filter(
            custom_field_values__field__name=self.name,
            custom_field_values__serialized_value__icontains=value,
--- a/netbox/extras/forms.py
+++ b/netbox/extras/forms.py
@@ -1,13 +1,14 @@
 from __future__ import unicode_literals
-
 from collections import OrderedDict

 from django import forms
 from django.contrib.contenttypes.models import ContentType

 from utilities.forms import BootstrapMixin, BulkEditForm, LaxURLField
-from .constants import CF_TYPE_BOOLEAN, CF_TYPE_DATE, CF_TYPE_INTEGER, CF_TYPE_SELECT, CF_TYPE_URL
-from .models import CustomField, CustomFieldValue, ImageAttachment
+from .models import (
+    CF_TYPE_BOOLEAN, CF_TYPE_DATE, CF_TYPE_INTEGER, CF_TYPE_SELECT, CF_TYPE_URL, CustomField, CustomFieldValue,
+    ImageAttachment,
+)


 def get_custom_fields_for_model(content_type, filterable_only=False, bulk_edit=False):
--- a/netbox/extras/management/commands/nbshell.py
+++ b/netbox/extras/management/commands/nbshell.py
@@ -10,6 +10,7 @@ from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.db.models import Model

+
 APPS = ['circuits', 'dcim', 'extras', 'ipam', 'secrets', 'tenancy', 'users', 'virtualization']

 BANNER_TEXT = """### NetBox interactive shell ({node})
--- a/netbox/extras/management/commands/run_inventory.py
+++ b/netbox/extras/management/commands/run_inventory.py
@@ -1,12 +1,12 @@
 from __future__ import unicode_literals

 from getpass import getpass
+from ncclient.transport.errors import AuthenticationError
+from paramiko import AuthenticationException

 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 from django.db import transaction
-from ncclient.transport.errors import AuthenticationError
-from paramiko import AuthenticationException

 from dcim.models import Device, InventoryItem, Site, STATUS_ACTIVE

--- a/netbox/extras/management/commands/runreport.py
+++ b/netbox/extras/management/commands/runreport.py
@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 from django.core.management.base import BaseCommand
 from django.utils import timezone

+from extras.models import ReportResult
 from extras.reports import get_reports


@@ -11,6 +12,7 @@ class Command(BaseCommand):

    def add_arguments(self, parser):
        parser.add_argument('reports', nargs='+', help="Report(s) to run")
+        # parser.add_argument('--verbose', action='store_true', default=False, help="Print all logs")

    def handle(self, *args, **options):

@@ -20,7 +22,7 @@ class Command(BaseCommand):
        # Run reports
        for module_name, report_list in reports:
            for report in report_list:
-                if module_name in options['reports'] or report.full_name in options['reports']:
+                if module_name in options['reports'] or report.full_namel in options['reports']:

                    # Run the report and create a new ReportResult
                    self.stdout.write(
--- a/netbox/extras/migrations/0008_reports.py
+++ b/netbox/extras/migrations/0008_reports.py
@@ -1,31 +1,11 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-09-26 21:25
 from __future__ import unicode_literals
-from distutils.version import StrictVersion
-import re

 from django.conf import settings
 import django.contrib.postgres.fields.jsonb
-from django.db import connection, migrations, models
+from django.db import migrations, models
 import django.db.models.deletion
-from django.db.utils import OperationalError
-
-
-def verify_postgresql_version(apps, schema_editor):
-    """
-    Verify that PostgreSQL is version 9.4 or higher.
-    """
-    try:
-        with connection.cursor() as cursor:
-            cursor.execute("SELECT VERSION()")
-            row = cursor.fetchone()
-            pg_version = re.match('^PostgreSQL (\d+\.\d+(\.\d+)?)', row[0]).group(1)
-            if StrictVersion(pg_version) < StrictVersion('9.4.0'):
-                raise Exception("PostgreSQL 9.4.0 or higher is required ({} found). Upgrade PostgreSQL and then run migrations again.".format(pg_version))
-
-    # Skip if the database is missing (e.g. for CI testing) or misconfigured.
-    except OperationalError:
-        pass


 class Migration(migrations.Migration):
@@ -36,7 +16,6 @@ class Migration(migrations.Migration):
    ]

    operations = [
-        migrations.RunPython(verify_postgresql_version),
        migrations.CreateModel(
            name='ReportResult',
            fields=[
--- a/netbox/extras/models.py
+++ b/netbox/extras/models.py
@@ -1,9 +1,8 @@
 from __future__ import unicode_literals
-
 from collections import OrderedDict
 from datetime import date
-
 import graphviz
+
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
@@ -275,7 +274,6 @@ class TopologyMap(models.Model):
        # Construct the graph
        graph = graphviz.Graph()
        graph.graph_attr['ranksep'] = '1'
-        seen = set()
        for i, device_set in enumerate(self.device_sets):

            subgraph = graphviz.Graph(name='sg{}'.format(i))
@@ -290,9 +288,6 @@ class TopologyMap(models.Model):
            devices = []
            for query in device_set.strip(';').split(';'):  # Split regexes on semicolons
                devices += Device.objects.filter(name__regex=query).select_related('device_role')
-            # Remove duplicate devices
-            devices = [d for d in devices if d.id not in seen]
-            seen.update([d.id for d in devices])
            for d in devices:
                bg_color = '#{}'.format(d.device_role.color)
                fg_color = '#{}'.format(foreground_color(d.device_role.color))
--- a/netbox/extras/reports.py
+++ b/netbox/extras/reports.py
@@ -1,15 +1,13 @@
-from __future__ import unicode_literals
-
+from collections import OrderedDict
 import importlib
 import inspect
 import pkgutil
-from collections import OrderedDict

-from django.conf import settings
 from django.utils import timezone

 from .constants import LOG_DEFAULT, LOG_FAILURE, LOG_INFO, LOG_LEVEL_CODES, LOG_SUCCESS, LOG_WARNING
 from .models import ReportResult
+import reports as custom_reports


 def is_report(obj):
@@ -44,9 +42,9 @@ def get_reports():
    """
    module_list = []

-    # Iterate through all modules within the reports path. These are the user-created files in which reports are
+    # Iterate through all modules within the reports path. These are the user-defined files in which reports are
    # defined.
-    for importer, module_name, is_pkg in pkgutil.walk_packages([settings.REPORTS_ROOT]):
+    for importer, module_name, is_pkg in pkgutil.walk_packages(custom_reports.__path__):
        module = importlib.import_module('reports.{}'.format(module_name))
        report_list = [cls() for _, cls in inspect.getmembers(module, is_report)]
        module_list.append((module_name, report_list))
@@ -178,12 +176,3 @@ class Report(object):
        result = ReportResult(report=self.full_name, failed=self.failed, data=self._results)
        result.save()
        self.result = result
-
-        # Perform any post-run tasks
-        self.post_run()
-
-    def post_run(self):
-        """
-        Extend this method to include any tasks which should execute after the report has been run.
-        """
-        pass
--- a/netbox/extras/rpc.py
+++ b/netbox/extras/rpc.py
@@ -1,11 +1,11 @@
 from __future__ import unicode_literals
-
 import re
 import time

+from ncclient import manager
 import paramiko
 import xmltodict
-from ncclient import manager
+

 CONNECT_TIMEOUT = 5  # seconds

--- a/netbox/extras/tests/test_api.py
+++ b/netbox/extras/tests/test_api.py
@@ -1,14 +1,14 @@
 from __future__ import unicode_literals

+from rest_framework import status
+from rest_framework.test import APITestCase
+
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.urls import reverse
-from rest_framework import status
-from rest_framework.test import APITestCase

 from dcim.models import Device
-from extras.constants import GRAPH_TYPE_SITE
-from extras.models import Graph, ExportTemplate
+from extras.models import Graph, GRAPH_TYPE_SITE, ExportTemplate
 from users.models import Token
 from utilities.tests import HttpStatusMixin

--- a/netbox/extras/tests/test_customfields.py
+++ b/netbox/extras/tests/test_customfields.py
@@ -1,17 +1,19 @@
 from __future__ import unicode_literals
-
 from datetime import date

+from rest_framework import status
+from rest_framework.test import APITestCase
+
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 from django.urls import reverse
-from rest_framework import status
-from rest_framework.test import APITestCase

 from dcim.models import Site
-from extras.constants import CF_TYPE_TEXT, CF_TYPE_INTEGER, CF_TYPE_BOOLEAN, CF_TYPE_DATE, CF_TYPE_SELECT, CF_TYPE_URL
-from extras.models import CustomField, CustomFieldValue, CustomFieldChoice
+from extras.models import (
+    CustomField, CustomFieldValue, CustomFieldChoice, CF_TYPE_TEXT, CF_TYPE_INTEGER, CF_TYPE_BOOLEAN, CF_TYPE_DATE,
+    CF_TYPE_SELECT, CF_TYPE_URL,
+)
 from users.models import Token
 from utilities.tests import HttpStatusMixin

--- a/netbox/extras/urls.py
+++ b/netbox/extras/urls.py
@@ -4,6 +4,7 @@ from django.conf.urls import url

 from extras import views

+
 app_name = 'extras'
 urlpatterns = [

--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals

-from django.contrib import messages
 from django.contrib.auth.mixins import PermissionRequiredMixin
+from django.contrib import messages
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.safestring import mark_safe
--- a/netbox/ipam/api/serializers.py
+++ b/netbox/ipam/api/serializers.py
@@ -1,5 +1,4 @@
 from __future__ import unicode_literals
-
 from collections import OrderedDict

 from rest_framework import serializers
@@ -7,10 +6,10 @@ from rest_framework.validators import UniqueTogetherValidator

 from dcim.api.serializers import NestedDeviceSerializer, InterfaceSerializer, NestedSiteSerializer
 from extras.api.customfields import CustomFieldModelSerializer
-from ipam.constants import (
-    IPADDRESS_ROLE_CHOICES, IPADDRESS_STATUS_CHOICES, IP_PROTOCOL_CHOICES, PREFIX_STATUS_CHOICES, VLAN_STATUS_CHOICES,
+from ipam.models import (
+    Aggregate, IPAddress, IPADDRESS_ROLE_CHOICES, IPADDRESS_STATUS_CHOICES, IP_PROTOCOL_CHOICES, Prefix,
+    PREFIX_STATUS_CHOICES, RIR, Role, Service, VLAN, VLAN_STATUS_CHOICES, VLANGroup, VRF,
 )
-from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
 from tenancy.api.serializers import NestedTenantSerializer
 from utilities.api import ChoiceFieldSerializer, ValidatedModelSerializer
 from virtualization.api.serializers import NestedVirtualMachineSerializer
@@ -241,22 +240,12 @@ class WritablePrefixSerializer(CustomFieldModelSerializer):
 # IP addresses
 #

-class IPAddressInterfaceSerializer(InterfaceSerializer):
-    virtual_machine = NestedVirtualMachineSerializer()
-
-    class Meta(InterfaceSerializer.Meta):
-        fields = [
-            'id', 'device', 'virtual_machine', 'name', 'form_factor', 'enabled', 'lag', 'mtu', 'mac_address',
-            'mgmt_only', 'description', 'is_connected', 'interface_connection', 'circuit_termination',
-        ]
-
-
 class IPAddressSerializer(CustomFieldModelSerializer):
    vrf = NestedVRFSerializer()
    tenant = NestedTenantSerializer()
    status = ChoiceFieldSerializer(choices=IPADDRESS_STATUS_CHOICES)
    role = ChoiceFieldSerializer(choices=IPADDRESS_ROLE_CHOICES)
-    interface = IPAddressInterfaceSerializer()
+    interface = InterfaceSerializer()

    class Meta:
        model = IPAddress
@@ -273,7 +262,6 @@ class NestedIPAddressSerializer(serializers.ModelSerializer):
        model = IPAddress
        fields = ['id', 'url', 'family', 'address']

-
 IPAddressSerializer._declared_fields['nat_inside'] = NestedIPAddressSerializer()
 IPAddressSerializer._declared_fields['nat_outside'] = NestedIPAddressSerializer()

--- a/netbox/ipam/api/urls.py
+++ b/netbox/ipam/api/urls.py
@@ -16,9 +16,6 @@ class IPAMRootView(routers.APIRootView):
 router = routers.DefaultRouter()
 router.APIRootView = IPAMRootView

-# Field choices
-router.register(r'_choices', views.IPAMFieldChoicesViewSet, base_name='field-choice')
-
 # VRFs
 router.register(r'vrfs', views.VRFViewSet)

--- a/netbox/ipam/api/views.py
+++ b/netbox/ipam/api/views.py
@@ -1,34 +1,21 @@
 from __future__ import unicode_literals

-from django.conf import settings
-from django.shortcuts import get_object_or_404
 from rest_framework import status
 from rest_framework.decorators import detail_route
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet

-from extras.api.views import CustomFieldModelViewSet
-from ipam import filters
+from django.conf import settings
+from django.shortcuts import get_object_or_404
+
 from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
-from utilities.api import FieldChoicesViewSet, WritableSerializerMixin
+from ipam import filters
+from extras.api.views import CustomFieldModelViewSet
+from utilities.api import WritableSerializerMixin
 from . import serializers


-#
-# Field choices
-#
-
-class IPAMFieldChoicesViewSet(FieldChoicesViewSet):
-    fields = (
-        (Aggregate, ['family']),
-        (Prefix, ['family', 'status']),
-        (IPAddress, ['family', 'status', 'role']),
-        (VLAN, ['status']),
-        (Service, ['protocol']),
-    )
-
-
 #
 # VRFs
 #
@@ -150,7 +137,7 @@ class IPAddressViewSet(WritableSerializerMixin, CustomFieldModelViewSet):
    queryset = IPAddress.objects.select_related(
        'vrf__tenant', 'tenant', 'nat_inside'
    ).prefetch_related(
-        'interface__device', 'interface__virtual_machine'
+        'interface__device'
    )
    serializer_class = serializers.IPAddressSerializer
    write_serializer_class = serializers.WritableIPAddressSerializer
--- a/netbox/ipam/constants.py
+++ b/netbox/ipam/constants.py
@@ -39,7 +39,6 @@ IPADDRESS_ROLE_VIP = 40
 IPADDRESS_ROLE_VRRP = 41
 IPADDRESS_ROLE_HSRP = 42
 IPADDRESS_ROLE_GLBP = 43
-IPADDRESS_ROLE_CARP = 44
 IPADDRESS_ROLE_CHOICES = (
    (IPADDRESS_ROLE_LOOPBACK, 'Loopback'),
    (IPADDRESS_ROLE_SECONDARY, 'Secondary'),
@@ -48,7 +47,6 @@ IPADDRESS_ROLE_CHOICES = (
    (IPADDRESS_ROLE_VRRP, 'VRRP'),
    (IPADDRESS_ROLE_HSRP, 'HSRP'),
    (IPADDRESS_ROLE_GLBP, 'GLBP'),
-    (IPADDRESS_ROLE_CARP, 'CARP'),
 )

 # VLAN statuses
@@ -61,7 +59,7 @@ VLAN_STATUS_CHOICES = (
    (VLAN_STATUS_DEPRECATED, 'Deprecated')
 )

-# Bootstrap CSS classes
+# Bootstrap CSS classes for various statuses
 STATUS_CHOICE_CLASSES = {
    0: 'default',
    1: 'primary',
@@ -70,16 +68,6 @@ STATUS_CHOICE_CLASSES = {
    4: 'warning',
    5: 'success',
 }
-ROLE_CHOICE_CLASSES = {
-    10: 'default',
-    20: 'primary',
-    30: 'warning',
-    40: 'success',
-    41: 'success',
-    42: 'success',
-    43: 'success',
-    44: 'success',
-}

 # IP protocols (for services)
 IP_PROTOCOL_TCP = 6
--- a/netbox/ipam/fields.py
+++ b/netbox/ipam/fields.py
@@ -1,8 +1,9 @@
 from __future__ import unicode_literals

+from netaddr import IPNetwork
+
 from django.core.exceptions import ValidationError
 from django.db import models
-from netaddr import IPNetwork

 from .formfields import IPFormField
 from .lookups import (
--- a/netbox/ipam/filters.py
+++ b/netbox/ipam/filters.py
@@ -1,17 +1,20 @@
 from __future__ import unicode_literals

 import django_filters
-from django.db.models import Q
 from netaddr import IPNetwork
 from netaddr.core import AddrFormatError

+from django.db.models import Q
+
 from dcim.models import Site, Device, Interface
 from extras.filters import CustomFieldFilterSet
 from tenancy.models import Tenant
-from utilities.filters import NumericInFilter
+from utilities.filters import NullableModelMultipleChoiceFilter, NumericInFilter
 from virtualization.models import VirtualMachine
-from .constants import IPADDRESS_ROLE_CHOICES, IPADDRESS_STATUS_CHOICES, PREFIX_STATUS_CHOICES, VLAN_STATUS_CHOICES
-from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
+from .models import (
+    Aggregate, IPAddress, IPADDRESS_ROLE_CHOICES, IPADDRESS_STATUS_CHOICES, Prefix, PREFIX_STATUS_CHOICES, RIR, Role,
+    Service, VLAN, VLAN_STATUS_CHOICES, VLANGroup, VRF,
+)


 class VRFFilter(CustomFieldFilterSet, django_filters.FilterSet):
@@ -20,12 +23,12 @@ class VRFFilter(CustomFieldFilterSet, django_filters.FilterSet):
        method='search',
        label='Search',
    )
-    tenant_id = django_filters.ModelMultipleChoiceFilter(
+    tenant_id = NullableModelMultipleChoiceFilter(
        queryset=Tenant.objects.all(),
        label='Tenant (ID)',
    )
-    tenant = django_filters.ModelMultipleChoiceFilter(
-        name='tenant__slug',
+    tenant = NullableModelMultipleChoiceFilter(
+        name='tenant',
        queryset=Tenant.objects.all(),
        to_field_name='slug',
        label='Tenant (slug)',
@@ -99,54 +102,45 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet):
        method='search',
        label='Search',
    )
-    # TODO: Deprecate in v2.3.0
    parent = django_filters.CharFilter(
-        method='search_within_include',
-        label='Parent prefix (deprecated)',
-    )
-    within = django_filters.CharFilter(
-        method='search_within',
-        label='Within prefix',
-    )
-    within_include = django_filters.CharFilter(
-        method='search_within_include',
-        label='Within and including prefix',
+        method='search_by_parent',
+        label='Parent prefix',
    )
    mask_length = django_filters.NumberFilter(
        method='filter_mask_length',
        label='Mask length',
    )
-    vrf_id = django_filters.ModelMultipleChoiceFilter(
+    vrf_id = NullableModelMultipleChoiceFilter(
        queryset=VRF.objects.all(),
        label='VRF',
    )
-    vrf = django_filters.ModelMultipleChoiceFilter(
-        name='vrf__rd',
+    vrf = NullableModelMultipleChoiceFilter(
+        name='vrf',
        queryset=VRF.objects.all(),
        to_field_name='rd',
        label='VRF (RD)',
    )
-    tenant_id = django_filters.ModelMultipleChoiceFilter(
+    tenant_id = NullableModelMultipleChoiceFilter(
        queryset=Tenant.objects.all(),
        label='Tenant (ID)',
    )
-    tenant = django_filters.ModelMultipleChoiceFilter(
-        name='tenant__slug',
+    tenant = NullableModelMultipleChoiceFilter(
+        name='tenant',
        queryset=Tenant.objects.all(),
        to_field_name='slug',
        label='Tenant (slug)',
    )
-    site_id = django_filters.ModelMultipleChoiceFilter(
+    site_id = NullableModelMultipleChoiceFilter(
        queryset=Site.objects.all(),
        label='Site (ID)',
    )
-    site = django_filters.ModelMultipleChoiceFilter(
-        name='site__slug',
+    site = NullableModelMultipleChoiceFilter(
+        name='site',
        queryset=Site.objects.all(),
        to_field_name='slug',
        label='Site (slug)',
    )
-    vlan_id = django_filters.ModelMultipleChoiceFilter(
+    vlan_id = NullableModelMultipleChoiceFilter(
        queryset=VLAN.objects.all(),
        label='VLAN (ID)',
    )
@@ -154,19 +148,18 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet):
        name='vlan__vid',
        label='VLAN number (1-4095)',
    )
-    role_id = django_filters.ModelMultipleChoiceFilter(
+    role_id = NullableModelMultipleChoiceFilter(
        queryset=Role.objects.all(),
        label='Role (ID)',
    )
-    role = django_filters.ModelMultipleChoiceFilter(
-        name='role__slug',
+    role = NullableModelMultipleChoiceFilter(
+        name='role',
        queryset=Role.objects.all(),
        to_field_name='slug',
        label='Role (slug)',
    )
    status = django_filters.MultipleChoiceFilter(
-        choices=PREFIX_STATUS_CHOICES,
-        null_value=None
+        choices=PREFIX_STATUS_CHOICES
    )

    class Meta:
@@ -184,17 +177,7 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet):
            pass
        return queryset.filter(qs_filter)

-    def search_within(self, queryset, name, value):
-        value = value.strip()
-        if not value:
-            return queryset
-        try:
-            query = str(IPNetwork(value).cidr)
-            return queryset.filter(prefix__net_contained=query)
-        except (AddrFormatError, ValueError):
-            return queryset.none()
-
-    def search_within_include(self, queryset, name, value):
+    def search_by_parent(self, queryset, name, value):
        value = value.strip()
        if not value:
            return queryset
@@ -224,22 +207,22 @@ class IPAddressFilter(CustomFieldFilterSet, django_filters.FilterSet):
        method='filter_mask_length',
        label='Mask length',
    )
-    vrf_id = django_filters.ModelMultipleChoiceFilter(
+    vrf_id = NullableModelMultipleChoiceFilter(
        queryset=VRF.objects.all(),
        label='VRF',
    )
-    vrf = django_filters.ModelMultipleChoiceFilter(
-        name='vrf__rd',
+    vrf = NullableModelMultipleChoiceFilter(
+        name='vrf',
        queryset=VRF.objects.all(),
        to_field_name='rd',
        label='VRF (RD)',
    )
-    tenant_id = django_filters.ModelMultipleChoiceFilter(
+    tenant_id = NullableModelMultipleChoiceFilter(
        queryset=Tenant.objects.all(),
        label='Tenant (ID)',
    )
-    tenant = django_filters.ModelMultipleChoiceFilter(
-        name='tenant__slug',
+    tenant = NullableModelMultipleChoiceFilter(
+        name='tenant',
        queryset=Tenant.objects.all(),
        to_field_name='slug',
        label='Tenant (slug)',
@@ -271,8 +254,7 @@ class IPAddressFilter(CustomFieldFilterSet, django_filters.FilterSet):
        label='Interface (ID)',
    )
    status = django_filters.MultipleChoiceFilter(
-        choices=IPADDRESS_STATUS_CHOICES,
-        null_value=None
+        choices=IPADDRESS_STATUS_CHOICES
    )
    role = django_filters.MultipleChoiceFilter(
        choices=IPADDRESS_ROLE_CHOICES
@@ -285,10 +267,12 @@ class IPAddressFilter(CustomFieldFilterSet, django_filters.FilterSet):
    def search(self, queryset, name, value):
        if not value.strip():
            return queryset
-        qs_filter = (
-            Q(description__icontains=value) |
-            Q(address__istartswith=value)
-        )
+        qs_filter = Q(description__icontains=value)
+        try:
+            ipaddress = str(IPNetwork(value.strip()))
+            qs_filter |= Q(address__net_host=ipaddress)
+        except (AddrFormatError, ValueError):
+            pass
        return queryset.filter(qs_filter)

    def search_by_parent(self, queryset, name, value):
@@ -308,12 +292,12 @@ class IPAddressFilter(CustomFieldFilterSet, django_filters.FilterSet):


 class VLANGroupFilter(django_filters.FilterSet):
-    site_id = django_filters.ModelMultipleChoiceFilter(
+    site_id = NullableModelMultipleChoiceFilter(
        queryset=Site.objects.all(),
        label='Site (ID)',
    )
-    site = django_filters.ModelMultipleChoiceFilter(
-        name='site__slug',
+    site = NullableModelMultipleChoiceFilter(
+        name='site',
        queryset=Site.objects.all(),
        to_field_name='slug',
        label='Site (slug)',
@@ -330,49 +314,48 @@ class VLANFilter(CustomFieldFilterSet, django_filters.FilterSet):
        method='search',
        label='Search',
    )
-    site_id = django_filters.ModelMultipleChoiceFilter(
+    site_id = NullableModelMultipleChoiceFilter(
        queryset=Site.objects.all(),
        label='Site (ID)',
    )
-    site = django_filters.ModelMultipleChoiceFilter(
-        name='site__slug',
+    site = NullableModelMultipleChoiceFilter(
+        name='site',
        queryset=Site.objects.all(),
        to_field_name='slug',
        label='Site (slug)',
    )
-    group_id = django_filters.ModelMultipleChoiceFilter(
+    group_id = NullableModelMultipleChoiceFilter(
        queryset=VLANGroup.objects.all(),
        label='Group (ID)',
    )
-    group = django_filters.ModelMultipleChoiceFilter(
-        name='group__slug',
+    group = NullableModelMultipleChoiceFilter(
+        name='group',
        queryset=VLANGroup.objects.all(),
        to_field_name='slug',
        label='Group',
    )
-    tenant_id = django_filters.ModelMultipleChoiceFilter(
+    tenant_id = NullableModelMultipleChoiceFilter(
        queryset=Tenant.objects.all(),
        label='Tenant (ID)',
    )
-    tenant = django_filters.ModelMultipleChoiceFilter(
-        name='tenant__slug',
+    tenant = NullableModelMultipleChoiceFilter(
+        name='tenant',
        queryset=Tenant.objects.all(),
        to_field_name='slug',
        label='Tenant (slug)',
    )
-    role_id = django_filters.ModelMultipleChoiceFilter(
+    role_id = NullableModelMultipleChoiceFilter(
        queryset=Role.objects.all(),
        label='Role (ID)',
    )
-    role = django_filters.ModelMultipleChoiceFilter(
-        name='role__slug',
+    role = NullableModelMultipleChoiceFilter(
+        name='role',
        queryset=Role.objects.all(),
        to_field_name='slug',
        label='Role (slug)',
    )
    status = django_filters.MultipleChoiceFilter(
-        choices=VLAN_STATUS_CHOICES,
-        null_value=None
+        choices=VLAN_STATUS_CHOICES
    )

    class Meta:
--- a/netbox/ipam/formfields.py
+++ b/netbox/ipam/formfields.py
@@ -1,8 +1,9 @@
 from __future__ import unicode_literals

+from netaddr import IPNetwork, AddrFormatError
+
 from django import forms
 from django.core.exceptions import ValidationError
-from netaddr import IPNetwork, AddrFormatError


 #
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -14,8 +14,11 @@ from utilities.forms import (
    add_blank_choice,
 )
 from virtualization.models import VirtualMachine
-from .constants import IPADDRESS_ROLE_CHOICES, IPADDRESS_STATUS_CHOICES, PREFIX_STATUS_CHOICES, VLAN_STATUS_CHOICES
-from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
+from .models import (
+    Aggregate, IPAddress, IPADDRESS_ROLE_CHOICES, IPADDRESS_STATUS_CHOICES, Prefix, PREFIX_STATUS_CHOICES, RIR, Role,
+    Service, VLAN, VLANGroup, VLAN_STATUS_CHOICES, VRF,
+)
+

 IP_FAMILY_CHOICES = [
    ('', 'All'),
@@ -94,17 +97,6 @@ class RIRForm(BootstrapMixin, forms.ModelForm):
        fields = ['name', 'slug', 'is_private']


-class RIRCSVForm(forms.ModelForm):
-    slug = SlugField()
-
-    class Meta:
-        model = RIR
-        fields = ['name', 'slug', 'is_private']
-        help_texts = {
-            'name': 'RIR name',
-        }
-
-
 class RIRFilterForm(BootstrapMixin, forms.Form):
    is_private = forms.NullBooleanField(required=False, label='Private', widget=forms.Select(choices=[
        ('', '---------'),
@@ -177,17 +169,6 @@ class RoleForm(BootstrapMixin, forms.ModelForm):
        fields = ['name', 'slug']


-class RoleCSVForm(forms.ModelForm):
-    slug = SlugField()
-
-    class Meta:
-        model = Role
-        fields = ['name', 'slug']
-        help_texts = {
-            'name': 'Role name',
-        }
-
-
 #
 # Prefixes
 #
@@ -359,7 +340,7 @@ def prefix_status_choices():
 class PrefixFilterForm(BootstrapMixin, CustomFieldFilterForm):
    model = Prefix
    q = forms.CharField(required=False, label='Search')
-    within_include = forms.CharField(required=False, label='Search within', widget=forms.TextInput(attrs={
+    parent = forms.CharField(required=False, label='Parent prefix', widget=forms.TextInput(attrs={
        'placeholder': 'Prefix',
    }))
    family = forms.ChoiceField(required=False, choices=IP_FAMILY_CHOICES, label='Address family')
@@ -688,11 +669,6 @@ class IPAddressBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
        nullable_fields = ['vrf', 'role', 'tenant', 'description']


-class IPAddressAssignForm(BootstrapMixin, forms.Form):
-    vrf = forms.ModelChoiceField(queryset=VRF.objects.all(), required=False, label='VRF', empty_label='Global')
-    address = forms.CharField(label='IP Address')
-
-
 def ipaddress_status_choices():
    status_counts = {}
    for status in IPAddress.objects.values('status').annotate(count=Count('status')).order_by('status'):
@@ -742,26 +718,6 @@ class VLANGroupForm(BootstrapMixin, forms.ModelForm):
        fields = ['site', 'name', 'slug']


-class VLANGroupCSVForm(forms.ModelForm):
-    site = forms.ModelChoiceField(
-        queryset=Site.objects.all(),
-        required=False,
-        to_field_name='name',
-        help_text='Name of parent site',
-        error_messages={
-            'invalid_choice': 'Site not found.',
-        }
-    )
-    slug = SlugField()
-
-    class Meta:
-        model = VLANGroup
-        fields = ['site', 'name', 'slug']
-        help_texts = {
-            'name': 'Name of VLAN group',
-        }
-
-
 class VLANGroupFilterForm(BootstrapMixin, forms.Form):
    site = FilterChoiceField(
        queryset=Site.objects.annotate(filter_count=Count('vlan_groups')),
--- a/netbox/ipam/lookups.py
+++ b/netbox/ipam/lookups.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals

 from django.db.models import Lookup, Transform, IntegerField
-from django.db.models import lookups
+from django.db.models.lookups import BuiltinLookup


 class NetFieldDecoratorMixin(object):
@@ -13,27 +13,27 @@ class NetFieldDecoratorMixin(object):
        return lhs_string, lhs_params


-class EndsWith(NetFieldDecoratorMixin, lookups.EndsWith):
+class EndsWith(NetFieldDecoratorMixin, BuiltinLookup):
    lookup_name = 'endswith'


-class IEndsWith(NetFieldDecoratorMixin, lookups.IEndsWith):
+class IEndsWith(NetFieldDecoratorMixin, BuiltinLookup):
    lookup_name = 'iendswith'


-class StartsWith(NetFieldDecoratorMixin, lookups.StartsWith):
+class StartsWith(NetFieldDecoratorMixin, BuiltinLookup):
    lookup_name = 'startswith'


-class IStartsWith(NetFieldDecoratorMixin, lookups.IStartsWith):
+class IStartsWith(NetFieldDecoratorMixin, BuiltinLookup):
    lookup_name = 'istartswith'


-class Regex(NetFieldDecoratorMixin, lookups.Regex):
+class Regex(NetFieldDecoratorMixin, BuiltinLookup):
    lookup_name = 'regex'


-class IRegex(NetFieldDecoratorMixin, lookups.IRegex):
+class IRegex(NetFieldDecoratorMixin, BuiltinLookup):
    lookup_name = 'iregex'


--- a/netbox/ipam/migrations/0020_ipaddress_add_role_carp.py
+++ b/netbox/ipam/migrations/0020_ipaddress_add_role_carp.py
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-10-09 20:02
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('ipam', '0019_virtualization'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='ipaddress',
-            name='role',
-            field=models.PositiveSmallIntegerField(blank=True, choices=[(10, 'Loopback'), (20, 'Secondary'), (30, 'Anycast'), (40, 'VIP'), (41, 'VRRP'), (42, 'HSRP'), (43, 'GLBP'), (44, 'CARP')], help_text='The functional role of this IP', null=True, verbose_name='Role'),
-        ),
-    ]
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -1,11 +1,13 @@
 from __future__ import unicode_literals
-
 import netaddr
+
 from django.conf import settings
-from django.contrib.contenttypes.fields import GenericRelation
+from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
+from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
+from django.db.models import Q
 from django.db.models.expressions import RawSQL
 from django.urls import reverse
 from django.utils.encoding import python_2_unicode_compatible
@@ -14,10 +16,10 @@ from dcim.models import Interface
 from extras.models import CustomFieldModel, CustomFieldValue
 from tenancy.models import Tenant
 from utilities.models import CreatedUpdatedModel
+from utilities.sql import NullsFirstQuerySet
 from utilities.utils import csv_format
 from .constants import *
 from .fields import IPNetworkField, IPAddressField
-from .querysets import PrefixQuerySet


@python_2_unicode_compatible
@@ -188,6 +190,41 @@ class Role(models.Model):
        return self.vlans.count()


+class PrefixQuerySet(NullsFirstQuerySet):
+
+    def annotate_depth(self, limit=None):
+        """
+        Iterate through a QuerySet of Prefixes and annotate the hierarchical level of each. While it would be preferable
+        to do this using .extra() on the QuerySet to count the unique parents of each prefix, that approach introduces
+        performance issues at scale.
+
+        Because we're adding a non-field attribute to the model, annotation must be made *after* any QuerySet
+        modifications.
+        """
+        queryset = self
+        stack = []
+        for p in queryset:
+            try:
+                prev_p = stack[-1]
+            except IndexError:
+                prev_p = None
+            if prev_p is not None:
+                while (p.prefix not in prev_p.prefix) or p.prefix == prev_p.prefix:
+                    stack.pop()
+                    try:
+                        prev_p = stack[-1]
+                    except IndexError:
+                        prev_p = None
+                        break
+            if prev_p is not None:
+                prev_p.has_children = True
+            stack.append(p)
+            p.depth = len(stack) - 1
+        if limit is None:
+            return queryset
+        return list(filter(lambda p: p.depth <= limit, queryset))
+
+
@python_2_unicode_compatible
 class Prefix(CreatedUpdatedModel, CustomFieldModel):
    """
@@ -285,7 +322,7 @@ class Prefix(CreatedUpdatedModel, CustomFieldModel):
        """
        Return all IPAddresses within this Prefix.
        """
-        return IPAddress.objects.filter(address__net_host_contained=str(self.prefix), vrf=self.vrf)
+        return IPAddress.objects.filter(address__net_contained_or_equal=str(self.prefix), vrf=self.vrf)

    def get_available_ips(self):
        """
@@ -304,16 +341,6 @@ class Prefix(CreatedUpdatedModel, CustomFieldModel):

        return available_ips

-    def get_first_available_ip(self):
-        """
-        Return the first available IP within the prefix (or None).
-        """
-        available_ips = self.get_available_ips()
-        if available_ips:
-            return '{}/{}'.format(next(available_ips.__iter__()), self.prefix.prefixlen)
-        else:
-            return None
-
    def get_utilization(self):
        """
        Determine the utilization of the prefix and return it as a percentage. For Prefixes with a status of
@@ -324,7 +351,9 @@ class Prefix(CreatedUpdatedModel, CustomFieldModel):
            child_prefixes = netaddr.IPSet([p.prefix for p in queryset])
            return int(float(child_prefixes.size) / self.prefix.size * 100)
        else:
-            child_count = self.get_child_ips().count()
+            child_count = IPAddress.objects.filter(
+                address__net_contained_or_equal=str(self.prefix), vrf=self.vrf
+            ).count()
            prefix_size = self.prefix.size
            if self.family == 4 and self.prefix.prefixlen < 31 and not self.is_pool:
                prefix_size -= 2
@@ -447,7 +476,7 @@ class IPAddress(CreatedUpdatedModel, CustomFieldModel):
            self.get_status_display(),
            self.get_role_display(),
            self.device.identifier if self.device else None,
-            self.virtual_machine.name if self.virtual_machine else None,
+            self.virtual_machine.name if self.device else None,
            self.interface.name if self.interface else None,
            is_primary,
            self.description,
@@ -459,18 +488,9 @@ class IPAddress(CreatedUpdatedModel, CustomFieldModel):
            return self.interface.device
        return None

-    @property
-    def virtual_machine(self):
-        if self.interface:
-            return self.interface.virtual_machine
-        return None
-
    def get_status_class(self):
        return STATUS_CHOICE_CLASSES[self.status]

-    def get_role_class(self):
-        return ROLE_CHOICE_CLASSES[self.role]
-

@python_2_unicode_compatible
 class VLANGroup(models.Model):
--- a/netbox/ipam/querysets.py
+++ b/netbox/ipam/querysets.py
@@ -1,38 +0,0 @@
-from __future__ import unicode_literals
-
-from utilities.sql import NullsFirstQuerySet
-
-
-class PrefixQuerySet(NullsFirstQuerySet):
-
-    def annotate_depth(self, limit=None):
-        """
-        Iterate through a QuerySet of Prefixes and annotate the hierarchical level of each. While it would be preferable
-        to do this using .extra() on the QuerySet to count the unique parents of each prefix, that approach introduces
-        performance issues at scale.
-
-        Because we're adding a non-field attribute to the model, annotation must be made *after* any QuerySet
-        modifications.
-        """
-        queryset = self
-        stack = []
-        for p in queryset:
-            try:
-                prev_p = stack[-1]
-            except IndexError:
-                prev_p = None
-            if prev_p is not None:
-                while (p.prefix not in prev_p.prefix) or p.prefix == prev_p.prefix:
-                    stack.pop()
-                    try:
-                        prev_p = stack[-1]
-                    except IndexError:
-                        prev_p = None
-                        break
-            if prev_p is not None:
-                prev_p.has_children = True
-            stack.append(p)
-            p.depth = len(stack) - 1
-        if limit is None:
-            return queryset
-        return list(filter(lambda p: p.depth <= limit, queryset))
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -6,6 +6,7 @@ from django_tables2.utils import Accessor
 from utilities.tables import BaseTable, ToggleColumn
 from .models import Aggregate, IPAddress, Prefix, RIR, Role, VLAN, VLANGroup, VRF

+
 RIR_UTILIZATION = """
 <div class="progress">
    {% if record.stats.total %}
@@ -70,16 +71,12 @@ IPADDRESS_LINK = """
 {% if record.pk %}
    <a href="{{ record.get_absolute_url }}">{{ record.address }}</a>
 {% elif perms.ipam.add_ipaddress %}
-    <a href="{% url 'ipam:ipaddress_add' %}?address={{ record.1 }}{% if prefix.vrf %}&vrf={{ prefix.vrf.pk }}{% endif %}{% if prefix.tenant %}&tenant={{ prefix.tenant.pk }}{% endif %}" class="btn btn-xs btn-success">{% if record.0 <= 65536 %}{{ record.0 }}{% else %}Many{% endif %} IP{{ record.0|pluralize }} available</a>
+    <a href="{% url 'ipam:ipaddress_add' %}?address={{ record.1 }}{% if prefix.vrf %}&vrf={{ prefix.vrf.pk }}{% endif %}" class="btn btn-xs btn-success">{% if record.0 <= 65536 %}{{ record.0 }}{% else %}Many{% endif %} IP{{ record.0|pluralize }} available</a>
 {% else %}
    {% if record.0 <= 65536 %}{{ record.0 }}{% else %}Many{% endif %} IP{{ record.0|pluralize }} available
 {% endif %}
 """

-IPADDRESS_ASSIGN_LINK = """
-<a href="{% url 'ipam:ipaddress_edit' pk=record.pk %}?interface={{ request.GET.interface }}&return_url={{ request.GET.return_url }}">{{ record }}</a>
-"""
-
 IPADDRESS_PARENT = """
 {% if record.interface %}
    <a href="{{ record.interface.parent.get_absolute_url }}">{{ record.interface.parent }}</a>
@@ -272,8 +269,8 @@ class PrefixDetailTable(PrefixTable):
 class IPAddressTable(BaseTable):
    pk = ToggleColumn()
    address = tables.TemplateColumn(IPADDRESS_LINK, verbose_name='IP Address')
-    vrf = tables.TemplateColumn(VRF_LINK, verbose_name='VRF')
    status = tables.TemplateColumn(STATUS_LABEL)
+    vrf = tables.TemplateColumn(VRF_LINK, verbose_name='VRF')
    tenant = tables.TemplateColumn(TENANT_LINK)
    parent = tables.TemplateColumn(IPADDRESS_PARENT, orderable=False)
    interface = tables.Column(orderable=False)
@@ -297,18 +294,6 @@ class IPAddressDetailTable(IPAddressTable):
        )


-class IPAddressAssignTable(BaseTable):
-    address = tables.TemplateColumn(IPADDRESS_ASSIGN_LINK, verbose_name='IP Address')
-    status = tables.TemplateColumn(STATUS_LABEL)
-    parent = tables.TemplateColumn(IPADDRESS_PARENT, orderable=False)
-    interface = tables.Column(orderable=False)
-
-    class Meta(BaseTable.Meta):
-        model = IPAddress
-        fields = ('address', 'vrf', 'status', 'role', 'tenant', 'parent', 'interface')
-        orderable = False
-
-
 #
 # VLAN groups
 #
--- a/netbox/ipam/tests/test_api.py
+++ b/netbox/ipam/tests/test_api.py
@@ -1,14 +1,16 @@
 from __future__ import unicode_literals

-from django.contrib.auth.models import User
-from django.urls import reverse
 from netaddr import IPNetwork
 from rest_framework import status
 from rest_framework.test import APITestCase

+from django.contrib.auth.models import User
+from django.urls import reverse
+
 from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Site
-from ipam.constants import IP_PROTOCOL_TCP, IP_PROTOCOL_UDP
-from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
+from ipam.models import (
+    Aggregate, IPAddress, IP_PROTOCOL_TCP, IP_PROTOCOL_UDP, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF,
+)
 from users.models import Token
 from utilities.tests import HttpStatusMixin

--- a/netbox/ipam/tests/test_models.py
+++ b/netbox/ipam/tests/test_models.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals

 import netaddr
+
 from django.core.exceptions import ValidationError
 from django.test import TestCase, override_settings

--- a/netbox/ipam/urls.py
+++ b/netbox/ipam/urls.py
@@ -21,7 +21,6 @@ urlpatterns = [
    # RIRs
    url(r'^rirs/$', views.RIRListView.as_view(), name='rir_list'),
    url(r'^rirs/add/$', views.RIRCreateView.as_view(), name='rir_add'),
-    url(r'^rirs/import/$', views.RIRBulkImportView.as_view(), name='rir_import'),
    url(r'^rirs/delete/$', views.RIRBulkDeleteView.as_view(), name='rir_bulk_delete'),
    url(r'^rirs/(?P<slug>[\w-]+)/edit/$', views.RIREditView.as_view(), name='rir_edit'),

@@ -38,7 +37,6 @@ urlpatterns = [
    # Roles
    url(r'^roles/$', views.RoleListView.as_view(), name='role_list'),
    url(r'^roles/add/$', views.RoleCreateView.as_view(), name='role_add'),
-    url(r'^roles/import/$', views.RoleBulkImportView.as_view(), name='role_import'),
    url(r'^roles/delete/$', views.RoleBulkDeleteView.as_view(), name='role_bulk_delete'),
    url(r'^roles/(?P<slug>[\w-]+)/edit/$', views.RoleEditView.as_view(), name='role_edit'),

@@ -60,7 +58,6 @@ urlpatterns = [
    url(r'^ip-addresses/import/$', views.IPAddressBulkImportView.as_view(), name='ipaddress_import'),
    url(r'^ip-addresses/edit/$', views.IPAddressBulkEditView.as_view(), name='ipaddress_bulk_edit'),
    url(r'^ip-addresses/delete/$', views.IPAddressBulkDeleteView.as_view(), name='ipaddress_bulk_delete'),
-    url(r'^ip-addresses/assign/$', views.IPAddressAssignView.as_view(), name='ipaddress_assign'),
    url(r'^ip-addresses/(?P<pk>\d+)/$', views.IPAddressView.as_view(), name='ipaddress'),
    url(r'^ip-addresses/(?P<pk>\d+)/edit/$', views.IPAddressEditView.as_view(), name='ipaddress_edit'),
    url(r'^ip-addresses/(?P<pk>\d+)/delete/$', views.IPAddressDeleteView.as_view(), name='ipaddress_delete'),
@@ -68,7 +65,6 @@ urlpatterns = [
    # VLAN groups
    url(r'^vlan-groups/$', views.VLANGroupListView.as_view(), name='vlangroup_list'),
    url(r'^vlan-groups/add/$', views.VLANGroupCreateView.as_view(), name='vlangroup_add'),
-    url(r'^vlan-groups/import/$', views.VLANGroupBulkImportView.as_view(), name='vlangroup_import'),
    url(r'^vlan-groups/delete/$', views.VLANGroupBulkDeleteView.as_view(), name='vlangroup_bulk_delete'),
    url(r'^vlan-groups/(?P<pk>\d+)/edit/$', views.VLANGroupEditView.as_view(), name='vlangroup_edit'),

--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -1,13 +1,14 @@
 from __future__ import unicode_literals

+from django_tables2 import RequestConfig
 import netaddr
+
 from django.conf import settings
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db.models import Count, Q
-from django.shortcuts import get_object_or_404, redirect, render
+from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 from django.views.generic import View
-from django_tables2 import RequestConfig

 from dcim.models import Device, Interface
 from utilities.paginator import EnhancedPaginator
@@ -16,8 +17,11 @@ from utilities.views import (
 )
 from virtualization.models import VirtualMachine
 from . import filters, forms, tables
-from .constants import IPADDRESS_ROLE_ANYCAST, PREFIX_STATUS_ACTIVE, PREFIX_STATUS_DEPRECATED, PREFIX_STATUS_RESERVED
-from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
+from .constants import IPADDRESS_ROLE_ANYCAST
+from .models import (
+    Aggregate, IPAddress, PREFIX_STATUS_ACTIVE, PREFIX_STATUS_DEPRECATED, PREFIX_STATUS_RESERVED, Prefix, RIR, Role,
+    Service, VLAN, VLANGroup, VRF,
+)


 def add_available_prefixes(parent, prefix_list):
@@ -257,13 +261,6 @@ class RIREditView(RIRCreateView):
    permission_required = 'ipam.change_rir'


-class RIRBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'ipam.add_rir'
-    model_form = forms.RIRCSVForm
-    table = tables.RIRTable
-    default_return_url = 'ipam:rir_list'
-
-
 class RIRBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
    permission_required = 'ipam.delete_rir'
    cls = RIR
@@ -321,7 +318,7 @@ class AggregateView(View):

        prefix_table = tables.PrefixDetailTable(child_prefixes)
        if request.user.has_perm('ipam.change_prefix') or request.user.has_perm('ipam.delete_prefix'):
-            prefix_table.columns.show('pk')
+            prefix_table.base_columns['pk'].visible = True

        paginate = {
            'klass': EnhancedPaginator,
@@ -410,13 +407,6 @@ class RoleEditView(RoleCreateView):
    permission_required = 'ipam.change_role'


-class RoleBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'ipam.add_role'
-    model_form = forms.RoleCSVForm
-    table = tables.RoleTable
-    default_return_url = 'ipam:role_list'
-
-
 class RoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
    permission_required = 'ipam.delete_role'
    cls = Role
@@ -455,7 +445,9 @@ class PrefixView(View):
            aggregate = None

        # Count child IP addresses
-        ipaddress_count = prefix.get_child_ips().count()
+        ipaddress_count = IPAddress.objects.filter(
+            vrf=prefix.vrf, address__net_host_contained=str(prefix.prefix)
+        ).count()

        # Parent prefixes table
        parent_prefixes = Prefix.objects.filter(
@@ -489,7 +481,7 @@ class PrefixView(View):
            child_prefixes = add_available_prefixes(prefix.prefix, child_prefixes)
        child_prefix_table = tables.PrefixDetailTable(child_prefixes)
        if request.user.has_perm('ipam.change_prefix') or request.user.has_perm('ipam.delete_prefix'):
-            child_prefix_table.columns.show('pk')
+            child_prefix_table.base_columns['pk'].visible = True

        paginate = {
            'klass': EnhancedPaginator,
@@ -511,7 +503,6 @@ class PrefixView(View):
            'parent_prefix_table': parent_prefix_table,
            'child_prefix_table': child_prefix_table,
            'duplicate_prefix_table': duplicate_prefix_table,
-            'bulk_querystring': 'vrf_id={}&within={}'.format(prefix.vrf or '0', prefix.prefix),
            'permissions': permissions,
            'return_url': prefix.get_absolute_url(),
        })
@@ -524,14 +515,16 @@ class PrefixIPAddressesView(View):
        prefix = get_object_or_404(Prefix.objects.all(), pk=pk)

        # Find all IPAddresses belonging to this Prefix
-        ipaddresses = prefix.get_child_ips().select_related(
+        ipaddresses = IPAddress.objects.filter(
+            vrf=prefix.vrf, address__net_host_contained=str(prefix.prefix)
+        ).select_related(
            'vrf', 'interface__device', 'primary_ip4_for', 'primary_ip6_for'
        )
        ipaddresses = add_available_ipaddresses(prefix.prefix, ipaddresses, prefix.is_pool)

        ip_table = tables.IPAddressTable(ipaddresses)
        if request.user.has_perm('ipam.change_ipaddress') or request.user.has_perm('ipam.delete_ipaddress'):
-            ip_table.columns.show('pk')
+            ip_table.base_columns['pk'].visible = True

        paginate = {
            'klass': EnhancedPaginator,
@@ -550,7 +543,7 @@ class PrefixIPAddressesView(View):
            'prefix': prefix,
            'ip_table': ip_table,
            'permissions': permissions,
-            'bulk_querystring': 'vrf_id={}&parent={}'.format(prefix.vrf.pk if prefix.vrf else '0', prefix.prefix),
+            'bulk_querystring': 'vrf_id={}&parent={}'.format(prefix.vrf or '0', prefix.prefix),
        })


@@ -686,51 +679,6 @@ class IPAddressEditView(IPAddressCreateView):
    permission_required = 'ipam.change_ipaddress'


-class IPAddressAssignView(PermissionRequiredMixin, View):
-    """
-    Search for IPAddresses to be assigned to an Interface.
-    """
-    permission_required = 'ipam.change_ipaddress'
-
-    def dispatch(self, request, *args, **kwargs):
-
-        # Redirect user if an interface has not been provided
-        if 'interface' not in request.GET:
-            return redirect('ipam:ipaddress_add')
-
-        return super(IPAddressAssignView, self).dispatch(request, *args, **kwargs)
-
-    def get(self, request):
-
-        form = forms.IPAddressAssignForm()
-
-        return render(request, 'ipam/ipaddress_assign.html', {
-            'form': form,
-            'return_url': request.GET.get('return_url', ''),
-        })
-
-    def post(self, request):
-
-        form = forms.IPAddressAssignForm(request.POST)
-        table = None
-
-        if form.is_valid():
-
-            queryset = IPAddress.objects.select_related(
-                'vrf', 'tenant', 'interface__device', 'interface__virtual_machine'
-            ).filter(
-                vrf=form.cleaned_data['vrf'],
-                address__net_host=form.cleaned_data['address'],
-            )
-            table = tables.IPAddressAssignTable(queryset)
-
-        return render(request, 'ipam/ipaddress_assign.html', {
-            'form': form,
-            'table': table,
-            'return_url': request.GET.get('return_url', ''),
-        })
-
-
 class IPAddressDeleteView(PermissionRequiredMixin, ObjectDeleteView):
    permission_required = 'ipam.delete_ipaddress'
    model = IPAddress
@@ -797,13 +745,6 @@ class VLANGroupEditView(VLANGroupCreateView):
    permission_required = 'ipam.change_vlangroup'


-class VLANGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'ipam.add_vlangroup'
-    model_form = forms.VLANGroupCSVForm
-    table = tables.VLANGroupTable
-    default_return_url = 'ipam:vlangroup_list'
-
-
 class VLANGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
    permission_required = 'ipam.delete_vlangroup'
    cls = VLANGroup
--- a/netbox/netbox/api.py
+++ b/netbox/netbox/api.py
@@ -1,147 +0,0 @@
-from __future__ import unicode_literals
-
-from rest_framework import authentication, exceptions
-from rest_framework.pagination import LimitOffsetPagination
-from rest_framework.permissions import DjangoModelPermissions, SAFE_METHODS
-from rest_framework.renderers import BrowsableAPIRenderer
-from rest_framework.utils import formatting
-
-from users.models import Token
-
-
-#
-# Renderers
-#
-
-class FormlessBrowsableAPIRenderer(BrowsableAPIRenderer):
-    """
-    Override the built-in BrowsableAPIRenderer to disable HTML forms.
-    """
-    def show_form_for_method(self, *args, **kwargs):
-        return False
-
-
-#
-# Authentication
-#
-
-class TokenAuthentication(authentication.TokenAuthentication):
-    """
-    A custom authentication scheme which enforces Token expiration times.
-    """
-    model = Token
-
-    def authenticate_credentials(self, key):
-        model = self.get_model()
-        try:
-            token = model.objects.select_related('user').get(key=key)
-        except model.DoesNotExist:
-            raise exceptions.AuthenticationFailed("Invalid token")
-
-        # Enforce the Token's expiration time, if one has been set.
-        if token.is_expired:
-            raise exceptions.AuthenticationFailed("Token expired")
-
-        if not token.user.is_active:
-            raise exceptions.AuthenticationFailed("User inactive")
-
-        return token.user, token
-
-
-class TokenPermissions(DjangoModelPermissions):
-    """
-    Custom permissions handler which extends the built-in DjangoModelPermissions to validate a Token's write ability
-    for unsafe requests (POST/PUT/PATCH/DELETE).
-    """
-    def __init__(self):
-        # LOGIN_REQUIRED determines whether read-only access is provided to anonymous users.
-        from django.conf import settings
-        self.authenticated_users_only = settings.LOGIN_REQUIRED
-        super(TokenPermissions, self).__init__()
-
-    def has_permission(self, request, view):
-        # If token authentication is in use, verify that the token allows write operations (for unsafe methods).
-        if request.method not in SAFE_METHODS and isinstance(request.auth, Token):
-            if not request.auth.write_enabled:
-                return False
-        return super(TokenPermissions, self).has_permission(request, view)
-
-
-#
-# Pagination
-#
-
-class OptionalLimitOffsetPagination(LimitOffsetPagination):
-    """
-    Override the stock paginator to allow setting limit=0 to disable pagination for a request. This returns all objects
-    matching a query, but retains the same format as a paginated request. The limit can only be disabled if
-    MAX_PAGE_SIZE has been set to 0 or None.
-    """
-
-    def paginate_queryset(self, queryset, request, view=None):
-
-        try:
-            self.count = queryset.count()
-        except (AttributeError, TypeError):
-            self.count = len(queryset)
-        self.limit = self.get_limit(request)
-        self.offset = self.get_offset(request)
-        self.request = request
-
-        if self.limit and self.count > self.limit and self.template is not None:
-            self.display_page_controls = True
-
-        if self.count == 0 or self.offset > self.count:
-            return list()
-
-        if self.limit:
-            return list(queryset[self.offset:self.offset + self.limit])
-        else:
-            return list(queryset[self.offset:])
-
-    def get_limit(self, request):
-
-        from django.conf import settings
-
-        if self.limit_query_param:
-            try:
-                limit = int(request.query_params[self.limit_query_param])
-                if limit < 0:
-                    raise ValueError()
-                # Enforce maximum page size, if defined
-                if settings.MAX_PAGE_SIZE:
-                    if limit == 0:
-                        return settings.MAX_PAGE_SIZE
-                    else:
-                        return min(limit, settings.MAX_PAGE_SIZE)
-                return limit
-            except (KeyError, ValueError):
-                pass
-
-        return self.default_limit
-
-
-#
-# Miscellaneous
-#
-
-def get_view_name(view_cls, suffix=None):
-    """
-    Derive the view name from its associated model, if it has one. Fall back to DRF's built-in `get_view_name`.
-    """
-    if hasattr(view_cls, 'queryset'):
-        # Determine the model name from the queryset.
-        name = view_cls.queryset.model._meta.verbose_name
-        name = ' '.join([w[0].upper() + w[1:] for w in name.split()])  # Capitalize each word
-
-    else:
-        # Replicate DRF's built-in behavior.
-        name = view_cls.__name__
-        name = formatting.remove_trailing_string(name, 'View')
-        name = formatting.remove_trailing_string(name, 'ViewSet')
-        name = formatting.camelcase_to_spaces(name)
-
-    if suffix:
-        name += ' ' + suffix
-
-    return name
--- a/netbox/netbox/configuration.docker.py
+++ b/netbox/netbox/configuration.docker.py
@@ -0,0 +1,79 @@
+import os
+#########################
+#                       #
+#   Required settings   #
+#                       #
+#########################
+
+# This is a list of valid fully-qualified domain names (FQDNs) for the NetBox server. NetBox will not permit write
+# access to the server via any other hostnames. The first FQDN in the list will be treated as the preferred name.
+#
+# Example: ALLOWED_HOSTS = ['netbox.example.com', 'netbox.internal.local']
+ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', '').split(' ')
+
+# PostgreSQL database configuration.
+DATABASE = {
+    'NAME': os.environ.get('DB_NAME', 'netbox'),         # Database name
+    'USER': os.environ.get('DB_USER', ''),               # PostgreSQL username
+    'PASSWORD': os.environ.get('DB_PASSWORD', ''),       # PostgreSQL password
+    'HOST': os.environ.get('DB_HOST', 'localhost'),      # Database server
+    'PORT': os.environ.get('DB_PORT', ''),               # Database port (leave blank for default)
+}
+
+# This key is used for secure generation of random numbers and strings. It must never be exposed outside of this file.
+# For optimal security, SECRET_KEY should be at least 50 characters in length and contain a mix of letters, numbers, and
+# symbols. NetBox will not run without this defined. For more information, see
+# https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-SECRET_KEY
+SECRET_KEY = os.environ.get('SECRET_KEY', '')
+
+#########################
+#                       #
+#   Optional settings   #
+#                       #
+#########################
+
+# Specify one or more name and email address tuples representing NetBox administrators. These people will be notified of
+# application errors (assuming correct email settings are provided).
+ADMINS = [
+    # ['John Doe', 'jdoe@example.com'],
+]
+
+# Email settings
+EMAIL = {
+    'SERVER': os.environ.get('EMAIL_SERVER', 'localhost'),
+    'PORT': os.environ.get('EMAIL_PORT', 25),
+    'USERNAME': os.environ.get('EMAIL_USERNAME', ''),
+    'PASSWORD': os.environ.get('EMAIL_PASSWORD', ''),
+    'TIMEOUT': os.environ.get('EMAIL_TIMEOUT', 10),  # seconds
+    'FROM_EMAIL': os.environ.get('EMAIL_FROM', ''),
+}
+
+# Setting this to True will permit only authenticated users to access any part of NetBox. By default, anonymous users
+# are permitted to access most data in NetBox (excluding secrets) but not make any changes.
+LOGIN_REQUIRED = os.environ.get('LOGIN_REQUIRED', False)
+
+# Base URL path if accessing NetBox within a directory. For example, if installed at http://example.com/netbox/, set:
+# BASE_PATH = 'netbox/'
+BASE_PATH = os.environ.get('BASE_PATH', '')
+
+# Setting this to True will display a "maintenance mode" banner at the top of every page.
+MAINTENANCE_MODE = os.environ.get('MAINTENANCE_MODE', False)
+
+# Credentials that NetBox will use to access live devices.
+NAPALM_USERNAME = os.environ.get('NAPALM_USERNAME', '')
+NAPALM_PASSWORD = os.environ.get('NAPALM_PASSWORD', '')
+
+# Determine how many objects to display per page within a list. (Default: 50)
+PAGINATE_COUNT = os.environ.get('PAGINATE_COUNT', 50)
+
+# Time zone (default: UTC)
+TIME_ZONE = os.environ.get('TIME_ZONE', 'UTC')
+
+# Date/time formatting. See the following link for supported formats:
+# https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+DATE_FORMAT = os.environ.get('DATE_FORMAT', 'N j, Y')
+SHORT_DATE_FORMAT = os.environ.get('SHORT_DATE_FORMAT', 'Y-m-d')
+TIME_FORMAT = os.environ.get('TIME_FORMAT', 'g:i a')
+SHORT_TIME_FORMAT = os.environ.get('SHORT_TIME_FORMAT', 'H:i:s')
+DATETIME_FORMAT = os.environ.get('DATETIME_FORMAT', 'N j, Y g:i a')
+SHORT_DATETIME_FORMAT = os.environ.get('SHORT_DATETIME_FORMAT', 'Y-m-d H:i')
--- a/netbox/netbox/configuration.example.py
+++ b/netbox/netbox/configuration.example.py
@@ -118,10 +118,6 @@ PAGINATE_COUNT = 50
 # prefer IPv4 instead.
 PREFER_IPV4 = False

-# The file path where custom reports will be stored. A trailing slash is not needed. Note that the default value of
-# this setting is derived from the installed location.
-# REPORTS_ROOT = '/opt/netbox/netbox/reports'
-
 # Time zone (default: UTC)
 TIME_ZONE = 'UTC'

--- a/netbox/netbox/forms.py
+++ b/netbox/netbox/forms.py
@@ -4,6 +4,7 @@ from django import forms

 from utilities.forms import BootstrapMixin

+
 OBJ_TYPE_CHOICES = (
    ('', 'All Objects'),
    ('Circuits', (
@@ -29,10 +30,6 @@ OBJ_TYPE_CHOICES = (
    ('Tenancy', (
        ('tenant', 'Tenants'),
    )),
-    ('Virtualization', (
-        ('cluster', 'Clusters'),
-        ('virtualmachine', 'Virtual machines'),
-    )),
 )


--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -13,7 +13,7 @@ except ImportError:
    )


-VERSION = '2.2.6'
+VERSION = '2.2-beta2'

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

@@ -54,7 +54,6 @@ NAPALM_TIMEOUT = getattr(configuration, 'NAPALM_TIMEOUT', 30)
 NAPALM_ARGS = getattr(configuration, 'NAPALM_ARGS', {})
 PAGINATE_COUNT = getattr(configuration, 'PAGINATE_COUNT', 50)
 PREFER_IPV4 = getattr(configuration, 'PREFER_IPV4', False)
-REPORTS_ROOT = getattr(configuration, 'REPORTS_ROOT', os.path.join(BASE_DIR, 'reports')).rstrip('/')
 SHORT_DATE_FORMAT = getattr(configuration, 'SHORT_DATE_FORMAT', 'Y-m-d')
 SHORT_DATETIME_FORMAT = getattr(configuration, 'SHORT_DATETIME_FORMAT', 'Y-m-d H:i')
 SHORT_TIME_FORMAT = getattr(configuration, 'SHORT_TIME_FORMAT', 'H:i:s')
@@ -148,7 +147,6 @@ MIDDLEWARE = (
    'django.contrib.messages.middleware.MessageMiddleware',
    'django.middleware.clickjacking.XFrameOptionsMiddleware',
    'django.middleware.security.SecurityMiddleware',
-    'utilities.middleware.ExceptionHandlingMiddleware',
    'utilities.middleware.LoginRequiredMiddleware',
    'utilities.middleware.APIVersionMiddleware',
 )
@@ -207,36 +205,40 @@ LOGIN_URL = '/{}login/'.format(BASE_PATH)
 # Secrets
 SECRETS_MIN_PUBKEY_SIZE = 2048

-# Django filters
-FILTERS_NULL_CHOICE_LABEL = 'None'
-FILTERS_NULL_CHOICE_VALUE = '0'  # Must be a string
-
 # Django REST framework (API)
 REST_FRAMEWORK_VERSION = VERSION[0:3]  # Use major.minor as API version
 REST_FRAMEWORK = {
    'ALLOWED_VERSIONS': [REST_FRAMEWORK_VERSION],
    'DEFAULT_AUTHENTICATION_CLASSES': (
        'rest_framework.authentication.SessionAuthentication',
-        'netbox.api.TokenAuthentication',
+        'utilities.api.TokenAuthentication',
    ),
    'DEFAULT_FILTER_BACKENDS': (
-        'django_filters.rest_framework.DjangoFilterBackend',
+        'rest_framework.filters.DjangoFilterBackend',
    ),
-    'DEFAULT_PAGINATION_CLASS': 'netbox.api.OptionalLimitOffsetPagination',
+    'DEFAULT_PAGINATION_CLASS': 'utilities.api.OptionalLimitOffsetPagination',
    'DEFAULT_PERMISSION_CLASSES': (
-        'netbox.api.TokenPermissions',
+        'utilities.api.TokenPermissions',
    ),
    'DEFAULT_RENDERER_CLASSES': (
        'rest_framework.renderers.JSONRenderer',
-        'netbox.api.FormlessBrowsableAPIRenderer',
+        'utilities.api.FormlessBrowsableAPIRenderer',
    ),
    'DEFAULT_VERSION': REST_FRAMEWORK_VERSION,
    'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.AcceptHeaderVersioning',
    'PAGE_SIZE': PAGINATE_COUNT,
-    'VIEW_NAME_FUNCTION': 'netbox.api.get_view_name',
+    'VIEW_NAME_FUNCTION': 'utilities.api.get_view_name',
 }

 # Django debug toolbar
+# Disable the templates panel by default due to a performance issue in Django 1.11; see
+# https://github.com/jazzband/django-debug-toolbar/issues/910
+DEBUG_TOOLBAR_CONFIG = {
+    'DISABLE_PANELS': [
+        'debug_toolbar.panels.redirects.RedirectsPanel',
+        'debug_toolbar.panels.templates.TemplatesPanel',
+    ],
+}
 INTERNAL_IPS = (
    '127.0.0.1',
    '::1',
--- a/netbox/netbox/urls.py
+++ b/netbox/netbox/urls.py
@@ -1,14 +1,17 @@
 from __future__ import unicode_literals

+from rest_framework_swagger.views import get_swagger_view
+
 from django.conf import settings
 from django.conf.urls import include, url
 from django.contrib import admin
 from django.views.static import serve
-from rest_framework_swagger.views import get_swagger_view

-from netbox.views import APIRootView, HomeView, SearchView
+from netbox.views import APIRootView, handle_500, HomeView, SearchView, trigger_500
 from users.views import LoginView, LogoutView

+
+handler500 = handle_500
 swagger_view = get_swagger_view(title='NetBox API')

 _patterns = [
@@ -45,6 +48,9 @@ _patterns = [
    # Serving static media in Django to pipe it through LoginRequiredMiddleware
    url(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT}),

+    # Error testing
+    url(r'^500/$', trigger_500),
+
    # Admin
    url(r'^admin/', admin.site.urls),

--- a/netbox/netbox/views.py
+++ b/netbox/netbox/views.py
@@ -1,19 +1,20 @@
 from __future__ import unicode_literals
-
 from collections import OrderedDict
+import sys
+
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.reverse import reverse

 from django.shortcuts import render
 from django.views.generic import View
-from rest_framework.response import Response
-from rest_framework.reverse import reverse
-from rest_framework.views import APIView

 from circuits.filters import CircuitFilter, ProviderFilter
 from circuits.models import Circuit, Provider
 from circuits.tables import CircuitTable, ProviderTable
 from dcim.filters import DeviceFilter, DeviceTypeFilter, RackFilter, SiteFilter
 from dcim.models import ConsolePort, Device, DeviceType, InterfaceConnection, PowerPort, Rack, Site
-from dcim.tables import DeviceDetailTable, DeviceTypeTable, RackTable, SiteTable
+from dcim.tables import DeviceTable, DeviceTypeTable, RackTable, SiteTable
 from extras.models import TopologyMap, UserAction
 from ipam.filters import AggregateFilter, IPAddressFilter, PrefixFilter, VLANFilter, VRFFilter
 from ipam.models import Aggregate, IPAddress, Prefix, VLAN, VRF
@@ -26,9 +27,10 @@ from tenancy.models import Tenant
 from tenancy.tables import TenantTable
 from virtualization.filters import ClusterFilter, VirtualMachineFilter
 from virtualization.models import Cluster, VirtualMachine
-from virtualization.tables import ClusterTable, VirtualMachineDetailTable
+from virtualization.tables import ClusterTable, VirtualMachineTable
 from .forms import SearchForm

+
 SEARCH_MAX_RESULTS = 15
 SEARCH_TYPES = OrderedDict((
    # Circuits
@@ -65,10 +67,10 @@ SEARCH_TYPES = OrderedDict((
    }),
    ('device', {
        'queryset': Device.objects.select_related(
-            'device_type__manufacturer', 'device_role', 'tenant', 'site', 'rack', 'primary_ip4', 'primary_ip6',
+            'device_type__manufacturer', 'device_role', 'tenant', 'site', 'rack'
        ),
        'filter': DeviceFilter,
-        'table': DeviceDetailTable,
+        'table': DeviceTable,
        'url': 'dcim:device_list',
    }),
    # IPAM
@@ -124,11 +126,9 @@ SEARCH_TYPES = OrderedDict((
        'url': 'virtualization:cluster_list',
    }),
    ('virtualmachine', {
-        'queryset': VirtualMachine.objects.select_related(
-            'cluster', 'tenant', 'platform', 'primary_ip4', 'primary_ip6',
-        ),
+        'queryset': VirtualMachine.objects.select_related('cluster', 'tenant', 'platform'),
        'filter': VirtualMachineFilter,
-        'table': VirtualMachineDetailTable,
+        'table': VirtualMachineTable,
        'url': 'virtualization:virtualmachine_list',
    }),
 ))
@@ -245,3 +245,23 @@ class APIRootView(APIView):
            ('tenancy', reverse('tenancy-api:api-root', request=request, format=format)),
            ('virtualization', reverse('virtualization-api:api-root', request=request, format=format)),
        )))
+
+
+def handle_500(request):
+    """
+    Custom server error handler
+    """
+    type_, error, traceback = sys.exc_info()
+    return render(request, '500.html', {
+        'exception': str(type_),
+        'error': error,
+    }, status=500)
+
+
+def trigger_500(request):
+    """
+    Hot-wired method of triggering a server error to test reporting
+    """
+    raise Exception(
+        "Congratulations, you've triggered an exception! Go tell all your friends what an exceptional person you are."
+    )
--- a/netbox/netbox/wsgi.py
+++ b/netbox/netbox/wsgi.py
@@ -1,3 +1,12 @@
+"""
+WSGI config for do_ipam project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.8/howto/deployment/wsgi/
+"""
+
 import os

 from django.core.wsgi import get_wsgi_application
--- a/netbox/project-static/css/base.css
+++ b/netbox/project-static/css/base.css
@@ -35,22 +35,8 @@ footer p {
    margin: 20px 0;
 }

-/* Hide the username in the navigation menu on displays less than 1400px wide */
-@media (max-width: 1399px) {
-    #navbar_user {
-        display: none;
-    }
-}
-
-/* Hide the search bar in the navigation menu on displays less than 1200px wide */
+/* Collapse the nav menu on displays less than 1200px wide */
@media (max-width: 1199px) {
-    #navbar_search {
-        display: none;
-    }
-}
-
-/* Collapse the nav menu on displays less than 960px wide */
-@media (max-width: 959px) {
    .navbar-header {
        float: none;
    }
@@ -86,8 +72,12 @@ footer p {
    .collapse.in {
        display:block !important;
    }
-    #navbar_user {
-        display: inline;
+}
+
+/* Hide the nav search bar on displays less than 1600px wide */
+@media (max-width: 1599px) {
+    #navbar_search {
+        display: none;
    }
 }

@@ -116,14 +106,9 @@ label {
 label.required {
    font-weight: bold;
 }
-input[name="pk"] {
-    margin-top: 0;
-}

 /* Tables */
-.table > tbody > tr > th.pk, .table > tbody > tr > td.pk {
-    padding-bottom: 6px;
-    padding-top: 10px;
+th.pk, td.pk {
    width: 30px;
 }
 tfoot td {
@@ -405,9 +390,6 @@ table.reports td.stats label {
 }

 /* Misc */
-.text-nowrap {
-    white-space: nowrap;
-}
 .banner-bottom {
    margin-bottom: 50px;
 }
--- a/netbox/project-static/js/secrets.js
+++ b/netbox/project-static/js/secrets.js
@@ -18,7 +18,7 @@ $(document).ready(function() {
    $('form').submit(function(event) {
        $(this).find('.requires-session-key').each(function() {
            if (this.value && document.cookie.indexOf('session_key') == -1) {
-                console.log('Field ' + this.name + ' requires a session key');
+                console.log('Field ' + this.value + ' requires a session key');
                $('#privkey_modal').modal('show');
                event.preventDefault();
                return false;
--- a/netbox/secrets/api/urls.py
+++ b/netbox/secrets/api/urls.py
@@ -16,9 +16,6 @@ class SecretsRootView(routers.APIRootView):
 router = routers.DefaultRouter()
 router.APIRootView = SecretsRootView

-# Field choices
-router.register(r'_choices', views.SecretsFieldChoicesViewSet, base_name='field-choice')
-
 # Secrets
 router.register(r'secret-roles', views.SecretRoleViewSet)
 router.register(r'secrets', views.SecretViewSet)
--- a/netbox/secrets/api/views.py
+++ b/netbox/secrets/api/views.py
@@ -1,34 +1,27 @@
 from __future__ import unicode_literals
-
 import base64

 from Crypto.PublicKey import RSA
-from django.http import HttpResponseBadRequest
 from rest_framework.exceptions import ValidationError
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet, ViewSet

+from django.http import HttpResponseBadRequest
+
 from secrets import filters
 from secrets.exceptions import InvalidKey
 from secrets.models import Secret, SecretRole, SessionKey, UserKey
-from utilities.api import FieldChoicesViewSet, WritableSerializerMixin
+from utilities.api import WritableSerializerMixin
 from . import serializers

+
 ERR_USERKEY_MISSING = "No UserKey found for the current user."
 ERR_USERKEY_INACTIVE = "UserKey has not been activated for decryption."
 ERR_PRIVKEY_MISSING = "Private key was not provided."
 ERR_PRIVKEY_INVALID = "Invalid private key."


-#
-# Field choices
-#
-
-class SecretsFieldChoicesViewSet(FieldChoicesViewSet):
-    fields = ()
-
-
 #
 # Secret Roles
 #
--- a/netbox/secrets/filters.py
+++ b/netbox/secrets/filters.py
@@ -1,11 +1,12 @@
 from __future__ import unicode_literals

 import django_filters
+
 from django.db.models import Q

+from .models import Secret, SecretRole
 from dcim.models import Device
 from utilities.filters import NumericInFilter
-from .models import Secret, SecretRole


 class SecretRoleFilter(django_filters.FilterSet):
--- a/netbox/secrets/forms.py
+++ b/netbox/secrets/forms.py
@@ -2,6 +2,7 @@ from __future__ import unicode_literals

 from Crypto.Cipher import PKCS1_OAEP
 from Crypto.PublicKey import RSA
+
 from django import forms
 from django.db.models import Count

@@ -42,17 +43,6 @@ class SecretRoleForm(BootstrapMixin, forms.ModelForm):
        fields = ['name', 'slug', 'users', 'groups']


-class SecretRoleCSVForm(forms.ModelForm):
-    slug = SlugField()
-
-    class Meta:
-        model = SecretRole
-        fields = ['name', 'slug']
-        help_texts = {
-            'name': 'Name of secret role',
-        }
-
-
 #
 # Secrets
 #
--- a/netbox/secrets/models.py
+++ b/netbox/secrets/models.py
@@ -1,10 +1,9 @@
 from __future__ import unicode_literals
-
 import os

-from Crypto.Cipher import AES, PKCS1_OAEP
+from Crypto.Cipher import AES, PKCS1_OAEP, XOR
 from Crypto.PublicKey import RSA
-from Crypto.Util import strxor
+
 from django.conf import settings
 from django.contrib.auth.hashers import make_password, check_password
 from django.contrib.auth.models import Group, User
@@ -17,7 +16,6 @@ from dcim.models import Device
 from utilities.models import CreatedUpdatedModel
 from .exceptions import InvalidKey
 from .hashers import SecretValidationHasher
-from .querysets import UserKeyQuerySet


 def generate_random_key(bits=256):
@@ -47,6 +45,24 @@ def decrypt_master_key(master_key_cipher, private_key):
    return cipher.decrypt(master_key_cipher)


+def xor_keys(key_a, key_b):
+    """
+    Return the binary XOR of two given keys.
+    """
+    xor = XOR.new(key_a)
+    return xor.encrypt(key_b)
+
+
+class UserKeyQuerySet(models.QuerySet):
+
+    def active(self):
+        return self.filter(master_key_cipher__isnull=False)
+
+    def delete(self):
+        # Disable bulk deletion to avoid accidentally wiping out all copies of the master key.
+        raise Exception("Bulk deletion has been disabled.")
+
+
@python_2_unicode_compatible
 class UserKey(CreatedUpdatedModel):
    """
@@ -82,7 +98,7 @@ class UserKey(CreatedUpdatedModel):

            # Validate the public key format
            try:
-                pubkey = RSA.import_key(self.public_key)
+                pubkey = RSA.importKey(self.public_key)
            except ValueError:
                raise ValidationError({
                    'public_key': "Invalid RSA key format."
@@ -92,7 +108,7 @@ class UserKey(CreatedUpdatedModel):
                                      "uploading a valid RSA public key in PEM format (no SSH/PGP).")

            # Validate the public key length
-            pubkey_length = pubkey.size_in_bits()
+            pubkey_length = pubkey.size() + 1  # key.size() returns 1 less than the key modulus
            if pubkey_length < settings.SECRETS_MIN_PUBKEY_SIZE:
                raise ValidationError({
                    'public_key': "Insufficient key length. Keys must be at least {} bits long.".format(
@@ -198,7 +214,7 @@ class SessionKey(models.Model):
        self.hash = make_password(self.key)

        # Encrypt master key using the session key
-        self.cipher = strxor.strxor(self.key, master_key)
+        self.cipher = xor_keys(self.key, master_key)

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

@@ -209,14 +225,14 @@ class SessionKey(models.Model):
            raise InvalidKey("Invalid session key")

        # Decrypt master key using provided session key
-        master_key = strxor.strxor(session_key, bytes(self.cipher))
+        master_key = xor_keys(session_key, bytes(self.cipher))

        return master_key

    def get_session_key(self, master_key):

        # Recover session key using the master key
-        session_key = strxor.strxor(master_key, bytes(self.cipher))
+        session_key = xor_keys(master_key, bytes(self.cipher))

        # Validate the recovered session key
        if not check_password(session_key, self.hash):
@@ -286,9 +302,6 @@ class Secret(CreatedUpdatedModel):
        super(Secret, self).__init__(*args, **kwargs)

    def __str__(self):
-        if self.role and self.device and self.name:
-            return '{} for {} ({})'.format(self.role, self.device, self.name)
-        # Return role and device if no name is set
        if self.role and self.device:
            return '{} for {}'.format(self.role, self.device)
        return 'Secret'
--- a/netbox/secrets/querysets.py
+++ b/netbox/secrets/querysets.py
@@ -1,13 +0,0 @@
-from __future__ import unicode_literals
-
-from django.db.models import QuerySet
-
-
-class UserKeyQuerySet(QuerySet):
-
-    def active(self):
-        return self.filter(master_key_cipher__isnull=False)
-
-    def delete(self):
-        # Disable bulk deletion to avoid accidentally wiping out all copies of the master key.
-        raise Exception("Bulk deletion has been disabled.")
--- a/netbox/secrets/tables.py
+++ b/netbox/secrets/tables.py
@@ -3,8 +3,10 @@ from __future__ import unicode_literals
 import django_tables2 as tables

 from utilities.tables import BaseTable, ToggleColumn
+
 from .models import SecretRole, Secret

+
 SECRETROLE_ACTIONS = """
 {% if perms.secrets.change_secretrole %}
    <a href="{% url 'secrets:secretrole_edit' slug=record.slug %}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
--- a/netbox/secrets/tests/test_api.py
+++ b/netbox/secrets/tests/test_api.py
@@ -1,17 +1,18 @@
 from __future__ import unicode_literals
-
 import base64

+from rest_framework import status
+from rest_framework.test import APITestCase
+
 from django.contrib.auth.models import User
 from django.urls import reverse
-from rest_framework import status
-from rest_framework.test import APITestCase

 from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Site
 from secrets.models import Secret, SecretRole, SessionKey, UserKey
 from users.models import Token
 from utilities.tests import HttpStatusMixin

+
 # Dummy RSA key pair for testing use only
 PRIVATE_KEY = """-----BEGIN RSA PRIVATE KEY-----
 MIIEowIBAAKCAQEA97wPWxpq5cClRu8Ssq609ZLfyx6E8ln/v/PdFZ7fxxmA4k+z
--- a/netbox/secrets/tests/test_models.py
+++ b/netbox/secrets/tests/test_models.py
@@ -1,13 +1,14 @@
 from __future__ import unicode_literals

 from Crypto.PublicKey import RSA
+
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 from django.test import TestCase

-from secrets.hashers import SecretValidationHasher
 from secrets.models import UserKey, Secret, encrypt_master_key, decrypt_master_key, generate_random_key
+from secrets.hashers import SecretValidationHasher


 class UserKeyTestCase(TestCase):
--- a/netbox/secrets/urls.py
+++ b/netbox/secrets/urls.py
@@ -4,13 +4,13 @@ from django.conf.urls import url

 from . import views

+
 app_name = 'secrets'
 urlpatterns = [

    # Secret roles
    url(r'^secret-roles/$', views.SecretRoleListView.as_view(), name='secretrole_list'),
    url(r'^secret-roles/add/$', views.SecretRoleCreateView.as_view(), name='secretrole_add'),
-    url(r'^secret-roles/import/$', views.SecretRoleBulkImportView.as_view(), name='secretrole_import'),
    url(r'^secret-roles/delete/$', views.SecretRoleBulkDeleteView.as_view(), name='secretrole_bulk_delete'),
    url(r'^secret-roles/(?P<slug>[\w-]+)/edit/$', views.SecretRoleEditView.as_view(), name='secretrole_edit'),

--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -1,5 +1,4 @@
 from __future__ import unicode_literals
-
 import base64

 from django.contrib import messages
@@ -53,13 +52,6 @@ class SecretRoleEditView(SecretRoleCreateView):
    permission_required = 'secrets.change_secretrole'


-class SecretRoleBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'secrets.add_secretrole'
-    model_form = forms.SecretRoleCSVForm
-    table = tables.SecretRoleTable
-    default_return_url = 'secrets:secretrole_list'
-
-
 class SecretRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
    permission_required = 'secrets.delete_secretrole'
    cls = SecretRole
@@ -204,9 +196,7 @@ class SecretBulkImportView(BulkImportView):
    permission_required = 'ipam.add_vlan'
    model_form = forms.SecretCSVForm
    table = tables.SecretTable
-    template_name = 'secrets/secret_import.html'
    default_return_url = 'secrets:secret_list'
-    widget_attrs = {'class': 'requires-session-key'}

    master_key = None

--- a/netbox/templates/500.html
+++ b/netbox/templates/500.html
@@ -3,16 +3,15 @@
 <html lang="en">

 <head>
-    <title>Server Error</title>
-    <link rel="stylesheet" href="{% static 'bootstrap-3.3.7-dist/css/bootstrap.min.css' %}">
+	<title>Server Error</title>
+	<link rel="stylesheet" href="{% static 'bootstrap-3.3.7-dist/css/bootstrap.min.css' %}">
    <link rel="stylesheet" href="{% static 'font-awesome-4.7.0/css/font-awesome.min.css' %}">
-    <meta charset="UTF-8">
 </head>

 <body>
    <div class="container-fluid">
        <div class="row">
-            <div class="col-md-6 col-md-offset-3">
+            <div class="col-md-4 col-md-offset-4">
                <div class="panel panel-danger" style="margin-top: 200px">
                    <div class="panel-heading">
                        <strong>
@@ -21,20 +20,13 @@
                        </strong>
                    </div>
                    <div class="panel-body">
-                        {% block message %}
-                            <p>
-                                There was a problem with your request. Please contact an administrator.
-                            </p>
-                        {% endblock %}
-                        <hr />
-                        <p>
-                            The complete exception is provided below:
-                        </p>
+                        <p>There was a problem with your request. This error has been logged and administrative staff have
+                        been notified. Please return to the home page and try again.</p>
+                        <p>If you are responsible for this installation, please consider
+                        <a href="https://github.com/digitalocean/netbox/issues">filing a bug report</a>. Additional
+                        information is provided below:</p>
 <pre><strong>{{ exception }}</strong><br />
 {{ error }}</pre>
-                        <p>
-                            If further assistance is required, please post to the <a href="https://groups.google.com/forum/#!forum/netbox-discuss">NetBox mailing list</a>.
-                        </p>
                        <div class="text-right">
                            <a href="{% url 'home' %}" class="btn btn-primary">Home Page</a>
                        </div>
--- a/netbox/templates/_base.html
+++ b/netbox/templates/_base.html
@@ -3,13 +3,12 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>{% block title %}Home{% endblock %} - NetBox</title>
-    <link rel="stylesheet" href="{% static 'bootstrap-3.3.7-dist/css/bootstrap.min.css' %}">
+	<title>{% block title %}Home{% endblock %} - NetBox</title>
+	<link rel="stylesheet" href="{% static 'bootstrap-3.3.7-dist/css/bootstrap.min.css' %}">
    <link rel="stylesheet" href="{% static 'font-awesome-4.7.0/css/font-awesome.min.css' %}">
    <link rel="stylesheet" href="{% static 'jquery-ui-1.12.1/jquery-ui.css' %}">
-    <link rel="stylesheet" href="{% static 'css/base.css' %}?v{{ settings.VERSION }}">
+	<link rel="stylesheet" href="{% static 'css/base.css' %}?v{{ settings.VERSION }}">
    <link rel="icon" type="image/png" href="{% static 'img/netbox.ico' %}" />
-    <meta charset="UTF-8">
    <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
 </head>
 <body>
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -65,7 +65,7 @@
                    <td>
                        {% if circuit.tenant %}
                            {% if circuit.tenant.group %}
-                                <a href="{{ circuit.tenant.group.get_absolute_url }}">{{ circuit.tenant.group }}</a>
+                                <a href="{{ circuit.tenant.group.get_absolute_url }}">{{ circuit.tenant.group.name }}</a>
                                <i class="fa fa-angle-right"></i>
                            {% endif %}
                            <a href="{{ circuit.tenant.get_absolute_url }}">{{ circuit.tenant }}</a>
--- a/netbox/templates/circuits/circuittype_list.html
+++ b/netbox/templates/circuits/circuittype_list.html
@@ -8,10 +8,6 @@
            <span class="fa fa-plus" aria-hidden="true"></span>
            Add a circuit type
        </a>
-        <a href="{% url 'circuits:circuittype_import' %}" class="btn btn-info">
-            <span class="fa fa-download" aria-hidden="true"></span>
-            Import circuit types
-        </a>
    {% endif %}
 </div>
 <h1>{% block title %}Circuit Types{% endblock %}</h1>
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -7,7 +7,7 @@
 {% block content %}
 {% include 'dcim/inc/device_header.html' with active_tab='info' %}
 <div class="row">
-	<div class="col-md-6">
+	<div class="col-md-5">
        <div class="panel panel-default">
            <div class="panel-heading">
                <strong>Device</strong>
@@ -28,10 +28,10 @@
                    <td>
                        {% if device.rack %}
                            {% if device.rack.group %}
-                                <a href="{{ device.rack.group.get_absolute_url }}">{{ device.rack.group }}</a>
+                                <a href="{{ device.rack.group.get_absolute_url }}">{{ device.rack.group.name }}</a>
                                <i class="fa fa-angle-right"></i>
                            {% endif %}
-                            <a href="{% url 'dcim:rack' pk=device.rack.pk %}">{{ device.rack }}</a>
+                            <a href="{% url 'dcim:rack' pk=device.rack.pk %}">{{ device.rack.name }}</a>{% if device.rack.facility_id %} ({{ device.rack.facility_id }}){% endif %}
                        {% else %}
                            <span class="text-muted">None</span>
                        {% endif %}
@@ -42,7 +42,7 @@
                    <td>
                        {% if device.parent_bay %}
                            {% with device.parent_bay.device as parent %}
-                                <a href="{{ parent.get_absolute_url }}">{{ parent }}</a> <i class="fa fa-angle-right"></i> {{ device.parent_bay }}
+                                <a href="{{ parent.get_absolute_url }}">{{ parent }}</a> <i class="fa fa-angle-right"></i> {{ device.parent_bay.name }}
                                {% if parent.position %}
                                    (U{{ parent.position }} / {{ parent.get_face_display }})
                                {% endif %}
@@ -61,7 +61,7 @@
                    <td>
                        {% if device.tenant %}
                            {% if device.tenant.group %}
-                                <a href="{{ device.tenant.group.get_absolute_url }}">{{ device.tenant.group }}</a>
+                                <a href="{{ device.tenant.group.get_absolute_url }}">{{ device.tenant.group.name }}</a>
                                <i class="fa fa-angle-right"></i>
                            {% endif %}
                            <a href="{{ device.tenant.get_absolute_url }}">{{ device.tenant }}</a>
@@ -172,69 +172,6 @@
        {% with device.get_custom_fields as custom_fields %}
            {% include 'inc/custom_fields_panel.html' %}
        {% endwith %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Comments</strong>
-            </div>
-            <div class="panel-body">
-                {% if device.comments %}
-                    {{ device.comments|gfm }}
-                {% else %}
-                    <span class="text-muted">None</span>
-                {% endif %}
-            </div>
-        </div>
-    </div>
-    <div class="col-md-6">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Console / Power</strong>
-            </div>
-            <table class="table table-hover panel-body component-list">
-                {% for cp in console_ports %}
-                    {% include 'dcim/inc/consoleport.html' %}
-                {% empty %}
-                    {% if device.device_type.console_port_templates.exists %}
-                        <tr>
-                            <td colspan="6" class="alert-warning">
-                                <i class="fa fa-fw fa-warning"></i> No console ports defined
-                                {% if perms.dcim.add_consoleport %}
-                                    <a href="{% url 'dcim:consoleport_add' pk=device.pk %}" class="btn btn-primary btn-xs pull-right"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></a>
-                                {% endif %}
-                            </td>
-                        </tr>
-                    {% endif %}
-                {% endfor %}
-                {% for pp in power_ports %}
-                    {% include 'dcim/inc/powerport.html' %}
-                {% empty %}
-                    {% if device.device_type.power_port_templates.exists %}
-                        <tr>
-                            <td colspan="6" class="alert-warning">
-                                <i class="fa fa-fw fa-warning"></i> No power ports defined
-                                {% if perms.dcim.add_powerport %}
-                                    <a href="{% url 'dcim:powerport_add' pk=device.pk %}" class="btn btn-primary btn-xs pull-right"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></a>
-                                {% endif %}
-                            </td>
-                        </tr>
-                    {% endif %}
-                {% endfor %}
-            </table>
-            {% if perms.dcim.add_interface or perms.dcim.add_consoleport or perms.dcim.add_powerport %}
-                <div class="panel-footer text-right">
-                    {% if perms.dcim.add_consoleport %}
-                        <a href="{% url 'dcim:consoleport_add' pk=device.pk %}" class="btn btn-xs btn-primary">
-                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add console port
-                        </a>
-                    {% endif %}
-                    {% if perms.dcim.add_powerport %}
-                        <a href="{% url 'dcim:powerport_add' pk=device.pk %}" class="btn btn-xs btn-primary">
-                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add power port
-                        </a>
-                    {% endif %}
-                </div>
-            {% endif %}
-        </div>
        {% if request.user.is_authenticated %}
            <div class="panel panel-default">
                <div class="panel-heading">
@@ -287,6 +224,67 @@
                </div>
            {% endif %}
        </div>
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Console / Power</strong>
+            </div>
+            <table class="table table-hover panel-body component-list">
+                {% for cp in console_ports %}
+                    {% include 'dcim/inc/consoleport.html' %}
+                {% empty %}
+                    {% if device.device_type.console_port_templates.exists %}
+                        <tr>
+                            <td colspan="6" class="alert-warning">
+                                <i class="fa fa-fw fa-warning"></i> No console ports defined
+                                {% if perms.dcim.add_consoleport %}
+                                    <a href="{% url 'dcim:consoleport_add' pk=device.pk %}" class="btn btn-primary btn-xs pull-right"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></a>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    {% endif %}
+                {% endfor %}
+                {% for pp in power_ports %}
+                    {% include 'dcim/inc/powerport.html' %}
+                {% empty %}
+                    {% if device.device_type.power_port_templates.exists %}
+                        <tr>
+                            <td colspan="6" class="alert-warning">
+                                <i class="fa fa-fw fa-warning"></i> No power ports defined
+                                {% if perms.dcim.add_powerport %}
+                                    <a href="{% url 'dcim:powerport_add' pk=device.pk %}" class="btn btn-primary btn-xs pull-right"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></a>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    {% endif %}
+                {% endfor %}
+            </table>
+            {% if perms.dcim.add_interface or perms.dcim.add_consoleport or perms.dcim.add_powerport %}
+                <div class="panel-footer text-right">
+                    {% if perms.dcim.add_consoleport %}
+                        <a href="{% url 'dcim:consoleport_add' pk=device.pk %}" class="btn btn-xs btn-primary">
+                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add console port
+                        </a>
+                    {% endif %}
+                    {% if perms.dcim.add_powerport %}
+                        <a href="{% url 'dcim:powerport_add' pk=device.pk %}" class="btn btn-xs btn-primary">
+                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add power port
+                        </a>
+                    {% endif %}
+                </div>
+            {% endif %}
+        </div>
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Comments</strong>
+            </div>
+            <div class="panel-body">
+                {% if device.comments %}
+                    {{ device.comments|gfm }}
+                {% else %}
+                    <span class="text-muted">None</span>
+                {% endif %}
+            </div>
+        </div>
        <div class="panel panel-default">
            <div class="panel-heading">
                <strong>Images</strong>
@@ -328,9 +326,7 @@
            {% endif %}
        </div>
 	</div>
-</div>
-<div class="row">
-	<div class="col-md-12">
+	<div class="col-md-7">
        {% if device_bays or device.device_type.is_parent_device %}
            {% if perms.dcim.delete_devicebay %}
                <form method="post" action="{% url 'dcim:devicebay_bulk_delete' pk=device.pk %}">
@@ -354,7 +350,7 @@
                </div>
                <table class="table table-hover panel-body component-list">
                    {% for devicebay in device_bays %}
-                        {% include 'dcim/inc/devicebay.html' %}
+                        {% include 'dcim/inc/devicebay.html' with selectable=True %}
                    {% empty %}
                        <tr>
                            <td colspan="4">No device bays defined</td>
@@ -409,23 +405,11 @@
                    </div>
                </div>
                <table id="interfaces_table" class="table table-hover panel-body component-list">
-                    <tr class="table-headings">
-                        {% if perms.dcim.change_interface or perms.dcim.delete_interface %}
-                            <th></th>
-                        {% endif %}
-                        <th>Name</th>
-                        <th>LAG</th>
-                        <th>Description</th>
-                        <th>MTU</th>
-                        <th>MAC Address</th>
-                        <th colspan="2">Connection</th>
-                        <th></th>
-                    </tr>
                    {% for iface in interfaces %}
-                        {% include 'dcim/inc/interface.html' %}
+                        {% include 'dcim/inc/interface.html' with selectable=True %}
                    {% empty %}
                        <tr>
-                            <td colspan="8">No interfaces defined</td>
+                            <td colspan="4">No interfaces defined</td>
                        </tr>
                    {% endfor %}
                </table>
@@ -483,16 +467,8 @@
                    </div>
                </div>
                <table class="table table-hover panel-body component-list">
-                    <tr class="table-headings">
-                        {% if perms.dcim.change_consoleserverport or perms.dcim.delete_consoleserverport %}
-                            <th></th>
-                        {% endif %}
-                        <th>Name</th>
-                        <th colspan="2">Connection</th>
-                        <th></th>
-                    </tr>
                    {% for csp in cs_ports %}
-                        {% include 'dcim/inc/consoleserverport.html' %}
+                        {% include 'dcim/inc/consoleserverport.html' with selectable=True %}
                    {% empty %}
                        <tr>
                            <td colspan="4">No console server ports defined</td>
@@ -548,20 +524,12 @@
                    </div>
                </div>
                <table class="table table-hover panel-body component-list">
-                    <tr class="table-headings">
-                        {% if perms.dcim.change_poweroutlet or perms.dcim.delete_poweroutlet %}
-                            <th></th>
-                        {% endif %}
-                        <th>Name</th>
-                        <th colspan="2">Connection</th>
-                        <th></th>
-                    </tr>
                    {% for po in power_outlets %}
-                        {% include 'dcim/inc/poweroutlet.html' %}
+                        {% include 'dcim/inc/poweroutlet.html' with selectable=True %}
                    {% empty %}
                        <tr>
                            <td colspan="4">No power outlets defined</td>
-                        </tr> text-nowrap
+                        </tr>
                    {% endfor %}
                </table>
                {% if perms.dcim.add_poweroutlet or perms.dcim.delete_poweroutlet %}
--- a/netbox/templates/dcim/device_lldp_neighbors.html
+++ b/netbox/templates/dcim/device_lldp_neighbors.html
@@ -54,27 +54,15 @@ $(document).ready(function() {
            $.each(json['get_lldp_neighbors'], function(iface, neighbors) {
                var neighbor = neighbors[0];
                var row = $('#' + iface.split(".")[0].replace(/(\/)/g, "\\$1"));
-
-                // Glean configured hostnames/interfaces from the DOM
                var configured_device = row.children('td.configured_device').attr('data');
                var configured_interface = row.children('td.configured_interface').attr('data');
-                if (configured_interface) {
-                    // Match long-form IOS names against short ones (e.g. Gi0/1 == GigabitEthernet0/1).
-                    configured_interface = configured_interface.replace(/^([A-Z][a-z])[^0-9]*([0-9\/]+)$/, "$1$2");
-                }
-
-                // Clean up hostnames/interfaces learned via LLDP
-                var lldp_device = neighbor['hostname'].split(".")[0];  // Strip off any trailing domain name
-                var lldp_interface = neighbor['port'].split(".")[0];   // Strip off any trailing subinterface ID
-
                // Add LLDP neighbors to table
-                row.children('td.device').html(lldp_device);
-                row.children('td.interface').html(lldp_interface);
-
+                row.children('td.device').html(neighbor['hostname']);
+                row.children('td.interface').html(neighbor['port']);
                // Apply colors to rows
-                if (!configured_device && lldp_device) {
+                if (!configured_device && neighbor['hostname']) {
                    row.addClass('info');
-                } else if (configured_device == lldp_device && configured_interface == lldp_interface) {
+                } else if (configured_device == neighbor['hostname'] && configured_interface == neighbor['port'].split(".")[0]) {
                    row.addClass('success');
                } else {
                    row.addClass('danger');
--- a/Show More
+++ b/Show More