Merge lp:~rvb/maas/no-nodegroup-for-devices into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Link the devices to the default nodegroup. Devices should not be linked to a particular nodegroup but since the DNS machinery is linked to the nodegroups, as a step forward, we use the default nodegroup for now.

When we disconnect the DNS machinery from the nodegroups, we can remove this and have the device's nodegroup field set to None. What's important right now is that the API is designed in a way that can work with the model with have now *and* with the new networking model (i.e. we don't want the use to select a nodegroup when creating a device).

[Blake Rouse (blake-rouse)]

review: Approve

=== modified file 'src/maasserver/api/tests/test_devices.py'
--- src/maasserver/api/tests/test_devices.py	2015-02-17 19:32:56 +0000
+++ src/maasserver/api/tests/test_devices.py	2015-03-04 16:27:53 +0000
@@ -29,6 +29,7 @@
 from maasserver.models import (
     Node,
     node as node_module,
+    NodeGroup,
     StaticIPAddress,
     )
 from maasserver.testing.api import APITestCase
@@ -44,7 +45,6 @@
             '/api/1.0/devices/', reverse('devices_handler'))
 
     def test_new_creates_device(self):
-        cluster = factory.make_NodeGroup()
         hostname = factory.make_name('host')
         macs = {
             factory.make_mac_address()
@@ -54,7 +54,6 @@
             reverse('devices_handler'),
             {
                 'op': 'new',
-                'nodegroup': cluster.id,
                 'hostname': hostname,
                 'mac_addresses': macs,
             })
@@ -63,18 +62,17 @@
         device = Node.devices.get(system_id=system_id)
         self.assertEquals(hostname, device.hostname)
         self.assertFalse(device.installable)
+        self.assertEquals(NodeGroup.objects.ensure_master(), device.nodegroup)
         self.assertEquals(self.logged_in_user, device.owner)
         self.assertEquals(
             macs,
             {mac.mac_address for mac in device.macaddress_set.all()})
 
     def test_POST_returns_limited_fields(self):
-        cluster = factory.make_NodeGroup()
         response = self.client.post(
             reverse('devices_handler'),
             {
                 'op': 'new',
-                'nodegroup': cluster.id,
                 'hostname': factory.make_string(),
                 'mac_addresses': ['aa:bb:cc:dd:ee:ff'],
             })

=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2015-02-20 16:52:57 +0000
+++ src/maasserver/forms.py	2015-03-04 16:27:53 +0000
@@ -638,7 +638,6 @@
         model = Device
 
         fields = (
-            'nodegroup',
             'hostname',
             'parent',
         )
@@ -648,22 +647,18 @@
         self.request = request
 
         instance = kwargs.get('instance')
-        # Are we creating a new node object?
-        self.new_node = (instance is None)
-        if self.new_node:
-            # Offer choice of nodegroup.
-            self.fields['nodegroup'] = NodeGroupFormField(
-                required=False, empty_label="Default (master)")
+        # Are we creating a new device object?
+        self.new_device = (instance is None)
 
     def save(self, commit=True):
-        node = super(DeviceForm, self).save(commit=False)
-        node.installable = False
-        if self.new_node:
-            # Set the owner: non-installable nodes are owned by their
-            # creator.
-            node.owner = self.request.user
-        node.save()
-        return node
+        device = super(DeviceForm, self).save(commit=False)
+        device.installable = False
+        if self.new_device:
+            # Set the owner: devices are owned by their creator.
+            device.owner = self.request.user
+            device.nodegroup = NodeGroup.objects.ensure_master()
+        device.save()
+        return device
 
 
 CLUSTER_NOT_AVAILABLE = mark_safe(