Merge lp:~mpontillo/maas/fix-1517097-1.9 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Merge fix for #1517097 from trunk revision 4512.

=== modified file 'src/maasserver/models/node.py'
=== modified file 'src/provisioningserver/drivers/power/__init__.py'
=== modified file 'src/provisioningserver/drivers/power/amt.py'
--- src/provisioningserver/drivers/power/amt.py	2015-11-17 02:05:20 +0000
+++ src/provisioningserver/drivers/power/amt.py	2015-11-21 00:18:35 +0000
@@ -53,6 +53,7 @@
                 missing_packages.append(package)
         return missing_packages
 
+<<<<<<< TREE
     def _render_wsman_state_xml(self, power_change):
         """Render wsman state XML."""
         wsman_state_filename = join(dirname(__file__), "amt.wsman-state.xml")
@@ -373,3 +374,13 @@
             return self.amttool_query_state(ip_address, power_pass)
         elif amt_command == 'wsman':
             return self.wsman_query_state(ip_address, power_pass)
+=======
+    def power_on(self, system_id, context):
+        raise NotImplementedError
+
+    def power_off(self, system_id, context):
+        raise NotImplementedError
+
+    def power_query(self, system_id, context):
+        raise NotImplementedError
+>>>>>>> MERGE-SOURCE
 
=== modified file 'src/provisioningserver/drivers/power/ipmi.py'
--- src/provisioningserver/drivers/power/ipmi.py	2015-11-18 21:16:42 +0000
+++ src/provisioningserver/drivers/power/ipmi.py	2015-11-21 00:18:35 +0000
@@ -27,6 +27,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 (
@@ -43,6 +44,16 @@
 """
 
 
+<<<<<<< TREE
+=======
+maaslog = get_maas_logger("drivers.power.ipmi")
+
+
+def is_set(setting):
+    return not (setting is None or setting == "" or setting.isspace())
+
+
+>>>>>>> MERGE-SOURCE
 class IPMIPowerDriver(PowerDriver):
 
     name = 'ipmi'
@@ -55,7 +66,8 @@
         return []
 
     @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)
@@ -70,18 +82,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_amt.py'
--- src/provisioningserver/drivers/power/tests/test_amt.py	2015-11-17 02:05:20 +0000
+++ src/provisioningserver/drivers/power/tests/test_amt.py	2015-11-21 00:18:35 +0000
@@ -99,6 +99,7 @@
         missing = driver.detect_missing_packages()
         self.assertItemsEqual([], missing)
 
+<<<<<<< TREE
     def test__render_wsman_state_xml_renders_xml(self):
         amt_power_driver = AMTPowerDriver()
         power_change = choice(['on', 'off', 'restart'])
@@ -780,3 +781,19 @@
             wsman_query_state_mock, MockCalledOnceWith(
                 context['ip_address'], context['power_pass']))
         self.expectThat(state, Equals('on'))
+=======
+    def test_power_on(self):
+        driver = amt_module.AMTPowerDriver()
+        self.assertRaises(
+            NotImplementedError, driver.power_on, "fake_id", {})
+
+    def test_power_off(self):
+        driver = amt_module.AMTPowerDriver()
+        self.assertRaises(
+            NotImplementedError, driver.power_off, "fake_id", {})
+
+    def test_power_query(self):
+        driver = amt_module.AMTPowerDriver()
+        self.assertRaises(
+            NotImplementedError, driver.power_query, "fake_id", {})
+>>>>>>> MERGE-SOURCE
 
=== modified file 'src/provisioningserver/drivers/power/tests/test_ipmi.py'
--- src/provisioningserver/drivers/power/tests/test_ipmi.py	2015-11-17 02:05:20 +0000
+++ src/provisioningserver/drivers/power/tests/test_ipmi.py	2015-11-21 00:18:35 +0000
@@ -269,8 +269,13 @@
                 ipmipower_command, env=env))
         self.expectThat(result, Equals('other'))
 
+<<<<<<< TREE
     def test__issue_ipmi_command_issues_raises_power_auth_error(self):
         _, _, _, _, _, _, _, context = make_parameters()
+=======
+    def test__issue_ipmi_command_raises_power_fatal_error(self):
+        _, _, _, _, _, _, _, context = make_parameters()
+>>>>>>> MERGE-SOURCE
         ipmi_power_driver = IPMIPowerDriver()
         popen_mock = self.patch(ipmi_module, 'Popen')
         process = popen_mock.return_value
@@ -281,17 +286,34 @@
             PowerAuthError, ipmi_power_driver._issue_ipmi_command,
             'on', **context)
 
+<<<<<<< TREE
     def test__issue_ipmi_command_issues_raises_power_fatal_error(self):
         _, _, _, _, _, _, _, context = make_parameters()
+=======
+    def test__issue_ipmi_command_logs_maaslog_warning(self):
+        _, _, _, _, _, _, _, context = make_parameters()
+>>>>>>> MERGE-SOURCE
         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
+<<<<<<< TREE
 
         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')))
+>>>>>>> MERGE-SOURCE
 
     def test__issue_ipmi_command_issues_catches_external_process_error(self):
         _, _, _, _, _, _, _, context = make_parameters()