Merge lp:~rvb/maas/bug-1154142 into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Add 'resource_uri' when returning the JSONized value of a file.

We're generating the JSON representation of a file manually (because we're base64-encoding its content), we also need to populate the value of 'resource_uri' manually. The Go provider relies on that.

[Jeroen T. Vermeulen (jtv)]

Thanks for the testing, and the fix! The "Add the resource_uri" comment is probably a bit overkill — this is python and it's pretty clear what you're doing.

review: Approve

[Gavin Panella (allenap)]

I think a workaround will need to go into gomaasapi too, because this has probably missed the SRU.

review: Approve

[MAAS Lander (maas-lander)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2013-03-08 13:46:34 +0000
+++ src/maasserver/api.py	2013-03-12 16:02:21 +0000
@@ -104,6 +104,7 @@
     PermissionDenied,
     ValidationError,
     )
+from django.core.urlresolvers import reverse
 from django.db.utils import DatabaseError
 from django.forms.models import model_to_dict
 from django.http import (
@@ -845,6 +846,8 @@
     # Encode the content as base64.
     dict_representation['content'] = b64encode(
         getattr(stored_file, 'content'))
+    dict_representation['resource_uri'] = reverse(
+        'file_handler', args=[stored_file.filename])
     # Emit the json for this object manually because, no matter what the
     # piston documentation says, once a type is associated with a list
     # of fields by piston's typemapper mechanism, there is no way to

=== modified file 'src/maasserver/tests/test_api.py'
--- src/maasserver/tests/test_api.py	2013-03-08 13:46:34 +0000
+++ src/maasserver/tests/test_api.py	2013-03-12 16:02:21 +0000
@@ -2861,6 +2861,18 @@
                 b64decode(parsed_result['content'])
             ))
 
+    def test_get_file_returns_file_object_with_resource_uri(self):
+        filename = factory.make_name("file")
+        content = sample_binary_data
+        factory.make_file_storage(
+            filename=filename, content=content, owner=self.logged_in_user)
+        response = self.client.get(
+            reverse('file_handler', args=[filename]))
+        parsed_result = json.loads(response.content)
+        self.assertEqual(
+            reverse('file_handler', args=[filename]),
+            parsed_result['resource_uri'])
+
     def test_get_file_returns_owned_file(self):
         # If both an owned file and a non-owned file are present (with the
         # same name), the owned file is returned.