Merge lp:~julian-edwards/maas/remove-harmless-warning-bug-1386909 into lp:~maas-committers/maas/trunk

[Julian Edwards]

Don't bother searching for a boot purpose of "local" when serving pxeconfig API requests. It saves a call to the cluster controller and prevents a spurious log message.

[Newell Jensen (newell-jensen)]

Nicely done.

review: Approve

[Graham Binns (gmb)]

review: Approve

=== modified file 'src/maasserver/api/pxeconfig.py'
--- src/maasserver/api/pxeconfig.py	2014-10-20 20:32:00 +0000
+++ src/maasserver/api/pxeconfig.py	2014-11-06 06:13:51 +0000
@@ -84,6 +84,13 @@
         nodegroup, osystem, architecture, subarchitecture, series, purpose):
     """Obtain the first available boot image for this cluster for the given
     osystem, architecture, subarchitecute, series, and purpose."""
+    # When local booting a node we put it through a PXE cycle. In
+    # this case it requests a purpose of "local" when looking for
+    # boot images.  To avoid unnecessary work, we can shortcut that
+    # here and just return None right away.
+    if purpose == "local":
+        return None
+
     try:
         images = get_boot_images_for(
             nodegroup, osystem, architecture, subarchitecture, series)

=== modified file 'src/maasserver/api/tests/test_pxeconfig.py'
--- src/maasserver/api/tests/test_pxeconfig.py	2014-10-20 20:32:00 +0000
+++ src/maasserver/api/tests/test_pxeconfig.py	2014-11-06 06:13:51 +0000
@@ -50,7 +50,10 @@
 from maasserver.testing.orm import reload_object
 from maasserver.testing.testcase import MAASServerTestCase
 from maastesting.fakemethod import FakeMethod
-from maastesting.matchers import MockCalledOnceWith
+from maastesting.matchers import (
+    MockCalledOnceWith,
+    MockNotCalled,
+    )
 from mock import sentinel
 from netaddr import IPNetwork
 from provisioningserver import kernel_opts
@@ -60,6 +63,7 @@
     Contains,
     ContainsAll,
     Equals,
+    Is,
     MatchesListwise,
     StartsWith,
     )
@@ -119,6 +123,16 @@
                 sentinel.architecture, subarch,
                 sentinel.series, purpose))
 
+    def test__returns_None_immediately_if_purpose_is_local(self):
+        self.patch(pxeconfig_module, 'get_boot_images_for')
+        self.expectThat(
+            get_boot_image(
+                sentinel.nodegroup, sentinel.osystem,
+                sentinel.architecture, sentinel.subarchitecture,
+                sentinel.series, "local"),
+            Is(None))
+        self.expectThat(pxeconfig_module.get_boot_images_for, MockNotCalled())
+
 
 class TestPXEConfigAPI(MAASServerTestCase):