Merge lp:~newell-jensen/maas/2.0-fix-1632815 into lp:maas/2.0

[Newell Jensen]

Backport trunk r5475: During release, check if return deferred from _stop is None, as _stop will return None for 'manual' power type.

[Newell Jensen (newell-jensen)]

Self approved backport.

review: Approve

=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2016-10-05 19:01:28 +0000
+++ src/maasserver/models/node.py	2016-10-12 22:33:25 +0000
@@ -2192,9 +2192,11 @@
                 # Deferred it returns for the asynchronous (post-commit) bits.
                 stopping = self._stop(self.owner)
                 # If there's an error, reset the node's status.
-                stopping.addErrback(
-                    callOutToDatabase, Node._set_status, self.system_id,
-                    status=self.status)
+                # Check for None (_stop returns None for manual power type).
+                if stopping is not None:
+                    stopping.addErrback(
+                        callOutToDatabase, Node._set_status, self.system_id,
+                        status=self.status)
             except Exception as ex:
                 maaslog.error(
                     "%s: Unable to shut node down: %s", self.hostname,
 
=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2016-10-05 19:01:28 +0000
+++ src/maasserver/models/tests/test_node.py	2016-10-12 22:33:25 +0000
@@ -1479,10 +1479,7 @@
         }
         uncontrolled_power_types = (
             all_power_types.difference(QUERY_POWER_TYPES))
-        # manual cannot be stopped, so discard this option.
-        uncontrolled_power_types.discard("manual")
         power_type = random.choice(list(uncontrolled_power_types))
-        self.assertNotEqual("manual", power_type)
         rack = factory.make_RackController()
         node = factory.make_Node_with_Interface_on_Subnet(
             status=NODE_STATUS.ALLOCATED, owner=owner, owner_data=owner_data,