~0x44/nova/extdoc

« back to all changes in this revision

Viewing changes to nova/api/ec2/cloud.py

  • Committer: Tarmac
  • Author(s): Brian Waldon
  • Date: 2011-09-13 15:23:15 UTC
  • mfrom: (1517.2.17 image-service-cleanup)
  • Revision ID: tarmac-20110913152315-a21jg0bvjjlyga82
- remove translation of non-recognized attributes to user metadata, now just ignored
- ensure all keys are defined in image dictionaries, defaulting to None if glance client doesn't provide one
- remove BaseImageService
- reorganize some GlanceImageService tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
1467
1467
        return image
1468
1468
 
1469
1469
    def _format_image(self, image):
1470
 
        """Convert from format defined by BaseImageService to S3 format."""
 
1470
        """Convert from format defined by GlanceImageService to S3 format."""
1471
1471
        i = {}
1472
1472
        image_type = self._image_type(image.get('container_format'))
1473
1473
        ec2_id = self.image_ec2_id(image.get('id'), image_type)