Merge lp:~rvb/maas/rm-cluster-interf-connexion into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Remove the API that gives the user the ability to link a device's MAC to a cluster interface. This isn't an API endpoint we want to have to maintain in 1.8 when networks and cluster interface will be more strictly tied together.

Although we still internally use the connection between a cluster interface and a MAC to figure out to which network a MAC is connected to, we don't want to expose this to the user as this will be refactored heavily in 1.8.

The ways to connect a MAC to a cluster interface are:
- set a parent for the device: the device primary MAC will be connected to the same cluster interface the parent is PXE booting from
- have the device DHCP off MAAS. Then MAAS will make the connection between the MAC and the cluster interface (this is done in a follow-up branch).
- explicitly claim a particular IP address for a MAC address: if this IP is part of a network MAAS manages, it will create the connection with the right cluster interface.

[Blake Rouse (blake-rouse)]

review: Approve

=== modified file 'src/maasserver/api/devices.py'
--- src/maasserver/api/devices.py	2015-02-18 13:18:08 +0000
+++ src/maasserver/api/devices.py	2015-03-05 08:43:33 +0000
@@ -15,16 +15,12 @@
     "DevicesHandler",
     ]
 
-from django.shortcuts import get_object_or_404
 from maasserver.api.logger import maaslog
 from maasserver.api.support import (
     operation,
     OperationsHandler,
     )
-from maasserver.api.utils import (
-    get_mandatory_param,
-    get_optional_list,
-    )
+from maasserver.api.utils import get_optional_list
 from maasserver.dns.config import dns_update_zones
 from maasserver.enum import (
     IPADDRESS_TYPE,
@@ -42,8 +38,6 @@
 from maasserver.models import (
     MACAddress,
     Node,
-    NodeGroup,
-    NodeGroupInterface,
     )
 from maasserver.models.node import Device
 from piston.utils import rc
@@ -186,41 +180,6 @@
             ', '.join(allocation.ip for allocation in sticky_ips))
         return device
 
-    @operation(idempotent=False)
-    def connect_mac_to_cluster_interface(self, request, system_id):
-        """Connect the given MAC Address to a cluster interface.
-
-        :param mac_address: MAC address to connect.
-        :param cluster_uuid: The UUID of the cluster the MAC address should
-            be connected to.
-        :param cluster_interface_name: The name of the cluster interface the
-            MAC address should be connected to.
-
-        Returns 404 if the device is not found.
-        Returns 400 if the mac_address is not found on the device.
-        """
-        device = Node.devices.get_node_or_404(
-            system_id=system_id, user=request.user, perm=NODE_PERMISSION.EDIT)
-        mac_address = get_mandatory_param(request.data, 'mac_address')
-        cluster_uuid = get_mandatory_param(request.data, 'cluster_uuid')
-        cluster_interface_name = get_mandatory_param(
-            request.data, 'cluster_interface')
-        cluster = get_object_or_404(NodeGroup, uuid=cluster_uuid)
-        nodegroupinterface = get_object_or_404(
-            NodeGroupInterface, nodegroup=cluster,
-            name=cluster_interface_name)
-        try:
-            mac = MACAddress.objects.get(
-                mac_address=mac_address, node=device)
-        except MACAddress.DoesNotExist:
-            raise MAASAPIBadRequest(
-                "mac_address %s not found on the device" % mac_address)
-        mac.cluster_interface = nodegroupinterface
-        mac.save()
-        maaslog.info(
-            "%s %s linked to cluster interface %s",
-            device.hostname, mac_address, nodegroupinterface.name)
-
 
 class DevicesHandler(OperationsHandler):
     """Manage the collection of all the devices in the MAAS."""
 
=== modified file 'src/maasserver/api/tests/test_devices.py'
--- src/maasserver/api/tests/test_devices.py	2015-03-05 08:43:33 +0000
+++ src/maasserver/api/tests/test_devices.py	2015-03-05 08:43:33 +0000
@@ -23,7 +23,6 @@
 from maasserver.enum import (
     IPADDRESS_TYPE,
     NODE_STATUS,
-    NODEGROUP_STATUS,
     NODEGROUPINTERFACE_MANAGEMENT,
     )
 from maasserver.models import (
@@ -287,65 +286,3 @@
             get_device_uri(device), {'op': 'claim_sticky_ip_address'})
         self.assertEqual(httplib.FORBIDDEN, response.status_code)
         self.assertItemsEqual([], StaticIPAddress.objects.all())
-
-    def test_connect_mac_to_cluster_interface_connects_mac(self):
-        cluster = factory.make_NodeGroup(status=NODEGROUP_STATUS.ACCEPTED)
-        interface = factory.make_NodeGroupInterface(
-            cluster, network=None,
-            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP)
-        device = factory.make_Node(
-            installable=False, mac=True, disable_ipv4=False,
-            owner=self.logged_in_user)
-        mac = device.macaddress_set.all()[0]
-        response = self.client.post(
-            get_device_uri(device),
-            {
-                'op': 'connect_mac_to_cluster_interface',
-                'mac_address': (
-                    mac.mac_address.get_raw()),
-                'cluster_uuid': cluster.uuid,
-                'cluster_interface': interface.name,
-            })
-        self.assertEqual(httplib.OK, response.status_code, response.content)
-        self.assertEqual(interface, reload_object(mac).cluster_interface)
-
-    def test_connect_mac_to_cluster_interface_checks_permission(self):
-        cluster = factory.make_NodeGroup(status=NODEGROUP_STATUS.ACCEPTED)
-        interface = factory.make_NodeGroupInterface(
-            cluster, network=None,
-            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP)
-        device = factory.make_Node(
-            installable=False, mac=True, disable_ipv4=False,
-            owner=factory.make_User())
-        mac = device.macaddress_set.all()[0]
-        response = self.client.post(
-            get_device_uri(device),
-            {
-                'op': 'connect_mac_to_cluster_interface',
-                'mac_address': (
-                    mac.mac_address.get_raw()),
-                'cluster_uuid': cluster.uuid,
-                'cluster_interface': interface.name,
-            })
-        self.assertEqual(
-            httplib.FORBIDDEN, response.status_code, response.content)
-
-    def test_connect_mac_to_cluster_interface_rejects_unknown_mac(self):
-        cluster = factory.make_NodeGroup(status=NODEGROUP_STATUS.ACCEPTED)
-        interface = factory.make_NodeGroupInterface(
-            cluster, network=None,
-            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP)
-        device = factory.make_Node(
-            installable=False, mac=True, disable_ipv4=False,
-            owner=self.logged_in_user)
-        response = self.client.post(
-            get_device_uri(device),
-            {
-                'op': 'connect_mac_to_cluster_interface',
-                'mac_address': (
-                    factory.make_MAC()),
-                'cluster_uuid': cluster.uuid,
-                'cluster_interface': interface.name,
-            })
-        self.assertEqual(
-            httplib.BAD_REQUEST, response.status_code, response.content)