Merge lp:~newell-jensen/maas/fix-1595753 into lp:~maas-committers/maas/trunk

[Newell Jensen]

This branch fixes an HMC regression from MAAS 1.9 to MAAS 2.0 (this will be backported to 2.0 branch). Updates faulty unit tests as well.

[Newell Jensen (newell-jensen)]

Self approving, simple fix.

review: Approve

[Mike Pontillo (mpontillo)]

Looks fine, just curious why the fix was needed. It might be good to explain that in the comments, as it's not too clear from the diff.

[Newell Jensen (newell-jensen)]

The proper parameters were not getting passed to the run_hmc_command method. The unit tests were faulty and did not catch this as the mocked method was expected to be called with the incorrect amount of arguments.

=== modified file 'src/provisioningserver/drivers/power/hmc.py'
--- src/provisioningserver/drivers/power/hmc.py	2016-04-11 16:23:26 +0000
+++ src/provisioningserver/drivers/power/hmc.py	2016-06-23 23:50:42 +0000
@@ -48,7 +48,7 @@
             ssh_client.connect(
                 power_address, username=power_user, password=power_pass)
             _, stdout, _ = ssh_client.exec_command(command)
-            output = stdout.read().decode('utf-8')
+            output = stdout.read().decode('utf-8').strip()
         except (SSHException, EOFError, SOCKETError) as e:
             raise PowerConnError(
                 "Could not make SSH connection to HMC for "
@@ -66,7 +66,7 @@
             # Power lpar on
             self.run_hmc_command(
                 "chsysstate -r lpar -m %s -o on -n %s --bootstring network-all"
-                % (context['server_name'], context['lpar']))
+                % (context['server_name'], context['lpar']), **context)
         except PowerConnError as e:
             raise PowerActionError(
                 "HMC Power Driver unable to power on lpar %s: %s"
@@ -78,7 +78,7 @@
             # Power lpar off
             self.run_hmc_command(
                 "chsysstate -r lpar -m %s -o shutdown -n %s --immed"
-                % (context['server_name'], context['lpar']))
+                % (context['server_name'], context['lpar']), **context)
         except PowerConnError as e:
             raise PowerActionError(
                 "HMC Power Driver unable to power off lpar %s: %s"
@@ -90,7 +90,7 @@
             # Power query lpar
             power_state = self.run_hmc_command(
                 "lssyscfg -m %s -r lpar -F state --filter lpar_names=%s"
-                % (context['server_name'], context['lpar']))
+                % (context['server_name'], context['lpar']), **context)
         except PowerConnError as e:
             raise PowerActionError(
                 "HMC Power Driver unable to power query lpar %s: %s"
 
=== modified file 'src/provisioningserver/drivers/power/tests/test_hmc.py'
--- src/provisioningserver/drivers/power/tests/test_hmc.py	2016-05-12 19:07:37 +0000
+++ src/provisioningserver/drivers/power/tests/test_hmc.py	2016-06-23 23:50:42 +0000
@@ -96,7 +96,7 @@
         self.assertThat(
             run_hmc_command, MockCalledOnceWith(
                 "chsysstate -r lpar -m %s -o on -n %s --bootstring network-all"
-                % (context['server_name'], context['lpar'])))
+                % (context['server_name'], context['lpar']), **context))
 
     def test_power_on_crashes_for_connection_error(self):
         driver = HMCPowerDriver()
@@ -118,7 +118,7 @@
         self.assertThat(
             run_hmc_command, MockCalledOnceWith(
                 "chsysstate -r lpar -m %s -o shutdown -n %s --immed"
-                % (context['server_name'], context['lpar'])))
+                % (context['server_name'], context['lpar']), **context))
 
     def test_power_off_crashes_for_connection_error(self):
         driver = HMCPowerDriver()