Merge lp:~newell-jensen/maas/fix-1516065-1.9 into lp:maas/1.9

[Newell Jensen]

Do not fail to power manage a machine if BMC does not support changing the boot order.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'src/provisioningserver/drivers/power/ipmi.py'
--- src/provisioningserver/drivers/power/ipmi.py	2015-11-17 19:49:40 +0000
+++ src/provisioningserver/drivers/power/ipmi.py	2015-11-19 22:57:18 +0000
@@ -26,6 +26,7 @@
     PowerDriver,
     PowerFatalError,
 )
+from provisioningserver.logger import get_maas_logger
 from provisioningserver.utils import shell
 from provisioningserver.utils.network import find_ip_via_arp
 from provisioningserver.utils.shell import (
@@ -42,6 +43,9 @@
 """
 
 
+maaslog = get_maas_logger("drivers.power.ipmi")
+
+
 def is_set(setting):
     return not (setting is None or setting == "" or setting.isspace())
 
@@ -63,7 +67,8 @@
         return env
 
     @staticmethod
-    def _issue_ipmi_chassis_config_command(command, change, address, env):
+    def _issue_ipmi_chassis_config_command(
+            command, power_change, power_address, env):
         with NamedTemporaryFile() as tmp_config:
             # Write out the chassis configuration.
             tmp_config.write(IPMI_CONFIG)
@@ -78,18 +83,19 @@
         if "password invalid" in stderr:
             raise PowerAuthError("Invalid password.")
         if process.returncode != 0:
-            raise PowerFatalError(
-                "Failed to power %s %s: %s" % (change, address, stderr))
+            maaslog.warning(
+                'Failed to change the boot order to PXE %s: %s' % (
+                    power_address, stderr))
 
     @staticmethod
-    def _issue_ipmi_power_command(command, change, address, env):
+    def _issue_ipmi_power_command(command, power_change, power_address, env):
         command = tuple(command)  # For consistency when testing.
         try:
             output = call_and_check(command, env=env)
         except ExternalProcessError as e:
             raise PowerFatalError(
                 "Failed to power %s %s: %s" % (
-                    change, address, e.output_as_unicode))
+                    power_change, power_address, e.output_as_unicode))
         else:
             if 'on' in output:
                 return 'on'

=== modified file 'src/provisioningserver/drivers/power/tests/test_ipmi.py'
--- src/provisioningserver/drivers/power/tests/test_ipmi.py	2015-11-17 19:49:40 +0000
+++ src/provisioningserver/drivers/power/tests/test_ipmi.py	2015-11-19 22:57:18 +0000
@@ -268,7 +268,7 @@
                 ipmipower_command, env=env))
         self.expectThat(result, Equals('other'))
 
-    def test__issue_ipmi_command_issues_raises_power_auth_error(self):
+    def test__issue_ipmi_command_raises_power_fatal_error(self):
         _, _, _, _, _, _, _, context = make_parameters()
         ipmi_power_driver = IPMIPowerDriver()
         popen_mock = self.patch(ipmi_module, 'Popen')
@@ -280,17 +280,22 @@
             PowerAuthError, ipmi_power_driver._issue_ipmi_command,
             'on', **context)
 
-    def test__issue_ipmi_command_issues_raises_power_fatal_error(self):
+    def test__issue_ipmi_command_logs_maaslog_warning(self):
         _, _, _, _, _, _, _, context = make_parameters()
         ipmi_power_driver = IPMIPowerDriver()
         popen_mock = self.patch(ipmi_module, 'Popen')
         process = popen_mock.return_value
-        process.communicate.return_value = (None, '')
+        process.communicate.return_value = (None, 'maaslog error')
         process.returncode = -1
-
-        self.assertRaises(
-            PowerFatalError, ipmi_power_driver._issue_ipmi_command,
-            'on', **context)
+        maaslog = self.patch(ipmi_module, 'maaslog')
+        self.patch(ipmi_power_driver, '_issue_ipmi_power_command')
+
+        ipmi_power_driver._issue_ipmi_command('on', **context)
+
+        self.assertThat(
+            maaslog.warning, MockCalledOnceWith(
+                'Failed to change the boot order to PXE %s: %s' % (
+                    context['power_address'], 'maaslog error')))
 
     def test__issue_ipmi_command_issues_catches_external_process_error(self):
         _, _, _, _, _, _, _, context = make_parameters()