Merge lp:~blake-rouse/maas/fix-1482737 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Convert the request.data to a mutable QueryDict in get_storage_layout_params in the acquire call.

[Ricardo Bánffy (rbanffy)]

Typo in comment.

review: Approve

[Ricardo Bánffy (rbanffy)]

Sorry. Didn't save the inline note. "multable" on line 8

=== modified file 'src/maasserver/api/nodes.py'
--- src/maasserver/api/nodes.py	2015-08-05 15:06:29 +0000
+++ src/maasserver/api/nodes.py	2015-08-07 19:26:13 +0000
@@ -205,6 +205,9 @@
     form = StorageLayoutForm(required=required, data=request.data)
     if not form.is_valid():
         raise MAASAPIValidationError(form.errors)
+    # The request data needs to be mutable so replace the immutable QueryDict
+    # with a mutable one.
+    request.data = request.data.copy()
     storage_layout = request.data.pop('storage_layout', None)
     if not storage_layout:
         storage_layout = None

=== modified file 'src/maasserver/api/tests/test_nodes.py'
--- src/maasserver/api/tests/test_nodes.py	2015-08-05 15:06:29 +0000
+++ src/maasserver/api/tests/test_nodes.py	2015-08-07 19:26:13 +0000
@@ -21,6 +21,7 @@
 import crochet
 from django.core.urlresolvers import reverse
 from django.http import QueryDict
+from django.test import RequestFactory
 from maasserver import forms
 from maasserver.api import nodes as nodes_module
 from maasserver.api.utils import get_overridden_query_dict
@@ -81,6 +82,20 @@
 )
 
 
+class TestGetStorageLayoutParams(MAASServerTestCase):
+
+    def test_sets_request_data_to_mutable(self):
+        data = {
+            'op': 'acquire',
+            'storage_layout': 'flat',
+        }
+        request = RequestFactory().post(reverse('nodes_handler'), data)
+        request.data = request.POST.copy()
+        request.data._mutable = False
+        nodes_module.get_storage_layout_params(request)
+        self.assertTrue(request.data._mutable)
+
+
 class NodeHostnameTest(MultipleUsersScenarios,
                        MAASServerTestCase):