Merge lp:~allenap/maas/mac-n-cheese--bug-1398159 into lp:~maas-committers/maas/trunk

[Gavin Panella]

Don't query for node info when we don't have a MAC address.

When accessing the TFTP server from the local machine we can't look-up the MAC address via the ARP cache. Given that we will never be provisioning the local machine, because it's a cluster controller, we can return early.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[Gavin Panella (allenap)]

QA done locally.

[Gavin Panella (allenap)]

Thanks for the review Blake!

=== modified file 'src/provisioningserver/boot/tests/test_windows.py'
--- src/provisioningserver/boot/tests/test_windows.py	2014-09-27 01:44:10 +0000
+++ src/provisioningserver/boot/tests/test_windows.py	2014-12-09 09:23:02 +0000
@@ -15,9 +15,11 @@
 __metaclass__ = type
 __all__ = []
 
+import logging
 import os
 import shutil
 
+from fixtures import FakeLogger
 from maastesting.factory import factory
 from maastesting.matchers import MockCalledOnceWith
 from maastesting.testcase import (
@@ -25,6 +27,7 @@
     MAASTwistedRunTest,
     )
 import mock
+from mock import sentinel
 from provisioningserver.boot import (
     BootMethodError,
     BytesReader,
@@ -35,7 +38,15 @@
     WindowsPXEBootMethod,
     )
 from provisioningserver.config import Config
+from provisioningserver.rpc.exceptions import NoSuchNode
+from provisioningserver.rpc.region import RequestNodeInfoByMACAddress
+from provisioningserver.rpc.testing import (
+    always_fail_with,
+    always_succeed_with,
+    )
 from provisioningserver.tests.test_kernel_opts import make_kernel_parameters
+from testtools.deferredruntest import extract_result
+from testtools.matchers import Is
 from tftp.backend import FilesystemReader
 from twisted.internet.defer import inlineCallbacks
 
@@ -145,6 +156,38 @@
         self.assertThat(bcd.hive.commit, MockCalledOnceWith(None))
 
 
+class TestRequestNodeInfoByMACAddress(MAASTestCase):
+
+    run_tests_with = MAASTwistedRunTest.make_factory(timeout=5)
+
+    def test__returns_None_when_MAC_is_None(self):
+        logger = self.useFixture(FakeLogger("maas", logging.DEBUG))
+        d = windows_module.request_node_info_by_mac_address(None)
+        self.assertThat(extract_result(d), Is(None))
+        self.assertDocTestMatches(
+            "Cannot determine node; MAC address is unknown.",
+            logger.output)
+
+    def test__returns_None_when_node_not_found(self):
+        logger = self.useFixture(FakeLogger("maas", logging.DEBUG))
+        client = self.patch(windows_module, "getRegionClient").return_value
+        client.side_effect = always_fail_with(NoSuchNode())
+        mac = factory.make_mac_address()
+        d = windows_module.request_node_info_by_mac_address(mac)
+        self.assertThat(extract_result(d), Is(None))
+        self.assertDocTestMatches(
+            "Node doesn't exist for MAC address: %s" % mac,
+            logger.output)
+
+    def test__returns_output_from_RequestNodeInfoByMACAddress(self):
+        client = self.patch(windows_module, "getRegionClient").return_value
+        client.side_effect = always_succeed_with(sentinel.node_info)
+        d = windows_module.request_node_info_by_mac_address(sentinel.mac)
+        self.assertThat(extract_result(d), Is(sentinel.node_info))
+        self.assertThat(client, MockCalledOnceWith(
+            RequestNodeInfoByMACAddress, mac_address=sentinel.mac))
+
+
 class TestWindowsPXEBootMethod(MAASTestCase):
 
     run_tests_with = MAASTwistedRunTest.make_factory(timeout=5)

=== modified file 'src/provisioningserver/boot/windows.py'
--- src/provisioningserver/boot/windows.py	2014-11-17 11:56:49 +0000
+++ src/provisioningserver/boot/windows.py	2014-12-09 09:23:02 +0000
@@ -42,6 +42,7 @@
 from twisted.internet.defer import (
     inlineCallbacks,
     returnValue,
+    succeed,
     )
 from twisted.python.context import get
 from twisted.python.filepath import FilePath
@@ -89,20 +90,25 @@
 
 
 @asynchronous
-@inlineCallbacks
 def request_node_info_by_mac_address(mac_address):
     """Request node info for the given mac address.
 
     :param mac_address: The MAC Address of the node of the event.
     :type mac_address: unicode
     """
+    if mac_address is None:
+        maaslog.debug("Cannot determine node; MAC address is unknown.")
+        return succeed(None)
+
     client = getRegionClient()
-    try:
-        yield client(
-            RequestNodeInfoByMACAddress, mac_address=mac_address)
-    except NoSuchNode:
-        maaslog.debug(
-            "Node doesn't exist for MAC address: %s" % mac_address)
+    d = client(RequestNodeInfoByMACAddress, mac_address=mac_address)
+
+    def eb_request_node_info(failure):
+        failure.trap(NoSuchNode)
+        maaslog.debug("Node doesn't exist for MAC address: %s", mac_address)
+        return None
+
+    return d.addErrback(eb_request_node_info)
 
 
 class Bcd: