Merge lp:~rvb/maas/bug-1154142-1.2 into lp:maas/1.2

[Raphaël Badin]

Backport revision 1455.

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2013-03-08 13:58:41 +0000
+++ src/maasserver/api.py	2013-03-12 16:31:21 +0000
@@ -102,6 +102,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 (
@@ -1087,6 +1088,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:58:41 +0000
+++ src/maasserver/tests/test_api.py	2013-03-12 16:31:21 +0000
@@ -2948,6 +2948,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.