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

[Newell Jensen]

Make DLI PDU power off first, if it is already powered on, before powering on.

Remove DLI from query power types.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

=== modified file 'src/provisioningserver/drivers/power/dli.py'
--- src/provisioningserver/drivers/power/dli.py	2015-11-17 19:49:40 +0000
+++ src/provisioningserver/drivers/power/dli.py	2015-12-04 20:58:41 +0000
@@ -14,8 +14,11 @@
 __metaclass__ = type
 __all__ = []
 
+from time import sleep
+
 from provisioningserver.drivers.power import (
     PowerDriver,
+    PowerError,
     PowerFatalError,
 )
 from provisioningserver.utils import shell
@@ -93,6 +96,13 @@
 
     def power_on(self, system_id, context):
         """Power on DLI outlet."""
+        if self._query_outlet_state(**context) == 'on':
+            self._set_outlet_state('OFF', **context)
+            sleep(1)
+            if self._query_outlet_state(**context) != 'off':
+                raise PowerError(
+                    "Unable to power off outlet %s that is already on."
+                    % context['outlet_id'])
         self._set_outlet_state('ON', **context)
 
     def power_off(self, system_id, context):

=== modified file 'src/provisioningserver/drivers/power/tests/test_dli.py'
--- src/provisioningserver/drivers/power/tests/test_dli.py	2015-11-17 19:49:40 +0000
+++ src/provisioningserver/drivers/power/tests/test_dli.py	2015-12-04 20:58:41 +0000
@@ -17,11 +17,18 @@
 from random import choice
 
 from maastesting.factory import factory
-from maastesting.matchers import MockCalledOnceWith
+from maastesting.matchers import (
+    MockCalledOnceWith,
+    MockCallsMatch,
+)
 from maastesting.testcase import MAASTestCase
-from mock import sentinel
+from mock import (
+    call,
+    sentinel,
+)
 from provisioningserver.drivers.power import (
     dli as dli_module,
+    PowerError,
     PowerFatalError,
 )
 from provisioningserver.utils.shell import (
@@ -143,10 +150,35 @@
         driver = dli_module.DLIPowerDriver()
         system_id = factory.make_name('system_id')
         context = {'context': factory.make_name('context')}
+        _query_outlet_state_mock = self.patch(driver, '_query_outlet_state')
+        _query_outlet_state_mock.side_effect = ('on', 'off')
         _set_outlet_state_mock = self.patch(driver, '_set_outlet_state')
+        self.patch(dli_module, 'sleep')
+
         driver.power_on(system_id, context)
-        self.assertThat(
-            _set_outlet_state_mock, MockCalledOnceWith('ON', **context))
+
+        self.expectThat(
+            _query_outlet_state_mock, MockCallsMatch(
+                call(**context), call(**context)))
+        self.expectThat(
+            _set_outlet_state_mock, MockCallsMatch(
+                call('OFF', **context), call('ON', **context)))
+
+    def test_power_on_raises_power_error(self):
+        driver = dli_module.DLIPowerDriver()
+        system_id = factory.make_name('system_id')
+        context = {'outlet_id': factory.make_name('outlet_id')}
+        _query_outlet_state_mock = self.patch(driver, '_query_outlet_state')
+        _query_outlet_state_mock.side_effect = ('on', 'not-off')
+        _set_outlet_state_mock = self.patch(driver, '_set_outlet_state')
+        self.patch(dli_module, 'sleep')
+
+        self.assertRaises(PowerError, driver.power_on, system_id, context)
+        self.expectThat(
+            _query_outlet_state_mock, MockCallsMatch(
+                call(**context), call(**context)))
+        self.expectThat(
+            _set_outlet_state_mock, MockCalledOnceWith('OFF', **context))
 
     def test_power_off(self):
         driver = dli_module.DLIPowerDriver()

=== modified file 'src/provisioningserver/power/__init__.py'
--- src/provisioningserver/power/__init__.py	2015-09-24 16:22:12 +0000
+++ src/provisioningserver/power/__init__.py	2015-12-04 20:58:41 +0000
@@ -30,7 +30,6 @@
 # querying the power state of a node.
 QUERY_POWER_TYPES = [
     'amt',
-    'dli',
     'hmc',
     'ipmi',
     'mscm',