Merge lp:~gmb/maas/fix-netboot_off into lp:~maas-committers/maas/trunk

[Graham Binns]

Move the emission of the "installation finished" event to the anonymous API handler in metadataserver.api; previously it was on the non-anonymous handler and was never getting called.

Also fixed a bug in the emission code itself so that the description is set meaningfully.

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'src/metadataserver/api.py'
--- src/metadataserver/api.py	2014-09-23 12:16:45 +0000
+++ src/metadataserver/api.py	2014-09-23 15:20:04 +0000
@@ -304,16 +304,6 @@
         """
         node = get_queried_node(request, for_mac=mac)
         node.set_netboot(False)
-
-        # Build and register an event for "node installation finished".
-        # This is a best-guess. At the moment, netboot_off() only gets
-        # called when the node has finished installing, so it's an
-        # accurate predictor of the end of the install process.
-        type_name = EVENT_TYPES.NODE_INSTALLATION_FINISHED
-        event_details = EVENT_DETAILS[type_name]
-        Event.objects.register_event_and_event_type(
-            node.system_id, type_name, type_level=event_details.level,
-            event_description=event_details.description)
         return rc.ALL_OK
 
     @operation(idempotent=False)
@@ -507,4 +497,15 @@
         """
         node = get_object_or_404(Node, system_id=system_id)
         node.set_netboot(False)
+
+        # Build and register an event for "node installation finished".
+        # This is a best-guess. At the moment, netboot_off() only gets
+        # called when the node has finished installing, so it's an
+        # accurate predictor of the end of the install process.
+        type_name = EVENT_TYPES.NODE_INSTALLATION_FINISHED
+        event_details = EVENT_DETAILS[type_name]
+        Event.objects.register_event_and_event_type(
+            node.system_id, type_name, type_level=event_details.level,
+            type_description=event_details.description,
+            event_description="Node disabled netboot")
         return rc.ALL_OK
 
=== modified file 'src/metadataserver/tests/test_api.py'
--- src/metadataserver/tests/test_api.py	2014-09-23 12:16:45 +0000
+++ src/metadataserver/tests/test_api.py	2014-09-23 15:20:04 +0000
@@ -890,23 +890,6 @@
         node = reload_object(node)
         self.assertTrue(node.netboot, response)
 
-    def test_netboot_off_adds_installation_finished_event(self):
-        node = factory.make_Node(netboot=True)
-        client = make_node_client(node=node)
-        url = reverse('metadata-version', args=['latest'])
-        client.post(url, {'op': 'netboot_off'})
-        latest_event = Event.objects.filter(node=node).last()
-        self.assertEqual(
-            (
-                EVENT_TYPES.NODE_INSTALLATION_FINISHED,
-                EVENT_DETAILS[
-                    EVENT_TYPES.NODE_INSTALLATION_FINISHED].description
-            ),
-            (
-                latest_event.type.name,
-                latest_event.description,
-            ))
-
 
 class TestAnonymousAPI(DjangoTestCase):
 
@@ -974,6 +957,26 @@
              response.content),
             response)
 
+    def test_anoymous_netboot_off_adds_installation_finished_event(self):
+        node = factory.make_Node(netboot=True)
+        anon_netboot_off_url = reverse(
+            'metadata-node-by-id', args=['latest', node.system_id])
+        self.client.post(
+            anon_netboot_off_url, {'op': 'netboot_off'})
+        latest_event = Event.objects.filter(node=node).last()
+        self.assertEqual(
+            (
+                EVENT_TYPES.NODE_INSTALLATION_FINISHED,
+                EVENT_DETAILS[
+                    EVENT_TYPES.NODE_INSTALLATION_FINISHED].description,
+                "Node disabled netboot",
+            ),
+            (
+                latest_event.type.name,
+                latest_event.type.description,
+                latest_event.description,
+            ))
+
 
 class TestEnlistViews(DjangoTestCase):
     """Tests for the enlistment metadata views."""