Merge lp:~lamont/maas/bug-1660188 into lp:~maas-committers/maas/trunk

[LaMont Jones]

Create Device Details page.

Create Device Details page.

[Gavin Panella (allenap)]

Just a few comments from quickly going over this code.

You were worried about query counts going up. That's a good thing to have noticed and to worry about, but it's nothing unusual: it's the curse of ORMs. The dehydrate_* method pattern is nice to work with but it exacerbates this problem.

The first tool I'd reach for is tests, specifically using CountQueries / count_queries. Typically I'd do something like "render n things" and then "render n+1 things" and assert that the query count is the same for both. Then I'd add pre-fetching in the "right" places until the test passes.

Overall, there's a lot of stuff in here. It's already at ~1000 lines of diff, but it's densely populated. Splitting it into 2 or more pieces will help a lot at review time.

[LaMont Jones (lamont)]

Replies.

[Blake Rouse (blake-rouse)]

Overall almost there. Couple of issues with the directives, just always use ng-if instead of ng-show or ng-hide. ng-if is better performance as it actually removes the dom elements from the page. There has been some effort to transition all to ng-if but that has not happened 100% yet.

I did run into this issue on the devices details page. The DHCP warning shouldn't be there and I think editing should be possible for a device if a rack controller if no rack controllers. I really want to remove that limitation for machines as well, but not yet, sigh...

review: Needs Fixing

[Blake Rouse (blake-rouse)]

Forgot the link to the screenshot:

http://imgur.com/a/SiPpq

=== modified file 'src/maasserver/enum.py'
--- src/maasserver/enum.py	2017-02-17 21:27:46 +0000
+++ src/maasserver/enum.py	2017-02-28 04:16:58 +0000
@@ -7,6 +7,8 @@
     'CACHE_MODE_TYPE',
     'CACHE_MODE_TYPE_CHOICES',
     'COMPONENT',
+    'DEVICE_IP_ASSIGNMENT_TYPE',
+    'DEVICE_IP_ASSIGNMENT_TYPE_CHOICES',
     'FILESYSTEM_GROUP_TYPE',
     'FILESYSTEM_GROUP_TYPE_CHOICES',
     'FILESYSTEM_TYPE',
@@ -206,6 +208,27 @@
     ADMIN = 'admin_node'
 
 
+class DEVICE_IP_ASSIGNMENT_TYPE:
+    """The vocabulary of a `Device`'s possible IP assignment type. This value
+    is calculated by looking at the overall model for a `Device`. This is not
+    set directly on the model."""
+    #: Device is outside of MAAS control.
+    EXTERNAL = "external"
+
+    #: Device receives ip address from `NodeGroupInterface` dynamic range.
+    DYNAMIC = "dynamic"
+
+    #: Device has ip address assigned from `NodeGroupInterface` static range.
+    STATIC = "static"
+
+
+DEVICE_IP_ASSIGNMENT_TYPE_CHOICES = (
+    (DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC, "Dynamic"),
+    (DEVICE_IP_ASSIGNMENT_TYPE.EXTERNAL, "External"),
+    (DEVICE_IP_ASSIGNMENT_TYPE.STATIC, "Static"),
+)
+
+
 class PRESEED_TYPE:
     """Types of preseed documents that can be generated."""
     COMMISSIONING = 'commissioning'

=== modified file 'src/maasserver/forms/__init__.py'
--- src/maasserver/forms/__init__.py	2017-02-17 14:23:04 +0000
+++ src/maasserver/forms/__init__.py	2017-02-28 04:16:58 +0000
@@ -803,27 +803,42 @@
         required=False, initial=None,
         queryset=Node.objects.all(), to_field_name='system_id')
 
+    zone = forms.ModelChoiceField(
+        label="Physical zone", required=False,
+        initial=Zone.objects.get_default_zone,
+        queryset=Zone.objects.all(), to_field_name='name')
+
     class Meta:
         model = Device
 
         fields = NodeForm.Meta.fields + (
             'parent',
+            'zone',
         )
 
+    zone = forms.ModelChoiceField(
+        label="Physical zone", required=False,
+        initial=Zone.objects.get_default_zone,
+        queryset=Zone.objects.all(), to_field_name='name')
+
     def __init__(self, request=None, *args, **kwargs):
         super(DeviceForm, self).__init__(*args, **kwargs)
         self.request = request
 
         instance = kwargs.get('instance')
         self.set_up_initial_device(instance)
+        if instance is not None:
+            self.initial['zone'] = instance.zone.name
 
     def set_up_initial_device(self, instance):
         """Initialize the 'parent' field if a device instance was given.
 
         This is a workaround for Django bug #17657.
         """
-        if instance is not None and instance.parent is not None:
-            self.initial['parent'] = instance.parent.system_id
+        if instance is not None:
+            if instance.parent is not None:
+                self.initial['parent'] = instance.parent.system_id
+            self.initial['zone'] = instance.zone.name
 
     def save(self, commit=True):
         device = super(DeviceForm, self).save(commit=False)
@@ -832,6 +847,10 @@
             # Set the owner: devices are owned by their creator.
             device.owner = self.request.user
 
+        zone = self.cleaned_data.get('zone')
+        if zone:
+            device.zone = zone
+
         # If the device has a parent and no domain was provided,
         # inherit the parent's domain.
         if device.parent:
@@ -839,6 +858,9 @@
                     device.parent.domain):
                 device.domain = device.parent.domain
 
+        zone = self.cleaned_data.get('zone')
+        if zone:
+            device.zone = zone
         device.save()
         return device
 

=== modified file 'src/maasserver/forms/interface.py'
--- src/maasserver/forms/interface.py	2017-02-17 14:23:04 +0000
+++ src/maasserver/forms/interface.py	2017-02-28 04:16:58 +0000
@@ -16,6 +16,7 @@
     BOND_LACP_RATE_CHOICES,
     BOND_MODE_CHOICES,
     BOND_XMIT_HASH_POLICY_CHOICES,
+    DEVICE_IP_ASSIGNMENT_TYPE,
     INTERFACE_TYPE,
     IPADDRESS_TYPE,
     NODE_TYPE,
@@ -56,6 +57,16 @@
     accept_ra = forms.NullBooleanField(required=False)
     autoconf = forms.NullBooleanField(required=False)
 
+    # Device parameters
+    ip_assignment = forms.MultipleChoiceField(
+        choices=(
+            ('static', DEVICE_IP_ASSIGNMENT_TYPE.STATIC),
+            ('dynamic', DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC),
+            ('external', DEVICE_IP_ASSIGNMENT_TYPE.EXTERNAL)),
+        required=False)
+    ip_address = forms.GenericIPAddressField(
+        unpack_ipv4=True, required=False)
+
     @staticmethod
     def get_interface_form(type):
         try:
@@ -148,9 +159,18 @@
                 msg = "Parents are related to different nodes."
                 set_form_error(self, 'name', msg)
 
+    def clean_device(self, cleaned_data):
+        ip_assignment = cleaned_data.get('ip_assignment')
+        if ip_assignment == DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC:
+            # Dynamic means that there is no IP address stored.
+            cleaned_data['ip_address'] = None
+        return cleaned_data
+
     def clean(self):
         cleaned_data = super(InterfaceForm, self).clean()
         self.clean_parents_all_same_node(cleaned_data.get('parents'))
+        if self.node.node_type == NODE_TYPE.DEVICE:
+            cleaned_data = self.clean_device(cleaned_data)
         return cleaned_data
 
     def _set_param(self, interface, key):

=== modified file 'src/maasserver/forms/tests/test_device.py'
--- src/maasserver/forms/tests/test_device.py	2017-02-17 14:23:04 +0000
+++ src/maasserver/forms/tests/test_device.py	2017-02-28 04:16:58 +0000
@@ -40,6 +40,7 @@
                 'parent',
                 'disable_ipv4',
                 'swap_size',
+                'zone',
             ], list(form.fields))
 
     def test_changes_device_parent(self):

=== modified file 'src/maasserver/static/js/angular/controllers/node_details.js'
--- src/maasserver/static/js/angular/controllers/node_details.js	2017-01-28 00:51:47 +0000
+++ src/maasserver/static/js/angular/controllers/node_details.js	2017-02-28 04:16:58 +0000
@@ -6,14 +6,22 @@
 
 angular.module('MAAS').controller('NodeDetailsController', [
     '$scope', '$rootScope', '$routeParams', '$location', '$interval',
+    'DevicesManager',
     'MachinesManager', 'ControllersManager', 'ZonesManager', 'GeneralManager',
     'UsersManager', 'TagsManager', 'DomainsManager', 'ManagerHelperService',
     'ServicesManager', 'ErrorService', 'ValidationService', function(
-        $scope, $rootScope, $routeParams, $location, $interval,
+        $scope, $rootScope, $routeParams, $location, $interval, DevicesManager,
         MachinesManager, ControllersManager, ZonesManager, GeneralManager,
         UsersManager, TagsManager, DomainsManager, ManagerHelperService,
         ServicesManager, ErrorService, ValidationService) {
 
+        // Mapping of device.ip_assignment to viewable text.
+        var DEVICE_IP_ASSIGNMENT = {
+            external: "External",
+            dynamic: "Dynamic",
+            "static": "Static"
+        };
+
         // Set title and page.
         $rootScope.title = "Loading...";
         $rootScope.page = "nodes";
@@ -84,6 +92,11 @@
             parameters: {}
         };
 
+        // Get the display text for device ip assignment type.
+        $scope.getDeviceIPAssignment = function(ipAssignment) {
+            return DEVICE_IP_ASSIGNMENT[ipAssignment];
+        };
+
         // Events section.
         $scope.events = {
             limit: 10
@@ -674,9 +687,10 @@
         $scope.hasInvalidArchitecture = function() {
             if(angular.isObject($scope.node)) {
                 return (
-                    $scope.node.architecture === "" ||
-                    $scope.summary.architecture.options.indexOf(
-                        $scope.node.architecture) === -1);
+                    !$scope.isDevice && (
+                        $scope.node.architecture === "" ||
+                        $scope.summary.architecture.options.indexOf(
+                            $scope.node.architecture) === -1));
             } else {
                 return false;
             }
@@ -685,9 +699,10 @@
         // Return true if the current architecture selection is invalid.
         $scope.invalidArchitecture = function() {
             return (
-                $scope.summary.architecture.selected === "" ||
-                $scope.summary.architecture.options.indexOf(
-                    $scope.summary.architecture.selected) === -1);
+                !$scope.isDevice && (
+                    $scope.summary.architecture.selected === "" ||
+                    $scope.summary.architecture.options.indexOf(
+                        $scope.summary.architecture.selected) === -1));
         };
 
         // Return true if at least a rack controller is connected to the
@@ -702,7 +717,7 @@
             return (
                 $scope.isRackControllerConnected() &&
                 $scope.isSuperUser() &&
-                !$scope.isController);
+                !$scope.isController && !$scope.isDevice);
         };
 
         // Called to edit the node name.
@@ -1029,6 +1044,7 @@
         // Load all the required managers.
         ManagerHelperService.loadManagers($scope, [
             MachinesManager,
+            DevicesManager,
             ControllersManager,
             ZonesManager,
             GeneralManager,
@@ -1040,11 +1056,19 @@
             if('controller' === $routeParams.type) {
                 $scope.nodesManager = ControllersManager;
                 $scope.isController = true;
+                $scope.isDevice = false;
                 $scope.type_name = 'controller';
                 $scope.type_name_title = 'Controller';
+            }else if('device' === $routeParams.type) {
+                $scope.nodesManager = DevicesManager;
+                $scope.isController = false;
+                $scope.isDevice = true;
+                $scope.type_name = 'device';
+                $scope.type_name_title = 'Device';
             }else{
                 $scope.nodesManager = MachinesManager;
                 $scope.isController = false;
+                $scope.isDevice = false;
                 $scope.type_name = 'machine';
                 $scope.type_name_title = 'Machine';
             }
@@ -1062,6 +1086,10 @@
                     }, function(error) {
                         ErrorService.raiseError(error);
                     });
+                activeNode = $scope.nodesManager.getActiveItem();
+            }
+            if($scope.isDevice) {
+                $scope.ip_assignment = activeNode.ip_assignment;
             }
 
             // Poll for architectures, hwe_kernels, and osinfo the whole

=== modified file 'src/maasserver/static/js/angular/controllers/node_details_networking.js'
--- src/maasserver/static/js/angular/controllers/node_details_networking.js	2016-10-26 19:05:43 +0000
+++ src/maasserver/static/js/angular/controllers/node_details_networking.js	2017-02-28 04:16:58 +0000
@@ -171,6 +171,28 @@
             EDIT: "edit"
         };
 
+        var IP_ASSIGNMENT = {
+            DYNAMIC: "dynamic",
+            EXTERNAL: "external",
+            STATIC: "static"
+        };
+
+        // Device ip assignment options.
+        $scope.ipAssignments = [
+            {
+                name: IP_ASSIGNMENT.EXTERNAL,
+                text: "External"
+            },
+            {
+                name: IP_ASSIGNMENT.DYNAMIC,
+                text: "Dynamic"
+            },
+            {
+                name: IP_ASSIGNMENT.STATIC,
+                text: "Static"
+            }
+        ];
+
         // Set the initial values for this scope.
         $scope.loaded = false;
         $scope.nodeHasLoaded = false;
@@ -542,6 +564,10 @@
                 // If the user is not the superuser, pretend it's not Ready.
                 return false;
             }
+            if ($scope.$parent.isDevice) {
+                // Devices are never Ready, for our purposes, for now.
+                return true;
+            }
             if ($scope.$parent.isController) {
                 // Controllers are always Ready, for our purposes.
                 return true;
@@ -563,8 +589,8 @@
                 // If the user is not the superuser, pretend it's not Ready.
                 return false;
             }
-            if ($scope.$parent.isController) {
-                // Controllers never in limited mode.
+            if ($scope.$parent.isController || $scope.$parent.isDevice) {
+                // Controllers and Devices are never in limited mode.
                 return false;
             }
             return (
@@ -581,9 +607,9 @@
                 // If the user is not a superuser, disable the networking panel.
                 return true;
             }
-            if ($scope.$parent.isController) {
+            if ($scope.$parent.isController || $scope.$parent.isDevice) {
                 // Never disable the full networking panel when its a
-                // controller.
+                // Controller or Device.
                 return false;
             }
             if (angular.isObject($scope.node) &&
@@ -772,18 +798,29 @@
         $scope.edit = function(nic) {
             $scope.selectedInterfaces = [$scope.getUniqueKey(nic)];
             $scope.selectedMode = SELECTION_MODE.EDIT;
-            $scope.editInterface = {
-                id: nic.id,
-                name: nic.name,
-                mac_address: nic.mac_address,
-                tags: angular.copy(nic.tags),
-                fabric: nic.fabric,
-                vlan: nic.vlan,
-                subnet: nic.subnet,
-                mode: nic.mode,
-                ip_address: nic.ip_address,
-                link_id: nic.link_id
-            };
+            if($scope.$parent.isDevice) {
+                $scope.editInterface = {
+                    id: nic.id,
+                    name: nic.name,
+                    mac_address: nic.mac_address,
+                    subnet: nic.subnet,
+                    ip_address: nic.ip_address,
+                    ip_assignment: nic.ip_assignment
+                };
+            }else{
+                $scope.editInterface = {
+                    id: nic.id,
+                    name: nic.name,
+                    mac_address: nic.mac_address,
+                    tags: angular.copy(nic.tags),
+                    fabric: nic.fabric,
+                    vlan: nic.vlan,
+                    subnet: nic.subnet,
+                    mode: nic.mode,
+                    ip_address: nic.ip_address,
+                    link_id: nic.link_id
+                };
+            }
         };
 
         // Called when the fabric is changed.
@@ -828,6 +865,10 @@
             }
         };
 
+        $scope.ipAssignementChanged = function(nic) {
+            return;
+        };
+
         // Called to cancel edit mode.
         $scope.editCancel = function(nic) {
             $scope.selectedInterfaces = [];
@@ -837,13 +878,24 @@
 
         // Save the following interface on the node.
         $scope.saveInterface = function(nic) {
-            var params = {
-                "name": nic.name,
-                "mac_address": nic.mac_address,
-                "tags": nic.tags.map(
-                    function(tag) { return tag.text; })
-            };
-            if(nic.vlan !== null) {
+            var params;
+            if($scope.$parent.isDevice) {
+                params = {
+                    "name": nic.name,
+                    "mac_address": nic.mac_address,
+                    "ip_assignment": nic.ip_assignment,
+                    "ip_address": nic.ip_address,
+                    "subnet": nic.subnet
+                };
+            }else{
+                params = {
+                    "name": nic.name,
+                    "mac_address": nic.mac_address,
+                    "tags": nic.tags.map(
+                        function(tag) { return tag.text; })
+                };
+            }
+            if(nic.vlan !== undefined && nic.vlan !== null) {
                 params.vlan = nic.vlan.id;
             } else {
                 params.vlan = null;
@@ -866,6 +918,9 @@
             var params = {
                 "mode": nic.mode
             };
+            if($scope.$parent.isDevice) {
+                params.ip_assignment=nic.ip_assignment;
+            }
             if(angular.isObject(nic.subnet)) {
                 params.subnet = nic.subnet.id;
             }
@@ -1110,9 +1165,18 @@
 
         // Perform the add action over the websocket.
         $scope.addInterface = function(type) {
-            if($scope.newInterface.type === INTERFACE_TYPE.ALIAS) {
+            var nic;
+            if($scope.$parent.isDevice) {
+                nic = {
+                    id: $scope.newInterface.parent.id,
+                    ip_assignment: $scope.newInterface.ip_assignment,
+                    subnet: $scope.newInterface.subnet,
+                    ip_address: $scope.newInterface.ip_address
+                };
+                $scope.saveInterfaceLink(nic);
+            } else if($scope.newInterface.type === INTERFACE_TYPE.ALIAS) {
                 // Add a link to the current interface.
-                var nic = {
+                nic = {
                     id: $scope.newInterface.parent.id,
                     mode: $scope.newInterface.mode,
                     subnet: $scope.newInterface.subnet,
@@ -1416,17 +1480,29 @@
         $scope.showCreatePhysical = function() {
             if($scope.selectedMode === SELECTION_MODE.NONE) {
                 $scope.selectedMode = SELECTION_MODE.CREATE_PHYSICAL;
-                $scope.newInterface = {
-                    name: getNextName("eth"),
-                    macAddress: "",
-                    macError: false,
-                    tags: [],
-                    errorMsg: null,
-                    fabric: $scope.fabrics[0],
-                    vlan: getDefaultVLAN($scope.fabrics[0]),
-                    subnet: null,
-                    mode: LINK_MODE.LINK_UP
-                };
+                if($scope.$parent.isDevice) {
+                    $scope.newInterface = {
+                        name: getNextName("eth"),
+                        macAddress: "",
+                        macError: false,
+                        tags: [],
+                        errorMsg: null,
+                        subnet: null,
+                        ip_assignment: IP_ASSIGNMENT.DYNAMIC
+                    };
+                }else{
+                    $scope.newInterface = {
+                        name: getNextName("eth"),
+                        macAddress: "",
+                        macError: false,
+                        tags: [],
+                        errorMsg: null,
+                        fabric: $scope.fabrics[0],
+                        vlan: getDefaultVLAN($scope.fabrics[0]),
+                        subnet: null,
+                        mode: LINK_MODE.LINK_UP
+                    };
+                }
             }
         };
 
@@ -1444,14 +1520,24 @@
                return;
             }
 
-            var params = {
-                name: $scope.newInterface.name,
-                tags: $scope.newInterface.tags.map(
-                    function(tag) { return tag.text; }),
-                mac_address: $scope.newInterface.macAddress,
-                vlan: $scope.newInterface.vlan.id,
-                mode: $scope.newInterface.mode
-            };
+            var params;
+            if($scope.$parent.isDevice) {
+                params = {
+                    name: $scope.newInterface.name,
+                    mac_address: $scope.newInterface.macAddress,
+                    ip_assignment: $scope.newInterface.ip_assignment,
+                    ip_address: $scope.newInterface.ip_address
+                };
+            }else{
+                params = {
+                    name: $scope.newInterface.name,
+                    tags: $scope.newInterface.tags.map(
+                        function(tag) { return tag.text; }),
+                    mac_address: $scope.newInterface.macAddress,
+                    vlan: $scope.newInterface.vlan.id,
+                    mode: $scope.newInterface.mode
+                };
+            }
             if(angular.isObject($scope.newInterface.subnet)) {
                 params.subnet = $scope.newInterface.subnet.id;
             }

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_details.js	2017-01-28 00:51:47 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details.js	2017-02-28 04:16:58 +0000
@@ -42,6 +42,7 @@
     var webSocket;
     beforeEach(inject(function($injector) {
         MachinesManager = $injector.get("MachinesManager");
+        DevicesManager = $injector.get("DevicesManager");
         ControllersManager = $injector.get("ControllersManager");
         ZonesManager = $injector.get("ZonesManager");
         GeneralManager = $injector.get("GeneralManager");
@@ -136,6 +137,7 @@
             $routeParams: $routeParams,
             $location: $location,
             MachinesManager: MachinesManager,
+            DevicesManager: DevicesManager,
             ControllersManager: ControllersManager,
             ZonesManager: ZonesManager,
             GeneralManager: GeneralManager,
@@ -260,9 +262,9 @@
         var controller = makeController();
         expect(ManagerHelperService.loadManagers).toHaveBeenCalledWith(
             $scope, [
-                MachinesManager, ControllersManager, ZonesManager,
-                GeneralManager, UsersManager, TagsManager, DomainsManager,
-                ServicesManager]);
+                MachinesManager, DevicesManager, ControllersManager,
+                ZonesManager, GeneralManager, UsersManager, TagsManager,
+                DomainsManager, ServicesManager]);
     });
 
     it("doesnt call setActiveItem if node is loaded", function() {

=== modified file 'src/maasserver/static/js/angular/factories/devices.js'
--- src/maasserver/static/js/angular/factories/devices.js	2016-09-27 00:47:54 +0000
+++ src/maasserver/static/js/angular/factories/devices.js	2017-02-28 04:16:58 +0000
@@ -11,16 +11,19 @@
 
 angular.module('MAAS').factory(
     'DevicesManager',
-    ['$q', '$rootScope', 'RegionConnection', 'Manager', function(
-            $q, $rootScope, RegionConnection, Manager) {
+    ['$q', '$rootScope', 'RegionConnection', 'NodesManager', function(
+            $q, $rootScope, RegionConnection, NodesManager) {
 
         function DevicesManager() {
-            Manager.call(this);
+            NodesManager.call(this);
 
             this._pk = "system_id";
             this._handler = "device";
             this._metadataAttributes = {
                 "owner": null,
+                "subnets": null,
+                "fabrics": null,
+                "spaces": null,
                 "tags": null,
                 "zone": function(device) {
                     return device.zone.name;
@@ -34,7 +37,7 @@
             });
         }
 
-        DevicesManager.prototype = new Manager();
+        DevicesManager.prototype = new NodesManager();
 
         // Create a device.
         DevicesManager.prototype.create = function(node) {

=== modified file 'src/maasserver/static/js/angular/factories/tests/test_devices.js'
--- src/maasserver/static/js/angular/factories/tests/test_devices.js	2016-09-27 14:24:19 +0000
+++ src/maasserver/static/js/angular/factories/tests/test_devices.js	2017-02-28 04:16:58 +0000
@@ -46,7 +46,7 @@
         expect(DevicesManager._pk).toBe("system_id");
         expect(DevicesManager._handler).toBe("device");
         expect(Object.keys(DevicesManager._metadataAttributes)).toEqual(
-            ["owner", "tags", "zone"]);
+            ["owner", "subnets", "fabrics", "spaces", "tags", "zone"]);
     });
 
     describe("createInferface", function() {

=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2017-02-17 14:23:04 +0000
+++ src/maasserver/static/partials/node-details.html	2017-02-28 04:16:58 +0000
@@ -30,7 +30,7 @@
                 data-ng-click="saveEditHeader()">Save</a>
 
             <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
-            <p class="page-header__status" data-ng-hide="isController || header.editing">
+            <p class="page-header__status" data-ng-if="!isController && !isDevice && !header.editing">
                 {$ node.status $}
                 <span class="u-text--{$ getPowerStateClass() $} u-margin--left-small"><i class="icon icon--power-{$ getPowerStateClass() $} u-margin--right-tiny"></i>{$ getPowerStateText() $}</span>
                 <a href="" class="page-header__status-check" data-ng-show="canCheckPowerState()" data-ng-click="checkPowerState()">check now</a>
@@ -47,7 +47,7 @@
             <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
             <div class="page-header__dropdown" data-ng-class="{ 'is-open': actionOption }">
 
-                <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="!node.dhcp_on">
+                <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-if="!isDevice && !node.dhcp_on">
 	            <p class="page-header__message page-header__message--warning">
                         MAAS is not providing DHCP.
 		    </p>
@@ -89,58 +89,20 @@
                         <div class="page-header__controls">
                             <a href="" class="button--base button--inline" data-ng-click="actionCancel()">Cancel</a>
                             <button class="button--inline" data-ng-class="actionOption.name === 'delete' ? 'button--destructive' : 'button--positive'" data-ng-click="actionGo('nodes')" data-ng-hide="hasActionsFailed('nodes')">
-                                <span data-ng-if="actionOption.name === 'commission'">Commission
-                                    <span data-ng-if="!isController">machine</span>
-                                    <span data-ng-if="isController">controller</span>
-                                </span>
-                                <span data-ng-if="actionOption.name === 'acquire'">Acquire
-                                    <span data-ng-if="!isController">machine</span>
-                                    <span data-ng-if="isController">controller</span>
-                                </span>
-                                <span data-ng-if="actionOption.name === 'deploy'">Deploy
-                                    <span data-ng-if="!isController">machine</span>
-                                    <span data-ng-if="isController">controller</span>
-                                </span>
-                                <span data-ng-if="actionOption.name === 'release'">Release
-                                    <span data-ng-if="!isController">machine</span>
-                                    <span data-ng-if="isController">controller</span>
-                                </span>
-                                <span data-ng-if="actionOption.name === 'set-zone'">Set zone for
-                                    <span data-ng-if="!isController">machine</span>
-                                    <span data-ng-if="isController">controller</span>
-                                </span>
-                                <span data-ng-if="actionOption.name === 'on'">Power on
-                                    <span data-ng-if="!isController">machine</span>
-                                    <span data-ng-if="isController">controller</span>
-                                </span>
-                                <span data-ng-if="actionOption.name === 'off'">Power off
-                                    <span data-ng-if="!isController">machine</span>
-                                    <span data-ng-if="isController">controller</span>
-                                </span>
-                                <span data-ng-if="actionOption.name === 'abort'">Abort action on
-                                    <span data-ng-if="!isController">machine</span>
-                                    <span data-ng-if="isController">controller</span>
-                                </span>
-                                <span data-ng-if="actionOption.name === 'rescue-mode'">Rescue
-                                    <span data-ng-if="!isController">machine</span>
-                                    <span data-ng-if="isController">controller</span>
-                                </span>
-                                <span data-ng-if="actionOption.name === 'exit-rescue-mode'">Exit rescue mode
-                                </span>
-                                <span data-ng-if="actionOption.name === 'mark-broken'">Mark
-                                    <span data-ng-if="!isController">machine</span>
-                                    <span data-ng-if="isController">controller</span> as broken
-                                </span>
-                                <span data-ng-if="actionOption.name === 'mark-fixed'">Mark
-                                    <span data-ng-if="!isController">machine</span>
-                                    <span data-ng-if="isController">controller</span> as fixed
-                                </span>
-                                <span data-ng-if="actionOption.name === 'delete'">Delete
-                                    <span data-ng-if="!isController">machine</span>
-                                    <span data-ng-if="isController">controller</span>
-                                </span>
-                                <span data-ng-if="actionOption.name === 'import-images'">Import images
-                                </span>
+                                <span data-ng-if="actionOption.name === 'commission'">Commission {$ type_name $}</span>
+                                <span data-ng-if="actionOption.name === 'acquire'">Acquire {$ type_name $}</span>
+                                <span data-ng-if="actionOption.name === 'deploy'">Deploy {$ type_name $}</span>
+                                <span data-ng-if="actionOption.name === 'release'">Release {$ type_name $}</span>
+                                <span data-ng-if="actionOption.name === 'set-zone'">Set zone for {$ type_name $}</span>
+                                <span data-ng-if="actionOption.name === 'on'">Power on {$ type_name $}</span>
+                                <span data-ng-if="actionOption.name === 'off'">Power off {$ type_name $}</span>
+                                <span data-ng-if="actionOption.name === 'abort'">Abort action on {$ type_name $}</span>
+                                <span data-ng-if="actionOption.name === 'rescue-mode'">Rescue {$ type_name $}</span>
+                                <span data-ng-if="actionOption.name === 'exit-rescue-mode'">Exit rescue mode</span>
+                                <span data-ng-if="actionOption.name === 'mark-broken'">Mark {$ type_name $}</span>
+                                <span data-ng-if="actionOption.name === 'mark-fixed'">Mark {$ type_name $}</span>
+                                <span data-ng-if="actionOption.name === 'delete'">Delete {$ type_name $}</span>
+                                <span data-ng-if="actionOption.name === 'import-images'">Import images</span>
                             </button>
                         </div>
                     </form>
@@ -201,12 +163,13 @@
     </nav> -->
     <div class="row" id="summary">
         <div class="wrapper--inner">
-            <h2 data-ng-hide="isController" class="eight-col">Machine summary</h2>
-            <h2 data-ng-show="isController" class="eight-col">Controller summary</h2>
-            <div data-ng-hide="isController">
+            <h2 data-ng-if="!isController && !isDevice" class="eight-col">Machine summary</h2>
+            <h2 data-ng-if="isController" class="eight-col">Controller summary</h2>
+            <h2 data-ng-if="isDevice" class="eight-col">Device summary</h2>
+            <div data-ng-if="!isController">
                 <div class="four-col last-col u-align--right" data-ng-hide="summary.editing">
                     <a href="" class="button--secondary button--inline"
-                        data-ng-show="canEdit()"
+                        data-ng-if="canEdit()"
                         data-ng-click="editSummary()">Edit</a>
                 </div>
                 <div class="four-col last-col u-align--right ng-hide" data-ng-show="summary.editing">
@@ -219,17 +182,17 @@
             </div>
             <div class="twelve-col" data-ng-if="isSuperUser()">
                 <div class="p-notification--error"
-                    data-ng-if="!isController && !isRackControllerConnected()">
+                    data-ng-if="!isController && !isDevice && !isRackControllerConnected()">
                     <p class="p-notification__response">
                       <span class="p-notification__status">Error:</span>Editing is currently disabled because no rack controller is currently connected to the region.</p>
                 </div>
                 <div class="p-notification--error"
-                    data-ng-if="!isController && hasInvalidArchitecture() && isRackControllerConnected() && hasUsableArchitectures()">
+                    data-ng-if="!isController && !isDevice && hasInvalidArchitecture() && isRackControllerConnected() && hasUsableArchitectures()">
                         <p class="p-notification__response">
                           <span class="p-notification__status">Error:</span>This machine currently has an invalid architecture. Update the architecture of this machine to make it deployable.</p>
                 </div>
                 <div class="p-notification--error"
-                    data-ng-if="!isController && hasInvalidArchitecture() && isRackControllerConnected() && !hasUsableArchitectures()">
+                    data-ng-if="!isController && !isDevice && hasInvalidArchitecture() && isRackControllerConnected() && !hasUsableArchitectures()">
                         <p class="p-notification__response">
                           <span class="p-notification__status">Error:</span>No boot images have been imported for a valid architecture to be selected. Visit the <a href="images">images page</a> to start the import process.</p>
                 </div>
@@ -247,7 +210,7 @@
                             </select>
                         </div>
                     </div>
-                    <div class="form__group">
+                    <div class="form__group" data-ng-if="!isDevice">
                         <label for="architecture" class="form__group-label two-col">Architecture</label>
                         <div class="form__group-input three-col">
                             <select name="architecture" id="architecture"
@@ -259,7 +222,7 @@
                             </select>
                         </div>
                     </div>
-                    <div class="form__group">
+                    <div class="form__group" data-ng-if="!isDevice">
                         <label for="min_hwe_kernel" class="form__group-label two-col">Minimum Kernel</label>
                         <div class="form__group-input three-col">
                             <select name="min_hwe_kernel" id="min_hwe_kernel" placeholder="No minimum kernel"
@@ -293,7 +256,7 @@
                             <dd class="four-col last-col">
                                 {$ node.zone.name $}
                             </dd>
-                        <dt class="two-col">Architecture</dt>
+                        <dt class="two-col" data-ng-if="!isDevice">Architecture</dt>
                             <dd class="four-col last-col">
                                 {$ node.architecture || "Missing" $}
                             </dd>
@@ -336,7 +299,7 @@
                             </dd>
                     </dl>
                 </div>
-                <div class="six-col last-col">
+                <div class="six-col last-col" data-ng-if="!isDevice">
                     <dl>
                         <dt class="two-col">CPU</dt>
                             <dd class="four-col last-col">
@@ -388,7 +351,7 @@
             </div>
         </div>
     </div>
-    <div class="row" id="power" data-ng-show="!isController && isSuperUser()">
+    <div class="row" id="power" data-ng-if="!isController && !isDevice && isSuperUser()">
         <div class="wrapper--inner">
             <h2 class="eight-col">Power</h2>
             <div class="four-col last-col u-align--right" data-ng-hide="power.editing">
@@ -613,8 +576,8 @@
                         <h2 class="title">Interfaces</h2>
                     </div>
                     <div class="twelve-col" data-ng-if="
-                            (!isController && isAllNetworkingDisabled() && isSuperUser()) ||
-                            !node.on_network || (!isController && !isUbuntuOS())">
+                            !isDevice && ((!isController && isAllNetworkingDisabled() && isSuperUser()) ||
+                            !node.on_network || (!isController && !isUbuntuOS()))">
                             <div class="p-notification--error" data-ng-if="!node.on_network">
                                 <p class="p-notification__response">
                                   <span class="p-notification__status">Error:</span>Node must be connected to a network.</p>
@@ -635,6 +598,7 @@
                               <div class="table__row">
                                   <div class="table__header table-col--3"></div>
                                   <div class="table__header table-col--12">
+                                    <span data-ng-if="!isDevice">
                                       <a class="table__header-link is-active"
                                           data-ng-class="{ 'is-active': column == 'name' }"
                                           data-ng-click="column = 'name'">
@@ -645,11 +609,16 @@
                                           data-ng-click="column = 'mac'">
                                           MAC
                                       </a>
-                                  </div>
-                                  <div class="table__header table-col--3"><span data-ng-if="!isController">PXE</span></div>
-                                  <div class="table__header table-col--9">Type</div>
-                                  <div class="table__header table-col--14">Fabric</div>
-                                  <div class="table__header table-col--14">VLAN</div>
+                                    </span>
+                                    <span data-ng-if="isDevice">MAC</span>
+                                  </div>
+                                  <div class="table__header table-col--3"><span data-ng-if="!isController && !isDevice">PXE</span></div>
+                                  <div class="table__header table-col--9"><span data-ng-if="!isDevice">Type</span></div>
+                                  <div class="table__header table-col--14">
+                                    <span data-ng-if="!isDevice">Fabric</span>
+                                    <span data-ng-if="isDevice">IP Assignment</span>
+                                  </div>
+                                  <div class="table__header table-col--14"><span data-ng-if="!isDevice">VLAN</span></div>
                                   <div class="table__header table-col--18">Subnet</div>
                                   <div class="table__header table-col--27">IP Address</div>
                               </div>
@@ -667,43 +636,48 @@
                                           data-ng-if="!isController && isNodeEditingAllowed()">
                                       <label for="{$ getUniqueKey(interface) $}"></label>
                                   </div>
-                                  <div class="table__data table-col--12" aria-label="Name" data-ng-show="column == 'name'">
+                                  <div class="table__data table-col--12" aria-label="Name" data-ng-if="!isDevice" data-ng-show="column == 'name'">
                                       <span data-ng-if="!isEditing(interface)">{$ interface.name $}</span>
                                       <input type="text" class="table__input"
                                           data-ng-if="isEditing(interface) && interface.type != 'vlan'"
                                           data-ng-model="editInterface.name"
                                           data-ng-class="{ 'has-error': isInterfaceNameInvalid(editInterface) }">
                                   </div>
-                                  <div class="table__data table-col--12 ng-hide" data-ng-show="column == 'mac'">
+                                  <div class="table__data table-col--12 ng-hide" data-ng-if="!isDevice" data-ng-show="column == 'mac'">
                                       {$ interface.mac_address $}
                                   </div>
+                                  <div class="table__data table-col--12" data-ng-if="isDevice">{$ interface.mac_address $}</div>
                                   <div class="table__data table-col--3 u-align--center" aria-label="Boot interface">
                                       <input type="radio" name="bootInterface" id="{$ interface.name $}" checked
-                                          data-ng-if="!isController && isBootInterface(interface)" class="u-display--desktop">
+                                          data-ng-if="!isController && !isDevice && isBootInterface(interface)" class="u-display--desktop">
                                       <label for="{$ interface.name $}" class="u-display--desktop"></label>
-                                      <span class="u-display--mobile" data-ng-if="!isController && isBootInterface(interface)">Yes</span>
-                                      <span class="u-display--mobile" data-ng-if="!isController && !isBootInterface(interface)">No</span>
+                                      <span class="u-display--mobile" data-ng-if="!isController && !isDevice && isBootInterface(interface)">Yes</span>
+                                      <span class="u-display--mobile" data-ng-if="!isController && !isDevice && !isBootInterface(interface)">No</span>
                                   </div>
                                   <div class="table__data table-col--9" aria-label="Type">
-                                      <span data-ng-if="!isEditing(interface)">{$ getInterfaceTypeText(interface) $}</span>
+                                      <span data-ng-if="!isDevice && !isEditing(interface)">{$ getInterfaceTypeText(interface) $}</span>
                                   </div>
                                   <div class="table__data table-col--14" aria-label="Fabric">
-                                      <span data-ng-if="!isEditing(interface)">{$ interface.fabric.name || "Disconnected" $}</span>
+                                      <span data-ng-if="!isDevice && !isEditing(interface)">{$ interface.fabric.name || "Disconnected" $}</span>
+                                      <span data-ng-if="isDevice && !isEditing(interface)">{$ getDeviceIPAssignment(interface.ip_assignment) $}</span>
                                   </div>
                                   <div class="table__data table-col--14" aria-label="VLAN">
-                                      <span data-ng-if="!isEditing(interface)">{$ getVLANText(interface.vlan) $}</span>
+                                      <span data-ng-if="!isDevice && !isEditing(interface)">{$ getVLANText(interface.vlan) $}</span>
                                   </div>
                                   <div class="table__data table-col--18" aria-label="Subnet">
-                                      <span data-ng-if="!isEditing(interface) && interface.fabric">{$ getSubnetText(interface.subnet) $}</span>
+                                      <span data-ng-if="!isEditing(interface) && ((isDevice && interface.subnet) || interface.fabric)">{$ getSubnetText(interface.subnet) $}</span>
                                       <span data-ng-if="isAllNetworkingDisabled() && interface.discovered[0].subnet_id">
                                           {$ getSubnetText(getSubnet(interface.discovered[0].subnet_id)) $}
                                       </span>
                                   </div>
                                   <div class="table__data table-col--19" aria-label="IP Address">
-                                      <span data-ng-if="!isEditing(interface) && !interface.discovered[0].ip_address && interface.fabric">
+                                      <span data-ng-if="isDevice">
+                                          {$ interface.ip_address $}
+                                      </span>
+                                      <span data-ng-if="!isDevice && !isEditing(interface) && !interface.discovered[0].ip_address && interface.fabric" >
                                           {$ interface.ip_address $} ({$ getLinkModeText(interface) $})
                                       </span>
-                                      <span data-ng-if="!isEditing(interface) && interface.discovered[0].ip_address && interface.fabric">
+                                      <span data-ng-if="!isDevice && !isEditing(interface) && interface.discovered[0].ip_address && interface.fabric">
                                           {$ interface.discovered[0].ip_address $} (DHCP)
                                       </span>
                                   </div>
@@ -711,7 +685,7 @@
                                       <div class="table__controls u-align--right" data-ng-if="isNodeEditingAllowed() || isLimitedEditingAllowed(interface)">
                                           <a class="u-display--desktop icon icon--add tooltip"
                                               aria-label="Add Alias or VLAN"
-                                              data-ng-if="canAddAliasOrVLAN(interface)"
+                                              data-ng-if="!isDevice && canAddAliasOrVLAN(interface)"
                                               data-ng-click="quickAdd(interface)"></a>
                                           <a class="u-display--desktop icon icon--edit tooltip"
                                               data-ng-if="!cannotEditInterface(interface)"
@@ -723,7 +697,7 @@
                                               data-ng-click="quickRemove(interface)"></a>
                                           <a class="button--secondary u-display--mobile"
                                               aria-label="Add Alias or VLAN"
-                                              data-ng-if="canAddAliasOrVLAN(interface)"
+                                              data-ng-if="!isDevice && canAddAliasOrVLAN(interface)"
                                               data-ng-click="quickAdd(interface)">Add alias or VLAN</a>
                                           <a class="button--secondary u-display--mobile"
                                               data-ng-if="!cannotEditInterface(interface)"
@@ -837,8 +811,10 @@
                                               <div class="table__data table-col--100" data-ng-if="isEditing(interface)">
                                                   <fieldset class="form__fieldset six-col">
                                                       <dl>
+                                                        <span data-ng-if="!isDevice">
                                                           <dt class="two-col">Type</dt>
                                                               <dd class="four-col last-col">{$ getInterfaceTypeText(interface) $}</dd>
+                                                        </span>
                                                       </dl>
                                                       <div class="form__group" data-ng-if="interface.type != 'alias' && interface.type != 'vlan'">
                                                           <label for="mac" class="two-col">MAC address</label>
@@ -847,14 +823,14 @@
                                                               data-ng-model="editInterface.mac_address"
                                                               data-ng-class="{ 'has-error': isMACAddressInvalid(editInterface.mac_address, true) }">
                                                       </div>
-                                                      <div class="form__group" data-ng-if="!isLimitedEditingAllowed(interface)">
+                                                      <div class="form__group" data-ng-if="!isDevice && !isLimitedEditingAllowed(interface)">
                                                           <label class="two-col" data-ng-if="interface.type != 'alias'">Tags</label>
                                                           <div class="form__group-input three-col last-col" data-ng-if="interface.type != 'alias'">
                                                               <tags-input ng-model="editInterface.tags" allow-tags-pattern="[\w-]+"></tags-input>
                                                           </div>
                                                       </div>
                                                   </fieldset>
-                                                  <fieldset class="form__fieldset six-col last-col" data-ng-if="!isLimitedEditingAllowed(interface)">
+                                                  <fieldset class="form__fieldset six-col last-col" data-ng-if="!isDevice && !isLimitedEditingAllowed(interface)">
                                                       <div class="form__group">
                                                           <label for="fabric" class="two-col">Fabric</label>
                                                           <select name="fabric" class="three-col"
@@ -904,6 +880,37 @@
                                                           </div>
                                                       </div>
                                                   </fieldset>
+                                                  <fieldset class="form__fieldset six-col last-col" data-ng-if="isDevice && !isLimitedEditingAllowed(interface)">
+                                                      <div class="form__group">
+                                                          <label for="ip-assignment" class="two-col">IP Assignment</label>
+                                                          <select name="ip-assignment" class="three-col"
+                                                              ng-model="editInterface.ip_assignment"
+                                                              data-ng-change="ipAssignementChanged(editInterface)"
+                                                              data-ng-options="assignment.name as assignment.text for assignment in ipAssignments">
+                                                          </select>
+                                                      </div>
+                                                      <div class="form__group" data-ng-if="editInterface.ip_assignment === 'static'">
+                                                          <label for="subnet" class="two-col">Subnet</label>
+                                                          <select name="subnet" class="three-col"
+                                                              ng-model="editInterface.subnet"
+                                                              data-ng-change="subnetChanged(newInterface)"
+                                                              data-ng-options="subnet as getSubnetText(subnet) for subnet in subnets">
+                                                              <option value="" data-ng-hide="interface.links.length > 1">Unconfigured</option>
+                                                          </select>
+                                                      </div>
+                                                      <div class="form__group" data-ng-if="editInterface.ip_assignment !== 'dynamic'">
+                                                          <label for="ip-address" class="two-col">IP address</label>
+                                                          <div class="form__group-input three-col last-col">
+                                                              <input name="ip-address" type="text"
+                                                                  placeholder="IP address (optional)"
+                                                                  ng-model="editInterface.ip_address"
+                                                                  data-ng-class="{ 'has-error': isIPAddressInvalid(editInterface) }">
+                                                              <ul class="errors u-margin--bottom-none form__group--errors" data-ng-if="getInterfaceError(editInterface)">
+                                                                  <li>{$ getInterfaceError(editInterface) $}</li>
+                                                              </ul>
+                                                          </div>
+                                                      </div>
+                                                  </fieldset>
                                               </div>
                                           </div>
                                           <div class="table__row is-active" data-ng-if="isShowingDeleteConfirm()">
@@ -1124,7 +1131,7 @@
                                       <input type="checkbox" class="checkbox" id="interface-create" disabled="disabled" checked />
                                       <label for="interface-create"></label>
                                   </div>
-                                  <div class="table__data table-col--12">
+                                  <div class="table__data table-col--12" data-ng-if="!isDevice">
                                       <input type="text" class="table__input"
                                           data-ng-class="{ 'has-error': isInterfaceNameInvalid(newInterface) }"
                                           data-ng-model="newInterface.name">
@@ -1138,7 +1145,15 @@
                                       </div>
                                       <div class="table__row form form--stack is-active">
                                           <div class="table__data table-col--100">
-                                              <div class="form__fieldset six-col">
+                                              <div class="table__data table-col--12" data-ng-if="isDevice">
+                                                  <div class="form__group">
+                                                      <label for="mac" class="three-col">MAC address</label>
+                                                      <input type="text" name="mac" class="table__input"
+                                                          data-ng-model="newInterface.macAddress"
+                                                          data-ng-class="{ 'has-error': isMACAddressInvalid(newInterface.macAddress, false) || newInterface.macError }">
+                                                  </div>
+                                              </div>
+                                              <div class="form__fieldset six-col" data-ng-if="!isDevice">
                                                   <div class="form__group u-display--mobile">
                                                       <label for="new-interface-name" class="two-col">Name</label>
                                                       <input type="text" class="three-col" id="new-interface-name"
@@ -1162,7 +1177,8 @@
                                                       </div>
                                                   </div>
                                               </div>
-                                              <div class="form__fieldset six-col last-col">
+                                              <span data-ng-if="!isDevice">
+                                                <div class="form__fieldset six-col last-col">
                                                   <div class="form__group">
                                                       <label for="fabric" class="two-col">Fabric</label>
                                                       <select name="fabric" class="three-col"
@@ -1203,7 +1219,41 @@
                                                           ng-model="newInterface.ip_address"
                                                           data-ng-class="{ 'has-error': isIPAddressInvalid(newInterface) }">
                                                   </div>
-                                              </div>
+                                                </div>
+                                              </span>
+                                              <span data-ng-if="isDevice">
+                                                <div class="form__fieldset six-col last-col">
+                                                  <div class="form__group">
+                                                      <label for="ip-assignment" class="two-col">IP Assignment</label>
+                                                      <select name="ip-assignment" class="three-col"
+                                                          ng-model="newInterface.ip_assignment"
+                                                          data-ng-change="ipAssignementChanged(newInterface)"
+                                                          data-ng-options="assignment.name as assignment.text for assignment in ipAssignments">
+                                                      </select>
+                                                  </div>
+                                                  <div class="form__group" data-ng-if="newInterface.ip_assignment === 'static'">
+                                                      <label for="subnet" class="two-col">Subnet</label>
+                                                      <select name="subnet" class="three-col"
+                                                          ng-model="newInterface.subnet"
+                                                          data-ng-change="subnetChanged(newInterface)"
+                                                          data-ng-options="subnet as getSubnetText(subnet) for subnet in subnets">
+                                                          <option value="" data-ng-hide="interface.links.length > 1">Unconfigured</option>
+                                                      </select>
+                                                  </div>
+                                                  <div class="form__group" data-ng-if="newInterface.ip_assignment !== 'dynamic'">
+                                                      <label for="ip-address" class="two-col">IP address</label>
+                                                      <div class="form__group-input three-col last-col">
+                                                          <input name="ip-address" type="text"
+                                                              placeholder="IP address (optional)"
+                                                              ng-model="newInterface.ip_address"
+                                                              data-ng-class="{ 'has-error': isIPAddressInvalid(newInterface) }">
+                                                          <ul class="errors u-margin--bottom-none form__group--errors" data-ng-if="getInterfaceError(newInterface)">
+                                                              <li>{$ getInterfaceError(newInterface) $}</li>
+                                                          </ul>
+                                                      </div>
+                                                  </div>
+                                                </div>
+                                              </span>
                                           </div>
                                       </div>
                                       <div class="table__row is-active">
@@ -1221,7 +1271,7 @@
                               </div>
                           </main>
                       </div>
-                      <div data-ng-if="!isController" data-ng-hide="isAllNetworkingDisabled() || isShowingCreateBond() || isShowingCreatePhysical()">
+                      <div data-ng-if="!isController && !isDevice" data-ng-hide="isAllNetworkingDisabled() || isShowingCreateBond() || isShowingCreatePhysical()">
                           <a class="button--secondary button--inline"
                               data-ng-disabled="selectedMode !== null"
                               data-ng-click="showCreatePhysical()">Add interface</a>
@@ -1232,12 +1282,17 @@
                               data-ng-disabled="!canCreateBridge()"
                               data-ng-click="showCreateBridge()">Create bridge</a>
                       </div>
+                      <div data-ng-if="isDevice" data-ng-hide="isAllNetworkingDisabled() || isShowingCreateBond() || isShowingCreatePhysical()">
+                          <a class="button--secondary button--inline"
+                              data-ng-disabled="selectedMode !== null"
+                              data-ng-click="showCreatePhysical()">Add interface</a>
+                      </div>
                     </div>
                 </form>
             </div>
         </div>
     </div>
-    <div class="row" id="storage" data-ng-hide="isController">
+    <div class="row" id="storage" data-ng-if="!isController && !isDevice">
         <div class="wrapper--inner" ng-controller="NodeStorageController">
             <form>
                 <div class="twelve-col">
@@ -2223,7 +2278,7 @@
             </form>
         </div>
     </div>
-    <div class="row" id="events" data-ng-hide="isController">
+    <div class="row" id="events" data-ng-if="!isController && !isDevice">
         <div class="wrapper--inner">
             <div class="eight-col">
                 <h2 class="title">Latest {$ type_name $} events</h2>

=== modified file 'src/maasserver/static/partials/nodes-list.html'
--- src/maasserver/static/partials/nodes-list.html	2017-02-17 14:23:04 +0000
+++ src/maasserver/static/partials/nodes-list.html	2017-02-28 04:16:58 +0000
@@ -902,7 +902,9 @@
                         <input type="checkbox" class="checkbox" data-ng-click="toggleChecked(device, 'devices')" data-ng-checked="device.$selected" id="{$ device.fqdn $}" data-ng-disabled="hasActionsInProgress('devices')"/>
                         <label for="{$ device.fqdn $}" class="checkbox-label"></label>
                     </td>
-                    <td class="table-col--24" aria-label="FQDN">{$ device.fqdn $}</td>
+                    <td class="table-col--24" aria-label="FQDN">
+                        <a href="#/node/device/{$ device.system_id $}">{$ device.fqdn $}</a>
+                    </td>
                     <td class="table-col--25" aria-label="MAC">
                         {$ device.primary_mac $}
                         <span class="extra-macs" data-ng-show="device.extra_macs.length">(+{$ device.extra_macs.length $})</span>

=== modified file 'src/maasserver/websockets/handlers/device.py'
--- src/maasserver/websockets/handlers/device.py	2017-02-17 21:27:46 +0000
+++ src/maasserver/websockets/handlers/device.py	2017-02-28 04:16:58 +0000
@@ -7,7 +7,9 @@
     "DeviceHandler",
     ]
 
+from django.core.exceptions import ValidationError
 from maasserver.enum import (
+    DEVICE_IP_ASSIGNMENT_TYPE,
     INTERFACE_LINK_TYPE,
     IPADDRESS_TYPE,
     NODE_PERMISSION,
@@ -17,7 +19,11 @@
     DeviceForm,
     DeviceWithMACsForm,
 )
-from maasserver.forms.interface import PhysicalInterfaceForm
+from maasserver.forms.interface import (
+    InterfaceForm,
+    PhysicalInterfaceForm,
+)
+from maasserver.models.interface import Interface
 from maasserver.models.node import Device
 from maasserver.models.staticipaddress import StaticIPAddress
 from maasserver.models.subnet import Subnet
@@ -26,6 +32,7 @@
 from maasserver.websockets.base import (
     HandlerDoesNotExistError,
     HandlerError,
+    HandlerPermissionError,
     HandlerValidationError,
 )
 from maasserver.websockets.handlers.node import (
@@ -39,20 +46,6 @@
 maaslog = get_maas_logger("websockets.device")
 
 
-class DEVICE_IP_ASSIGNMENT:
-    """The vocabulary of a `Device`'s possible IP assignment type. This value
-    is calculated by looking at the overall model for a `Device`. This is not
-    set directly on the model."""
-    #: Device is outside of MAAS control.
-    EXTERNAL = "external"
-
-    #: Device receives ip address from `NodeGroupInterface` dynamic range.
-    DYNAMIC = "dynamic"
-
-    #: Device has ip address assigned from `NodeGroupInterface` static range.
-    STATIC = "static"
-
-
 def get_Interface_from_list(interfaces, mac):
     """Return the `Interface` object with the given MAC address."""
     # Compare using EUI instances so that we're not concerned with a MAC's
@@ -77,6 +70,12 @@
             'set_active',
             'create',
             'create_interface',
+            'create_physical',
+            'update_interface',
+            'delete_interface',
+            'link_subnet',
+            'unlink_subnet',
+            'update',
             'action']
         exclude = [
             "creation_type",
@@ -149,32 +148,39 @@
 
     def dehydrate(self, obj, data, for_list=False):
         """Add extra fields to `data`."""
-        data["fqdn"] = obj.fqdn
-        data["actions"] = list(compile_node_actions(obj, self.user).keys())
-        data["node_type_display"] = obj.get_node_type_display()
+        data = super().dehydrate(obj, data, for_list=for_list)
 
+        # We handle interfaces ourselves, because of ip_assignment.
         boot_interface = obj.get_boot_interface()
         data["primary_mac"] = (
             "%s" % boot_interface.mac_address
             if boot_interface is not None else "")
-        data["extra_macs"] = [
-            "%s" % interface.mac_address
-            for interface in obj.interface_set.all()
-            if interface != boot_interface
-            ]
-
-        data["ip_assignment"] = self.dehydrate_ip_assignment(
-            obj, boot_interface)
-        data["ip_address"] = self.dehydrate_ip_address(
-            obj, boot_interface)
-
-        data["tags"] = [
-            tag.name
-            for tag in obj.tags.all()
-            ]
-        return data
-
-    def _get_first_none_discovered_ip(self, ip_addresses):
+
+        if for_list:
+            data["ip_assignment"] = self.dehydrate_ip_assignment(
+                obj, boot_interface)
+            data["ip_address"] = self.dehydrate_ip_address(obj, boot_interface)
+        else:
+            data["interfaces"] = [
+                self.dehydrate_interface(interface, obj)
+                for interface in obj.interface_set.all().order_by('name')
+            ]
+            # Propogate the boot interface ip assignment/address to the device.
+            for iface_data in data["interfaces"]:
+                if iface_data["name"] == boot_interface.name:
+                    data["ip_assignment"] = iface_data["ip_assignment"]
+                    data["ip_address"] = iface_data["ip_address"]
+
+        return data
+
+    def dehydrate_interface(self, interface, obj):
+        """Add extra fields to interface data."""
+        data = super().dehydrate_interface(interface, obj)
+        data["ip_assignment"] = self.dehydrate_ip_assignment(obj, interface)
+        data["ip_address"] = self.dehydrate_ip_address(obj, interface)
+        return data
+
+    def _get_first_non_discovered_ip(self, ip_addresses):
         for ip in ip_addresses:
             if ip.alloc_type != IPADDRESS_TYPE.DISCOVERED:
                 return ip
@@ -190,15 +196,15 @@
             return ""
         # We get the IP address from the all() so the cache is used.
         ip_addresses = list(interface.ip_addresses.all())
-        first_ip = self._get_first_none_discovered_ip(ip_addresses)
+        first_ip = self._get_first_non_discovered_ip(ip_addresses)
         if first_ip is not None:
             if first_ip.alloc_type == IPADDRESS_TYPE.DHCP:
-                return DEVICE_IP_ASSIGNMENT.DYNAMIC
+                return DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC
             elif first_ip.subnet is None:
-                return DEVICE_IP_ASSIGNMENT.EXTERNAL
+                return DEVICE_IP_ASSIGNMENT_TYPE.EXTERNAL
             else:
-                return DEVICE_IP_ASSIGNMENT.STATIC
-        return DEVICE_IP_ASSIGNMENT.DYNAMIC
+                return DEVICE_IP_ASSIGNMENT_TYPE.STATIC
+        return DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC
 
     def dehydrate_ip_address(self, obj, interface):
         """Return the IP address for the device."""
@@ -207,7 +213,7 @@
 
         # Get ip address from StaticIPAddress if available.
         ip_addresses = list(interface.ip_addresses.all())
-        first_ip = self._get_first_none_discovered_ip(ip_addresses)
+        first_ip = self._get_first_non_discovered_ip(ip_addresses)
         if first_ip is not None:
             if first_ip.alloc_type == IPADDRESS_TYPE.DHCP:
                 discovered_ip = self._get_first_discovered_ip_with_ip(
@@ -254,6 +260,8 @@
             "parent": params.get("parent"),
             }
 
+        if "zone" in params:
+            new_params["zone"] = params["zone"]["name"]
         if "domain" in params:
             new_params["domain"] = params["domain"]["name"]
 
@@ -268,16 +276,17 @@
     def _configure_interface(self, interface, params):
         """Configure the interface based on the selection."""
         ip_assignment = params["ip_assignment"]
-        if ip_assignment == DEVICE_IP_ASSIGNMENT.EXTERNAL:
+        interface.ip_addresses.all().delete()
+        if ip_assignment == DEVICE_IP_ASSIGNMENT_TYPE.EXTERNAL:
             subnet = Subnet.objects.get_best_subnet_for_ip(
                 params["ip_address"])
             sticky_ip = StaticIPAddress.objects.create(
                 alloc_type=IPADDRESS_TYPE.USER_RESERVED,
                 ip=params["ip_address"], subnet=subnet, user=self.user)
             interface.ip_addresses.add(sticky_ip)
-        elif ip_assignment == DEVICE_IP_ASSIGNMENT.DYNAMIC:
+        elif ip_assignment == DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC:
             interface.link_subnet(INTERFACE_LINK_TYPE.DHCP, None)
-        elif ip_assignment == DEVICE_IP_ASSIGNMENT.STATIC:
+        elif ip_assignment == DEVICE_IP_ASSIGNMENT_TYPE.STATIC:
             # Convert an empty string to None.
             ip_address = params.get("ip_address")
             if not ip_address:
@@ -316,6 +325,76 @@
         else:
             raise HandlerValidationError(form.errors)
 
+    def create_physical(self, params):
+        """Create a physical interface, an alias for create_interface."""
+        return self.create_interface(params)
+
+    def update_interface(self, params):
+        """Update the interface."""
+        # Only admin users can perform update.
+        if not reload_object(self.user).is_superuser:
+            raise HandlerPermissionError()
+
+        device = self.get_object(params)
+        interface = Interface.objects.get(
+            node=device, id=params["interface_id"])
+        interface_form = InterfaceForm.get_interface_form(interface.type)
+        form = interface_form(instance=interface, data=params)
+        if form.is_valid():
+            interface = form.save()
+            self._configure_interface(interface, params)
+            return self.full_dehydrate(reload_object(device))
+        else:
+            raise ValidationError(form.errors)
+
+    def delete_interface(self, params):
+        """Delete the interface."""
+        # Only admin users can perform delete.
+        if not reload_object(self.user).is_superuser:
+            raise HandlerPermissionError()
+
+        node = self.get_object(params)
+        interface = Interface.objects.get(node=node, id=params["interface_id"])
+        interface.delete()
+
+    def link_subnet(self, params):
+        """Create or update the link."""
+        # Only admin users can perform update.
+        if not reload_object(self.user).is_superuser:
+            raise HandlerPermissionError()
+
+        node = self.get_object(params)
+        interface = Interface.objects.get(node=node, id=params["interface_id"])
+        if params['ip_assignment'] == DEVICE_IP_ASSIGNMENT_TYPE.STATIC:
+            mode = INTERFACE_LINK_TYPE.STATIC
+        elif params['ip_assignment'] == DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC:
+            mode = INTERFACE_LINK_TYPE.DHCP
+        else:
+            mode = INTERFACE_LINK_TYPE.LINK_UP
+        subnet = None
+        if "subnet" in params:
+            subnet = Subnet.objects.get(id=params["subnet"])
+        if "link_id" in params:
+            # We are updating an already existing link.
+            interface.update_link_by_id(
+                params["link_id"], mode, subnet,
+                ip_address=params.get("ip_address", None))
+        elif params['ip_assignment'] == DEVICE_IP_ASSIGNMENT_TYPE.STATIC:
+            # We are creating a new link.
+            interface.link_subnet(
+                INTERFACE_LINK_TYPE.STATIC, subnet,
+                ip_address=params.get("ip_address", None))
+
+    def unlink_subnet(self, params):
+        """Delete the link."""
+        # Only admin users can perform unlink.
+        if not reload_object(self.user).is_superuser:
+            raise HandlerPermissionError()
+
+        node = self.get_object(params)
+        interface = Interface.objects.get(node=node, id=params["interface_id"])
+        interface.unlink_subnet_by_id(params["link_id"])
+
     def action(self, params):
         """Perform the action on the object."""
         obj = self.get_object(params)
@@ -327,3 +406,11 @@
                 "%s action is not available for this device." % action_name)
         extra_params = params.get("extra", {})
         return action.execute(**extra_params)
+
+    def update(self, params):
+        """Update the object from params."""
+        # Only admin users can perform update.
+        if not reload_object(self.user).is_superuser:
+            raise HandlerPermissionError()
+
+        return super().update(params)

=== modified file 'src/maasserver/websockets/handlers/node.py'
--- src/maasserver/websockets/handlers/node.py	2017-02-17 14:23:04 +0000
+++ src/maasserver/websockets/handlers/node.py	2017-02-28 04:16:58 +0000
@@ -16,6 +16,7 @@
     FILESYSTEM_FORMAT_TYPE_CHOICES,
     FILESYSTEM_FORMAT_TYPE_CHOICES_DICT,
     NODE_STATUS,
+    NODE_TYPE,
 )
 from maasserver.models.cacheset import CacheSet
 from maasserver.models.config import Config
@@ -99,36 +100,13 @@
     def dehydrate(self, obj, data, for_list=False):
         """Add extra fields to `data`."""
         data["fqdn"] = obj.fqdn
-        data["status"] = obj.display_status()
-        data["status_code"] = obj.status
         data["actions"] = list(compile_node_actions(obj, self.user).keys())
-        data["memory"] = obj.display_memory()
         data["node_type_display"] = obj.get_node_type_display()
 
         data["extra_macs"] = [
             "%s" % mac_address
             for mac_address in obj.get_extra_macs()
         ]
-        boot_interface = obj.get_boot_interface()
-        if boot_interface is not None:
-            data["pxe_mac"] = "%s" % boot_interface.mac_address
-            data["pxe_mac_vendor"] = obj.get_pxe_mac_vendor()
-        else:
-            data["pxe_mac"] = data["pxe_mac_vendor"] = ""
-
-        blockdevices = self.get_blockdevices_for(obj)
-        physical_blockdevices = [
-            blockdevice for blockdevice in blockdevices
-            if isinstance(blockdevice, PhysicalBlockDevice)
-            ]
-        data["physical_disk_count"] = len(physical_blockdevices)
-        data["storage"] = "%3.1f" % (
-            sum([
-                blockdevice.size
-                for blockdevice in physical_blockdevices
-                ]) / (1000 ** 3))
-        data["storage_tags"] = self.get_all_storage_tags(blockdevices)
-
         subnets = self.get_all_subnets(obj)
         data["subnets"] = [subnet.cidr for subnet in subnets]
         data["fabrics"] = self.get_all_fabric_names(obj, subnets)
@@ -138,73 +116,100 @@
             tag.name
             for tag in obj.tags.all()
         ]
-        data["osystem"] = obj.get_osystem(
-            default=self.default_osystem)
-        data["distro_series"] = obj.get_distro_series(
-            default=self.default_distro_series)
-        data["dhcp_on"] = self.get_providing_dhcp(obj)
+        if obj.node_type != NODE_TYPE.DEVICE:
+            data["memory"] = obj.display_memory()
+            data["status"] = obj.display_status()
+            data["status_code"] = obj.status
+            boot_interface = obj.get_boot_interface()
+            if boot_interface is not None:
+                data["pxe_mac"] = "%s" % boot_interface.mac_address
+                data["pxe_mac_vendor"] = obj.get_pxe_mac_vendor()
+            else:
+                data["pxe_mac"] = data["pxe_mac_vendor"] = ""
+
+            blockdevices = self.get_blockdevices_for(obj)
+            physical_blockdevices = [
+                blockdevice for blockdevice in blockdevices
+                if isinstance(blockdevice, PhysicalBlockDevice)
+                ]
+            data["physical_disk_count"] = len(physical_blockdevices)
+            data["storage"] = "%3.1f" % (
+                sum(
+                    blockdevice.size
+                    for blockdevice in physical_blockdevices
+                    ) / (1000 ** 3))
+            data["storage_tags"] = self.get_all_storage_tags(blockdevices)
+
+            data["osystem"] = obj.get_osystem(
+                default=self.default_osystem)
+            data["distro_series"] = obj.get_distro_series(
+                default=self.default_distro_series)
+            data["dhcp_on"] = self.get_providing_dhcp(obj)
         if not for_list:
-            data["hwe_kernel"] = make_hwe_kernel_ui_text(obj.hwe_kernel)
-
-            data["power_type"] = obj.power_type
-            data["power_parameters"] = self.dehydrate_power_parameters(
-                obj.power_parameters)
-            data["power_bmc_node_count"] = obj.bmc.node_set.count() if (
-                obj.bmc is not None) else 0
-
-            # Network
-            data["interfaces"] = [
-                self.dehydrate_interface(interface, obj)
-                for interface in obj.interface_set.all().order_by('name')
-            ]
             data["on_network"] = obj.on_network()
-
-            # Storage
-            data["disks"] = sorted(chain(
-                (self.dehydrate_blockdevice(blockdevice, obj)
-                 for blockdevice in blockdevices),
-                (self.dehydrate_volume_group(volume_group) for volume_group
-                 in VolumeGroup.objects.filter_by_node(obj)),
-                (self.dehydrate_cache_set(cache_set) for cache_set
-                 in CacheSet.objects.get_cache_sets_for_node(obj)),
-            ), key=itemgetter("name"))
-            data["supported_filesystems"] = [
-                {'key': key, 'ui': ui}
-                for key, ui in FILESYSTEM_FORMAT_TYPE_CHOICES
-            ]
-            data["storage_layout_issues"] = obj.storage_layout_issues()
-            data["special_filesystems"] = [
-                self.dehydrate_filesystem(filesystem)
-                for filesystem in obj.special_filesystems.order_by("id")
-            ]
-
-            # Events
-            data["events"] = self.dehydrate_events(obj)
-
-            # Machine output
-            data = self.dehydrate_summary_output(obj, data)
-            # XXX ltrager 2017-01-27 - Show the testing results in the
-            # commissioning table until we get the testing UI done.
-            if obj.current_testing_script_set is not None:
-                data["commissioning_results"] = self.dehydrate_script_set(
-                    chain(
-                        obj.current_commissioning_script_set,
-                        obj.current_testing_script_set,
-                    ))
-            else:
-                data["commissioning_results"] = self.dehydrate_script_set(
-                    obj.current_commissioning_script_set)
-            data["installation_results"] = self.dehydrate_script_set(
-                obj.current_installation_script_set)
-
-            # Third party drivers
-            if Config.objects.get_config('enable_third_party_drivers'):
-                driver = get_third_party_driver(obj)
-                if "module" in driver and "comment" in driver:
-                    data["third_party_driver"] = {
-                        "module": driver["module"],
-                        "comment": driver["comment"],
-                    }
+            if obj.node_type != NODE_TYPE.DEVICE:
+                # XXX lamont 2017-02-15 Much of this should be split out into
+                # individual methods, rather than having this huge block of
+                # dense code here.
+                # Network
+                data["interfaces"] = [
+                    self.dehydrate_interface(interface, obj)
+                    for interface in obj.interface_set.all().order_by('name')
+                ]
+
+                data["hwe_kernel"] = make_hwe_kernel_ui_text(obj.hwe_kernel)
+
+                data["power_type"] = obj.power_type
+                data["power_parameters"] = self.dehydrate_power_parameters(
+                    obj.power_parameters)
+                data["power_bmc_node_count"] = obj.bmc.node_set.count() if (
+                    obj.bmc is not None) else 0
+
+                # Storage
+                data["disks"] = sorted(chain(
+                    (self.dehydrate_blockdevice(blockdevice, obj)
+                     for blockdevice in blockdevices),
+                    (self.dehydrate_volume_group(volume_group) for volume_group
+                     in VolumeGroup.objects.filter_by_node(obj)),
+                    (self.dehydrate_cache_set(cache_set) for cache_set
+                     in CacheSet.objects.get_cache_sets_for_node(obj)),
+                ), key=itemgetter("name"))
+                data["supported_filesystems"] = [
+                    {'key': key, 'ui': ui}
+                    for key, ui in FILESYSTEM_FORMAT_TYPE_CHOICES
+                ]
+                data["storage_layout_issues"] = obj.storage_layout_issues()
+                data["special_filesystems"] = [
+                    self.dehydrate_filesystem(filesystem)
+                    for filesystem in obj.special_filesystems.order_by("id")
+                ]
+
+                # Events
+                data["events"] = self.dehydrate_events(obj)
+
+                # Machine output
+                data = self.dehydrate_summary_output(obj, data)
+                # XXX ltrager 2017-01-27 - Show the testing results in the
+                # commissioning table until we get the testing UI done.
+                if obj.current_testing_script_set is not None:
+                    data["commissioning_results"] = self.dehydrate_script_set(
+                        chain(
+                            obj.current_commissioning_script_set,
+                            obj.current_testing_script_set,
+                        ))
+                else:
+                    data["commissioning_results"] = self.dehydrate_script_set(
+                        obj.current_commissioning_script_set)
+                data["installation_results"] = self.dehydrate_script_set(
+                    obj.current_installation_script_set)
+                # Third party drivers
+                if Config.objects.get_config('enable_third_party_drivers'):
+                    driver = get_third_party_driver(obj)
+                    if "module" in driver and "comment" in driver:
+                        data["third_party_driver"] = {
+                            "module": driver["module"],
+                            "comment": driver["comment"],
+                        }
 
         return data
 
@@ -495,8 +500,8 @@
     def get_all_space_names(self, subnets):
         space_names = set()
         for subnet in subnets:
-            if subnet.space is not None:
-                space_names.add(subnet.space.name)
+            if subnet.vlan.space is not None:
+                space_names.add(subnet.vlan.space.name)
         return list(space_names)
 
     def get_blockdevices_for(self, obj):

=== modified file 'src/maasserver/websockets/handlers/tests/test_device.py'
--- src/maasserver/websockets/handlers/tests/test_device.py	2017-01-28 00:51:47 +0000
+++ src/maasserver/websockets/handlers/tests/test_device.py	2017-02-28 04:16:58 +0000
@@ -5,7 +5,15 @@
 
 __all__ = []
 
+from operator import itemgetter
+import random
+from unittest.mock import ANY
+
 from maasserver.enum import (
+    DEVICE_IP_ASSIGNMENT_TYPE,
+    DEVICE_IP_ASSIGNMENT_TYPE_CHOICES,
+    INTERFACE_LINK_TYPE,
+    INTERFACE_TYPE,
     IPADDRESS_TYPE,
     NODE_TYPE,
 )
@@ -28,13 +36,17 @@
     dehydrate_datetime,
     HandlerDoesNotExistError,
     HandlerError,
+    HandlerPermissionError,
     HandlerValidationError,
 )
-from maasserver.websockets.handlers.device import (
-    DEVICE_IP_ASSIGNMENT,
-    DeviceHandler,
-)
+from maasserver.websockets.handlers.device import DeviceHandler
 from maastesting.djangotestcase import count_queries
+from maastesting.matchers import MockCalledOnceWith
+from maastesting.matchers import MockNotCalled
+from netaddr import (
+    IPAddress,
+    IPNetwork,
+)
 from testtools import ExpectedException
 from testtools.matchers import (
     Equals,
@@ -44,27 +56,25 @@
 
 class TestDeviceHandler(MAASTransactionServerTestCase):
 
-    def dehydrate_ip_assignment(self, device):
-        boot_interface = device.get_boot_interface()
-        if boot_interface is None:
+    def dehydrate_ip_assignment(self, device, interface):
+        if interface is None:
             return ""
-        ip_address = boot_interface.ip_addresses.exclude(
+        ip_address = interface.ip_addresses.exclude(
             alloc_type=IPADDRESS_TYPE.DISCOVERED).first()
         if ip_address is not None:
             if ip_address.alloc_type == IPADDRESS_TYPE.DHCP:
-                return DEVICE_IP_ASSIGNMENT.DYNAMIC
+                return DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC
             elif ip_address.subnet is None:
-                return DEVICE_IP_ASSIGNMENT.EXTERNAL
+                return DEVICE_IP_ASSIGNMENT_TYPE.EXTERNAL
             else:
-                return DEVICE_IP_ASSIGNMENT.STATIC
-        return DEVICE_IP_ASSIGNMENT.DYNAMIC
+                return DEVICE_IP_ASSIGNMENT_TYPE.STATIC
+        return DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC
 
-    def dehydrate_ip_address(self, device):
+    def dehydrate_ip_address(self, device, interface):
         """Return the IP address for the device."""
-        boot_interface = device.get_boot_interface()
-        if boot_interface is None:
+        if interface is None:
             return None
-        static_ip = boot_interface.ip_addresses.exclude(
+        static_ip = interface.ip_addresses.exclude(
             alloc_type=IPADDRESS_TYPE.DISCOVERED).first()
         if static_ip is not None:
             ip = static_ip.get_ip()
@@ -72,8 +82,58 @@
                 return "%s" % ip
         return None
 
+    def dehydrate_interface(self, interface, obj):
+        """Dehydrate a `interface` into a interface definition."""
+        # Sort the links by ID that way they show up in the same order in
+        # the UI.
+        links = sorted(interface.get_links(), key=itemgetter("id"))
+        for link in links:
+            # Replace the subnet object with the subnet_id. The client will
+            # use this information to pull the subnet information from the
+            # websocket.
+            subnet = link.pop("subnet", None)
+            if subnet is not None:
+                link["subnet_id"] = subnet.id
+        data = {
+            "id": interface.id,
+            "type": interface.type,
+            "name": interface.get_name(),
+            "enabled": interface.is_enabled(),
+            "tags": interface.tags,
+            "is_boot": interface == obj.get_boot_interface(),
+            "mac_address": "%s" % interface.mac_address,
+            "vlan_id": interface.vlan_id,
+            "parents": [
+                nic.id
+                for nic in interface.parents.all()
+            ],
+            "children": [
+                nic.child.id
+                for nic in interface.children_relationships.all()
+            ],
+            "links": links,
+            "ip_assignment": self.dehydrate_ip_assignment(obj, interface),
+            "ip_address": self.dehydrate_ip_address(obj, interface),
+        }
+        return data
+
     def dehydrate_device(self, node, user, for_list=False):
         boot_interface = node.get_boot_interface()
+        subnets = set(
+            ip_address.subnet
+            for interface in node.interface_set.all()
+            for ip_address in interface.ip_addresses.all()
+            if ip_address.subnet is not None)
+        space_names = set(
+            subnet.space.name
+            for subnet in subnets
+            if subnet.space is not None)
+        fabric_names = set(
+            iface.vlan.fabric.name
+            for iface in node.interface_set.all()
+            if iface.vlan is not None)
+        fabric_names.update({subnet.vlan.fabric.name for subnet in subnets})
+        boot_interface = node.get_boot_interface()
         data = {
             "actions": list(compile_node_actions(node, user).keys()),
             "bmc": node.bmc_id,
@@ -95,8 +155,17 @@
                 "%s" % boot_interface.mac_address),
             "parent": (
                 node.parent.system_id if node.parent is not None else None),
-            "ip_address": self.dehydrate_ip_address(node),
-            "ip_assignment": self.dehydrate_ip_assignment(node),
+            "ip_address": self.dehydrate_ip_address(node, boot_interface),
+            "ip_assignment": self.dehydrate_ip_assignment(
+                node, boot_interface),
+            "interfaces": [
+                self.dehydrate_interface(interface, node)
+                for interface in node.interface_set.all().order_by('name')
+                ],
+            "subnets": [subnet.cidr for subnet in subnets],
+            "fabrics": list(fabric_names),
+            "spaces": list(space_names),
+            "on_network": node.on_network(),
             "owner": "" if node.owner is None else node.owner.username,
             "swap_size": node.swap_size,
             "system_id": node.system_id,
@@ -121,6 +190,9 @@
                 "ip_address",
                 "ip_assignment",
                 "node_type_display",
+                "subnets",
+                "spaces",
+                "fabrics",
                 ]
             for key in list(data):
                 if key not in allowed_fields:
@@ -133,20 +205,20 @@
         for a device. This will setup the model to make sure the device will
         match `ip_assignment`."""
         if ip_assignment is None:
-            ip_assignment = factory.pick_enum(DEVICE_IP_ASSIGNMENT)
+            ip_assignment = factory.pick_enum(DEVICE_IP_ASSIGNMENT_TYPE)
         if owner is None:
             owner = factory.make_User()
         device = factory.make_Node(
             node_type=NODE_TYPE.DEVICE,
             interface=True, owner=owner)
         interface = device.get_boot_interface()
-        if ip_assignment == DEVICE_IP_ASSIGNMENT.EXTERNAL:
+        if ip_assignment == DEVICE_IP_ASSIGNMENT_TYPE.EXTERNAL:
             subnet = factory.make_Subnet()
             factory.make_StaticIPAddress(
                 alloc_type=IPADDRESS_TYPE.USER_RESERVED,
                 ip=factory.pick_ip_in_network(subnet.get_ipnetwork()),
                 subnet=subnet, user=owner)
-        elif ip_assignment == DEVICE_IP_ASSIGNMENT.DYNAMIC:
+        elif ip_assignment == DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC:
             factory.make_StaticIPAddress(
                 alloc_type=IPADDRESS_TYPE.DHCP, ip="", interface=interface)
         else:
@@ -206,7 +278,7 @@
             handler.list({}))
 
     @transactional
-    def test_list_num_queries_is_independent_of_num_devices(self):
+    def test_list_num_queries_is_the_expected_number(self):
         owner = factory.make_User()
         handler = DeviceHandler(owner, {})
         self.make_devices(10, owner=owner)
@@ -222,6 +294,21 @@
         self.assertEqual(
             query_10_count, 12,
             "Number of queries has changed; make sure this is expected.")
+
+    @transactional
+    def test_list_num_queries_is_independent_of_num_devices(self):
+        owner = factory.make_User()
+        handler = DeviceHandler(owner, {})
+        self.make_devices(10, owner=owner)
+        query_10_count, _ = count_queries(handler.list, {})
+        self.make_devices(10, owner=owner)
+        query_20_count, _ = count_queries(handler.list, {})
+
+        # This check is to notify the developer that a change was made that
+        # affects the number of queries performed when doing a node listing.
+        # It is important to keep this number as low as possible. A larger
+        # number means regiond has to do more work slowing down its process
+        # and slowing down the client waiting for the response.
         self.assertEqual(
             query_10_count, query_20_count,
             "Number of queries is not independent to the number of nodes.")
@@ -308,7 +395,7 @@
             "primary_mac": mac,
             "interfaces": [{
                 "mac": mac,
-                "ip_assignment": DEVICE_IP_ASSIGNMENT.DYNAMIC,
+                "ip_assignment": DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC,
             }],
         })
         self.expectThat(created_device["hostname"], Equals(hostname))
@@ -316,7 +403,7 @@
         self.expectThat(created_device["extra_macs"], Equals([]))
         self.expectThat(
             created_device["ip_assignment"],
-            Equals(DEVICE_IP_ASSIGNMENT.DYNAMIC))
+            Equals(DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC))
         self.expectThat(created_device["ip_address"], Is(None))
         self.expectThat(created_device["owner"], Equals(user.username))
 
@@ -332,13 +419,13 @@
             "primary_mac": mac,
             "interfaces": [{
                 "mac": mac,
-                "ip_assignment": DEVICE_IP_ASSIGNMENT.EXTERNAL,
+                "ip_assignment": DEVICE_IP_ASSIGNMENT_TYPE.EXTERNAL,
                 "ip_address": ip_address,
             }],
         })
         self.expectThat(
             created_device["ip_assignment"],
-            Equals(DEVICE_IP_ASSIGNMENT.EXTERNAL))
+            Equals(DEVICE_IP_ASSIGNMENT_TYPE.EXTERNAL))
         self.expectThat(created_device["ip_address"], Equals(ip_address))
         self.expectThat(
             StaticIPAddress.objects.filter(ip=ip_address).count(),
@@ -356,13 +443,13 @@
             "primary_mac": mac,
             "interfaces": [{
                 "mac": mac,
-                "ip_assignment": DEVICE_IP_ASSIGNMENT.STATIC,
+                "ip_assignment": DEVICE_IP_ASSIGNMENT_TYPE.STATIC,
                 "subnet": subnet.id,
             }],
         })
         self.expectThat(
             created_device["ip_assignment"],
-            Equals(DEVICE_IP_ASSIGNMENT.STATIC))
+            Equals(DEVICE_IP_ASSIGNMENT_TYPE.STATIC))
         static_interface = Interface.objects.get(mac_address=MAC(mac))
         observed_subnet = static_interface.ip_addresses.first().subnet
         self.expectThat(
@@ -386,14 +473,14 @@
             "primary_mac": mac,
             "interfaces": [{
                 "mac": mac,
-                "ip_assignment": DEVICE_IP_ASSIGNMENT.STATIC,
+                "ip_assignment": DEVICE_IP_ASSIGNMENT_TYPE.STATIC,
                 "subnet": subnet.id,
                 "ip_address": ip_address,
             }],
         })
         self.expectThat(
             created_device["ip_assignment"],
-            Equals(DEVICE_IP_ASSIGNMENT.STATIC))
+            Equals(DEVICE_IP_ASSIGNMENT_TYPE.STATIC))
         self.expectThat(created_device["ip_address"], Equals(ip_address))
         static_interface = Interface.objects.get(mac_address=MAC(mac))
         observed_subnet = static_interface.ip_addresses.first().subnet
@@ -423,13 +510,13 @@
             "interfaces": [
                 {
                     "mac": mac_static,
-                    "ip_assignment": DEVICE_IP_ASSIGNMENT.STATIC,
+                    "ip_assignment": DEVICE_IP_ASSIGNMENT_TYPE.STATIC,
                     "subnet": subnet.id,
                     "ip_address": static_ip_address,
                 },
                 {
                     "mac": mac_external,
-                    "ip_assignment": DEVICE_IP_ASSIGNMENT.EXTERNAL,
+                    "ip_assignment": DEVICE_IP_ASSIGNMENT_TYPE.EXTERNAL,
                     "ip_address": external_ip_address,
                 },
             ],
@@ -442,7 +529,7 @@
             Equals([mac_external]))
         self.expectThat(
             created_device["ip_assignment"],
-            Equals(DEVICE_IP_ASSIGNMENT.STATIC))
+            Equals(DEVICE_IP_ASSIGNMENT_TYPE.STATIC))
         self.expectThat(
             created_device["ip_address"], Equals(static_ip_address))
         static_interface = Interface.objects.get(mac_address=MAC(mac_static))
@@ -467,7 +554,7 @@
             "primary_mac": mac.lower(),  # Lowercase.
             "interfaces": [{
                 "mac": mac.upper(),  # Uppercase.
-                "ip_assignment": DEVICE_IP_ASSIGNMENT.DYNAMIC,
+                "ip_assignment": DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC,
             }],
         })
         self.assertThat(created_device["primary_mac"], Equals(mac))
@@ -482,7 +569,7 @@
             "primary_mac": mac,  # Colons.
             "interfaces": [{
                 "mac": mac.replace(":", "-"),  # Hyphens.
-                "ip_assignment": DEVICE_IP_ASSIGNMENT.DYNAMIC,
+                "ip_assignment": DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC,
             }],
         })
         self.assertThat(created_device["primary_mac"], Equals(mac))
@@ -511,12 +598,12 @@
         updated_device = handler.create_interface({
             "system_id": device.system_id,
             "mac_address": mac,
-            "ip_assignment": DEVICE_IP_ASSIGNMENT.DYNAMIC,
+            "ip_assignment": DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC,
         })
         self.expectThat(updated_device["primary_mac"], Equals(mac))
         self.expectThat(
             updated_device["ip_assignment"],
-            Equals(DEVICE_IP_ASSIGNMENT.DYNAMIC))
+            Equals(DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC))
 
     @transactional
     def test_create_interface_creates_with_external_ip_assignment(self):
@@ -528,13 +615,13 @@
         updated_device = handler.create_interface({
             "system_id": device.system_id,
             "mac_address": mac,
-            "ip_assignment": DEVICE_IP_ASSIGNMENT.EXTERNAL,
+            "ip_assignment": DEVICE_IP_ASSIGNMENT_TYPE.EXTERNAL,
             "ip_address": ip_address,
         })
         self.expectThat(updated_device["primary_mac"], Equals(mac))
         self.expectThat(
             updated_device["ip_assignment"],
-            Equals(DEVICE_IP_ASSIGNMENT.EXTERNAL))
+            Equals(DEVICE_IP_ASSIGNMENT_TYPE.EXTERNAL))
         self.expectThat(
             StaticIPAddress.objects.filter(ip=ip_address).count(),
             Equals(1), "StaticIPAddress was not created.")
@@ -549,13 +636,13 @@
         updated_device = handler.create_interface({
             "system_id": device.system_id,
             "mac_address": mac,
-            "ip_assignment": DEVICE_IP_ASSIGNMENT.STATIC,
+            "ip_assignment": DEVICE_IP_ASSIGNMENT_TYPE.STATIC,
             "subnet": subnet.id,
         })
         self.expectThat(updated_device["primary_mac"], Equals(mac))
         self.expectThat(
             updated_device["ip_assignment"],
-            Equals(DEVICE_IP_ASSIGNMENT.STATIC))
+            Equals(DEVICE_IP_ASSIGNMENT_TYPE.STATIC))
         static_interface = Interface.objects.get(mac_address=MAC(mac))
         observed_subnet = static_interface.ip_addresses.first().subnet
         self.expectThat(
@@ -573,14 +660,14 @@
         updated_device = handler.create_interface({
             "system_id": device.system_id,
             "mac_address": mac,
-            "ip_assignment": DEVICE_IP_ASSIGNMENT.STATIC,
+            "ip_assignment": DEVICE_IP_ASSIGNMENT_TYPE.STATIC,
             "subnet": subnet.id,
             "ip_address": ip_address,
         })
         self.expectThat(updated_device["primary_mac"], Equals(mac))
         self.expectThat(
             updated_device["ip_assignment"],
-            Equals(DEVICE_IP_ASSIGNMENT.STATIC))
+            Equals(DEVICE_IP_ASSIGNMENT_TYPE.STATIC))
         self.expectThat(updated_device["ip_address"], Equals(ip_address))
         static_interface = Interface.objects.get(mac_address=MAC(mac))
         observed_subnet = static_interface.ip_addresses.first().subnet
@@ -641,3 +728,238 @@
             }})
         device = reload_object(device)
         self.expectThat(device.zone, Equals(zone))
+
+    @transactional
+    def test_create_interface_creates_interface(self):
+        user = factory.make_admin()
+        node = factory.make_Node(interface=False, node_type=NODE_TYPE.DEVICE)
+        handler = DeviceHandler(user, {})
+        name = factory.make_name("eth")
+        mac_address = factory.make_mac_address()
+        handler.create_interface({
+            "system_id": node.system_id,
+            "name": name,
+            "mac_address": mac_address,
+            "ip_assignment": DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC,
+            })
+        self.assertEqual(
+            1, node.interface_set.count(),
+            "Should have one interface on the node.")
+
+    @transactional
+    def test_create_interface_creates_static(self):
+        user = factory.make_admin()
+        node = factory.make_Node(interface=False, node_type=NODE_TYPE.DEVICE)
+        handler = DeviceHandler(user, {})
+        name = factory.make_name("eth")
+        mac_address = factory.make_mac_address()
+        fabric = factory.make_Fabric()
+        vlan = fabric.get_default_vlan()
+        subnet = factory.make_Subnet(vlan=vlan)
+        handler.create_interface({
+            "system_id": node.system_id,
+            "name": name,
+            "mac_address": mac_address,
+            "ip_assignment": DEVICE_IP_ASSIGNMENT_TYPE.STATIC,
+            "subnet": subnet.id,
+            })
+        new_interface = node.interface_set.first()
+        self.assertIsNotNone(new_interface)
+        auto_ip = new_interface.ip_addresses.filter(
+            alloc_type=IPADDRESS_TYPE.STICKY, subnet=subnet)
+        self.assertIsNotNone(auto_ip)
+        self.assertEqual(1, len(auto_ip))
+
+    @transactional
+    def test_create_interface_creates_external(self):
+        user = factory.make_admin()
+        node = factory.make_Node(interface=False, node_type=NODE_TYPE.DEVICE)
+        handler = DeviceHandler(user, {})
+        name = factory.make_name("eth")
+        mac_address = factory.make_mac_address()
+        ip_address = factory.make_ip_address()
+        handler.create_interface({
+            "system_id": node.system_id,
+            "name": name,
+            "mac_address": mac_address,
+            "ip_assignment": DEVICE_IP_ASSIGNMENT_TYPE.EXTERNAL,
+            "ip_address": ip_address,
+            })
+        new_interface = node.interface_set.first()
+        self.assertIsNotNone(new_interface)
+        auto_ip = new_interface.ip_addresses.filter(
+            alloc_type=IPADDRESS_TYPE.USER_RESERVED)
+        self.assertIsNotNone(auto_ip)
+        self.assertEqual(1, len(auto_ip))
+
+    @transactional
+    def test_update_interface_updates(self):
+        user = factory.make_admin()
+        node = factory.make_Node(interface=False, node_type=NODE_TYPE.DEVICE)
+        handler = DeviceHandler(user, {})
+        name = factory.make_name("eth")
+        mac_address = factory.make_mac_address()
+        ip_assignment = random.choice(DEVICE_IP_ASSIGNMENT_TYPE_CHOICES)[0]
+        params = {
+            "system_id": node.system_id,
+            "name": name,
+            "mac_address": mac_address,
+            "ip_assignment": ip_assignment,
+            }
+        if ip_assignment == DEVICE_IP_ASSIGNMENT_TYPE.STATIC:
+            subnet = factory.make_Subnet()
+            params['subnet'] = subnet.id
+            ip_address = str(IPAddress(IPNetwork(subnet.cidr).first))
+            params['ip_address'] = ip_address
+        elif ip_assignment == DEVICE_IP_ASSIGNMENT_TYPE.EXTERNAL:
+            ip_address = factory.make_ip_address()
+            params['ip_address'] = ip_address
+        handler.create_interface(params)
+        interface = node.interface_set.first()
+        self.assertIsNotNone(interface)
+        new_name = factory.make_name("eth")
+        new_ip_assignment = random.choice(DEVICE_IP_ASSIGNMENT_TYPE_CHOICES)[0]
+        new_params = {
+            "system_id": node.system_id,
+            "interface_id": interface.id,
+            "name": new_name,
+            "mac_address": mac_address,
+            "ip_assignment": new_ip_assignment,
+        }
+        if new_ip_assignment == DEVICE_IP_ASSIGNMENT_TYPE.STATIC:
+            new_subnet = factory.make_Subnet()
+            new_params['subnet'] = new_subnet.id
+            new_ip_address = str(IPAddress(IPNetwork(new_subnet.cidr).first))
+            new_params['ip_address'] = new_ip_address
+        elif new_ip_assignment == DEVICE_IP_ASSIGNMENT_TYPE.EXTERNAL:
+            new_ip_address = factory.make_ip_address()
+            new_params['ip_address'] = new_ip_address
+        handler.update_interface(new_params)
+        data = self.dehydrate_device(node, user)['interfaces']
+        self.assertEqual(1, len(data))
+        self.assertEqual(data[0]['ip_assignment'], new_ip_assignment)
+        if new_ip_assignment != DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC:
+            self.assertEqual(data[0]['ip_address'], new_ip_address)
+
+    @transactional
+    def test_update_raise_permissions_error_for_non_admin(self):
+        user = factory.make_User()
+        handler = DeviceHandler(user, {})
+        self.assertRaises(
+            HandlerPermissionError,
+            handler.update, {})
+
+    @transactional
+    def test_update_does_not_raise_validation_error_for_invalid_arch(self):
+        user = factory.make_admin()
+        handler = DeviceHandler(user, {})
+        node = factory.make_Node(interface=True, node_type=NODE_TYPE.DEVICE)
+        node_data = self.dehydrate_device(node, user)
+        arch = factory.make_name("arch")
+        node_data["architecture"] = arch
+        handler.update(node_data)
+        # succeeds, because Devices don't care about architecture.
+
+    @transactional
+    def test_update_updates_node(self):
+        user = factory.make_admin()
+        handler = DeviceHandler(user, {})
+        node = factory.make_Node(interface=True, node_type=NODE_TYPE.DEVICE)
+        node_data = self.dehydrate_device(node, user)
+        new_zone = factory.make_Zone()
+        new_hostname = factory.make_name("hostname")
+        node_data["hostname"] = new_hostname
+        node_data["zone"] = {
+            "name": new_zone.name,
+        }
+        updated_node = handler.update(node_data)
+        self.assertEqual(updated_node["hostname"], new_hostname)
+        self.assertEqual(updated_node["zone"]["id"], new_zone.id)
+
+    @transactional
+    def test_delete_interface(self):
+        user = factory.make_admin()
+        node = factory.make_Node(node_type=NODE_TYPE.DEVICE)
+        handler = DeviceHandler(user, {})
+        interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+        handler.delete_interface({
+            "system_id": node.system_id,
+            "interface_id": interface.id,
+            })
+        self.assertIsNone(reload_object(interface))
+
+    @transactional
+    def test_link_subnet_calls_update_link_by_id_if_link_id(self):
+        user = factory.make_admin()
+        node = factory.make_Node(node_type=NODE_TYPE.DEVICE)
+        handler = DeviceHandler(user, {})
+        interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+        subnet = factory.make_Subnet()
+        link_id = random.randint(0, 100)
+        ip_assignment = factory.pick_enum(DEVICE_IP_ASSIGNMENT_TYPE)
+        if ip_assignment == DEVICE_IP_ASSIGNMENT_TYPE.STATIC:
+            mode = INTERFACE_LINK_TYPE.STATIC
+        elif ip_assignment == DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC:
+            mode = INTERFACE_LINK_TYPE.DHCP
+        else:
+            mode = INTERFACE_LINK_TYPE.LINK_UP
+        ip_address = factory.make_ip_address()
+        self.patch_autospec(Interface, "update_link_by_id")
+        handler.link_subnet({
+            "system_id": node.system_id,
+            "interface_id": interface.id,
+            "link_id": link_id,
+            "subnet": subnet.id,
+            "ip_assignment": ip_assignment,
+            "ip_address": ip_address,
+            })
+        self.assertThat(
+            Interface.update_link_by_id,
+            MockCalledOnceWith(
+                ANY, link_id, mode, subnet, ip_address=ip_address))
+
+    @transactional
+    def test_link_subnet_calls_link_subnet_if_not_link_id(self):
+        user = factory.make_admin()
+        node = factory.make_Node(node_type=NODE_TYPE.DEVICE)
+        handler = DeviceHandler(user, {})
+        interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+        subnet = factory.make_Subnet()
+        ip_assignment = factory.pick_enum(DEVICE_IP_ASSIGNMENT_TYPE)
+        if ip_assignment == DEVICE_IP_ASSIGNMENT_TYPE.STATIC:
+            mode = INTERFACE_LINK_TYPE.STATIC
+        elif ip_assignment == DEVICE_IP_ASSIGNMENT_TYPE.DYNAMIC:
+            mode = INTERFACE_LINK_TYPE.DHCP
+        else:
+            mode = INTERFACE_LINK_TYPE.LINK_UP
+        ip_address = factory.make_ip_address()
+        self.patch_autospec(Interface, "link_subnet")
+        handler.link_subnet({
+            "system_id": node.system_id,
+            "interface_id": interface.id,
+            "subnet": subnet.id,
+            "ip_assignment": ip_assignment,
+            "ip_address": ip_address,
+            })
+        if ip_assignment == DEVICE_IP_ASSIGNMENT_TYPE.STATIC:
+            self.assertThat(
+                Interface.link_subnet,
+                MockCalledOnceWith(
+                    ANY, mode, subnet, ip_address=ip_address))
+        else:
+            self.assertThat(Interface.link_subnet, MockNotCalled())
+
+    @transactional
+    def test_unlink_subnet(self):
+        user = factory.make_admin()
+        node = factory.make_Node(node_type=NODE_TYPE.DEVICE)
+        handler = DeviceHandler(user, {})
+        interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+        link_ip = factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.AUTO, ip="", interface=interface)
+        handler.delete_interface({
+            "system_id": node.system_id,
+            "interface_id": interface.id,
+            "link_id": link_ip.id,
+            })
+        self.assertIsNone(reload_object(link_ip))