Merge lp:~newell-jensen/maas/1.7-fix-bug-1382075 into lp:maas/1.7

[Newell Jensen]

Only save node power parameters via the metadataserver.api if the current node power type is not "mscm".

[Newell Jensen (newell-jensen)]

Currently have this queued in CI.

[Jason Hobbs (jason-hobbs)]

Comment inline

[Newell Jensen (newell-jensen)]

Jason, go ahead and have another look.

[Jason Hobbs (jason-hobbs)]

Approved, with a comment inline.

[Jason Hobbs (jason-hobbs)]

Actually approve.

review: Approve

[Christian Reis (kiko)]

Before landing this, could you please get Sean and Narinder to test, and can you test on non-moonshot systems to ensure this doesn't regress?

review: Needs Information

[Julian Edwards (julian-edwards)]

Just a small point, but presumably this is going to land in trunk as well? If
so, it's customary to land there first, and then merge the trunk revision back
into the older branch. I think I went through this with Newell before :)

[Newell Jensen (newell-jensen)]

Julian,

This branch is *only* going to be for 1.7, hence the reason for not doing it in trunk first and then doing a back port.

[Christian Reis (kiko)]

Right. The correct fix for trunk involves changing the commissioning semantics.

=== modified file 'src/metadataserver/api.py'
--- src/metadataserver/api.py	2014-09-24 23:31:30 +0000
+++ src/metadataserver/api.py	2014-10-21 23:07:52 +0000
@@ -279,7 +279,15 @@
 
         if node.status == NODE_STATUS.COMMISSIONING:
             self._store_commissioning_results(node, request)
-            store_node_power_parameters(node, request)
+            # XXX 2014-10-21 newell, bug=1382075
+            # Auto detection for IPMI tries to save power parameters
+            # for Moonshot.  This causes issues if the node's power type
+            # is already MSCM as it uses SSH instead of IPMI.  This fix
+            # is temporary as power parameters should not be overwritten
+            # during commissioning because MAAS already has knowledge to
+            # boot the node.
+            if node.power_type != "mscm":
+                store_node_power_parameters(node, request)
             target_status = self.signaling_statuses.get(status)
         elif node.status == NODE_STATUS.DEPLOYING:
             self._store_installing_results(node, request)
 
=== modified file 'src/metadataserver/tests/test_api.py'
--- src/metadataserver/tests/test_api.py	2014-10-09 16:32:04 +0000
+++ src/metadataserver/tests/test_api.py	2014-10-21 23:07:52 +0000
@@ -793,6 +793,21 @@
         node = reload_object(node)
         self.assertEqual(0, len(node.tags.all()))
 
+    def test_signal_current_power_type_mscm_does_not_store_params(self):
+        node = factory.make_Node(
+            power_type="mscm", status=NODE_STATUS.COMMISSIONING)
+        client = make_node_client(node=node)
+        params = dict(
+            power_address=factory.make_string(),
+            power_user=factory.make_string(),
+            power_pass=factory.make_string())
+        response = call_signal(
+            client, power_type="moonshot", power_parameters=json.dumps(params))
+        self.assertEqual(httplib.OK, response.status_code, response.content)
+        node = reload_object(node)
+        self.assertEqual("mscm", node.power_type)
+        self.assertNotEqual(params, node.power_parameters)
+
     def test_signal_refuses_bad_power_type(self):
         node = factory.make_Node(status=NODE_STATUS.COMMISSIONING)
         client = make_node_client(node=node)