Merge lp:~flacoste/maas/bug-981068 into lp:~maas-committers/maas/trunk

[Francis J. Lacoste]

When commissioning completes, remove the owner allocation.

This fixes bug #981068 which prevents the MAAS from using the machine once they are commissioned.

In the metadataserver, it clears out the owner when it's getting the end of commissioning signal (OK or FAILED).

[Francis J. Lacoste (flacoste)]

This is so simple, I'm self-reviewing this.

review: Approve

[Francis J. Lacoste (flacoste)]

review: Approve

[MAAS Lander (maas-lander)]

No approved revision specified.

=== modified file 'src/metadataserver/api.py'
--- src/metadataserver/api.py	2012-04-11 06:59:20 +0000
+++ src/metadataserver/api.py	2012-04-13 21:39:18 +0000
@@ -176,6 +176,9 @@
             return rc.ALL_OK
 
         node.status = target_status
+        # When moving to a terminal state, remove the allocation.
+        if target_status is not None:
+            node.owner = None
         node.error = request.POST.get('error', '')
         node.save()
 

=== modified file 'src/metadataserver/tests/test_api.py'
--- src/metadataserver/tests/test_api.py	2012-04-11 09:25:35 +0000
+++ src/metadataserver/tests/test_api.py	2012-04-13 21:39:18 +0000
@@ -313,6 +313,16 @@
         self.assertEqual(
             NODE_STATUS.COMMISSIONING, reload_object(node).status)
 
+    def test_signaling_WORKING_keeps_owner(self):
+        user = factory.make_user()
+        node = factory.make_node(status=NODE_STATUS.COMMISSIONING)
+        node.owner = user
+        node.save()
+        client = self.make_node_client(node=node)
+        response = self.call_signal(client, status='WORKING')
+        self.assertEqual(httplib.OK, response.status_code)
+        self.assertEqual(user, reload_object(node).owner)
+
     def test_signaling_commissioning_success_makes_node_Ready(self):
         node = factory.make_node(status=NODE_STATUS.COMMISSIONING)
         client = self.make_node_client(node=node)
@@ -343,6 +353,15 @@
         self.assertEqual(httplib.OK, response.status_code)
         self.assertEqual(NODE_STATUS.READY, reload_object(node).status)
 
+    def test_signaling_commissioning_success_clears_owner(self):
+        node = factory.make_node(status=NODE_STATUS.COMMISSIONING)
+        node.owner = factory.make_user()
+        node.save()
+        client = self.make_node_client(node=node)
+        response = self.call_signal(client, status='OK')
+        self.assertEqual(httplib.OK, response.status_code)
+        self.assertEqual(None, reload_object(node).owner)
+
     def test_signaling_commissioning_failure_makes_node_Failed_Tests(self):
         node = factory.make_node(status=NODE_STATUS.COMMISSIONING)
         client = self.make_node_client(node=node)
@@ -366,6 +385,15 @@
         self.assertEqual(httplib.OK, response.status_code)
         self.assertEqual(error_text, reload_object(node).error)
 
+    def test_signaling_commissioning_failure_clears_owner(self):
+        node = factory.make_node(status=NODE_STATUS.COMMISSIONING)
+        node.owner = factory.make_user()
+        node.save()
+        client = self.make_node_client(node=node)
+        response = self.call_signal(client, status='FAILED')
+        self.assertEqual(httplib.OK, response.status_code)
+        self.assertEqual(None, reload_object(node).owner)
+
     def test_signaling_no_error_clears_existing_error(self):
         node = factory.make_node(
             status=NODE_STATUS.COMMISSIONING, error=factory.getRandomString())