← Back to branch summary

~ubuntu-branches/ubuntu/precise/glance/precise-proposed

« back to all changes in this revision

Viewing changes to glance/api/v1/images.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandleman
  • Date: 2012-01-20 14:37:16 UTC
  • mfrom: (1.1.24)
  • Revision ID: package-import@ubuntu.com-20120120143716-2va2h1g2230m51zx
Tags: 2012.1~e3~20120120.1206-0ubuntu1
[Chuck Short]
* New upstream release.

[Adam Gandleman]
* debian/glance-api.install, glance-registry.install:  Install
  new paste configs that have been split among servers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
glance/api/v1/images.py
45
45
import glance.store.s3
46
46
import glance.store.swift
47
47
from glance.store import (get_from_backend,
 
48
                          get_size_from_backend,
48
49
                          schedule_delete_from_backend,
49
50
                          get_store_from_location,
50
51
                          get_store_from_scheme,
246
247
            # don't actually care what it is at this point
247
248
            self.get_store_or_400(req, store)
248
249
 
 
250
            # retrieve the image size from remote store (if not provided)
 
251
            image_meta['size'] = image_meta.get('size', 0) \
 
252
                                 or get_size_from_backend(location)
 
253
        else:
 
254
            # Ensure that the size attribute is set to zero for uploadable
 
255
            # images (if not provided). The size will be set to a non-zero
 
256
            # value during upload
 
257
            image_meta['size'] = image_meta.get('size', 0)
 
258
 
249
259
        image_meta['status'] = 'queued'
250
260
 
251
 
        # Ensure that the size attribute is set to zero for all
252
 
        # queued instances. The size will be set to a non-zero
253
 
        # value during upload
254
 
        image_meta['size'] = image_meta.get('size', 0)
255
 
 
256
261
        try:
257
262
            image_meta = registry.add_image_metadata(req.context, image_meta)
258
263
            return image_meta