Merge lp:~ltrager/maas/lp1636858_2.0 into lp:maas/2.0

[Lee Trager]

Backport from 2.1.1 - If the power_parameters are the empty string set them to an empty dictionary, don't use json.loads

Reviewed in - https://code.launchpad.net/~ltrager/maas/lp1636858/+merge/309392

[MAAS Lander (maas-lander)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: .

[Lee Trager (ltrager)]

review: Approve

=== modified file 'etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh'
--- etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh	2016-04-12 17:36:35 +0000
+++ etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh	2016-10-26 23:40:14 +0000
@@ -136,7 +136,7 @@
       -n | --hostname         hostname of the node to register
       -i | --interface        interface address to register (obtains MAC address)
       -a | --arch             architecture of the node to register
-      -t | --power-type       power type (ipmi, virsh, manual)
+      -t | --power-type       power type (ipmi, virsh, moonshot)
       -p | --power-params     power parameters (In JSON format, between single quotes)
                               e.g. --power-params '{"power_address":"192.168.1.10"}'
       --subarch               subarchitecture of the node to register
 
=== modified file 'src/maasserver/api/tests/test_machines.py'
--- src/maasserver/api/tests/test_machines.py	2016-10-05 19:01:28 +0000
+++ src/maasserver/api/tests/test_machines.py	2016-10-26 23:40:14 +0000
@@ -203,6 +203,23 @@
             "Select a valid choice. %s is not one of the "
             "available choices." % power_type, validation_errors[0])
 
+    def test_POST_new_handles_empty_str_power_parameters(self):
+        # Regression test for LP:1636858
+        response = self.client.post(
+            reverse('machines_handler'),
+            {
+                'architecture': make_usable_architecture(self),
+                'mac_addresses': ['aa:bb:cc:dd:ee:ff'],
+                'power_type': '',
+                'power_parameters': '',
+            })
+        self.assertEqual(http.client.OK, response.status_code)
+        system_id = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))['system_id']
+        machine = Machine.objects.get(system_id=system_id)
+        self.assertEquals('', machine.power_type)
+        self.assertItemsEqual({}, machine.power_parameters)
+
     def test_GET_lists_machines(self):
         # The api allows for fetching the list of Machines.
         machine1 = factory.make_Node()
@@ -219,7 +236,7 @@
 
     def test_GET_machines_issues_constant_number_of_queries(self):
         # XXX: GavinPanella 2014-10-03 bug=1377335
-        self.skip("Unreliable; something is causing varying counts.")
+        self.skipTest("Unreliable; something is causing varying counts.")
 
         for _ in range(10):
             factory.make_Node_with_Interface_on_Subnet()
 
=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2016-10-24 18:41:13 +0000
+++ src/maasserver/forms.py	2016-10-26 23:40:14 +0000
@@ -253,10 +253,14 @@
             'power_parameters', form.initial.get('power_parameters', {}))
 
         if isinstance(power_parameters, str):
-            try:
-                power_parameters = json.loads(power_parameters)
-            except json.JSONDecodeError:
-                raise ValidationError("Failed to parse JSON power_parameters")
+            if power_parameters.strip() == '':
+                power_parameters = {}
+            else:
+                try:
+                    power_parameters = json.loads(power_parameters)
+                except json.JSONDecodeError:
+                    raise ValidationError(
+                        "Failed to parse JSON power_parameters")
 
         # Integrate the machines existing power_parameters if unset by form.
         if machine: