Merge ~newell-jensen/maas:2.5-lp1812509 into maas:2.5

[Newell Jensen]

backport 6ac39e8857bb142ef59f234ce06c26310ca508be - LP: #1812509 -- Fix setting the power type for a node with BMCs that have matching power parameters.

[Newell Jensen (newell-jensen)]

Self approved backport

review: Approve

diff --git a/src/maasserver/models/node.py b/src/maasserver/models/node.py
index e49c649..3798baa 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Node objects."""
@@ -1219,8 +1219,13 @@ class Node(CleanSave, TimestampedModel):
             return
         if self.bmc is not None and self.bmc.power_type == power_type:
             return
-        self.bmc, _ = BMC.objects.get_or_create(
-            power_type=power_type, power_parameters=self.power_parameters)
+
+        if power_type == 'manual':
+            self.bmc = BMC.objects.create(
+                power_type='manual', power_parameters={})
+        else:
+            self.bmc, _ = BMC.objects.get_or_create(
+                power_type=power_type, power_parameters=self.power_parameters)
 
     @property
     def power_parameters(self):
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index 361b6f8..3aa4169 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Test maasserver models."""
@@ -4582,6 +4582,34 @@ class TestNodePowerParameters(MAASServerTestCase):
         self.assertEqual(node.power_type, node.bmc.power_type)
         self.assertEqual(ip_address, node.bmc.ip_address.ip)
 
+    def test_power_type_creates_new_bmc_for_manual_power_type(self):
+        ip_address = factory.make_ipv4_address()
+        bmc_parameters = dict(power_address=ip_address)
+        node_parameters = dict(server_name=factory.make_string())
+        parameters = {**bmc_parameters, **node_parameters}
+        node = factory.make_Node(
+            power_type='virsh', power_parameters=parameters)
+        self.assertFalse(BMC.objects.filter(power_type='manual'))
+        node.power_type = 'manual'
+        node.save()
+        node = reload_object(node)
+        self.assertEqual('manual', node.bmc.power_type)
+        self.assertEqual({}, node.bmc.power_parameters)
+        self.assertTrue(BMC.objects.filter(power_type='manual'))
+
+    def test_power_type_does_not_create_new_bmc_for_already_manual(self):
+        ip_address = factory.make_ipv4_address()
+        bmc_parameters = dict(power_address=ip_address)
+        node_parameters = dict(server_name=factory.make_string())
+        parameters = {**bmc_parameters, **node_parameters}
+        node = factory.make_Node(
+            power_type='manual', power_parameters=parameters)
+        bmc_id = node.bmc.id
+        node.power_type = 'manual'
+        node.save()
+        node = reload_object(node)
+        self.assertEqual(bmc_id, node.bmc.id)
+
     def test_power_parameters_are_stored_in_proper_scopes(self):
         node = factory.make_Node(power_type='virsh')
         bmc_parameters = dict(