← Back to branch summary

~glance-coresec/glance/trunk

« back to all changes in this revision

Viewing changes to glance/parallax/controllers.py

  • Committer: Tarmac
  • Author(s): Rick Harris
  • Date: 2010-10-05 16:16:42 UTC
  • mfrom: (8.2.10 refactor_swift_authurl)
  • Revision ID: hudson@openstack.org-20101005161642-0h3ugq7i4x2pqn13
With this patch Parallax and teller now work end-to-end with the Swift backend.

bash-3.2$ curl localhost:9292/image?uri=http://localhost:9191/images/2 > testimg.tar.gz
  % Total % Received % Xferd Average Speed Time Time Time Current
                                 Dload Upload Total Spent Left Speed
100 189M 0 189M 0 0 203k 0 --:--:-- 0:15:52 --:--:-- 214k

bash-3.2$ md5 testimg.tar.gz
MD5 (testimg.tar.gz) = ef6c5db4f55b0030828b71dd253a2384

Show diffs side-by-side

added added

removed removed

Lines of Context:
glance/parallax/controllers.py
81
81
                        if not m.deleted)
82
82
 
83
83
        image_attrs = base_attrs | set(['name', 'image_type', 'state', 'public'])
84
 
        
85
84
        image_dict = _fetch_attrs(image, image_attrs)
 
85
 
86
86
        image_dict['files'] = files
87
87
        image_dict['metadata'] = metadata
88
88
        return image_dict
89
89
 
90
 
        return dict(id=image.id, 
91
 
                    name=image.name,
92
 
                    state=image.state,
93
 
                    public=image.public,
94
 
                    files=files,
95
 
                    metadata=metadata)
96
 
 
97
90
 
98
91
class API(wsgi.Router):
99
92
    """WSGI entry point for all Parallax requests."""