Merge lp:~jaypipes/glance/bug719825 into lp:~glance-coresec/glance/cactus-trunk

[Jay Pipes]

Adds Location: header to return from API server for POST /images, per APP spec

Adds Location: header to return from API server for POST /images, per APP spec

[Soren Hansen (soren)]

lgtm

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'glance/server.py'
--- glance/server.py	2011-02-06 14:08:14 +0000
+++ glance/server.py	2011-02-16 10:04:59 +0000
@@ -341,7 +341,13 @@
                 location = req.headers['x-image-meta-location']
                 self._activate(req, image_meta, location)
 
-        return dict(image=image_meta)
+        # APP states we should return a Location: header with the edit
+        # URI of the resource newly-created.
+        res = Response(request=req, body=json.dumps(dict(image=image_meta)),
+                       content_type="text/plain")
+        res.headers.add('Location', "/images/%s" % image_meta['id'])
+
+        return req.get_response(res)
 
     def update(self, req, id):
         """

=== modified file 'tests/unit/test_api.py'
--- tests/unit/test_api.py	2011-02-05 07:40:39 +0000
+++ tests/unit/test_api.py	2011-02-16 10:04:59 +0000
@@ -288,6 +288,14 @@
         self.assertEquals(res_body['location'],
                           'file:///tmp/glance-tests/3')
 
+        # Test that the Location: header is set to the URI to
+        # edit the newly-created image, as required by APP.
+        # See LP Bug #719825
+        self.assertTrue('location' in res.headers,
+                        "'location' not in response headers.\n"
+                        "res.headerlist = %r" % res.headerlist)
+        self.assertTrue('/images/3' in res.headers['location'])
+
     def test_image_meta(self):
         """Test for HEAD /images/<ID>"""
         expected_headers = {'x-image-meta-id': 2,