Merge lp:~julian-edwards/maas/clear-distroseries-bug-1316396 into lp:~maas-committers/maas/trunk

[Julian Edwards]

Ensure Node.distro_series is always cleared when releasing the node. Previously, starting in the API and stopping with the web UI caused it to remain which meant that subsequent startups from the web UI failed to honour the default series.

[Jeroen T. Vermeulen (jtv)]

Well sleuthed.

review: Approve

[Jeroen T. Vermeulen (jtv)]

Andres says: consider backporting this to 1.5 as well. He's hoping to get a batch of fixes in this week.

[Julian Edwards (julian-edwards)]

On 07/05/14 07:12, Jeroen T. Vermeulen wrote:
> Andres says: consider backporting this to 1.5 as well. He's hoping to get a batch of fixes in this week.
>

Yeah I am :)

Thanks for reviewing.

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2014-05-01 05:38:03 +0000
+++ src/maasserver/api.py	2014-05-06 06:51:14 +0000
@@ -432,7 +432,6 @@
         """Release a node.  Opposite of `NodesHandler.acquire`."""
         node = Node.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NODE_PERMISSION.EDIT)
-        node.set_distro_series(series='')
         if node.status == NODE_STATUS.READY:
             # Nothing to do.  This may be a redundant retry, and the
             # postcondition is achieved, so call this success.

=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2014-05-05 06:53:40 +0000
+++ src/maasserver/models/node.py	2014-05-06 06:51:14 +0000
@@ -837,6 +837,7 @@
         self.token = None
         self.agent_name = ''
         self.set_netboot()
+        self.distro_series = ''
         self.save()
 
     def set_netboot(self, on=True):

=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2014-04-21 11:07:32 +0000
+++ src/maasserver/models/tests/test_node.py	2014-05-06 06:51:14 +0000
@@ -586,6 +586,13 @@
         node.release()
         self.assertTrue(node.netboot)
 
+    def test_release_clears_distro_series(self):
+        node = factory.make_node(
+            status=NODE_STATUS.ALLOCATED, owner=factory.make_user())
+        node.set_distro_series(series=DISTRO_SERIES.quantal)
+        node.release()
+        self.assertEqual("", node.distro_series)
+
     def test_release_powers_off_node(self):
         # Test that releasing a node causes a 'power_off' celery job.
         node = factory.make_node(