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

[Blake Rouse]

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

[Mike Pontillo (mpontillo)]

Looks good. I've been testing it on my local MAAS 1.9 setup, and it seems solid.

Two concerns that I'd like peoples' thoughts on before we land this:

(1) It looks like the resource_uri still refers to node-interfaces, even for devices. See:

http://paste.ubuntu.com/13684305/

(2) I'm concerned that if we migrate MAC addresses to 1.8 and they become "unknown" interfaces not associated with a node, the user will have no way to delete these via the CLI/API, since we require the system_id.

review: Needs Information

[Mike Pontillo (mpontillo)]

Oh, note that in the pastebin output above, I'm referring to an interface on a *device*, not a node. (at least, from the user's perspective.)

[Mike Pontillo (mpontillo)]

And I meant "migrate plain MAC addresses from 1.8 to 1.9".

/me needs to learn to proofread; sorry.

[Blake Rouse (blake-rouse)]

> Looks good. I've been testing it on my local MAAS 1.9 setup, and it seems
> solid.
>
> Two concerns that I'd like peoples' thoughts on before we land this:
>
> (1) It looks like the resource_uri still refers to node-interfaces, even for
> devices. See:
>
> http://paste.ubuntu.com/13684305/

Good catch! I have fixed this. Miss-typed the url pattern.

>
> (2) I'm concerned that if we migrate MAC addresses to 1.8 and they become
> "unknown" interfaces not associated with a node, the user will have no way to
> delete these via the CLI/API, since we require the system_id.

This branch was never design to address that issue. This branch was just to re-name an endpoint. The only interfaces that should be unknown are those that are user-reserved. So if those are not deleted when the user-reserved IP address is deleted then there is a problem in the model logic of MAAS not at the API level. If that is a problem please file a different bug.

[Andres Rodriguez (andreserl)]

lgtm! After this landing please double check that this doesn't cause the issue that Mike is talking about, because if so, then we need to fix it asap, or prevent this branch from being released.

review: Approve

[Blake Rouse (blake-rouse)]

Again this does not affect anything that Mike was talking about. Mike is just talking about an issue that we have no proof for and more of an issue of the IP address endpoint, not by me. By saying this branch causes that issue is completely wrong.

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2015-12-06 16:11:01 +0000
+++ docs/changelog.rst	2015-12-07 14:29:30 +0000
@@ -9,6 +9,8 @@
 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.
@@ -2398,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-11-09 19:39:43 +0000
+++ src/maasserver/api/interfaces.py	2015-12-07 14:29:30 +0000
@@ -18,6 +18,7 @@
     OperationsHandler,
 )
 from maasserver.enum import (
+    INTERFACE_LINK_TYPE,
     INTERFACE_TYPE,
     NODE_PERMISSION,
     NODE_STATUS,
@@ -75,29 +76,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.
@@ -112,10 +113,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()
@@ -237,9 +240,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
@@ -254,7 +257,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):
@@ -372,9 +375,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.
@@ -399,9 +405,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
 
@@ -437,10 +446,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:
@@ -455,9 +478,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()
@@ -479,9 +505,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():
@@ -490,7 +519,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
@@ -504,7 +543,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
@@ -518,7 +557,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-11-10 17:50:31 +0000
+++ src/maasserver/api/tests/test_interfaces.py	2015-12-07 14:29:30 +0000
@@ -37,20 +37,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):
@@ -74,18 +74,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(httplib.OK, response.status_code, response.content)
@@ -99,6 +99,18 @@
             ]
         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(httplib.OK, response.status_code, response.content)
+        self.assertEqual(interface.id, json.loads(response.content)[0]['id'])
+
     def test_create_physical(self):
         self.become_admin()
         for status in (NODE_STATUS.READY, NODE_STATUS.BROKEN):
@@ -110,7 +122,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,
@@ -132,6 +144,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(
+            httplib.OK, response.status_code, response.content)
+        self.assertThat(json.loads(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):
@@ -143,7 +188,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,
@@ -171,7 +216,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,
@@ -203,7 +248,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,
@@ -216,7 +261,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",
             })
@@ -235,7 +280,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,
@@ -264,7 +309,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,
@@ -291,6 +336,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(
+            httplib.NOT_FOUND, response.status_code, response.content)
+
     def test_create_bond_requires_admin(self):
         node = factory.make_Node()
         vlan = factory.make_VLAN()
@@ -299,7 +355,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,
@@ -335,7 +391,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,
@@ -349,7 +405,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",
             })
@@ -374,7 +430,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,
@@ -394,13 +450,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(
+            httplib.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,
@@ -412,7 +479,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",
             })
@@ -433,7 +500,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()
@@ -500,7 +567,7 @@
         }
         bond.save()
 
-        uri = get_node_interface_uri(bond)
+        uri = get_interface_uri(bond)
         response = self.client.get(uri)
         self.assertEqual(httplib.OK, response.status_code, response.content)
         parsed_interface = json.loads(response.content)
@@ -513,7 +580,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()),
         }))
@@ -533,17 +600,28 @@
     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(httplib.OK, response.status_code, response.content)
         parsed_interface = json.loads(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(httplib.OK, response.status_code, response.content)
+        parsed_interface = json.loads(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(
@@ -557,7 +635,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,
@@ -568,13 +646,32 @@
             self.assertEquals(new_name, parsed_interface["name"])
             self.assertEquals(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(
+            httplib.OK, response.status_code, response.content)
+        parsed_interface = json.loads(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],
                 })
@@ -591,7 +688,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,
                 })
@@ -605,7 +702,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,
             })
@@ -634,7 +731,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,
                 })
@@ -646,25 +743,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(
                 httplib.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(
+            httplib.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(
             httplib.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(
@@ -690,7 +800,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(
                 httplib.CONFLICT, response.status_code, response.content)
@@ -703,7 +813,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,
@@ -716,12 +826,51 @@
                     "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(
+            httplib.OK, response.status_code, response.content)
+        parsed_response = json.loads(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(
+                httplib.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",
                 })
@@ -734,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",
             })
@@ -761,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,
@@ -781,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,
@@ -790,12 +939,31 @@
                 httplib.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(
+            httplib.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",
                 })
@@ -808,7 +976,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",
             })
@@ -835,7 +1003,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",
                 })
@@ -855,7 +1023,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
@@ -877,7 +1045,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
@@ -891,7 +1059,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",
                 })
@@ -904,7 +1072,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",
             })
@@ -931,7 +1099,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-11-05 23:56:42 +0000
+++ src/maasserver/forms_interface_link.py	2015-12-07 14:29:30 +0000
@@ -52,13 +52,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)
@@ -66,8 +59,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-09-17 23:00:17 +0000
+++ src/maasserver/models/__init__.py	2015-12-07 14:29:30 +0000
@@ -263,7 +263,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-08-31 21:24:55 +0000
+++ src/maasserver/tests/test_auth.py	2015-12-07 14:29:30 +0000
@@ -232,6 +232,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-11-10 00:00:54 +0000
+++ src/maasserver/urls_api.py	2015-12-07 14:29:30 +0000
@@ -76,6 +76,8 @@
     FilesHandler,
 )
 from maasserver.api.interfaces import (
+    InterfaceHandler,
+    InterfacesHandler,
     NodeInterfaceHandler,
     NodeInterfacesHandler,
 )
@@ -197,6 +199,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(
@@ -308,8 +314,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,