Merge lp:~newell-jensen/maas/2.1-fix-1611999 into lp:maas/2.1

[Newell Jensen]

Backport trunk r5604: Update how UCSM power driver is querying the power state of the blade.

[Newell Jensen (newell-jensen)]

Self approved backport.

review: Approve

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-12-08 13:45:40 +0000
+++ docs/changelog.rst	2016-12-13 10:51:37 +0000
@@ -8,6 +8,8 @@
 Bugs fixed in this release
 --------------------------
 
+LP: #1611999    [2.1] MAAS cannot power query with Cisco UCSM power driver.
+
 LP: #1604962    node set to "failed deployment" for no visible reason
 
 LP: #1614584    MAAS fails to start when gethostname returns an FQDN.

=== modified file 'src/provisioningserver/drivers/hardware/tests/test_ucsm.py'
--- src/provisioningserver/drivers/hardware/tests/test_ucsm.py	2016-05-12 19:07:37 +0000
+++ src/provisioningserver/drivers/hardware/tests/test_ucsm.py	2016-12-13 10:51:37 +0000
@@ -92,8 +92,10 @@
     return factory.make_name('dn')
 
 
-def make_server():
-    return factory.make_name('server')
+def make_server(power_state=None):
+    return {
+        'operPower': power_state,
+    }
 
 
 class TestUCSMXMLAPIError(MAASTestCase):
@@ -547,19 +549,10 @@
         api = Mock()
         self.patch(ucsm, 'UCSM_XML_API').return_value = api
         get_servers_mock = self.patch(ucsm, 'get_servers')
-        server = make_server()
-        current_state = 'down'
-        power_control = Element('lsPower', {'state': current_state})
-        get_servers_mock.return_value = [server]
-        get_server_power_control_mock = self.patch(
-            ucsm, 'get_server_power_control')
-        get_server_power_control_mock.return_value = power_control
+        get_servers_mock.return_value = [make_server("off")]
 
         power_state = power_state_ucsm(url, username, password, uuid)
         self.expectThat(get_servers_mock, MockCalledOnceWith(api, uuid))
-        self.expectThat(
-            get_server_power_control_mock,
-            MockCalledOnceWith(api, server))
         self.expectThat(power_state, Equals('off'))
 
     def test_power_state_get_on(self):
@@ -570,19 +563,10 @@
         api = Mock()
         self.patch(ucsm, 'UCSM_XML_API').return_value = api
         get_servers_mock = self.patch(ucsm, 'get_servers')
-        server = make_server()
-        current_state = 'up'
-        power_control = Element('lsPower', {'state': current_state})
-        get_servers_mock.return_value = [server]
-        get_server_power_control_mock = self.patch(
-            ucsm, 'get_server_power_control')
-        get_server_power_control_mock.return_value = power_control
+        get_servers_mock.return_value = [make_server("on")]
 
         power_state = power_state_ucsm(url, username, password, uuid)
         self.expectThat(get_servers_mock, MockCalledOnceWith(api, uuid))
-        self.expectThat(
-            get_server_power_control_mock,
-            MockCalledOnceWith(api, server))
         self.expectThat(power_state, Equals('on'))
 
     def test_power_state_error_on_unknown_state(self):
@@ -593,13 +577,7 @@
         api = Mock()
         self.patch(ucsm, 'UCSM_XML_API').return_value = api
         get_servers_mock = self.patch(ucsm, 'get_servers')
-        server = make_server()
-        current_state = factory.make_name('error')
-        power_control = Element('lsPower', {'state': current_state})
-        get_servers_mock.return_value = [server]
-        get_server_power_control_mock = self.patch(
-            ucsm, 'get_server_power_control')
-        get_server_power_control_mock.return_value = power_control
+        get_servers_mock.return_value = [make_server()]
 
         self.assertRaises(
             UCSM_XML_API_Error, power_state_ucsm, url,

=== modified file 'src/provisioningserver/drivers/hardware/ucsm.py'
--- src/provisioningserver/drivers/hardware/ucsm.py	2016-05-12 19:07:37 +0000
+++ src/provisioningserver/drivers/hardware/ucsm.py	2016-12-13 10:51:37 +0000
@@ -85,15 +85,10 @@
 from provisioningserver.utils.twisted import synchronous
 
 
-class UCSMState:
-    DOWN = "down"
-    UP = "up"
-
-
 class UCSM_XML_API_Error(Exception):
     """Failure talking to a Cisco UCS Manager."""
 
-    def __init__(self, msg, code):
+    def __init__(self, msg, code=None):
         super(UCSM_XML_API_Error, self).__init__(msg)
         self.code = code
 
@@ -410,8 +405,8 @@
         # servers for a given UUID.
         [server] = get_servers(api, uuid)
         power_control = get_server_power_control(api, server)
-        command = get_power_command(maas_power_mode,
-                                    power_control.get('state'))
+        command = get_power_command(
+            maas_power_mode, server.get('operPower'))
         set_server_power_control(api, power_control, command)
 
 
@@ -421,13 +416,10 @@
         # UUIDs are unique per server, so we get either one or zero
         # servers for a given UUID.
         [server] = get_servers(api, uuid)
-        power_control = get_server_power_control(api, server)
-        power_state = power_control.get('state')
+        power_state = server.get('operPower')
 
-        if power_state == UCSMState.DOWN:
-            return 'off'
-        elif power_state == UCSMState.UP:
-            return 'on'
+        if power_state in ('on', 'off'):
+            return power_state
         raise UCSM_XML_API_Error(
             'Unknown power state: %s' % power_state, None)