Merge pull request #2552 from digitalocean/develop

Release v2.4.7
2025-12-30 17:17:46 -06:00 · 2018-11-06 10:55:29 -05:00 · 2018-11-06 10:49:44 -05:00 · 2018-11-06 10:31:56 -05:00 · 2018-11-06 10:08:00 -05:00 · 2018-11-06 09:26:05 -05:00
60 changed files with 1025 additions and 223 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,60 @@
+v2.4.7 (2018-11-06)
+
+## Enhancements
+
+* [#2388](https://github.com/digitalocean/netbox/issues/2388) - Enable filtering of devices/VMs by region
+* [#2427](https://github.com/digitalocean/netbox/issues/2427) - Allow filtering of interfaces by assigned VLAN or VLAN ID
+* [#2512](https://github.com/digitalocean/netbox/issues/2512) - Add device field to inventory item filter form
+
+## Bug Fixes
+
+* [#2502](https://github.com/digitalocean/netbox/issues/2502) - Allow duplicate VIPs inside a uniqueness-enforced VRF
+* [#2514](https://github.com/digitalocean/netbox/issues/2514) - Prevent new connections to already connected interfaces
+* [#2515](https://github.com/digitalocean/netbox/issues/2515) - Only use django-rq admin tmeplate if webhooks are enabled
+* [#2528](https://github.com/digitalocean/netbox/issues/2528) - Enable creating circuit terminations with interface assignment via API
+* [#2549](https://github.com/digitalocean/netbox/issues/2549) - Changed naming of `peer_device` and `peer_interface` on API /dcim/connected-device/ endpoint to use underscores
+
+---
+
+v2.4.6 (2018-10-05)
+
+## Enhancements
+
+* [#2479](https://github.com/digitalocean/netbox/issues/2479) - Add user permissions for creating/modifying API tokens
+* [#2487](https://github.com/digitalocean/netbox/issues/2487) - Return abbreviated API output when passed `?brief=1`
+
+## Bug Fixes
+
+* [#2393](https://github.com/digitalocean/netbox/issues/2393) - Fix Unicode support for CSV import under Python 2
+* [#2483](https://github.com/digitalocean/netbox/issues/2483) - Set max item count of API-populated form fields to MAX_PAGE_SIZE
+* [#2484](https://github.com/digitalocean/netbox/issues/2484) - Local config context not available on the Virtual Machine Edit Form
+* [#2485](https://github.com/digitalocean/netbox/issues/2485) - Fix cancel button when assigning a service to a device/VM
+* [#2491](https://github.com/digitalocean/netbox/issues/2491) - Fix exception when importing devices with invalid device type
+* [#2492](https://github.com/digitalocean/netbox/issues/2492) - Sanitize hostname and port values returned through LLDP
+
+---
+
+v2.4.5 (2018-10-02)
+
+## Enhancements
+
+* [#2392](https://github.com/digitalocean/netbox/issues/2392) - Implemented local context data for devices and virtual machines
+* [#2402](https://github.com/digitalocean/netbox/issues/2402) - Order and format JSON data in form fields
+* [#2432](https://github.com/digitalocean/netbox/issues/2432) - Link remote interface connections to the Interface view
+* [#2438](https://github.com/digitalocean/netbox/issues/2438) - API optimizations for tagged objects
+
+## Bug Fixes
+
+* [#2406](https://github.com/digitalocean/netbox/issues/2406) - Remove hard-coded limit of 1000 objects from API-populated form fields
+* [#2414](https://github.com/digitalocean/netbox/issues/2414) - Tags field missing from device/VM component creation forms
+* [#2442](https://github.com/digitalocean/netbox/issues/2442) - Nullify "next" link in API when limit=0 is passed
+* [#2443](https://github.com/digitalocean/netbox/issues/2443) - Enforce JSON object format when creating config contexts
+* [#2444](https://github.com/digitalocean/netbox/issues/2444) - Improve validation of interface MAC addresses
+* [#2455](https://github.com/digitalocean/netbox/issues/2455) - Ignore unique address enforcement for IPs with a shared/virtual role
+* [#2470](https://github.com/digitalocean/netbox/issues/2470) - Log the creation of device/VM components as object changes
+
+---
+
 v2.4.4 (2018-08-22)

 ## Enhancements
--- a/README.md
+++ b/README.md
@@ -42,3 +42,18 @@ and run `upgrade.sh`.
 * [Docker container](https://github.com/ninech/netbox-docker) (via [@cimnine](https://github.com/cimnine))
 * [Vagrant deployment](https://github.com/ryanmerolle/netbox-vagrant) (via [@ryanmerolle](https://github.com/ryanmerolle))
 * [Ansible deployment](https://github.com/lae/ansible-role-netbox) (via [@lae](https://github.com/lae))
+
+# Related projects
+
+## Supported SDK
+
+- [pynetbox](https://github.com/digitalocean/pynetbox) Python API client library for Netbox.
+
+## Community SDK
+
+- [netbox-client-ruby](https://github.com/ninech/netbox-client-ruby) A ruby client library for Netbox v2.
+
+## Ansible Inventory
+
+- [netbox-as-ansible-inventory](https://github.com/AAbouZaid/netbox-as-ansible-inventory) Ansible dynamic inventory script for Netbox.
+
--- a/docs/additional-features/context-data.md
+++ b/docs/additional-features/context-data.md
@@ -1,3 +1,5 @@
 # Contextual Configuration Data

 Sometimes it is desirable to associate arbitrary data with a group of devices to aid in their configuration. For example, you might want to associate a set of syslog servers for all devices at a particular site. Context data enables the association of arbitrary data to devices and virtual machines grouped by region, site, role, platform, and/or tenant. Context data is arranged hierarchically, so that data with a higher weight can be entered to override more general lower-weight data. Multiple instances of data are automatically merged by NetBox to present a single dictionary for each object.
+
+Devices and Virtual Machines may also have a local config context defined. This local context will always overwrite the rendered config context objects for the Device/VM. This is useful in situations were the device requires a one-off value different from the rest of the environment.
--- a/docs/additional-features/webhooks.md
+++ b/docs/additional-features/webhooks.md
@@ -4,6 +4,14 @@ A webhook defines an HTTP request that is sent to an external application when c

 An optional secret key can be configured for each webhook. This will append a `X-Hook-Signature` header to the request, consisting of a HMAC (SHA-512) hex digest of the request body using the secret as the key. This digest can be used by the receiver to authenticate the request's content.

+## Installation
+
+If you are upgrading from a previous version of Netbox and want to enable the webhook feature, please follow the directions listed in the sections below.
+
+* [Install Redis server and djano-rq package](../installation/2-netbox/#install-python-packages)
+* [Modify configuration to enable webhooks](../installation/2-netbox/#webhooks-configuration)
+* [Create supervisord program to run the rqworker process](../installation/3-http-daemon/#supervisord-installation)
+
 ## Requests

 The webhook POST request is structured as so (assuming `application/json` as the Content-Type):
--- a/docs/api/authentication.md
+++ b/docs/api/authentication.md
@@ -4,6 +4,9 @@ The NetBox API employs token-based authentication. For convenience, cookie authe

 A token is a unique identifier that identifies a user to the API. Each user in NetBox may have one or more tokens which he or she can use to authenticate to the API. To create a token, navigate to the API tokens page at `/user/api-tokens/`.

+!!! note
+    The creation and modification of API tokens can be restricted per user by an administrator. If you don't see an option to create an API token, ask an administrator to grant you access.
+
 Each token contains a 160-bit key represented as 40 hexadecimal characters. When creating a token, you'll typically leave the key field blank so that a random key will be automatically generated. However, NetBox allows you to specify a key in case you need to restore a previously deleted token to operation.

 By default, a token can be used for all operations available via the API. Deselecting the "write enabled" option will restrict API requests made with the token to read operations (e.g. GET) only.
--- a/docs/core-functionality/devices.md
+++ b/docs/core-functionality/devices.md
@@ -58,7 +58,7 @@ A device is said to be full depth if its installation on one rack face prevents

 ## Device Roles

-Devices can be organized by functional roles. These roles are fully cusomizable. For example, you might create roles for core switches, distribution switches, and access switches.
+Devices can be organized by functional roles. These roles are fully customizable. For example, you might create roles for core switches, distribution switches, and access switches.

 ---

@@ -99,9 +99,9 @@ Device bays represent the ability of a device to house child devices. For exampl

 # Platforms

-A platform defines the type of software running on a device or virtual machine. This can be helpful when it is necessary to distinguish between, for instance, different feature sets. Note that two devices of same type may be assigned different platforms: for example, one Juniper MX240 running Junos 14 and another running Junos 15.
+A platform defines the type of software running on a device or virtual machine. This can be helpful when it is necessary to distinguish between, for instance, different feature sets. Note that two devices of the same type may be assigned different platforms: for example, one Juniper MX240 running Junos 14 and another running Junos 15.

-The platform model is also used to indicate which [NAPALM](https://napalm-automation.net/) driver NetBox should use when connecting to a remote device. The name of the driver along with optional parameters are stored with the platform. See the [API documentation](api/napalm-integration.md) for more information on NAPALM integration.
+The platform model is also used to indicate which [NAPALM](https://napalm-automation.net/) driver NetBox should use when connecting to a remote device. The name of the driver along with optional parameters are stored with the platform.

 The assignment of platforms to devices is an optional feature, and may be disregarded if not desired.

--- a/docs/core-functionality/ipam.md
+++ b/docs/core-functionality/ipam.md
@@ -4,7 +4,7 @@ The first step to documenting your IP space is to define its scope by creating a

 * 10.0.0.0/8 (RFC 1918)
 * 100.64.0.0/10 (RFC 6598)
-* 172.16.0.0/20 (RFC 1918)
+* 172.16.0.0/12 (RFC 1918)
 * 192.168.0.0/16 (RFC 1918)
 * One or more /48s within fd00::/8 (IPv6 unique local addressing)

--- a/docs/installation/2-netbox.md
+++ b/docs/installation/2-netbox.md
@@ -71,7 +71,7 @@ Checking connectivity... done.

    `# chown -R netbox:netbox /opt/netbox/netbox/media/`

-## Install Python Packages
+# Install Python Packages

 Install the required Python packages using pip. (If you encounter any compilation errors during this step, ensure that you've installed all of the system dependencies listed above.)

@@ -82,7 +82,7 @@ Install the required Python packages using pip. (If you encounter any compilatio
 !!! note
    If you encounter errors while installing the required packages, check that you're running a recent version of pip (v9.0.1 or higher) with the command `pip3 -V`.

-### NAPALM Automation (Optional)
+## NAPALM Automation (Optional)

 NetBox supports integration with the [NAPALM automation](https://napalm-automation.net/) library. NAPALM allows NetBox to fetch live data from devices and return it to a requester via its REST API. Installation of NAPALM is optional. To enable it, install the `napalm` package using pip or pip3:

@@ -90,7 +90,7 @@ NetBox supports integration with the [NAPALM automation](https://napalm-automati
 # pip3 install napalm
 ```

-### Webhooks (Optional)
+## Webhooks (Optional)

 [Webhooks](../data-model/extras/#webhooks) allow NetBox to integrate with external services by pushing out a notification each time a relevant object is created, updated, or deleted. Enabling the webhooks feature requires [Redis](https://redis.io/), a lightweight in-memory database. You may opt to install a Redis sevice locally (see below) or connect to an external one.

--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,4 +1,5 @@
 site_name: NetBox
+theme: readthedocs
 repo_url: https://github.com/digitalocean/netbox

 pages:
--- a/netbox/circuits/api/serializers.py
+++ b/netbox/circuits/api/serializers.py
@@ -4,8 +4,8 @@ from rest_framework import serializers
 from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField

 from circuits.constants import CIRCUIT_STATUS_CHOICES
-from circuits.models import Provider, Circuit, CircuitTermination, CircuitType
-from dcim.api.serializers import NestedSiteSerializer, InterfaceSerializer
+from circuits.models import Circuit, CircuitTermination, CircuitType, Provider
+from dcim.api.serializers import NestedInterfaceSerializer, NestedSiteSerializer
 from extras.api.customfields import CustomFieldModelSerializer
 from tenancy.api.serializers import NestedTenantSerializer
 from utilities.api import ChoiceField, ValidatedModelSerializer, WritableNestedSerializer
@@ -87,7 +87,7 @@ class NestedCircuitSerializer(WritableNestedSerializer):
 class CircuitTerminationSerializer(ValidatedModelSerializer):
    circuit = NestedCircuitSerializer()
    site = NestedSiteSerializer()
-    interface = InterfaceSerializer(required=False, allow_null=True)
+    interface = NestedInterfaceSerializer(required=False, allow_null=True)

    class Meta:
        model = CircuitTermination
--- a/netbox/circuits/api/views.py
+++ b/netbox/circuits/api/views.py
@@ -29,7 +29,7 @@ class CircuitsFieldChoicesViewSet(FieldChoicesViewSet):
 #

 class ProviderViewSet(CustomFieldModelViewSet):
-    queryset = Provider.objects.all()
+    queryset = Provider.objects.prefetch_related('tags')
    serializer_class = serializers.ProviderSerializer
    filter_class = filters.ProviderFilter

@@ -59,7 +59,7 @@ class CircuitTypeViewSet(ModelViewSet):
 #

 class CircuitViewSet(CustomFieldModelViewSet):
-    queryset = Circuit.objects.select_related('type', 'tenant', 'provider')
+    queryset = Circuit.objects.select_related('type', 'tenant', 'provider').prefetch_related('tags')
    serializer_class = serializers.CircuitSerializer
    filter_class = filters.CircuitFilter

--- a/netbox/circuits/tests/test_api.py
+++ b/netbox/circuits/tests/test_api.py
@@ -5,7 +5,7 @@ from rest_framework import status

 from circuits.constants import CIRCUIT_STATUS_ACTIVE, TERM_SIDE_A, TERM_SIDE_Z
 from circuits.models import Circuit, CircuitTermination, CircuitType, Provider
-from dcim.models import Site
+from dcim.models import Device, DeviceRole, DeviceType, Interface, Manufacturer, Site
 from extras.constants import GRAPH_TYPE_PROVIDER
 from extras.models import Graph
 from utilities.testing import APITestCase
@@ -56,6 +56,16 @@ class ProviderTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_providers_brief(self):
+
+        url = reverse('circuits-api:provider-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_provider(self):

        data = {
@@ -147,6 +157,16 @@ class CircuitTypeTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_circuittypes_brief(self):
+
+        url = reverse('circuits-api:circuittype-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_circuittype(self):

        data = {
@@ -216,6 +236,16 @@ class CircuitTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_circuits_brief(self):
+
+        url = reverse('circuits-api:circuit-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['cid', 'id', 'url']
+        )
+
    def test_create_circuit(self):

        data = {
@@ -300,21 +330,44 @@ class CircuitTerminationTest(APITestCase):

        super(CircuitTerminationTest, self).setUp()

+        self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1')
+        self.site2 = Site.objects.create(name='Test Site 2', slug='test-site-2')
+        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
+        )
+        devicerole = DeviceRole.objects.create(
+            name='Test Device Role 1', slug='test-device-role-1', color='ff0000'
+        )
+        device1 = Device.objects.create(
+            device_type=devicetype, device_role=devicerole, name='Test Device 1', site=self.site1
+        )
+        device2 = Device.objects.create(
+            device_type=devicetype, device_role=devicerole, name='Test Device 2', site=self.site2
+        )
+        self.interface1 = Interface.objects.create(device=device1, name='Test Interface 1')
+        self.interface2 = Interface.objects.create(device=device2, name='Test Interface 2')
+        self.interface3 = Interface.objects.create(device=device1, name='Test Interface 3')
+        self.interface4 = Interface.objects.create(device=device2, name='Test Interface 4')
+        self.interface5 = Interface.objects.create(device=device1, name='Test Interface 5')
+        self.interface6 = Interface.objects.create(device=device2, name='Test Interface 6')
+
        provider = Provider.objects.create(name='Test Provider', slug='test-provider')
        circuittype = CircuitType.objects.create(name='Test Circuit Type', slug='test-circuit-type')
        self.circuit1 = Circuit.objects.create(cid='TEST0001', provider=provider, type=circuittype)
        self.circuit2 = Circuit.objects.create(cid='TEST0002', provider=provider, type=circuittype)
        self.circuit3 = Circuit.objects.create(cid='TEST0003', provider=provider, type=circuittype)
-        self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1')
-        self.site2 = Site.objects.create(name='Test Site 2', slug='test-site-2')
        self.circuittermination1 = CircuitTermination.objects.create(
-            circuit=self.circuit1, term_side=TERM_SIDE_A, site=self.site1, port_speed=1000000
+            circuit=self.circuit1, term_side=TERM_SIDE_A, site=self.site1, interface=self.interface1, port_speed=1000000
        )
        self.circuittermination2 = CircuitTermination.objects.create(
-            circuit=self.circuit2, term_side=TERM_SIDE_A, site=self.site1, port_speed=1000000
+            circuit=self.circuit1, term_side=TERM_SIDE_Z, site=self.site2, interface=self.interface2, port_speed=1000000
        )
        self.circuittermination3 = CircuitTermination.objects.create(
-            circuit=self.circuit3, term_side=TERM_SIDE_A, site=self.site1, port_speed=1000000
+            circuit=self.circuit2, term_side=TERM_SIDE_A, site=self.site1, interface=self.interface3, port_speed=1000000
+        )
+        self.circuittermination4 = CircuitTermination.objects.create(
+            circuit=self.circuit2, term_side=TERM_SIDE_Z, site=self.site2, interface=self.interface4, port_speed=1000000
        )

    def test_get_circuittermination(self):
@@ -329,14 +382,15 @@ class CircuitTerminationTest(APITestCase):
        url = reverse('circuits-api:circuittermination-list')
        response = self.client.get(url, **self.header)

-        self.assertEqual(response.data['count'], 3)
+        self.assertEqual(response.data['count'], 4)

    def test_create_circuittermination(self):

        data = {
-            'circuit': self.circuit1.pk,
-            'term_side': TERM_SIDE_Z,
-            'site': self.site2.pk,
+            'circuit': self.circuit3.pk,
+            'term_side': TERM_SIDE_A,
+            'site': self.site1.pk,
+            'interface': self.interface5.pk,
            'port_speed': 1000000,
        }

@@ -344,31 +398,37 @@ class CircuitTerminationTest(APITestCase):
        response = self.client.post(url, data, format='json', **self.header)

        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(CircuitTermination.objects.count(), 4)
+        self.assertEqual(CircuitTermination.objects.count(), 5)
        circuittermination4 = CircuitTermination.objects.get(pk=response.data['id'])
        self.assertEqual(circuittermination4.circuit_id, data['circuit'])
        self.assertEqual(circuittermination4.term_side, data['term_side'])
        self.assertEqual(circuittermination4.site_id, data['site'])
+        self.assertEqual(circuittermination4.interface_id, data['interface'])
        self.assertEqual(circuittermination4.port_speed, data['port_speed'])

    def test_update_circuittermination(self):

+        circuittermination5 = CircuitTermination.objects.create(
+            circuit=self.circuit3, term_side=TERM_SIDE_A, site=self.site1, interface=self.interface5, port_speed=1000000
+        )
+
        data = {
-            'circuit': self.circuit1.pk,
+            'circuit': self.circuit3.pk,
            'term_side': TERM_SIDE_Z,
            'site': self.site2.pk,
+            'interface': self.interface6.pk,
            'port_speed': 1000000,
        }

-        url = reverse('circuits-api:circuittermination-detail', kwargs={'pk': self.circuittermination1.pk})
+        url = reverse('circuits-api:circuittermination-detail', kwargs={'pk': circuittermination5.pk})
        response = self.client.put(url, data, format='json', **self.header)

        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(CircuitTermination.objects.count(), 3)
+        self.assertEqual(CircuitTermination.objects.count(), 5)
        circuittermination1 = CircuitTermination.objects.get(pk=response.data['id'])
-        self.assertEqual(circuittermination1.circuit_id, data['circuit'])
        self.assertEqual(circuittermination1.term_side, data['term_side'])
        self.assertEqual(circuittermination1.site_id, data['site'])
+        self.assertEqual(circuittermination1.interface_id, data['interface'])
        self.assertEqual(circuittermination1.port_speed, data['port_speed'])

    def test_delete_circuittermination(self):
@@ -377,4 +437,4 @@ class CircuitTerminationTest(APITestCase):
        response = self.client.delete(url, **self.header)

        self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
-        self.assertEqual(CircuitTermination.objects.count(), 2)
+        self.assertEqual(CircuitTermination.objects.count(), 3)
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -412,7 +412,7 @@ class DeviceSerializer(TaggitSerializer, CustomFieldModelSerializer):
            'id', 'name', 'display_name', 'device_type', 'device_role', 'tenant', 'platform', 'serial', 'asset_tag',
            'site', 'rack', 'position', 'face', 'parent_device', 'status', 'primary_ip', 'primary_ip4', 'primary_ip6',
            'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', 'tags', 'custom_fields', 'created',
-            'last_updated',
+            'last_updated', 'local_context_data',
        ]
        validators = []

@@ -448,7 +448,7 @@ class DeviceWithConfigContextSerializer(DeviceSerializer):
            'id', 'name', 'display_name', 'device_type', 'device_role', 'tenant', 'platform', 'serial', 'asset_tag',
            'site', 'rack', 'position', 'face', 'parent_device', 'status', 'primary_ip', 'primary_ip4', 'primary_ip6',
            'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', 'tags', 'custom_fields',
-            'config_context', 'created', 'last_updated',
+            'config_context', 'created', 'last_updated', 'local_context_data',
        ]

    def get_config_context(self, obj):
@@ -472,10 +472,14 @@ class ConsoleServerPortSerializer(TaggitSerializer, ValidatedModelSerializer):
 class NestedConsoleServerPortSerializer(WritableNestedSerializer):
    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverport-detail')
    device = NestedDeviceSerializer(read_only=True)
+    is_connected = serializers.SerializerMethodField(read_only=True)

    class Meta:
        model = ConsoleServerPort
-        fields = ['id', 'url', 'device', 'name']
+        fields = ['id', 'url', 'device', 'name', 'is_connected']
+
+    def get_is_connected(self, obj):
+        return hasattr(obj, 'connected_console') and obj.connected_console is not None


 #
@@ -492,6 +496,19 @@ class ConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer):
        fields = ['id', 'device', 'name', 'cs_port', 'connection_status', 'tags']


+class NestedConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleport-detail')
+    device = NestedDeviceSerializer(read_only=True)
+    is_connected = serializers.SerializerMethodField(read_only=True)
+
+    class Meta:
+        model = ConsolePort
+        fields = ['id', 'url', 'device', 'name', 'is_connected']
+
+    def get_is_connected(self, obj):
+        return obj.cs_port is not None
+
+
 #
 # Power outlets
 #
@@ -509,10 +526,14 @@ class PowerOutletSerializer(TaggitSerializer, ValidatedModelSerializer):
 class NestedPowerOutletSerializer(WritableNestedSerializer):
    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlet-detail')
    device = NestedDeviceSerializer(read_only=True)
+    is_connected = serializers.SerializerMethodField(read_only=True)

    class Meta:
        model = PowerOutlet
-        fields = ['id', 'url', 'device', 'name']
+        fields = ['id', 'url', 'device', 'name', 'is_connected']
+
+    def get_is_connected(self, obj):
+        return hasattr(obj, 'connected_port') and obj.connected_port is not None


 #
@@ -529,17 +550,46 @@ class PowerPortSerializer(TaggitSerializer, ValidatedModelSerializer):
        fields = ['id', 'device', 'name', 'power_outlet', 'connection_status', 'tags']


+class NestedPowerPortSerializer(TaggitSerializer, ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerport-detail')
+    device = NestedDeviceSerializer(read_only=True)
+    is_connected = serializers.SerializerMethodField(read_only=True)
+
+    class Meta:
+        model = PowerPort
+        fields = ['id', 'url', 'device', 'name', 'is_connected']
+
+    def get_is_connected(self, obj):
+        return obj.power_outlet is not None
+
+
 #
 # Interfaces
 #

-class NestedInterfaceSerializer(WritableNestedSerializer):
+class IsConnectedMixin(object):
+    """
+    Provide a method for setting is_connected on Interface serializers.
+    """
+    def get_is_connected(self, obj):
+        """
+        Return True if the interface has a connected interface or circuit.
+        """
+        if obj.connection:
+            return True
+        if hasattr(obj, 'circuit_termination') and obj.circuit_termination is not None:
+            return True
+        return False
+
+
+class NestedInterfaceSerializer(IsConnectedMixin, WritableNestedSerializer):
    device = NestedDeviceSerializer(read_only=True)
    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interface-detail')
+    is_connected = serializers.SerializerMethodField(read_only=True)

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


 class InterfaceNestedCircuitSerializer(serializers.ModelSerializer):
@@ -569,7 +619,7 @@ class InterfaceVLANSerializer(WritableNestedSerializer):
        fields = ['id', 'url', 'vid', 'name', 'display_name']


-class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer):
+class InterfaceSerializer(TaggitSerializer, IsConnectedMixin, ValidatedModelSerializer):
    device = NestedDeviceSerializer()
    form_factor = ChoiceField(choices=IFACE_FF_CHOICES, required=False)
    lag = NestedInterfaceSerializer(required=False, allow_null=True)
@@ -613,19 +663,6 @@ class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer):

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

-    def get_is_connected(self, obj):
-        """
-        Return True if the interface has a connected interface or circuit termination.
-        """
-        if obj.connection:
-            return True
-        try:
-            circuit_termination = obj.circuit_termination
-            return True
-        except CircuitTermination.DoesNotExist:
-            pass
-        return False
-
    def get_interface_connection(self, obj):
        if obj.connection:
            context = {
@@ -652,10 +689,11 @@ class DeviceBaySerializer(TaggitSerializer, ValidatedModelSerializer):

 class NestedDeviceBaySerializer(WritableNestedSerializer):
    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicebay-detail')
+    device = NestedDeviceSerializer(read_only=True)

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


 #
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from collections import OrderedDict

 from django.conf import settings
-from django.http import HttpResponseBadRequest, HttpResponseForbidden
+from django.http import HttpResponseForbidden
 from django.shortcuts import get_object_or_404
 from drf_yasg import openapi
 from drf_yasg.openapi import Parameter
@@ -60,7 +60,7 @@ class RegionViewSet(ModelViewSet):
 #

 class SiteViewSet(CustomFieldModelViewSet):
-    queryset = Site.objects.select_related('region', 'tenant')
+    queryset = Site.objects.select_related('region', 'tenant').prefetch_related('tags')
    serializer_class = serializers.SiteSerializer
    filter_class = filters.SiteFilter

@@ -100,7 +100,7 @@ class RackRoleViewSet(ModelViewSet):
 #

 class RackViewSet(CustomFieldModelViewSet):
-    queryset = Rack.objects.select_related('site', 'group__site', 'tenant')
+    queryset = Rack.objects.select_related('site', 'group__site', 'tenant').prefetch_related('tags')
    serializer_class = serializers.RackSerializer
    filter_class = filters.RackFilter

@@ -154,7 +154,7 @@ class ManufacturerViewSet(ModelViewSet):
 #

 class DeviceTypeViewSet(CustomFieldModelViewSet):
-    queryset = DeviceType.objects.select_related('manufacturer')
+    queryset = DeviceType.objects.select_related('manufacturer').prefetch_related('tags')
    serializer_class = serializers.DeviceTypeSerializer
    filter_class = filters.DeviceTypeFilter

@@ -228,7 +228,7 @@ class DeviceViewSet(CustomFieldModelViewSet):
        'device_type__manufacturer', 'device_role', 'tenant', 'platform', 'site', 'rack', 'parent_bay',
        'virtual_chassis__master',
    ).prefetch_related(
-        'primary_ip4__nat_outside', 'primary_ip6__nat_outside',
+        'primary_ip4__nat_outside', 'primary_ip6__nat_outside', 'tags',
    )
    filter_class = filters.DeviceFilter

@@ -238,6 +238,11 @@ class DeviceViewSet(CustomFieldModelViewSet):
        """
        if self.action == 'retrieve':
            return serializers.DeviceWithConfigContextSerializer
+
+        request = self.get_serializer_context()['request']
+        if request.query_params.get('brief', False):
+            return serializers.NestedDeviceSerializer
+
        return serializers.DeviceSerializer

    @action(detail=True, url_path='napalm')
@@ -315,31 +320,31 @@ class DeviceViewSet(CustomFieldModelViewSet):
 #

 class ConsolePortViewSet(ModelViewSet):
-    queryset = ConsolePort.objects.select_related('device', 'cs_port__device')
+    queryset = ConsolePort.objects.select_related('device', 'cs_port__device').prefetch_related('tags')
    serializer_class = serializers.ConsolePortSerializer
    filter_class = filters.ConsolePortFilter


 class ConsoleServerPortViewSet(ModelViewSet):
-    queryset = ConsoleServerPort.objects.select_related('device', 'connected_console__device')
+    queryset = ConsoleServerPort.objects.select_related('device', 'connected_console__device').prefetch_related('tags')
    serializer_class = serializers.ConsoleServerPortSerializer
    filter_class = filters.ConsoleServerPortFilter


 class PowerPortViewSet(ModelViewSet):
-    queryset = PowerPort.objects.select_related('device', 'power_outlet__device')
+    queryset = PowerPort.objects.select_related('device', 'power_outlet__device').prefetch_related('tags')
    serializer_class = serializers.PowerPortSerializer
    filter_class = filters.PowerPortFilter


 class PowerOutletViewSet(ModelViewSet):
-    queryset = PowerOutlet.objects.select_related('device', 'connected_port__device')
+    queryset = PowerOutlet.objects.select_related('device', 'connected_port__device').prefetch_related('tags')
    serializer_class = serializers.PowerOutletSerializer
    filter_class = filters.PowerOutletFilter


 class InterfaceViewSet(ModelViewSet):
-    queryset = Interface.objects.select_related('device')
+    queryset = Interface.objects.select_related('device').prefetch_related('tags')
    serializer_class = serializers.InterfaceSerializer
    filter_class = filters.InterfaceFilter

@@ -355,13 +360,13 @@ class InterfaceViewSet(ModelViewSet):


 class DeviceBayViewSet(ModelViewSet):
-    queryset = DeviceBay.objects.select_related('installed_device')
+    queryset = DeviceBay.objects.select_related('installed_device').prefetch_related('tags')
    serializer_class = serializers.DeviceBaySerializer
    filter_class = filters.DeviceBayFilter


 class InventoryItemViewSet(ModelViewSet):
-    queryset = InventoryItem.objects.select_related('device', 'manufacturer')
+    queryset = InventoryItem.objects.select_related('device', 'manufacturer').prefetch_related('tags')
    serializer_class = serializers.InventoryItemSerializer
    filter_class = filters.InventoryItemFilter

@@ -393,7 +398,7 @@ class InterfaceConnectionViewSet(ModelViewSet):
 #

 class VirtualChassisViewSet(ModelViewSet):
-    queryset = VirtualChassis.objects.all()
+    queryset = VirtualChassis.objects.prefetch_related('tags')
    serializer_class = serializers.VirtualChassisSerializer


@@ -407,13 +412,13 @@ class ConnectedDeviceViewSet(ViewSet):
    interface. This is useful in a situation where a device boots with no configuration, but can detect its neighbors
    via a protocol such as LLDP. Two query parameters must be included in the request:

-    * `peer-device`: The name of the peer device
-    * `peer-interface`: The name of the peer interface
+    * `peer_device`: The name of the peer device
+    * `peer_interface`: The name of the peer interface
    """
    permission_classes = [IsAuthenticatedOrLoginNotRequired]
-    _device_param = Parameter('peer-device', 'query',
+    _device_param = Parameter('peer_device', 'query',
                              description='The name of the peer device', required=True, type=openapi.TYPE_STRING)
-    _interface_param = Parameter('peer-interface', 'query',
+    _interface_param = Parameter('peer_interface', 'query',
                                 description='The name of the peer interface', required=True, type=openapi.TYPE_STRING)

    def get_view_name(self):
@@ -424,9 +429,15 @@ class ConnectedDeviceViewSet(ViewSet):
    def list(self, request):

        peer_device_name = request.query_params.get(self._device_param.name)
+        if not peer_device_name:
+            # TODO: remove this after 2.4 as the switch to using underscores is a breaking change
+            peer_device_name = request.query_params.get('peer-device')
        peer_interface_name = request.query_params.get(self._interface_param.name)
+        if not peer_interface_name:
+            # TODO: remove this after 2.4 as the switch to using underscores is a breaking change
+            peer_interface_name = request.query_params.get('peer-interface')
        if not peer_device_name or not peer_interface_name:
-            raise MissingFilterException(detail='Request must include "peer-device" and "peer-interface" filters.')
+            raise MissingFilterException(detail='Request must include "peer_device" and "peer_interface" filters.')

        # Determine local interface from peer interface's connection
        peer_interface = get_object_or_404(Interface, device__name=peer_device_name, name=peer_interface_name)
--- a/netbox/dcim/fields.py
+++ b/netbox/dcim/fields.py
@@ -1,13 +1,11 @@
 from __future__ import unicode_literals

-from netaddr import EUI, mac_unix_expanded
+from netaddr import AddrFormatError, EUI, mac_unix_expanded

 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator, MaxValueValidator
 from django.db import models

-from .formfields import MACAddressFormField
-

 class ASNField(models.BigIntegerField):
    description = "32-bit ASN field"
@@ -35,7 +33,7 @@ class MACAddressField(models.Field):
            return value
        try:
            return EUI(value, version=48, dialect=mac_unix_expanded_uppercase)
-        except ValueError as e:
+        except AddrFormatError as e:
            raise ValidationError(e)

    def db_type(self, connection):
@@ -45,11 +43,3 @@ class MACAddressField(models.Field):
        if not value:
            return None
        return str(self.to_python(value))
-
-    def form_class(self):
-        return MACAddressFormField
-
-    def formfield(self, **kwargs):
-        defaults = {'form_class': self.form_class()}
-        defaults.update(kwargs)
-        return super(MACAddressField, self).formfield(**defaults)
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -2,6 +2,7 @@ from __future__ import unicode_literals

 import django_filters
 from django.contrib.auth.models import User
+from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Q
 from netaddr import EUI
 from netaddr.core import AddrFormatError
@@ -456,6 +457,16 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet):
    )
    name = NullableCharFieldFilter()
    asset_tag = NullableCharFieldFilter()
+    region_id = django_filters.NumberFilter(
+        method='filter_region',
+        name='pk',
+        label='Region (ID)',
+    )
+    region = django_filters.CharFilter(
+        method='filter_region',
+        name='slug',
+        label='Region (slug)',
+    )
    site_id = django_filters.ModelMultipleChoiceFilter(
        queryset=Site.objects.all(),
        label='Site (ID)',
@@ -538,6 +549,16 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet):
            Q(comments__icontains=value)
        ).distinct()

+    def filter_region(self, queryset, name, value):
+        try:
+            region = Region.objects.get(**{name: value})
+        except ObjectDoesNotExist:
+            return queryset.none()
+        return queryset.filter(
+            Q(site__region=region) |
+            Q(site__region__in=region.get_descendants())
+        )
+
    def _mac_address(self, queryset, name, value):
        value = value.strip()
        if not value:
@@ -635,6 +656,14 @@ class InterfaceFilter(django_filters.FilterSet):
    tag = django_filters.CharFilter(
        name='tags__slug',
    )
+    vlan_id = django_filters.CharFilter(
+        method='filter_vlan_id',
+        label='Assigned VLAN'
+    )
+    vlan = django_filters.CharFilter(
+        method='filter_vlan',
+        label='Assigned VID'
+    )

    class Meta:
        model = Interface
@@ -649,6 +678,24 @@ class InterfaceFilter(django_filters.FilterSet):
        except Device.DoesNotExist:
            return queryset.none()

+    def filter_vlan_id(self, queryset, name, value):
+        value = value.strip()
+        if not value:
+            return queryset
+        return queryset.filter(
+            Q(untagged_vlan_id=value) |
+            Q(tagged_vlans=value)
+        )
+
+    def filter_vlan(self, queryset, name, value):
+        value = value.strip()
+        if not value:
+            return queryset
+        return queryset.filter(
+            Q(untagged_vlan_id__vid=value) |
+            Q(tagged_vlans__vid=value)
+        )
+
    def filter_type(self, queryset, name, value):
        value = value.strip().lower()
        return {
@@ -681,6 +728,15 @@ class InventoryItemFilter(DeviceComponentFilterSet):
        method='search',
        label='Search',
    )
+    device_id = django_filters.ModelChoiceFilter(
+        queryset=Device.objects.all(),
+        label='Device (ID)',
+    )
+    device = django_filters.ModelChoiceFilter(
+        queryset=Device.objects.all(),
+        to_field_name='name',
+        label='Device (name)',
+    )
    parent_id = django_filters.ModelMultipleChoiceFilter(
        queryset=InventoryItem.objects.all(),
        label='Parent inventory item (ID)',
--- a/netbox/dcim/formfields.py
+++ b/netbox/dcim/formfields.py
@@ -1,27 +0,0 @@
-from __future__ import unicode_literals
-
-from django import forms
-from django.core.exceptions import ValidationError
-from netaddr import EUI, AddrFormatError
-
-
-#
-# Form fields
-#
-
-class MACAddressFormField(forms.Field):
-    default_error_messages = {
-        'invalid': "Enter a valid MAC address.",
-    }
-
-    def to_python(self, value):
-        if not value:
-            return None
-
-        if isinstance(value, EUI):
-            return value
-
-        try:
-            return EUI(value, version=48)
-        except AddrFormatError:
-            raise ValidationError("Please specify a valid MAC address.")
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -18,7 +18,7 @@ from utilities.forms import (
    AnnotatedMultipleChoiceField, APISelect, add_blank_choice, ArrayFieldSelectMultiple, BootstrapMixin, BulkEditForm,
    BulkEditNullBooleanSelect, ChainedFieldsMixin, ChainedModelChoiceField, CommentField, ComponentForm,
    ConfirmationForm, CSVChoiceField, ExpandableNameField, FilterChoiceField, FilterTreeNodeMultipleChoiceField,
-    FlexibleModelChoiceField, Livesearch, SelectWithDisabled, SelectWithPK, SmallTextarea, SlugField,
+    FlexibleModelChoiceField, JSONField, Livesearch, SelectWithDisabled, SelectWithPK, SmallTextarea, SlugField,
 )
 from virtualization.models import Cluster
 from .constants import (
@@ -27,7 +27,6 @@ from .constants import (
    RACK_TYPE_CHOICES, RACK_WIDTH_CHOICES, RACK_WIDTH_19IN, RACK_WIDTH_23IN, SITE_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,
@@ -823,16 +822,19 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldForm):
    )
    comments = CommentField()
    tags = TagField(required=False)
+    local_context_data = JSONField(required=False)

    class Meta:
        model = Device
        fields = [
            'name', 'device_role', 'device_type', 'serial', 'asset_tag', 'site', 'rack', 'position', 'face',
            'status', 'platform', 'primary_ip4', 'primary_ip6', 'tenant_group', 'tenant', 'comments', 'tags',
+            'local_context_data'
        ]
        help_texts = {
            'device_role': "The function this device serves",
            'serial': "Chassis serial number",
+            'local_context_data': "Local config context data overwrites all sources contexts in the final rendered config context"
        }
        widgets = {
            'face': forms.Select(attrs={'filter-for': 'position'}),
@@ -1106,6 +1108,11 @@ class DeviceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditF
 class DeviceFilterForm(BootstrapMixin, CustomFieldFilterForm):
    model = Device
    q = forms.CharField(required=False, label='Search')
+    region = FilterTreeNodeMultipleChoiceField(
+        queryset=Region.objects.all(),
+        to_field_name='slug',
+        required=False,
+    )
    site = FilterChoiceField(
        queryset=Site.objects.annotate(filter_count=Count('devices')),
        to_field_name='slug',
@@ -1192,6 +1199,7 @@ class ConsolePortForm(BootstrapMixin, forms.ModelForm):

 class ConsolePortCreateForm(ComponentForm):
    name_pattern = ExpandableNameField(label='Name')
+    tags = TagField(required=False)


 class ConsoleConnectionCSVForm(forms.ModelForm):
@@ -1325,7 +1333,7 @@ class ConsolePortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelF
        label='Port',
        widget=APISelect(
            api_url='/api/dcim/console-server-ports/?device_id={{console_server}}',
-            disabled_indicator='connected_console',
+            disabled_indicator='is_connected',
        )
    )

@@ -1362,6 +1370,7 @@ class ConsoleServerPortForm(BootstrapMixin, forms.ModelForm):

 class ConsoleServerPortCreateForm(ComponentForm):
    name_pattern = ExpandableNameField(label='Name')
+    tags = TagField(required=False)


 class ConsoleServerPortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.Form):
@@ -1415,7 +1424,7 @@ class ConsoleServerPortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.
        label='Port',
        widget=APISelect(
            api_url='/api/dcim/console-ports/?device_id={{device}}',
-            disabled_indicator='cs_port'
+            disabled_indicator='is_connected'
        )
    )
    connection_status = forms.BooleanField(
@@ -1459,6 +1468,7 @@ class PowerPortForm(BootstrapMixin, forms.ModelForm):

 class PowerPortCreateForm(ComponentForm):
    name_pattern = ExpandableNameField(label='Name')
+    tags = TagField(required=False)


 class PowerConnectionCSVForm(forms.ModelForm):
@@ -1592,7 +1602,7 @@ class PowerPortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelFor
        label='Outlet',
        widget=APISelect(
            api_url='/api/dcim/power-outlets/?device_id={{pdu}}',
-            disabled_indicator='connected_port'
+            disabled_indicator='is_connected'
        )
    )

@@ -1629,6 +1639,7 @@ class PowerOutletForm(BootstrapMixin, forms.ModelForm):

 class PowerOutletCreateForm(ComponentForm):
    name_pattern = ExpandableNameField(label='Name')
+    tags = TagField(required=False)


 class PowerOutletConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.Form):
@@ -1682,7 +1693,7 @@ class PowerOutletConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.Form):
        label='Port',
        widget=APISelect(
            api_url='/api/dcim/power-ports/?device_id={{device}}',
-            disabled_indicator='power_outlet'
+            disabled_indicator='is_connected'
        )
    )
    connection_status = forms.BooleanField(
@@ -1854,7 +1865,7 @@ class InterfaceCreateForm(ComponentForm, forms.Form):
    enabled = forms.BooleanField(required=False)
    lag = forms.ModelChoiceField(queryset=Interface.objects.all(), required=False, label='Parent LAG')
    mtu = forms.IntegerField(required=False, min_value=1, max_value=32767, label='MTU')
-    mac_address = MACAddressFormField(required=False, label='MAC Address')
+    mac_address = forms.CharField(required=False, label='MAC Address')
    mgmt_only = forms.BooleanField(
        required=False,
        label='OOB Management',
@@ -1862,6 +1873,7 @@ class InterfaceCreateForm(ComponentForm, forms.Form):
    )
    description = forms.CharField(max_length=100, required=False)
    mode = forms.ChoiceField(choices=add_blank_choice(IFACE_MODE_CHOICES), required=False)
+    tags = TagField(required=False)

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

@@ -2099,6 +2111,7 @@ class DeviceBayForm(BootstrapMixin, forms.ModelForm):

 class DeviceBayCreateForm(ComponentForm):
    name_pattern = ExpandableNameField(label='Name')
+    tags = TagField(required=False)


 class PopulateDeviceBayForm(BootstrapMixin, forms.Form):
@@ -2193,6 +2206,7 @@ class InventoryItemBulkEditForm(BootstrapMixin, BulkEditForm):
 class InventoryItemFilterForm(BootstrapMixin, forms.Form):
    model = InventoryItem
    q = forms.CharField(required=False, label='Search')
+    device = forms.CharField(required=False, label='Device name')
    manufacturer = FilterChoiceField(
        queryset=Manufacturer.objects.annotate(filter_count=Count('inventory_items')),
        to_field_name='slug',
--- a/netbox/dcim/migrations/0063_device_local_context_data.py
+++ b/netbox/dcim/migrations/0063_device_local_context_data.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.8 on 2018-09-16 02:01
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0062_interface_mtu'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='device',
+            name='local_context_data',
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+        ),
+    ]
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -10,7 +10,7 @@ from django.contrib.postgres.fields import ArrayField, JSONField
 from django.core.exceptions import ObjectDoesNotExist, 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 import Count, Q
 from django.urls import reverse
 from django.utils.encoding import python_2_unicode_compatible
 from mptt.models import MPTTModel, TreeForeignKey
@@ -1400,7 +1400,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
                })

        # Validate manufacturer/platform
-        if self.device_type and self.platform:
+        if hasattr(self, 'device_type') and self.platform:
            if self.platform.manufacturer and self.platform.manufacturer != self.device_type.manufacturer:
                raise ValidationError({
                    'platform': "The assigned platform is limited to {} device types, but this device's type belongs "
@@ -2035,25 +2035,44 @@ class InterfaceConnection(models.Model):
    csv_headers = ['device_a', 'interface_a', 'device_b', 'interface_b', 'connection_status']

    def clean(self):
-        try:
-            if self.interface_a == self.interface_b:
-                raise ValidationError({
-                    'interface_b': "Cannot connect an interface to itself."
-                })
-            if self.interface_a.form_factor in NONCONNECTABLE_IFACE_TYPES:
-                raise ValidationError({
-                    'interface_a': '{} is not a connectable interface type.'.format(
-                        self.interface_a.get_form_factor_display()
-                    )
-                })
-            if self.interface_b.form_factor in NONCONNECTABLE_IFACE_TYPES:
-                raise ValidationError({
-                    'interface_b': '{} is not a connectable interface type.'.format(
-                        self.interface_b.get_form_factor_display()
-                    )
-                })
-        except ObjectDoesNotExist:
-            pass
+
+        # An interface cannot be connected to itself
+        if self.interface_a == self.interface_b:
+            raise ValidationError({
+                'interface_b': "Cannot connect an interface to itself."
+            })
+
+        # Only connectable interface types are permitted
+        if self.interface_a.form_factor in NONCONNECTABLE_IFACE_TYPES:
+            raise ValidationError({
+                'interface_a': '{} is not a connectable interface type.'.format(
+                    self.interface_a.get_form_factor_display()
+                )
+            })
+        if self.interface_b.form_factor in NONCONNECTABLE_IFACE_TYPES:
+            raise ValidationError({
+                'interface_b': '{} is not a connectable interface type.'.format(
+                    self.interface_b.get_form_factor_display()
+                )
+            })
+
+        # Prevent the A side of one connection from being the B side of another
+        interface_a_connections = InterfaceConnection.objects.filter(
+            Q(interface_a=self.interface_a) |
+            Q(interface_b=self.interface_a)
+        ).exclude(pk=self.pk)
+        if interface_a_connections.exists():
+            raise ValidationError({
+                'interface_a': "This interface is already connected."
+            })
+        interface_b_connections = InterfaceConnection.objects.filter(
+            Q(interface_a=self.interface_b) |
+            Q(interface_b=self.interface_b)
+        ).exclude(pk=self.pk)
+        if interface_b_connections.exists():
+            raise ValidationError({
+                'interface_b': "This interface is already connected."
+            })

    def to_csv(self):
        return (
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -614,10 +614,12 @@ class PowerConnectionTable(BaseTable):
 class InterfaceConnectionTable(BaseTable):
    device_a = tables.LinkColumn('dcim:device', accessor=Accessor('interface_a.device'),
                                 args=[Accessor('interface_a.device.pk')], verbose_name='Device A')
-    interface_a = tables.Column(verbose_name='Interface A')
+    interface_a = tables.LinkColumn('dcim:interface', accessor=Accessor('interface_a'),
+                                    args=[Accessor('interface_a.pk')], verbose_name='Interface A')
    device_b = tables.LinkColumn('dcim:device', accessor=Accessor('interface_b.device'),
                                 args=[Accessor('interface_b.device.pk')], verbose_name='Device B')
-    interface_b = tables.Column(verbose_name='Interface B')
+    interface_b = tables.LinkColumn('dcim:interface', accessor=Accessor('interface_b'),
+                                    args=[Accessor('interface_b.pk')], verbose_name='Interface B')

    class Meta(BaseTable.Meta):
        model = InterfaceConnection
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -44,6 +44,16 @@ class RegionTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_regions_brief(self):
+
+        url = reverse('dcim-api:region-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_region(self):

        data = {
@@ -158,6 +168,16 @@ class SiteTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_sites_brief(self):
+
+        url = reverse('dcim-api:site-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_site(self):

        data = {
@@ -262,6 +282,16 @@ class RackGroupTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_rackgroups_brief(self):
+
+        url = reverse('dcim-api:rackgroup-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_rackgroup(self):

        data = {
@@ -360,6 +390,16 @@ class RackRoleTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_rackroles_brief(self):
+
+        url = reverse('dcim-api:rackrole-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_rackrole(self):

        data = {
@@ -477,6 +517,16 @@ class RackTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_racks_brief(self):
+
+        url = reverse('dcim-api:rack-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['display_name', 'id', 'name', 'url']
+        )
+
    def test_create_rack(self):

        data = {
@@ -693,6 +743,16 @@ class ManufacturerTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_manufacturers_brief(self):
+
+        url = reverse('dcim-api:manufacturer-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_manufacturer(self):

        data = {
@@ -792,6 +852,16 @@ class DeviceTypeTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_devicetypes_brief(self):
+
+        url = reverse('dcim-api:devicetype-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'manufacturer', 'model', 'slug', 'url']
+        )
+
    def test_create_devicetype(self):

        data = {
@@ -1496,6 +1566,16 @@ class DeviceRoleTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_deviceroles_brief(self):
+
+        url = reverse('dcim-api:devicerole-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_devicerole(self):

        data = {
@@ -1594,6 +1674,16 @@ class PlatformTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_platforms_brief(self):
+
+        url = reverse('dcim-api:platform-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_platform(self):

        data = {
@@ -1722,6 +1812,16 @@ class DeviceTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_devices_brief(self):
+
+        url = reverse('dcim-api:device-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['display_name', 'id', 'name', 'url']
+        )
+
    def test_create_device(self):

        data = {
@@ -1848,6 +1948,16 @@ class ConsolePortTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_consoleports_brief(self):
+
+        url = reverse('dcim-api:consoleport-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['device', 'id', 'is_connected', 'name', 'url']
+        )
+
    def test_create_consoleport(self):

        data = {
@@ -1953,6 +2063,16 @@ class ConsoleServerPortTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_consoleserverports_brief(self):
+
+        url = reverse('dcim-api:consoleserverport-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['device', 'id', 'is_connected', 'name', 'url']
+        )
+
    def test_create_consoleserverport(self):

        data = {
@@ -2054,6 +2174,16 @@ class PowerPortTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_powerports_brief(self):
+
+        url = reverse('dcim-api:powerport-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['device', 'id', 'is_connected', 'name', 'url']
+        )
+
    def test_create_powerport(self):

        data = {
@@ -2159,6 +2289,16 @@ class PowerOutletTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_poweroutlets_brief(self):
+
+        url = reverse('dcim-api:poweroutlet-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['device', 'id', 'is_connected', 'name', 'url']
+        )
+
    def test_create_poweroutlet(self):

        data = {
@@ -2285,6 +2425,16 @@ class InterfaceTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_interfaces_brief(self):
+
+        url = reverse('dcim-api:interface-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['device', 'id', 'is_connected', 'name', 'url']
+        )
+
    def test_create_interface(self):

        data = {
@@ -2456,6 +2606,16 @@ class DeviceBayTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_devicebays_brief(self):
+
+        url = reverse('dcim-api:devicebay-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['device', 'id', 'name', 'url']
+        )
+
    def test_create_devicebay(self):

        data = {
@@ -2778,6 +2938,16 @@ class InterfaceConnectionTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_interfaceconnections_brief(self):
+
+        url = reverse('dcim-api:interfaceconnection-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['connection_status', 'id', 'url']
+        )
+
    def test_create_interfaceconnection(self):

        data = {
@@ -2883,7 +3053,7 @@ class ConnectedDeviceTest(APITestCase):
    def test_get_connected_device(self):

        url = reverse('dcim-api:connected-device-list')
-        response = self.client.get(url + '?peer-device=TestDevice2&peer-interface=eth0', **self.header)
+        response = self.client.get(url + '?peer_device=TestDevice2&peer_interface=eth0', **self.header)

        self.assertHttpStatus(response, status.HTTP_200_OK)
        self.assertEqual(response.data['name'], self.device1.name)
@@ -2973,6 +3143,16 @@ class VirtualChassisTest(APITestCase):

        self.assertEqual(response.data['count'], 2)

+    def test_list_virtualchassis_brief(self):
+
+        url = reverse('dcim-api:virtualchassis-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'url']
+        )
+
    def test_create_virtualchassis(self):

        data = {
--- a/netbox/extras/models.py
+++ b/netbox/extras/models.py
@@ -700,9 +700,22 @@ class ConfigContext(models.Model):
    def get_absolute_url(self):
        return reverse('extras:configcontext', kwargs={'pk': self.pk})

+    def clean(self):
+
+        # Verify that JSON data is provided as an object
+        if type(self.data) is not dict:
+            raise ValidationError(
+                {'data': 'JSON data must be in object form. Example: {"foo": 123}'}
+            )
+

 class ConfigContextModel(models.Model):

+    local_context_data = JSONField(
+        blank=True,
+        null=True,
+    )
+
    class Meta:
        abstract = True

@@ -716,6 +729,10 @@ class ConfigContextModel(models.Model):
        for context in ConfigContext.objects.get_for_object(self):
            data.update(context.data)

+        # If the object has local config context data defined, that data overwrites all rendered data
+        if self.local_context_data is not None:
+            data.update(self.local_context_data)
+
        return data


--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -106,9 +106,11 @@ class ObjectConfigContextView(View):

        obj = get_object_or_404(self.object_class, pk=pk)
        source_contexts = ConfigContext.objects.get_for_object(obj)
+        model_name = self.object_class._meta.model_name

        return render(request, 'extras/object_configcontext.html', {
-            self.object_class._meta.model_name: obj,
+            model_name: obj,
+            'obj': obj,
            'rendered_context': obj.get_config_context(),
            'source_contexts': source_contexts,
            'base_template': self.base_template,
--- a/netbox/ipam/api/views.py
+++ b/netbox/ipam/api/views.py
@@ -33,7 +33,7 @@ class IPAMFieldChoicesViewSet(FieldChoicesViewSet):
 #

 class VRFViewSet(CustomFieldModelViewSet):
-    queryset = VRF.objects.select_related('tenant')
+    queryset = VRF.objects.select_related('tenant').prefetch_related('tags')
    serializer_class = serializers.VRFSerializer
    filter_class = filters.VRFFilter

@@ -53,7 +53,7 @@ class RIRViewSet(ModelViewSet):
 #

 class AggregateViewSet(CustomFieldModelViewSet):
-    queryset = Aggregate.objects.select_related('rir')
+    queryset = Aggregate.objects.select_related('rir').prefetch_related('tags')
    serializer_class = serializers.AggregateSerializer
    filter_class = filters.AggregateFilter

@@ -73,7 +73,7 @@ class RoleViewSet(ModelViewSet):
 #

 class PrefixViewSet(CustomFieldModelViewSet):
-    queryset = Prefix.objects.select_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role')
+    queryset = Prefix.objects.select_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role').prefetch_related('tags')
    serializer_class = serializers.PrefixSerializer
    filter_class = filters.PrefixFilter

@@ -245,7 +245,7 @@ class IPAddressViewSet(CustomFieldModelViewSet):
    queryset = IPAddress.objects.select_related(
        'vrf__tenant', 'tenant', 'nat_inside', 'interface__device__device_type', 'interface__virtual_machine'
    ).prefetch_related(
-        'nat_outside'
+        'nat_outside', 'tags',
    )
    serializer_class = serializers.IPAddressSerializer
    filter_class = filters.IPAddressFilter
@@ -266,7 +266,7 @@ class VLANGroupViewSet(ModelViewSet):
 #

 class VLANViewSet(CustomFieldModelViewSet):
-    queryset = VLAN.objects.select_related('site', 'group', 'tenant', 'role')
+    queryset = VLAN.objects.select_related('site', 'group', 'tenant', 'role').prefetch_related('tags')
    serializer_class = serializers.VLANSerializer
    filter_class = filters.VLANFilter

@@ -276,6 +276,6 @@ class VLANViewSet(CustomFieldModelViewSet):
 #

 class ServiceViewSet(ModelViewSet):
-    queryset = Service.objects.select_related('device')
+    queryset = Service.objects.select_related('device').prefetch_related('tags')
    serializer_class = serializers.ServiceSerializer
    filter_class = filters.ServiceFilter
--- a/netbox/ipam/constants.py
+++ b/netbox/ipam/constants.py
@@ -51,6 +51,16 @@ IPADDRESS_ROLE_CHOICES = (
    (IPADDRESS_ROLE_CARP, 'CARP'),
 )

+IPADDRESS_ROLES_NONUNIQUE = (
+    # IPAddress roles which are exempt from unique address enforcement
+    IPADDRESS_ROLE_ANYCAST,
+    IPADDRESS_ROLE_VIP,
+    IPADDRESS_ROLE_VRRP,
+    IPADDRESS_ROLE_HSRP,
+    IPADDRESS_ROLE_GLBP,
+    IPADDRESS_ROLE_CARP,
+)
+
 # VLAN statuses
 VLAN_STATUS_ACTIVE = 1
 VLAN_STATUS_RESERVED = 2
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -596,7 +596,11 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
        if self.address:

            # Enforce unique IP space (if applicable)
-            if (self.vrf is None and settings.ENFORCE_GLOBAL_UNIQUE) or (self.vrf and self.vrf.enforce_unique):
+            if self.role not in IPADDRESS_ROLES_NONUNIQUE and ((
+                self.vrf is None and settings.ENFORCE_GLOBAL_UNIQUE
+            ) or (
+                self.vrf and self.vrf.enforce_unique
+            )):
                duplicate_ips = self.get_duplicates()
                if duplicate_ips:
                    raise ValidationError({
--- a/netbox/ipam/tests/test_api.py
+++ b/netbox/ipam/tests/test_api.py
@@ -34,6 +34,16 @@ class VRFTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_vrfs_brief(self):
+
+        url = reverse('ipam-api:vrf-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'rd', 'url']
+        )
+
    def test_create_vrf(self):

        data = {
@@ -125,6 +135,16 @@ class RIRTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_rirs_brief(self):
+
+        url = reverse('ipam-api:rir-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_rir(self):

        data = {
@@ -218,6 +238,16 @@ class AggregateTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_aggregates_brief(self):
+
+        url = reverse('ipam-api:aggregate-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['family', 'id', 'prefix', 'url']
+        )
+
    def test_create_aggregate(self):

        data = {
@@ -309,6 +339,16 @@ class RoleTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_roles_brief(self):
+
+        url = reverse('ipam-api:role-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_role(self):

        data = {
@@ -397,13 +437,23 @@ class PrefixTest(APITestCase):

        self.assertEqual(response.data['prefix'], str(self.prefix1.prefix))

-    def test_list_prefixs(self):
+    def test_list_prefixes(self):

        url = reverse('ipam-api:prefix-list')
        response = self.client.get(url, **self.header)

        self.assertEqual(response.data['count'], 3)

+    def test_list_prefixes_brief(self):
+
+        url = reverse('ipam-api:prefix-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['family', 'id', 'prefix', 'url']
+        )
+
    def test_create_prefix(self):

        data = {
@@ -630,6 +680,16 @@ class IPAddressTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_ipaddresses_brief(self):
+
+        url = reverse('ipam-api:ipaddress-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['address', 'family', 'id', 'url']
+        )
+
    def test_create_ipaddress(self):

        data = {
@@ -718,6 +778,16 @@ class VLANGroupTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_vlangroups_brief(self):
+
+        url = reverse('ipam-api:vlangroup-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_vlangroup(self):

        data = {
@@ -809,6 +879,16 @@ class VLANTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_vlans_brief(self):
+
+        url = reverse('ipam-api:vlan-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['display_name', 'id', 'name', 'url', 'vid']
+        )
+
    def test_create_vlan(self):

        data = {
--- a/netbox/ipam/tests/test_models.py
+++ b/netbox/ipam/tests/test_models.py
@@ -4,6 +4,7 @@ import netaddr
 from django.core.exceptions import ValidationError
 from django.test import TestCase, override_settings

+from ipam.constants import IPADDRESS_ROLE_VIP
 from ipam.models import IPAddress, Prefix, VRF


@@ -59,3 +60,8 @@ class TestIPAddress(TestCase):
        IPAddress.objects.create(vrf=vrf, address=netaddr.IPNetwork('192.0.2.1/24'))
        duplicate_ip = IPAddress(vrf=vrf, address=netaddr.IPNetwork('192.0.2.1/24'))
        self.assertRaises(ValidationError, duplicate_ip.clean)
+
+    @override_settings(ENFORCE_GLOBAL_UNIQUE=True)
+    def test_duplicate_nonunique_role(self):
+        IPAddress.objects.create(address=netaddr.IPNetwork('192.0.2.1/24'), role=IPADDRESS_ROLE_VIP)
+        IPAddress.objects.create(address=netaddr.IPNetwork('192.0.2.1/24'), role=IPADDRESS_ROLE_VIP)
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -991,6 +991,9 @@ class ServiceCreateView(PermissionRequiredMixin, ObjectEditView):
            obj.virtual_machine = get_object_or_404(VirtualMachine, pk=url_kwargs['virtualmachine'])
        return obj

+    def get_return_url(self, request, service):
+        return service.parent.get_absolute_url()
+

 class ServiceEditView(ServiceCreateView):
    permission_required = 'ipam.change_service'
--- a/netbox/netbox/admin.py
+++ b/netbox/netbox/admin.py
@@ -23,8 +23,9 @@ admin_site.register(User, UserAdmin)
 admin_site.register(Tag, TagAdmin)

 # Modify the template to include an RQ link if django_rq is installed (see RQ_SHOW_ADMIN_LINK)
-try:
-    import django_rq
-    admin_site.index_template = 'django_rq/index.html'
-except ImportError:
-    pass
+if settings.WEBHOOKS_ENABLED:
+    try:
+        import django_rq
+        admin_site.index_template = 'django_rq/index.html'
+    except ImportError:
+        pass
--- a/netbox/netbox/api.py
+++ b/netbox/netbox/api.py
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals

+from django.conf import settings
 from rest_framework import authentication, exceptions
 from rest_framework.pagination import LimitOffsetPagination
 from rest_framework.permissions import DjangoModelPermissions, SAFE_METHODS
@@ -104,8 +105,6 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination):

    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])
@@ -123,6 +122,22 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination):

        return self.default_limit

+    def get_next_link(self):
+
+        # Pagination has been disabled
+        if not self.limit:
+            return None
+
+        return super(OptionalLimitOffsetPagination, self).get_next_link()
+
+    def get_previous_link(self):
+
+        # Pagination has been disabled
+        if not self.limit:
+            return None
+
+        return super(OptionalLimitOffsetPagination, self).get_previous_link()
+

 #
 # Miscellaneous
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -22,7 +22,7 @@ if sys.version_info[0] < 3:
        DeprecationWarning
    )

-VERSION = '2.4.4'
+VERSION = '2.4.7'

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

--- a/netbox/project-static/js/forms.js
+++ b/netbox/project-static/js/forms.js
@@ -82,7 +82,7 @@ $(document).ready(function() {
            }

            if ($(parent).val() || $(parent).attr('nullable') == 'true') {
-                var api_url = child_field.attr('api-url') + '&limit=1000';
+                var api_url = child_field.attr('api-url') + '&limit=0&brief=1';
                var disabled_indicator = child_field.attr('disabled-indicator');
                var initial_value = child_field.attr('initial');
                var display_field = child_field.attr('display-field') || 'name';
--- a/netbox/secrets/api/views.py
+++ b/netbox/secrets/api/views.py
@@ -48,7 +48,7 @@ class SecretViewSet(ModelViewSet):
    queryset = Secret.objects.select_related(
        'device__primary_ip4', 'device__primary_ip6', 'role',
    ).prefetch_related(
-        'role__users', 'role__groups',
+        'role__users', 'role__groups', 'tags',
    )
    serializer_class = serializers.SecretSerializer
    filter_class = filters.SecretFilter
--- a/netbox/secrets/tests/test_api.py
+++ b/netbox/secrets/tests/test_api.py
@@ -73,6 +73,16 @@ class SecretRoleTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_secretroles_brief(self):
+
+        url = reverse('secrets-api:secretrole-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_secretrole(self):

        data = {
--- a/netbox/templates/dcim/device_edit.html
+++ b/netbox/templates/dcim/device_edit.html
@@ -77,6 +77,12 @@
            </div>
        </div>
    {% endif %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Local Config Context Data</strong></div>
+        <div class="panel-body">
+            {% render_field form.local_context_data %}
+        </div>
+    </div>
    <div class="panel panel-default">
        <div class="panel-heading"><strong>Tags</strong></div>
        <div class="panel-body">
--- a/netbox/templates/dcim/device_lldp_neighbors.html
+++ b/netbox/templates/dcim/device_lldp_neighbors.html
@@ -64,8 +64,10 @@ $(document).ready(function() {
                }

                // 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
+                var neighbor_host = neighbor['hostname'] || ""; // sanitize hostname if it's null to avoid breaking the split func
+                var neighbor_port = neighbor['port'] || ""; // sanitize port if it's null to avoid breaking the split func
+                var lldp_device = neighbor_host.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);
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -44,7 +44,7 @@
                <a href="{% url 'dcim:device' pk=connected_iface.device.pk %}">{{ connected_iface.device }}</a>
            </td>
            <td>
-                <span title="{{ connected_iface.get_form_factor_display }}">{{ connected_iface }}</span>
+                <a href="{% url 'dcim:interface' pk=connected_iface.pk %}"><span title="{{ connected_iface.get_form_factor_display }}">{{ connected_iface }}</span></a>
            </td>
        {% endwith %}
    {% elif iface.circuit_termination %}
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -134,7 +134,9 @@
                        </tr>
                        <tr>
                            <td>Name</td>
-                            <td>{{ connected_interface.name }}</td>
+                            <td>
+                                <a href="{{ connected_interface.get_absolute_url }}">{{ connected_interface.name }}</a>
+                            </td>
                        </tr>
                        <tr>
                            <td>Type</td>
--- a/netbox/templates/dcim/interface_edit.html
+++ b/netbox/templates/dcim/interface_edit.html
@@ -14,11 +14,6 @@
            {% render_field form.mgmt_only %}
            {% render_field form.description %}
            {% render_field form.mode %}
-        </div>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Tags</strong></div>
-        <div class="panel-body">
            {% render_field form.tags %}
        </div>
    </div>
--- a/netbox/templates/extras/object_configcontext.html
+++ b/netbox/templates/extras/object_configcontext.html
@@ -16,6 +16,24 @@
            </div>
        </div>
        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Local Context</strong>
+                </div>
+                <div class="panel-body">
+                    {% if obj.local_context_data %}
+                        <pre>{{ obj.local_context_data|render_json }}</pre>
+                    {% else %}
+                        <span class="text-muted">None</span>
+                    {% endif %}
+                </div>
+                <div class="panel-footer">
+                    <span class="help-block">
+                        <i class="fa fa-info-circle"></i>
+                        The local config context overwrites all source contexts.
+                    </span>
+                </div>
+            </div>
            <div class="panel panel-default">
                <div class="panel-heading">
                    <strong>Source Contexts</strong>
--- a/netbox/templates/users/api_tokens.html
+++ b/netbox/templates/users/api_tokens.html
@@ -10,8 +10,12 @@
                <div class="panel panel-{% if token.is_expired %}danger{% else %}default{% endif %}">
                    <div class="panel-heading">
                        <div class="pull-right">
-                            <a href="{% url 'user:token_edit' pk=token.pk %}" class="btn btn-xs btn-warning">Edit</a>
-                            <a href="{% url 'user:token_delete' pk=token.pk %}" class="btn btn-xs btn-danger">Delete</a>
+                            {% if perms.users.change_token %}
+                                <a href="{% url 'user:token_edit' pk=token.pk %}" class="btn btn-xs btn-warning">Edit</a>
+                            {% endif %}
+                            {% if perms.users.delete_token %}
+                                <a href="{% url 'user:token_delete' pk=token.pk %}" class="btn btn-xs btn-danger">Delete</a>
+                            {% endif %}
                        </div>
                        <i class="fa fa-key"></i> {{ token.key }}
                        {% if token.is_expired %}
@@ -49,10 +53,16 @@
            {% empty %}
                <p>You do not have any API tokens.</p>
            {% endfor %}
-            <a href="{% url 'user:token_add' %}" class="btn btn-primary">
-                <span class="fa fa-plus" aria-hidden="true"></span>
-                Add a token
-            </a>
+            {% if perms.users.add_token %}
+                <a href="{% url 'user:token_add' %}" class="btn btn-primary">
+                    <span class="fa fa-plus" aria-hidden="true"></span>
+                    Add a token
+                </a>
+            {% else %}
+                <div class="alert alert-info text-center" role="alert">
+                    You do not have permission to create new API tokens. If needed, ask an administrator to enable token creation for your account or an assigned group.
+                </div>
+            {% endif %}
        </div>
    </div>
 {% endblock %}
--- a/netbox/templates/virtualization/interface_edit.html
+++ b/netbox/templates/virtualization/interface_edit.html
@@ -11,6 +11,7 @@
            {% render_field form.mtu %}
            {% render_field form.description %}
            {% render_field form.mode %}
+            {% render_field form.tags %}
        </div>
    </div>
    {% if obj.mode %}
--- a/netbox/templates/virtualization/virtualmachine_edit.html
+++ b/netbox/templates/virtualization/virtualmachine_edit.html
@@ -48,6 +48,12 @@
            </div>
        </div>
    {% endif %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Local Config Context Data</strong></div>
+        <div class="panel-body">
+            {% render_field form.local_context_data %}
+        </div>
+    </div>
    <div class="panel panel-default">
        <div class="panel-heading"><strong>Tags</strong></div>
        <div class="panel-body">
--- a/netbox/tenancy/api/views.py
+++ b/netbox/tenancy/api/views.py
@@ -30,6 +30,6 @@ class TenantGroupViewSet(ModelViewSet):
 #

 class TenantViewSet(CustomFieldModelViewSet):
-    queryset = Tenant.objects.select_related('group')
+    queryset = Tenant.objects.select_related('group').prefetch_related('tags')
    serializer_class = serializers.TenantSerializer
    filter_class = filters.TenantFilter
--- a/netbox/tenancy/tests/test_api.py
+++ b/netbox/tenancy/tests/test_api.py
@@ -31,6 +31,16 @@ class TenantGroupTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_tenantgroups_brief(self):
+
+        url = reverse('tenancy-api:tenantgroup-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_tenantgroup(self):

        data = {
@@ -124,6 +134,16 @@ class TenantTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_tenants_brief(self):
+
+        url = reverse('tenancy-api:tenant-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_tenant(self):

        data = {
--- a/netbox/users/migrations/0003_token_permissions.py
+++ b/netbox/users/migrations/0003_token_permissions.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.0.8 on 2018-10-05 14:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0001_api_tokens_squashed_0002_unicode_literals'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='token',
+            options={},
+        ),
+    ]
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -43,7 +43,7 @@ class Token(models.Model):
    )

    class Meta:
-        default_permissions = []
+        pass

    def __str__(self):
        # Only display the last 24 bits of the token to avoid accidental exposure.
--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -3,8 +3,8 @@ from __future__ import unicode_literals
 from django.contrib import messages
 from django.contrib.auth import login as auth_login, logout as auth_logout, update_session_auth_hash
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpResponseRedirect
+from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
+from django.http import HttpResponseForbidden, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils.decorators import method_decorator
@@ -231,8 +231,12 @@ class TokenEditView(LoginRequiredMixin, View):
    def get(self, request, pk=None):

        if pk is not None:
+            if not request.user.has_perm('users.change_token'):
+                return HttpResponseForbidden()
            token = get_object_or_404(Token.objects.filter(user=request.user), pk=pk)
        else:
+            if not request.user.has_perm('users.add_token'):
+                return HttpResponseForbidden()
            token = Token(user=request.user)

        form = TokenForm(instance=token)
@@ -274,7 +278,8 @@ class TokenEditView(LoginRequiredMixin, View):
        })


-class TokenDeleteView(LoginRequiredMixin, View):
+class TokenDeleteView(PermissionRequiredMixin, View):
+    permission_required = 'users.delete_token'

    def get(self, request, pk):

--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -192,6 +192,19 @@ class ModelViewSet(_ModelViewSet):

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

+    def get_serializer_class(self):
+
+        # If 'brief' has been passed as a query param, find and return the nested serializer for this model, if one
+        # exists
+        request = self.get_serializer_context()['request']
+        if request.query_params.get('brief', False):
+            serializer_class = get_serializer_for_model(self.queryset.model, prefix='Nested')
+            if serializer_class is not None:
+                return serializer_class
+
+        # Fall back to the hard-coded serializer class
+        return self.serializer_class
+

 class FieldChoicesViewSet(ViewSet):
    """
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -2,11 +2,13 @@ from __future__ import unicode_literals

 import csv
 from io import StringIO
+import json
 import re
+import sys

 from django import forms
 from django.conf import settings
-from django.contrib.postgres.forms import JSONField as _JSONField
+from django.contrib.postgres.forms.jsonb import JSONField as _JSONField, InvalidJSONInput
 from django.db.models import Count
 from django.urls import reverse_lazy
 from mptt.forms import TreeNodeMultipleChoiceField
@@ -149,6 +151,11 @@ def add_blank_choice(choices):
    return ((None, '---------'),) + tuple(choices)


+def utf8_encoder(data):
+    for line in data:
+        yield line.encode('utf-8')
+
+
 #
 # Widgets
 #
@@ -302,7 +309,12 @@ class CSVDataField(forms.CharField):
    def to_python(self, value):

        records = []
-        reader = csv.reader(StringIO(value))
+
+        # Python 2 hack for Unicode support in the CSV reader
+        if sys.version_info[0] < 3:
+            reader = csv.reader(utf8_encoder(StringIO(value)))
+        else:
+            reader = csv.reader(StringIO(value))

        # Consume and validate the first line of CSV data as column headers
        headers = next(reader)
@@ -556,9 +568,11 @@ class JSONField(_JSONField):
            self.widget.attrs['placeholder'] = ''

    def prepare_value(self, value):
+        if isinstance(value, InvalidJSONInput):
+            return value
        if value is None:
            return ''
-        return super(JSONField, self).prepare_value(value)
+        return json.dumps(value, sort_keys=True, indent=4)


 #
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -710,22 +710,17 @@ class ComponentCreateView(View):
        if form.is_valid():

            new_components = []
-            data = deepcopy(form.cleaned_data)
+            data = deepcopy(request.POST)
+            data[self.parent_field] = parent.pk

            for name in form.cleaned_data['name_pattern']:
-                component_data = {
-                    self.parent_field: parent.pk,
-                    'name': name,
-                }
-                # Replace objects with their primary key to keep component_form.clean() happy
-                for k, v in data.items():
-                    if hasattr(v, 'pk'):
-                        component_data[k] = v.pk
-                    else:
-                        component_data[k] = v
-                component_form = self.model_form(component_data)
+
+                # Initialize the individual component form
+                data['name'] = name
+                component_form = self.model_form(data)
+
                if component_form.is_valid():
-                    new_components.append(component_form.save(commit=False))
+                    new_components.append(component_form)
                else:
                    for field, errors in component_form.errors.as_data().items():
                        # Assign errors on the child form's name field to name_pattern on the parent form
@@ -735,26 +730,10 @@ class ComponentCreateView(View):
                            form.add_error(field, '{}: {}'.format(name, ', '.join(e)))

            if not form.errors:
-                self.model.objects.bulk_create(new_components)

-                # ManyToMany relations are bulk created via the through model
-                m2m_fields = [field for field in component_form.fields if type(component_form.fields[field]) in M2M_FIELD_TYPES]
-                if m2m_fields:
-                    for field in m2m_fields:
-                        field_links = []
-                        for new_component in new_components:
-                            for related_obj in component_form.cleaned_data[field]:
-                                # The through model columns are the id's of our M2M relation objects
-                                through_kwargs = {}
-                                new_component_column = new_component.__class__.__name__ + '_id'
-                                related_obj_column = related_obj.__class__.__name__ + '_id'
-                                through_kwargs.update({
-                                    new_component_column.lower(): new_component.id,
-                                    related_obj_column.lower(): related_obj.id
-                                })
-                                field_link = getattr(self.model, field).through(**through_kwargs)
-                                field_links.append(field_link)
-                        getattr(self.model, field).through.objects.bulk_create(field_links)
+                # Create the new components
+                for component_form in new_components:
+                    component_form.save()

                messages.success(request, "Added {} {} to {}.".format(
                    len(new_components), self.model._meta.verbose_name_plural, parent
--- a/netbox/virtualization/api/serializers.py
+++ b/netbox/virtualization/api/serializers.py
@@ -107,6 +107,7 @@ class VirtualMachineSerializer(TaggitSerializer, CustomFieldModelSerializer):
        fields = [
            'id', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'platform', 'primary_ip', 'primary_ip4',
            'primary_ip6', 'vcpus', 'memory', 'disk', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
+            'local_context_data',
        ]


@@ -117,6 +118,7 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer):
        fields = [
            'id', 'name', 'status', 'cluster', 'role', 'tenant', 'platform', 'primary_ip', 'primary_ip4', 'primary_ip6',
            'vcpus', 'memory', 'disk', 'comments', 'tags', 'custom_fields', 'config_context', 'created', 'last_updated',
+            'local_context_data',
        ]

    def get_config_context(self, obj):
@@ -167,7 +169,8 @@ class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer):

 class NestedInterfaceSerializer(WritableNestedSerializer):
    url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:interface-detail')
+    virtual_machine = NestedVirtualMachineSerializer(read_only=True)

    class Meta:
        model = Interface
-        fields = ['id', 'url', 'name']
+        fields = ['id', 'url', 'virtual_machine', 'name']
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -35,7 +35,7 @@ class ClusterGroupViewSet(ModelViewSet):


 class ClusterViewSet(CustomFieldModelViewSet):
-    queryset = Cluster.objects.select_related('type', 'group')
+    queryset = Cluster.objects.select_related('type', 'group').prefetch_related('tags')
    serializer_class = serializers.ClusterSerializer
    filter_class = filters.ClusterFilter

@@ -47,7 +47,7 @@ class ClusterViewSet(CustomFieldModelViewSet):
 class VirtualMachineViewSet(CustomFieldModelViewSet):
    queryset = VirtualMachine.objects.select_related(
        'cluster__site', 'role', 'tenant', 'platform', 'primary_ip4', 'primary_ip6'
-    )
+    ).prefetch_related('tags')
    filter_class = filters.VirtualMachineFilter

    def get_serializer_class(self):
@@ -56,10 +56,24 @@ class VirtualMachineViewSet(CustomFieldModelViewSet):
        """
        if self.action == 'retrieve':
            return serializers.VirtualMachineWithConfigContextSerializer
+
+        request = self.get_serializer_context()['request']
+        if request.query_params.get('brief', False):
+            return serializers.NestedVirtualMachineSerializer
+
        return serializers.VirtualMachineSerializer


 class InterfaceViewSet(ModelViewSet):
-    queryset = Interface.objects.filter(virtual_machine__isnull=False).select_related('virtual_machine')
+    queryset = Interface.objects.filter(
+        virtual_machine__isnull=False
+    ).select_related('virtual_machine').prefetch_related('tags')
    serializer_class = serializers.InterfaceSerializer
    filter_class = filters.InterfaceFilter
+
+    def get_serializer_class(self):
+        request = self.get_serializer_context()['request']
+        if request.query_params.get('brief', False):
+            # Override get_serializer_for_model(), which will return the DCIM NestedInterfaceSerializer
+            return serializers.NestedInterfaceSerializer
+        return serializers.InterfaceSerializer
--- a/netbox/virtualization/filters.py
+++ b/netbox/virtualization/filters.py
@@ -1,11 +1,12 @@
 from __future__ import unicode_literals

 import django_filters
+from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Q
 from netaddr import EUI
 from netaddr.core import AddrFormatError

-from dcim.models import DeviceRole, Interface, Platform, Site
+from dcim.models import DeviceRole, Interface, Platform, Region, Site
 from extras.filters import CustomFieldFilterSet
 from tenancy.models import Tenant
 from utilities.filters import NumericInFilter
@@ -116,6 +117,16 @@ class VirtualMachineFilter(CustomFieldFilterSet):
        queryset=Cluster.objects.all(),
        label='Cluster (ID)',
    )
+    region_id = django_filters.NumberFilter(
+        method='filter_region',
+        name='pk',
+        label='Region (ID)',
+    )
+    region = django_filters.CharFilter(
+        method='filter_region',
+        name='slug',
+        label='Region (slug)',
+    )
    site_id = django_filters.ModelMultipleChoiceFilter(
        name='cluster__site',
        queryset=Site.objects.all(),
@@ -173,6 +184,16 @@ class VirtualMachineFilter(CustomFieldFilterSet):
            Q(comments__icontains=value)
        )

+    def filter_region(self, queryset, name, value):
+        try:
+            region = Region.objects.get(**{name: value})
+        except ObjectDoesNotExist:
+            return queryset.none()
+        return queryset.filter(
+            Q(cluster__site__region=region) |
+            Q(cluster__site__region__in=region.get_descendants())
+        )
+

 class InterfaceFilter(django_filters.FilterSet):
    virtual_machine_id = django_filters.ModelMultipleChoiceFilter(
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -8,7 +8,6 @@ from taggit.forms import TagField

 from dcim.constants import IFACE_FF_VIRTUAL, IFACE_MODE_ACCESS, IFACE_MODE_TAGGED_ALL
 from dcim.forms import INTERFACE_MODE_HELP_TEXT
-from dcim.formfields import MACAddressFormField
 from dcim.models import Device, DeviceRole, Interface, Platform, Rack, Region, Site
 from extras.forms import AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldForm, CustomFieldFilterForm
 from ipam.models import IPAddress
@@ -17,7 +16,8 @@ from tenancy.models import Tenant
 from utilities.forms import (
    AnnotatedMultipleChoiceField, APISelect, APISelectMultiple, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect,
    ChainedFieldsMixin, ChainedModelChoiceField, ChainedModelMultipleChoiceField, CommentField, ComponentForm,
-    ConfirmationForm, CSVChoiceField, ExpandableNameField, FilterChoiceField, SlugField, SmallTextarea, add_blank_choice
+    ConfirmationForm, CSVChoiceField, ExpandableNameField, FilterChoiceField, FilterTreeNodeMultipleChoiceField,
+    JSONField, SlugField, SmallTextarea, add_blank_choice,
 )
 from .constants import VM_STATUS_CHOICES
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine
@@ -247,13 +247,17 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldForm):
        )
    )
    tags = TagField(required=False)
+    local_context_data = JSONField(required=False)

    class Meta:
        model = VirtualMachine
        fields = [
            'name', 'status', 'cluster_group', 'cluster', 'role', 'tenant', 'platform', 'primary_ip4', 'primary_ip6',
-            'vcpus', 'memory', 'disk', 'comments', 'tags',
+            'vcpus', 'memory', 'disk', 'comments', 'tags', 'local_context_data',
        ]
+        help_texts = {
+            'local_context_data': "Local config context data overwrites all sources contexts in the final rendered config context",
+        }

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

@@ -382,6 +386,11 @@ class VirtualMachineFilterForm(BootstrapMixin, CustomFieldFilterForm):
        queryset=Cluster.objects.annotate(filter_count=Count('virtual_machines')),
        label='Cluster'
    )
+    region = FilterTreeNodeMultipleChoiceField(
+        queryset=Region.objects.all(),
+        to_field_name='slug',
+        required=False,
+    )
    site = FilterChoiceField(
        queryset=Site.objects.annotate(filter_count=Count('clusters__virtual_machines')),
        to_field_name='slug',
@@ -415,11 +424,12 @@ class VirtualMachineFilterForm(BootstrapMixin, CustomFieldFilterForm):
 #

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

    class Meta:
        model = Interface
        fields = [
-            'virtual_machine', 'name', 'form_factor', 'enabled', 'mac_address', 'mtu', 'description', 'mode',
+            'virtual_machine', 'name', 'form_factor', 'enabled', 'mac_address', 'mtu', 'description', 'mode', 'tags',
            'untagged_vlan', 'tagged_vlans',
        ]
        widgets = {
@@ -456,8 +466,9 @@ class InterfaceCreateForm(ComponentForm):
    form_factor = forms.ChoiceField(choices=VIFACE_FF_CHOICES, initial=IFACE_FF_VIRTUAL, widget=forms.HiddenInput())
    enabled = forms.BooleanField(required=False)
    mtu = forms.IntegerField(required=False, min_value=1, max_value=32767, label='MTU')
-    mac_address = MACAddressFormField(required=False, label='MAC Address')
+    mac_address = forms.CharField(required=False, label='MAC Address')
    description = forms.CharField(max_length=100, required=False)
+    tags = TagField(required=False)

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

--- a/netbox/virtualization/migrations/0008_virtualmachine_local_context_data.py
+++ b/netbox/virtualization/migrations/0008_virtualmachine_local_context_data.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.8 on 2018-09-16 02:01
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('virtualization', '0007_change_logging'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='virtualmachine',
+            name='local_context_data',
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+        ),
+    ]
--- a/netbox/virtualization/tests/test_api.py
+++ b/netbox/virtualization/tests/test_api.py
@@ -35,6 +35,16 @@ class ClusterTypeTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_clustertypes_brief(self):
+
+        url = reverse('virtualization-api:clustertype-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_clustertype(self):

        data = {
@@ -126,6 +136,16 @@ class ClusterGroupTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_clustergroups_brief(self):
+
+        url = reverse('virtualization-api:clustergroup-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
    def test_create_clustergroup(self):

        data = {
@@ -220,6 +240,16 @@ class ClusterTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_clusters_brief(self):
+
+        url = reverse('virtualization-api:cluster-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'url']
+        )
+
    def test_create_cluster(self):

        data = {
@@ -324,6 +354,16 @@ class VirtualMachineTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_virtualmachines_brief(self):
+
+        url = reverse('virtualization-api:virtualmachine-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'url']
+        )
+
    def test_create_virtualmachine(self):

        data = {
@@ -447,6 +487,16 @@ class InterfaceTest(APITestCase):

        self.assertEqual(response.data['count'], 3)

+    def test_list_interfaces_brief(self):
+
+        url = reverse('virtualization-api:interface-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'url', 'virtual_machine']
+        )
+
    def test_create_interface(self):

        data = {
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,10 +14,10 @@ Markdown==2.6.11
 natsort==5.3.3
 ncclient==0.6.0
 netaddr==0.7.19
-paramiko==2.4.1
+paramiko==2.4.2
 Pillow==5.2.0
 psycopg2-binary==2.7.5
 py-gfm==0.1.3
-pycryptodome==3.6.4
+pycryptodome==3.6.6
 xmltodict==0.11.0
Author	SHA1	Message	Date
Jeremy Stretch	cb83eb204b	Merge pull request #2552 from digitalocean/develop Release v2.4.7	2018-11-06 10:55:29 -05:00
Jeremy Stretch	99edb8b8d5	Release v2.4.7	2018-11-06 10:49:44 -05:00
Jeremy Stretch	b4998f4b01	Closes #2388 : Enable filtering of devices/VMs by region	2018-11-06 10:31:56 -05:00
John Anderson	51295389c6	add temporary support for hyphenated query params for #2549	2018-11-06 10:08:00 -05:00
Ben Bleything	5baf86dc89	fix prefix length for 172.16.0.0/12 (#2548 )	2018-11-06 09:26:05 -05:00
Jeremy Stretch	fd4a9db13e	Closes #2512 : Add device field to inventory item filter form	2018-11-06 09:24:05 -05:00
John Anderson	e243234c4e	changelog for #2549	2018-11-06 00:57:09 -05:00
John Anderson	817dc89279	fixed test for #2549	2018-11-06 00:54:57 -05:00
John Anderson	798a87b31e	fixed #2549 - incorrect naming of peer-device and peer-interface	2018-11-06 00:51:55 -05:00
Jeremy Stretch	4d47d848c5	Fixed changelog for #2528	2018-11-05 16:10:33 -05:00
Jeremy Stretch	bd3ccfe020	Fixes #2528 : Enable creating circuit terminations with interface assignment via API	2018-11-05 16:10:01 -05:00
Jeremy Stretch	ded90df01b	Filter cleanup	2018-11-05 15:45:21 -05:00
Jeremy Stretch	ce7930abfd	Changelog for #2427	2018-11-05 15:40:48 -05:00
Daniel Sheppard	82b4aad585	Fixes 2427: Added filtering interfaces by vlan id(vlan=#) and vlan pk(vlan_id=#) (#2521 )	2018-11-05 15:37:52 -05:00
Jeremy Stretch	f321e2c705	Changelog for #2501	2018-11-05 15:34:39 -05:00
knobix	0c86fd89ca	Update models.py (#2502 ) Fix the handling of shared IPs (VIP, VRRF, etc.) when unique IP space enforcement is set. Add parentheses for the logical OR-statement to make the evaluation valid. Fixes: #2501	2018-11-05 15:33:10 -05:00
Jeremy Stretch	e97708ada0	Fixes #2526 : Bump paramiko and pycryptodome requirements due to vulnerability	2018-10-22 11:23:37 -04:00
Jeremy Stretch	0bb5d229e8	Fixes #2514 : Prevent new connections to already connected interfaces	2018-10-16 16:42:23 -04:00
mmahacek	409a9256a1	Expand Webhook Documentation #2347 (#2524 ) * #2347 - Expand Webhook Documentation Move "Install Python Packages" section up one header level. Should make Napalm/Webhook sections appear in table of contents for direct linking. * #2347 - Expand Webhook Documentation Add text for installation to link to other documentation sections with instructions.	2018-10-16 13:19:33 -04:00
Jeremy Stretch	2c37e85a4c	Merge pull request #2523 from etcet/patch-1 Fix "cusomizable" typo	2018-10-16 13:16:12 -04:00
Chris James	0ae2dfbff3	Fix "cusomizable" typo	2018-10-16 11:36:32 -05:00
Jeremy Stretch	df5d105f29	Changelog for #2515	2018-10-16 09:42:19 -04:00
Jeremy Stretch	219c9e7d95	Merge pull request #2408 from ScanPlusGmbH/fix-2395 Fix #2515: Modify only when webhooks are enabled	2018-10-16 09:39:28 -04:00
Jeremy Stretch	6832df4699	Fixes #2508 : Removed invalid link	2018-10-10 09:49:35 -04:00
Tobias Genannt	c31c7b50b7	Fix #2395 : Modify only when webhooks are enabled This only adds the RQ link when the webhooks setting is enabled.	2018-10-08 07:34:56 +02:00
Jeremy Stretch	7d1f6b7049	Post-release version bump	2018-10-05 15:49:51 -04:00
Jeremy Stretch	74d525364a	Merge pull request #2494 from digitalocean/develop Release v2.4.6	2018-10-05 15:48:11 -04:00
Jeremy Stretch	c2f4cf3407	Release v2.4.6	2018-10-05 15:43:43 -04:00
Jeremy Stretch	83f3dc99ce	Changelog entry for #2492	2018-10-05 15:39:30 -04:00
Jeremy Stretch	44d3606ce1	Fixes #2492 : Sanitize hostname and port values returned through LLDP	2018-10-05 15:38:32 -04:00
Jeremy Stretch	470d22c835	PEP8 fix	2018-10-05 15:36:48 -04:00
Jeremy Stretch	4c37628784	Fixes #2393 : Fix Unicode support for CSV import under Python 2	2018-10-05 15:33:29 -04:00
Marc Heckmann	1daf7f8e2b	Sanitize hostname and port values returned through LLDP If hostname or port are null set to empty string (""). This avoids breaking the LLDP neighbors (NAPALM) view	2018-10-05 14:30:54 -04:00
Jeremy Stretch	841db3b0c2	Fixes #2491 : Fix exception when importing devices with invalid device type	2018-10-05 12:22:46 -04:00
Jeremy Stretch	5d10d8418e	Closes #2479 : Add user permissions for creating/modifying API tokens	2018-10-05 11:06:59 -04:00
Jeremy Stretch	2fee977b4c	Fixes #2485 : Fix cancel button when assigning a service to a device/VM	2018-10-05 10:30:13 -04:00
Jeremy Stretch	52f1b1c3bf	Changelog entry for #2487	2018-10-04 16:24:09 -04:00
Jeremy Stretch	ab53d0e863	Merge pull request #2488 from digitalocean/2487-api-brief Closes #2487: Enable brief API output utilizing nested serializers	2018-10-04 16:22:30 -04:00
Jeremy Stretch	259da2d18a	#2487 : Added API tests	2018-10-04 16:20:01 -04:00
Jeremy Stretch	bf47e7cae3	#2487 : Require the 'brief' parameter to evaluate True	2018-10-04 14:50:57 -04:00
Jeremy Stretch	db2721c581	Enable brief API output utilizing nested serializers	2018-10-04 13:43:50 -04:00
John Anderson	1b2e9a6d06	fixes #2484 - Local config context not available on the Virtual Machine Edit Form	2018-10-03 17:16:01 -04:00
Jeremy Stretch	99848aab6a	Fixes #2483 : Set max item count of API-populated form fields to MAX_PAGE_SIZE	2018-10-03 16:17:17 -04:00
Jeremy Stretch	7583912de7	Post-release version bump	2018-10-02 15:30:28 -04:00
Jeremy Stretch	125975832b	Merge pull request #2478 from digitalocean/develop Release v2.4.5	2018-10-02 15:29:13 -04:00
Jeremy Stretch	20fed375d1	Release v2.4.5	2018-10-02 15:24:42 -04:00
Jeremy Stretch	fc1b3d6927	Fixes #2471 : Fix ReadTheDocs theme	2018-10-02 11:51:53 -04:00
Jeremy Stretch	aed2a3cd1b	Closes #2438 : API optimizations for tagged objects	2018-09-28 16:44:05 -04:00
Jeremy Stretch	15babeb584	Fixes #2414 : Tags field missing from device/VM component creation forms	2018-09-28 16:26:08 -04:00
Jeremy Stretch	020b5ea870	Fixes #2470 : Log the creation of device/VM components as object changes	2018-09-28 16:04:51 -04:00
Jeremy Stretch	2ee5b2344e	Changelog and misc cleanup	2018-09-28 14:21:49 -04:00
Jeremy Stretch	7616bcad3d	Merge pull request #2445 from digitalocean/local-config-context Local config context	2018-09-28 14:03:28 -04:00
John Anderson	f76ce980e3	remove templates no longer needed for local config context	2018-09-26 10:30:34 -04:00
Jeremy Stretch	9440ac7640	Fixes #2455 : Ignore unique address enforcement for IPs with a shared/virtual role	2018-09-24 16:59:33 -04:00
Jeremy Stretch	0e18997c79	Merge pull request #2446 from hellerve/patch-1 docs: typo fix in devices	2018-09-19 09:47:46 -04:00
Veit Heller	95464772ac	docs: typo fix in devices	2018-09-19 10:57:09 +02:00
Jeremy Stretch	b4445dfdf8	Fixes #2442 : Nullify "next" link in API when limit=0 is passed	2018-09-18 13:59:50 -04:00
John Anderson	fb5dca2711	Merge branch 'develop' of github.com:digitalocean/netbox into local-config-context	2018-09-18 12:16:07 -04:00
Jeremy Stretch	6cdff955dc	Fixes #2444 : Improve validation of interface MAC addresses	2018-09-18 12:02:59 -04:00
John Anderson	4039753b2f	refactored UI for local config context	2018-09-18 11:52:12 -04:00
Jeremy Stretch	9df33cef8b	Fixes #2443 : Enforce JSON object format when creating config contexts	2018-09-18 11:46:22 -04:00
John Anderson	e3e9211e8a	PEP8 fix	2018-09-16 00:30:51 -04:00
John Anderson	0da113b723	implemnted #2392 - local config context for devices and VMs	2018-09-16 00:25:20 -04:00
John Anderson	e965adad7c	changelog for #2432	2018-09-15 17:25:50 -04:00
John Anderson	57b225b680	fixes #2423 - interface connection links	2018-09-15 17:23:58 -04:00
Jeremy Stretch	b97597c645	Merge pull request #2421 from sieben/docs_community Add content about related projects	2018-09-13 12:29:17 -04:00
Rémy Léone	162828da90	Add a page related to community related projects	2018-09-13 17:54:13 +02:00
Jeremy Stretch	292647da14	Closes #2402 : Order and format JSON data in form fields	2018-09-13 11:31:34 -04:00
Jeremy Stretch	3a88e43103	Fixes #2406 : Remove hard-coded limit of 1000 objects from API-populated form fields	2018-09-13 11:21:40 -04:00
Jeremy Stretch	010765e131	Post-release version bump	2018-08-22 11:55:51 -04:00