Merge lp:~freyes/maas/lp1610414-2.0 into lp:maas/2.0

[Felipe Reyes]

This MP allows to use MAASClient to submit POST calls without the `op` argument in the query string, this is needed to create devices.

Backport of rev5225, merged at https://code.launchpad.net/~freyes/maas/lp1610414/+merge/302188

[Blake Rouse (blake-rouse)]

Thanks for doing this.

review: Approve

=== modified file 'src/apiclient/maas_client.py'
--- src/apiclient/maas_client.py	2016-04-01 18:16:57 +0000
+++ src/apiclient/maas_client.py	2016-08-08 20:54:16 +0000
@@ -240,7 +240,8 @@
             POST it as application/json
         :return: The result of the dispatch_query call on the dispatcher.
         """
-        kwargs['op'] = op
+        if op:
+            kwargs['op'] = op
         url, headers, body = self._formulate_change(
             path, kwargs, as_json=as_json)
         return self.dispatcher.dispatch_query(
 
=== modified file 'src/apiclient/tests/test_maas_client.py'
--- src/apiclient/tests/test_maas_client.py	2016-05-12 19:07:37 +0000
+++ src/apiclient/tests/test_maas_client.py	2016-08-08 20:54:16 +0000
@@ -352,6 +352,19 @@
         self.assertTrue(request["request_url"].endswith('?op=%s' % (method,)))
         self.assertEqual({'param': param, 'list_param': list_param}, content)
 
+    def test_post_without_op(self):
+        path = make_path()
+        param = factory.make_string()
+        method = None
+        client = make_client()
+
+        client.post(path, method, parameter=param)
+        request = client.dispatcher.last_call
+        post, _ = parse_headers_and_body_with_django(
+            request["headers"], request["data"])
+        self.assertTrue(request["request_url"].endswith(path))
+        self.assertEqual({"parameter": [param]}, post)
+
     def test_put_dispatches_to_resource(self):
         path = make_path()
         client = make_client()