Merge lp:~blake-rouse/maas/fix-1522898 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Fix the node interfaces API to work for devices as well. Keep node-interface(s) on the cli for compatability. Update changelog to match 1.9 branch.

[Blake Rouse (blake-rouse)]

Forward port with some python3 fixes: https://code.launchpad.net/~blake-rouse/maas/fix-1522898-1.9/+merge/279660

review: Approve

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2015-11-23 15:18:53 +0000
+++ docs/changelog.rst	2015-12-07 16:38:37 +0000
@@ -3,6 +3,37 @@
 =========
 
 
+1.9.0 (RC3)
+=============
+
+Major bugs fixed in this release
+--------------------------------
+
+LP: #1522898    "node-interface" API should just be "interface" - to allow devices to use it
+
+LP: #1519527    Juju 1.25.1 proposed: lxc units all have the same IP address after upgrade from 1.7/1.8.
+
+LP: #1522294    MAAS fails to parse some DHCP leases.
+
+LP: #1519090    DHCP interface automatically obtains an IP even when the subnet is unmanaged.
+
+LP: #1519077    MAAS assigns IP addresses on unmanaged subnets without consideration for some addresses known to be in use.
+
+LP: #1519396    MTU field is not exposed over the API for VLAN.
+
+LP: #1521833    Updating subnet name removes dns_server.
+
+LP: #1519919    CC looks for NICs with kernel module loaded and fall back doesn't check persistent device names.
+
+LP: #1522225    Migration 0181 can fail on upgrade if disks across nodes have duplicate serial numbers.
+
+LP: #1519247    Migration 0146 can fail on upgrade when migrating unmanaged subnets.
+
+LP: #1519397    [UI] Once a cache_set is created the UI fails with ERROR.
+
+LP: #1519918    [UI] "failed to detect a valid IP address" when trying to view node details.
+
+
 1.9.0 (RC2)
 =============
 
@@ -2369,4 +2400,3 @@
 #1185897  expose ability to re-commission node in api and cli
 
 #997092  Can't delete allocated node even if owned by self
-

=== modified file 'src/maasserver/api/interfaces.py'
--- src/maasserver/api/interfaces.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/api/interfaces.py	2015-12-07 16:38:37 +0000
@@ -9,6 +9,7 @@
     OperationsHandler,
 )
 from maasserver.enum import (
+    INTERFACE_LINK_TYPE,
     INTERFACE_TYPE,
     NODE_PERMISSION,
     NODE_STATUS,
@@ -66,29 +67,29 @@
             "Cannot %s interface because the node is not Ready." % operation)
 
 
-class NodeInterfacesHandler(OperationsHandler):
-    """Manage interfaces on a node."""
-    api_doc_section_name = "Node Interfaces"
+class InterfacesHandler(OperationsHandler):
+    """Manage interfaces on a node or device."""
+    api_doc_section_name = "Interfaces"
     create = update = delete = None
     fields = DISPLAYED_INTERFACE_FIELDS
 
     @classmethod
     def resource_uri(cls, *args, **kwargs):
         # See the comment in NodeHandler.resource_uri.
-        return ('node_interfaces_handler', ["system_id"])
+        return ('interfaces_handler', ["system_id"])
 
     def read(self, request, system_id):
-        """List all interfaces belonging to node.
+        """List all interfaces belonging to a node or device.
 
         Returns 404 if the node is not found.
         """
-        node = Node.nodes.get_node_or_404(
+        node = Node.objects.get_node_or_404(
             system_id, request.user, NODE_PERMISSION.VIEW)
         return node.interface_set.all()
 
     @operation(idempotent=False)
     def create_physical(self, request, system_id):
-        """Create a physical interface on node.
+        """Create a physical interface on a node or device.
 
         :param name: Name of the interface.
         :param mac_address: MAC address of the interface.
@@ -103,10 +104,12 @@
 
         Returns 404 if the node is not found.
         """
-        node = Node.nodes.get_node_or_404(
-            system_id, request.user, NODE_PERMISSION.ADMIN)
-        raise_error_for_invalid_state_on_allocated_operations(
-            node, request.user, "create")
+        node = Node.objects.get_node_or_404(
+            system_id, request.user, NODE_PERMISSION.EDIT)
+        # Installable nodes require the node needs to be in the correct state.
+        if node.installable:
+            raise_error_for_invalid_state_on_allocated_operations(
+                node, request.user, "create")
         form = PhysicalInterfaceForm(node=node, data=request.data)
         if form.is_valid():
             return form.save()
@@ -232,9 +235,9 @@
             raise MAASAPIValidationError(form.errors)
 
 
-class NodeInterfaceHandler(OperationsHandler):
-    """Manage a node's interface."""
-    api_doc_section_name = "Node Interface"
+class InterfaceHandler(OperationsHandler):
+    """Manage a node's or device's interface."""
+    api_doc_section_name = "Interface"
     create = None
     model = Interface
     fields = DISPLAYED_INTERFACE_FIELDS
@@ -249,7 +252,7 @@
             node = interface.get_node()
             if node is not None:
                 system_id = node.system_id
-        return ('node_interface_handler', (system_id, interface_id))
+        return ('interface_handler', (system_id, interface_id))
 
     @classmethod
     def mac_address(cls, interface):
@@ -367,9 +370,12 @@
         Returns 404 if the node or interface is not found.
         """
         interface = Interface.objects.get_interface_or_404(
-            system_id, interface_id, request.user, NODE_PERMISSION.ADMIN)
-        raise_error_for_invalid_state_on_allocated_operations(
-            interface.node, request.user, "update interface")
+            system_id, interface_id, request.user, NODE_PERMISSION.EDIT)
+        if interface.get_node().installable:
+            # This node needs to be in the correct state to modify
+            # the interface.
+            raise_error_for_invalid_state_on_allocated_operations(
+                interface.node, request.user, "update interface")
         interface_form = InterfaceForm.get_interface_form(interface.type)
         # For VLAN interface we cast parents to parent. As a VLAN can only
         # have one parent.
@@ -394,9 +400,12 @@
         Returns 404 if the node or interface is not found.
         """
         interface = Interface.objects.get_interface_or_404(
-            system_id, interface_id, request.user, NODE_PERMISSION.ADMIN)
-        raise_error_for_invalid_state_on_allocated_operations(
-            interface.node, request.user, "delete interface")
+            system_id, interface_id, request.user, NODE_PERMISSION.EDIT)
+        if interface.get_node().installable:
+            # This node needs to be in the correct state to modify
+            # the interface.
+            raise_error_for_invalid_state_on_allocated_operations(
+                interface.node, request.user, "delete interface")
         interface.delete()
         return rc.DELETED
 
@@ -432,10 +441,24 @@
         Returns 404 if the node or interface is not found.
         """
         interface = Interface.objects.get_interface_or_404(
-            system_id, interface_id, request.user, NODE_PERMISSION.ADMIN)
-        raise_error_for_invalid_state_on_allocated_operations(
-            interface.node, request.user, "link subnet")
-        form = InterfaceLinkForm(instance=interface, data=request.data)
+            system_id, interface_id, request.user, NODE_PERMISSION.EDIT)
+        node = interface.get_node()
+        if node.installable:
+            # This node needs to be in the correct state to modify
+            # the interface.
+            raise_error_for_invalid_state_on_allocated_operations(
+                interface.node, request.user, "link subnet")
+            allowed_modes = [
+                INTERFACE_LINK_TYPE.AUTO,
+                INTERFACE_LINK_TYPE.DHCP,
+                INTERFACE_LINK_TYPE.STATIC,
+                INTERFACE_LINK_TYPE.LINK_UP,
+            ]
+        else:
+            # Devices can only be set in static IP mode.
+            allowed_modes = [INTERFACE_LINK_TYPE.STATIC]
+        form = InterfaceLinkForm(
+            instance=interface, data=request.data, allowed_modes=allowed_modes)
         if form.is_valid():
             return form.save()
         else:
@@ -450,9 +473,12 @@
         Returns 404 if the node or interface is not found.
         """
         interface = Interface.objects.get_interface_or_404(
-            system_id, interface_id, request.user, NODE_PERMISSION.ADMIN)
-        raise_error_for_invalid_state_on_allocated_operations(
-            interface.node, request.user, "unlink subnet")
+            system_id, interface_id, request.user, NODE_PERMISSION.EDIT)
+        if interface.get_node().installable:
+            # This node needs to be in the correct state to modify
+            # the interface.
+            raise_error_for_invalid_state_on_allocated_operations(
+                interface.node, request.user, "unlink subnet")
         form = InterfaceUnlinkForm(instance=interface, data=request.data)
         if form.is_valid():
             return form.save()
@@ -474,9 +500,12 @@
         Returns 404 if the node or interface is not found.
         """
         interface = Interface.objects.get_interface_or_404(
-            system_id, interface_id, request.user, NODE_PERMISSION.ADMIN)
-        raise_error_for_invalid_state_on_allocated_operations(
-            interface.node, request.user, "set default gateway")
+            system_id, interface_id, request.user, NODE_PERMISSION.EDIT)
+        if interface.get_node().installable:
+            # This node needs to be in the correct state to modify
+            # the interface.
+            raise_error_for_invalid_state_on_allocated_operations(
+                interface.node, request.user, "set default gateway")
         form = InterfaceSetDefaultGatwayForm(
             instance=interface, data=request.data)
         if form.is_valid():
@@ -485,7 +514,17 @@
             raise MAASAPIValidationError(form.errors)
 
 
-class PhysicalInterfaceHandler(NodeInterfaceHandler):
+class NodeInterfacesHandler(InterfacesHandler):
+    """Manage interfaces on a node. (Deprecated)"""
+    api_doc_section_name = "Node Interfaces"
+
+
+class NodeInterfaceHandler(InterfaceHandler):
+    """Manage a node's interface. (Deprecated)"""
+    api_doc_section_name = "Node Interface"
+
+
+class PhysicaInterfaceHandler(InterfaceHandler):
     """
     This handler only exists because piston requires a unique handler per
     class type. Without this class the resource_uri will not be added to any
@@ -499,7 +538,7 @@
     model = PhysicalInterface
 
 
-class BondInterfaceHandler(NodeInterfaceHandler):
+class BondInterfaceHandler(InterfaceHandler):
     """
     This handler only exists because piston requires a unique handler per
     class type. Without this class the resource_uri will not be added to any
@@ -513,7 +552,7 @@
     model = BondInterface
 
 
-class VLANInterfaceHandler(NodeInterfaceHandler):
+class VLANInterfaceHandler(InterfaceHandler):
     """
     This handler only exists because piston requires a unique handler per
     class type. Without this class the resource_uri will not be added to any

=== modified file 'src/maasserver/api/tests/test_interfaces.py'
--- src/maasserver/api/tests/test_interfaces.py	2015-12-04 08:25:27 +0000
+++ src/maasserver/api/tests/test_interfaces.py	2015-12-07 16:38:37 +0000
@@ -28,20 +28,20 @@
 )
 
 
-def get_node_interfaces_uri(node):
-    """Return a Node's interfaces URI on the API."""
+def get_interfaces_uri(node):
+    """Return a interfaces URI on the API."""
     return reverse(
-        'node_interfaces_handler', args=[node.system_id])
-
-
-def get_node_interface_uri(interface, node=None):
-    """Return a Node's interface URI on the API."""
+        'interfaces_handler', args=[node.system_id])
+
+
+def get_interface_uri(interface, node=None):
+    """Return a interface URI on the API."""
     if isinstance(interface, Interface):
         if node is None:
             node = interface.get_node()
         interface = interface.id
     return reverse(
-        'node_interface_handler', args=[node.system_id, interface])
+        'interface_handler', args=[node.system_id, interface])
 
 
 def make_complex_interface(node, name=None):
@@ -65,18 +65,18 @@
     return bond_interface, parents, [vlan_nic_10, vlan_nic_11]
 
 
-class TestNodeInterfacesAPI(APITestCase):
+class TestInterfacesAPI(APITestCase):
 
     def test_handler_path(self):
         node = factory.make_Node()
         self.assertEqual(
             '/api/1.0/nodes/%s/interfaces/' % (node.system_id),
-            get_node_interfaces_uri(node))
+            get_interfaces_uri(node))
 
     def test_read(self):
         node = factory.make_Node()
         bond, parents, children = make_complex_interface(node)
-        uri = get_node_interfaces_uri(node)
+        uri = get_interfaces_uri(node)
         response = self.client.get(uri)
 
         self.assertEqual(
@@ -91,6 +91,20 @@
             ]
         self.assertItemsEqual(expected_ids, result_ids)
 
+    def test_read_on_device(self):
+        parent = factory.make_Node()
+        device = factory.make_Node(
+            owner=self.logged_in_user, installable=False, parent=parent)
+        interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=device)
+        uri = get_interfaces_uri(device)
+        response = self.client.get(uri)
+
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        self.assertEqual(
+            interface.id, json_load_bytes(response.content)[0]['id'])
+
     def test_create_physical(self):
         self.become_admin()
         for status in (NODE_STATUS.READY, NODE_STATUS.BROKEN):
@@ -102,7 +116,7 @@
                 factory.make_name("tag")
                 for _ in range(3)
             ]
-            uri = get_node_interfaces_uri(node)
+            uri = get_interfaces_uri(node)
             response = self.client.post(uri, {
                 "op": "create_physical",
                 "mac_address": mac,
@@ -124,6 +138,39 @@
                 "enabled": Equals(True),
                 }))
 
+    def test_create_physical_on_device(self):
+        parent = factory.make_Node()
+        device = factory.make_Node(
+            owner=self.logged_in_user, installable=False, parent=parent)
+        mac = factory.make_mac_address()
+        name = factory.make_name("eth")
+        vlan = factory.make_VLAN()
+        tags = [
+            factory.make_name("tag")
+            for _ in range(3)
+        ]
+        uri = get_interfaces_uri(device)
+        response = self.client.post(uri, {
+            "op": "create_physical",
+            "mac_address": mac,
+            "name": name,
+            "vlan": vlan.id,
+            "tags": ",".join(tags),
+            })
+
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        self.assertThat(json_load_bytes(response.content), ContainsDict({
+            "mac_address": Equals(mac),
+            "name": Equals(name),
+            "vlan": ContainsDict({
+                "id": Equals(vlan.id),
+                }),
+            "type": Equals("physical"),
+            "tags": Equals(tags),
+            "enabled": Equals(True),
+            }))
+
     def test_create_physical_disabled(self):
         self.become_admin()
         for status in (NODE_STATUS.READY, NODE_STATUS.BROKEN):
@@ -135,7 +182,7 @@
                 factory.make_name("tag")
                 for _ in range(3)
             ]
-            uri = get_node_interfaces_uri(node)
+            uri = get_interfaces_uri(node)
             response = self.client.post(uri, {
                 "op": "create_physical",
                 "mac_address": mac,
@@ -163,7 +210,7 @@
         mac = factory.make_mac_address()
         name = factory.make_name("eth")
         vlan = factory.make_VLAN()
-        uri = get_node_interfaces_uri(node)
+        uri = get_interfaces_uri(node)
         response = self.client.post(uri, {
             "op": "create_physical",
             "mac_address": mac,
@@ -195,7 +242,7 @@
             mac = factory.make_mac_address()
             name = factory.make_name("eth")
             vlan = factory.make_VLAN()
-            uri = get_node_interfaces_uri(node)
+            uri = get_interfaces_uri(node)
             response = self.client.post(uri, {
                 "op": "create_physical",
                 "mac_address": mac,
@@ -208,7 +255,7 @@
     def test_create_physical_requires_mac_name_and_vlan(self):
         self.become_admin()
         node = factory.make_Node(status=NODE_STATUS.READY)
-        uri = get_node_interfaces_uri(node)
+        uri = get_interfaces_uri(node)
         response = self.client.post(uri, {
             "op": "create_physical",
             })
@@ -227,7 +274,7 @@
             INTERFACE_TYPE.PHYSICAL)
         name = factory.make_name("eth")
         vlan = factory.make_VLAN()
-        uri = get_node_interfaces_uri(node)
+        uri = get_interfaces_uri(node)
         response = self.client.post(uri, {
             "op": "create_physical",
             "mac_address": "%s" % interface_on_other_node.mac_address,
@@ -256,7 +303,7 @@
                 factory.make_name("tag")
                 for _ in range(3)
             ]
-            uri = get_node_interfaces_uri(node)
+            uri = get_interfaces_uri(node)
             response = self.client.post(uri, {
                 "op": "create_bond",
                 "mac_address": "%s" % parent_1_iface.mac_address,
@@ -283,6 +330,17 @@
                 parent_2_iface.name,
                 ], parsed_interface['parents'])
 
+    def test_create_bond_404_on_device(self):
+        parent = factory.make_Node()
+        device = factory.make_Node(
+            owner=self.logged_in_user, installable=False, parent=parent)
+        uri = get_interfaces_uri(device)
+        response = self.client.post(uri, {
+            "op": "create_bond",
+            })
+        self.assertEqual(
+            http.client.NOT_FOUND, response.status_code, response.content)
+
     def test_create_bond_requires_admin(self):
         node = factory.make_Node()
         vlan = factory.make_VLAN()
@@ -291,7 +349,7 @@
         parent_2_iface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, vlan=vlan, node=node)
         name = factory.make_name("bond")
-        uri = get_node_interfaces_uri(node)
+        uri = get_interfaces_uri(node)
         response = self.client.post(uri, {
             "op": "create_bond",
             "mac": "%s" % parent_1_iface.mac_address,
@@ -327,7 +385,7 @@
             parent_2_iface = factory.make_Interface(
                 INTERFACE_TYPE.PHYSICAL, vlan=vlan, node=node)
             name = factory.make_name("bond")
-            uri = get_node_interfaces_uri(node)
+            uri = get_interfaces_uri(node)
             response = self.client.post(uri, {
                 "op": "create_bond",
                 "mac": "%s" % parent_1_iface.mac_address,
@@ -341,7 +399,7 @@
     def test_create_bond_requires_name_vlan_and_parents(self):
         self.become_admin()
         node = factory.make_Node(status=NODE_STATUS.READY)
-        uri = get_node_interfaces_uri(node)
+        uri = get_interfaces_uri(node)
         response = self.client.post(uri, {
             "op": "create_bond",
             })
@@ -366,7 +424,7 @@
             factory.make_name("tag")
             for _ in range(3)
         ]
-        uri = get_node_interfaces_uri(node)
+        uri = get_interfaces_uri(node)
         response = self.client.post(uri, {
             "op": "create_vlan",
             "vlan": tagged_vlan.id,
@@ -387,13 +445,24 @@
             "tags": Equals(tags),
             }))
 
+    def test_create_vlan_404_on_device(self):
+        parent = factory.make_Node()
+        device = factory.make_Node(
+            owner=self.logged_in_user, installable=False, parent=parent)
+        uri = get_interfaces_uri(device)
+        response = self.client.post(uri, {
+            "op": "create_vlan",
+            })
+        self.assertEqual(
+            http.client.NOT_FOUND, response.status_code, response.content)
+
     def test_create_vlan_requires_admin(self):
         node = factory.make_Node()
         untagged_vlan = factory.make_VLAN()
         parent_iface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, vlan=untagged_vlan, node=node)
         tagged_vlan = factory.make_VLAN()
-        uri = get_node_interfaces_uri(node)
+        uri = get_interfaces_uri(node)
         response = self.client.post(uri, {
             "op": "create_vlan",
             "vlan": tagged_vlan.vid,
@@ -405,7 +474,7 @@
     def test_create_vlan_requires_vlan_and_parent(self):
         self.become_admin()
         node = factory.make_Node()
-        uri = get_node_interfaces_uri(node)
+        uri = get_interfaces_uri(node)
         response = self.client.post(uri, {
             "op": "create_vlan",
             })
@@ -426,7 +495,7 @@
         self.assertEqual(
             '/api/1.0/nodes/%s/interfaces/%s/' % (
                 node.system_id, interface.id),
-            get_node_interface_uri(interface, node=node))
+            get_interface_uri(interface, node=node))
 
     def test_read(self):
         node = factory.make_Node()
@@ -493,7 +562,7 @@
         }
         bond.save()
 
-        uri = get_node_interface_uri(bond)
+        uri = get_interface_uri(bond)
         response = self.client.get(uri)
         self.assertEqual(
             http.client.OK, response.status_code, response.content)
@@ -507,7 +576,7 @@
                 }),
             "mac_address": Equals("%s" % bond.mac_address),
             "tags": Equals(bond.tags),
-            "resource_uri": Equals(get_node_interface_uri(bond)),
+            "resource_uri": Equals(get_interface_uri(bond)),
             "params": Equals(bond.params),
             "effective_mtu": Equals(bond.get_effective_mtu()),
         }))
@@ -527,7 +596,7 @@
     def test_read_by_specifier(self):
         node = factory.make_Node(hostname="tasty-biscuits")
         bond0, _, _ = make_complex_interface(node, name="bond0")
-        uri = get_node_interface_uri(
+        uri = get_interface_uri(
             "hostname:tasty-biscuits,name:bond0", node=node)
         response = self.client.get(uri)
         self.assertEqual(
@@ -535,10 +604,22 @@
         parsed_interface = json_load_bytes(response.content)
         self.assertEqual(bond0.id, parsed_interface['id'])
 
+    def test_read_device_interface(self):
+        parent = factory.make_Node()
+        device = factory.make_Node(installable=False, parent=parent)
+        interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=device)
+        uri = get_interface_uri(interface)
+        response = self.client.get(uri)
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        parsed_interface = json_load_bytes(response.content)
+        self.assertEqual(interface.id, parsed_interface['id'])
+
     def test_read_404_when_invalid_id(self):
         node = factory.make_Node()
         uri = reverse(
-            'node_interface_handler',
+            'interface_handler',
             args=[node.system_id, random.randint(100, 1000)])
         response = self.client.get(uri)
         self.assertEqual(
@@ -552,7 +633,7 @@
                 INTERFACE_TYPE.PHYSICAL, node=node)
             new_name = factory.make_name("name")
             new_vlan = factory.make_VLAN()
-            uri = get_node_interface_uri(interface)
+            uri = get_interface_uri(interface)
             response = self.client.put(uri, {
                 "name": new_name,
                 "vlan": new_vlan.id,
@@ -563,13 +644,32 @@
             self.assertEqual(new_name, parsed_interface["name"])
             self.assertEqual(new_vlan.vid, parsed_interface["vlan"]["vid"])
 
+    def test_update_device_physical_interface(self):
+        node = factory.make_Node()
+        device = factory.make_Node(
+            owner=self.logged_in_user, installable=False, parent=node)
+        interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=device)
+        new_name = factory.make_name("name")
+        new_vlan = factory.make_VLAN()
+        uri = get_interface_uri(interface)
+        response = self.client.put(uri, {
+            "name": new_name,
+            "vlan": new_vlan.id,
+            })
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        parsed_interface = json_load_bytes(response.content)
+        self.assertEquals(new_name, parsed_interface["name"])
+        self.assertEquals(new_vlan.vid, parsed_interface["vlan"]["vid"])
+
     def test_update_bond_interface(self):
         self.become_admin()
         for status in (NODE_STATUS.READY, NODE_STATUS.BROKEN):
             node = factory.make_Node(status=status)
             bond, [nic_0, nic_1], [vlan_10, vlan_11] = make_complex_interface(
                 node)
-            uri = get_node_interface_uri(bond)
+            uri = get_interface_uri(bond)
             response = self.client.put(uri, {
                 "parents": [nic_0.id],
                 })
@@ -586,7 +686,7 @@
                 node)
             physical_interface = factory.make_Interface(
                 INTERFACE_TYPE.PHYSICAL, node=node)
-            uri = get_node_interface_uri(vlan_10)
+            uri = get_interface_uri(vlan_10)
             response = self.client.put(uri, {
                 "parent": physical_interface.id,
                 })
@@ -600,7 +700,7 @@
         node = factory.make_Node()
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
         new_name = factory.make_name("name")
-        uri = get_node_interface_uri(interface)
+        uri = get_interface_uri(interface)
         response = self.client.put(uri, {
             "name": new_name,
             })
@@ -629,7 +729,7 @@
             interface = factory.make_Interface(
                 INTERFACE_TYPE.PHYSICAL, node=node)
             new_name = factory.make_name("name")
-            uri = get_node_interface_uri(interface)
+            uri = get_interface_uri(interface)
             response = self.client.put(uri, {
                 "name": new_name,
                 })
@@ -641,25 +741,38 @@
         for status in (NODE_STATUS.READY, NODE_STATUS.BROKEN):
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
-            uri = get_node_interface_uri(interface)
+            uri = get_interface_uri(interface)
             response = self.client.delete(uri)
             self.assertEqual(
                 http.client.NO_CONTENT, response.status_code, response.content)
             self.assertIsNone(reload_object(interface))
 
+    def test_delete_deletes_device_interface(self):
+        parent = factory.make_Node()
+        device = factory.make_Node(
+            owner=self.logged_in_user, installable=False, parent=parent)
+        interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=device)
+        uri = get_interface_uri(interface)
+        response = self.client.delete(uri)
+        self.assertEqual(
+            http.client.NO_CONTENT, response.status_code, response.content)
+        self.assertIsNone(reload_object(interface))
+
     def test_delete_403_when_not_admin(self):
         node = factory.make_Node(interface=True)
         interface = node.get_boot_interface()
-        uri = get_node_interface_uri(interface)
+        uri = get_interface_uri(interface)
         response = self.client.delete(uri)
         self.assertEqual(
             http.client.FORBIDDEN, response.status_code, response.content)
         self.assertIsNotNone(reload_object(interface))
 
     def test_delete_404_when_invalid_id(self):
+        self.become_admin()
         node = factory.make_Node()
         uri = reverse(
-            'node_interface_handler',
+            'interface_handler',
             args=[node.system_id, random.randint(100, 1000)])
         response = self.client.delete(uri)
         self.assertEqual(
@@ -685,7 +798,7 @@
         ):
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
-            uri = get_node_interface_uri(interface)
+            uri = get_interface_uri(interface)
             response = self.client.delete(uri)
             self.assertEqual(
                 http.client.CONFLICT, response.status_code, response.content)
@@ -698,7 +811,7 @@
         for status in (NODE_STATUS.READY, NODE_STATUS.BROKEN):
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
-            uri = get_node_interface_uri(interface)
+            uri = get_interface_uri(interface)
             response = self.client.post(uri, {
                 "op": "link_subnet",
                 "mode": INTERFACE_LINK_TYPE.DHCP,
@@ -711,12 +824,52 @@
                     "mode": Equals(INTERFACE_LINK_TYPE.DHCP),
                     }))
 
+    def test_link_subnet_creates_link_on_device(self):
+        parent = factory.make_Node()
+        device = factory.make_Node(
+            owner=self.logged_in_user, installable=False, parent=parent)
+        interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=device)
+        subnet = factory.make_Subnet(vlan=interface.vlan)
+        uri = get_interface_uri(interface)
+        response = self.client.post(uri, {
+            "op": "link_subnet",
+            "mode": INTERFACE_LINK_TYPE.STATIC,
+            "subnet": subnet.id,
+            })
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        parsed_response = json_load_bytes(response.content)
+        self.assertThat(
+            parsed_response["links"][0], ContainsDict({
+                "mode": Equals(INTERFACE_LINK_TYPE.STATIC),
+                }))
+
+    def test_link_subnet_on_device_only_allows_static(self):
+        parent = factory.make_Node()
+        device = factory.make_Node(
+            owner=self.logged_in_user, installable=False, parent=parent)
+        interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=device)
+        for link_type in [
+                INTERFACE_LINK_TYPE.AUTO,
+                INTERFACE_LINK_TYPE.DHCP,
+                INTERFACE_LINK_TYPE.LINK_UP]:
+            uri = get_interface_uri(interface)
+            response = self.client.post(uri, {
+                "op": "link_subnet",
+                "mode": link_type,
+                })
+            self.assertEqual(
+                http.client.BAD_REQUEST, response.status_code,
+                response.content)
+
     def test_link_subnet_raises_error(self):
         self.become_admin()
         for status in (NODE_STATUS.READY, NODE_STATUS.BROKEN):
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
-            uri = get_node_interface_uri(interface)
+            uri = get_interface_uri(interface)
             response = self.client.post(uri, {
                 "op": "link_subnet",
                 })
@@ -730,7 +883,7 @@
     def test_link_subnet_requries_admin(self):
         node = factory.make_Node(interface=True)
         interface = node.get_boot_interface()
-        uri = get_node_interface_uri(interface)
+        uri = get_interface_uri(interface)
         response = self.client.post(uri, {
             "op": "link_subnet",
             })
@@ -757,7 +910,7 @@
         ):
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
-            uri = get_node_interface_uri(interface)
+            uri = get_interface_uri(interface)
             response = self.client.post(uri, {
                 "op": "link_subnet",
                 "mode": INTERFACE_LINK_TYPE.DHCP,
@@ -777,7 +930,7 @@
             dhcp_ip = factory.make_StaticIPAddress(
                 alloc_type=IPADDRESS_TYPE.DHCP, ip="",
                 subnet=subnet, interface=interface)
-            uri = get_node_interface_uri(interface)
+            uri = get_interface_uri(interface)
             response = self.client.post(uri, {
                 "op": "unlink_subnet",
                 "id": dhcp_ip.id,
@@ -786,12 +939,31 @@
                 http.client.OK, response.status_code, response.content)
             self.assertIsNone(reload_object(dhcp_ip))
 
+    def test_unlink_subnet_deletes_link_on_device(self):
+        parent = factory.make_Node()
+        device = factory.make_Node(
+            owner=self.logged_in_user, installable=False, parent=parent)
+        interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=device)
+        subnet = factory.make_Subnet()
+        static_ip = factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.STICKY,
+            subnet=subnet, interface=interface)
+        uri = get_interface_uri(interface)
+        response = self.client.post(uri, {
+            "op": "unlink_subnet",
+            "id": static_ip.id,
+            })
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        self.assertIsNone(reload_object(static_ip))
+
     def test_unlink_subnet_raises_error(self):
         self.become_admin()
         for status in (NODE_STATUS.READY, NODE_STATUS.BROKEN):
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
-            uri = get_node_interface_uri(interface)
+            uri = get_interface_uri(interface)
             response = self.client.post(uri, {
                 "op": "unlink_subnet",
                 })
@@ -805,7 +977,7 @@
     def test_unlink_subnet_requries_admin(self):
         node = factory.make_Node(interface=True)
         interface = node.get_boot_interface()
-        uri = get_node_interface_uri(interface)
+        uri = get_interface_uri(interface)
         response = self.client.post(uri, {
             "op": "unlink_subnet",
             })
@@ -832,7 +1004,7 @@
         ):
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
-            uri = get_node_interface_uri(interface)
+            uri = get_interface_uri(interface)
             response = self.client.post(uri, {
                 "op": "unlink_subnet",
                 })
@@ -852,7 +1024,7 @@
             link_ip = factory.make_StaticIPAddress(
                 alloc_type=IPADDRESS_TYPE.AUTO, ip="",
                 subnet=subnet, interface=interface)
-            uri = get_node_interface_uri(interface)
+            uri = get_interface_uri(interface)
             response = self.client.post(uri, {
                 "op": "set_default_gateway",
                 "link_id": link_ip.id
@@ -874,7 +1046,7 @@
             link_ip = factory.make_StaticIPAddress(
                 alloc_type=IPADDRESS_TYPE.AUTO, ip="",
                 subnet=subnet, interface=interface)
-            uri = get_node_interface_uri(interface)
+            uri = get_interface_uri(interface)
             response = self.client.post(uri, {
                 "op": "set_default_gateway",
                 "link_id": link_ip.id
@@ -888,7 +1060,7 @@
         for status in (NODE_STATUS.READY, NODE_STATUS.BROKEN):
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
-            uri = get_node_interface_uri(interface)
+            uri = get_interface_uri(interface)
             response = self.client.post(uri, {
                 "op": "set_default_gateway",
                 })
@@ -902,7 +1074,7 @@
     def test_set_default_gateway_requries_admin(self):
         node = factory.make_Node(interface=True)
         interface = node.get_boot_interface()
-        uri = get_node_interface_uri(interface)
+        uri = get_interface_uri(interface)
         response = self.client.post(uri, {
             "op": "set_default_gateway",
             })
@@ -929,7 +1101,7 @@
         ):
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
-            uri = get_node_interface_uri(interface)
+            uri = get_interface_uri(interface)
             response = self.client.post(uri, {
                 "op": "set_default_gateway",
                 })

=== modified file 'src/maasserver/forms_interface_link.py'
--- src/maasserver/forms_interface_link.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/forms_interface_link.py	2015-12-07 16:38:37 +0000
@@ -43,13 +43,6 @@
 class InterfaceLinkForm(forms.Form):
     """Interface link form."""
 
-    mode = CaseInsensitiveChoiceField(
-        choices=INTERFACE_LINK_TYPE_CHOICES, required=True,
-        error_messages={
-            'invalid_choice': compose_invalid_choice_text(
-                'mode', INTERFACE_LINK_TYPE_CHOICES),
-        })
-
     subnet = SpecifierOrModelChoiceField(queryset=None, required=False)
 
     ip_address = forms.GenericIPAddressField(required=False)
@@ -57,8 +50,29 @@
     default_gateway = forms.BooleanField(initial=False, required=False)
 
     def __init__(self, *args, **kwargs):
+        # Get list of allowed modes for this interface.
+        allowed_modes = kwargs.pop("allowed_modes", [
+            INTERFACE_LINK_TYPE.AUTO,
+            INTERFACE_LINK_TYPE.DHCP,
+            INTERFACE_LINK_TYPE.STATIC,
+            INTERFACE_LINK_TYPE.LINK_UP,
+        ])
+        mode_choices = [
+            (key, value)
+            for key, value in INTERFACE_LINK_TYPE_CHOICES
+            if key in allowed_modes
+        ]
+
         self.instance = kwargs.pop("instance")
         super(InterfaceLinkForm, self).__init__(*args, **kwargs)
+
+        # Create the mode field and setup the queryset on the subnet.
+        self.fields['mode'] = CaseInsensitiveChoiceField(
+            choices=mode_choices, required=True,
+            error_messages={
+                'invalid_choice': compose_invalid_choice_text(
+                    'mode', mode_choices),
+            })
         self.fields['subnet'].queryset = self.instance.vlan.subnet_set.all()
 
     def clean(self):

=== modified file 'src/maasserver/models/__init__.py'
--- src/maasserver/models/__init__.py	2015-12-02 20:43:30 +0000
+++ src/maasserver/models/__init__.py	2015-12-07 16:38:37 +0000
@@ -252,7 +252,26 @@
                 raise NotImplementedError(
                     'Invalid permission check (invalid permission name: %s).' %
                     perm)
-        elif isinstance(obj, (Fabric, FanNetwork, Interface, Subnet, Space)):
+        elif isinstance(obj, Interface):
+            if perm == NODE_PERMISSION.VIEW:
+                # Any registered user can view a interface regardless
+                # of its state.
+                return True
+            elif perm in NODE_PERMISSION.EDIT:
+                # A device can be editted by its owner a node must be admin.
+                node = obj.get_node()
+                if node is None or node.installable:
+                    return user.is_superuser
+                else:
+                    return node.owner == user
+            elif perm in NODE_PERMISSION.ADMIN:
+                # Admin permission is solely granted to superusers.
+                return user.is_superuser
+            else:
+                raise NotImplementedError(
+                    'Invalid permission check (invalid permission name: %s).' %
+                    perm)
+        elif isinstance(obj, (Fabric, FanNetwork, Subnet, Space)):
             if perm == NODE_PERMISSION.VIEW:
                 # Any registered user can view a fabric or interface regardless
                 # of its state.

=== modified file 'src/maasserver/tests/test_auth.py'
--- src/maasserver/tests/test_auth.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/tests/test_auth.py	2015-12-07 16:38:37 +0000
@@ -223,6 +223,34 @@
                 user, NODE_PERMISSION.ADMIN, factory.make_FilesystemGroup()))
 
 
+class TestMAASAuthorizationBackendForDeviceInterface(MAASServerTestCase):
+
+    def test_owner_can_edit_device_interface(self):
+        backend = MAASAuthorizationBackend()
+        user = factory.make_User()
+        parent = factory.make_Node()
+        device = factory.make_Node(
+            owner=user, installable=False, parent=parent)
+        interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=device)
+        self.assertTrue(
+            backend.has_perm(
+                user, NODE_PERMISSION.EDIT, interface))
+
+    def test_non_owner_cannot_edit_device_interface(self):
+        backend = MAASAuthorizationBackend()
+        user = factory.make_User()
+        owner = factory.make_User()
+        parent = factory.make_Node()
+        device = factory.make_Node(
+            owner=owner, installable=False, parent=parent)
+        interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=device)
+        self.assertFalse(
+            backend.has_perm(
+                user, NODE_PERMISSION.EDIT, interface))
+
+
 class TestMAASAuthorizationBackendForNetworking(MAASServerTestCase):
 
     scenarios = (

=== modified file 'src/maasserver/urls_api.py'
--- src/maasserver/urls_api.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/urls_api.py	2015-12-07 16:38:37 +0000
@@ -67,6 +67,8 @@
     FilesHandler,
 )
 from maasserver.api.interfaces import (
+    InterfaceHandler,
+    InterfacesHandler,
     NodeInterfaceHandler,
     NodeInterfacesHandler,
 )
@@ -188,6 +190,10 @@
     BcacheCacheSetHandler, authentication=api_auth)
 bcache_cache_sets_handler = RestrictedResource(
     BcacheCacheSetsHandler, authentication=api_auth)
+interface_handler = RestrictedResource(
+    InterfaceHandler, authentication=api_auth)
+interfaces_handler = RestrictedResource(
+    InterfacesHandler, authentication=api_auth)
 node_interface_handler = RestrictedResource(
     NodeInterfaceHandler, authentication=api_auth)
 node_interfaces_handler = RestrictedResource(
@@ -299,8 +305,14 @@
         '(?P<cache_set_id>[^/]+)/$',
         bcache_cache_set_handler, name='bcache_cache_set_handler'),
     url(r'^nodes/(?P<system_id>[^/]+)/interfaces/(?P<interface_id>[^/]+)/$',
+        interface_handler, name='interface_handler'),
+    url(
+        r'^nodes/(?P<system_id>[^/]+)/node-interfaces/'
+        '(?P<interface_id>[^/]+)/$',
         node_interface_handler, name='node_interface_handler'),
     url(r'^nodes/(?P<system_id>[^/]+)/interfaces/$',
+        interfaces_handler, name='interfaces_handler'),
+    url(r'^nodes/(?P<system_id>[^/]+)/node-interfaces/$',
         node_interfaces_handler, name='node_interfaces_handler'),
     url(
         r'^nodes/(?P<system_id>[^/]+)/$', node_handler,