X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fimage.py;h=4e511df190cb0193066b7e3660af7947350e6bcc;hb=fd395e1944dcd49f10a4d5b27ce4983ad389fb96;hp=555b1b9bb1d04f2d20a0cf1f3d141cd388fc1d94;hpb=4f9d407d0ce159bdb359e9ab500bf88b5f586e62;p=sfa.git diff --git a/sfa/openstack/image.py b/sfa/openstack/image.py index 555b1b9b..4e511df1 100644 --- a/sfa/openstack/image.py +++ b/sfa/openstack/image.py @@ -3,9 +3,10 @@ from sfa.rspecs.elements.disk_image import DiskImage class Image: - + def __init__(self, image=None): - if image is None: image={} + if image is None: + image = {} self.id = None self.container_format = None self.kernel_id = None @@ -21,22 +22,23 @@ class Image: def parse_image(self, image): if isinstance(image, dict): - self.id = image['id'] + self.id = image['id'] self.name = image['name'] self.container_format = image['container_format'] - self.properties = image['properties'] + self.properties = image['properties'] if 'kernel_id' in self.properties: self.kernel_id = self.properties['kernel_id'] if 'ramdisk_id' in self.properties: self.ramdisk_id = self.properties['ramdisk_id'] - + def to_rspec_object(self): img = DiskImage() img['name'] = self.name img['description'] = self.name img['os'] = self.name img['version'] = self.name - return img + return img + class ImageManager: @@ -68,7 +70,5 @@ class ImageManager: elif name: image = self.driver.shell.nova_manager.images.find(name=name) except ImageNotFound: - pass + pass return Image(image) - -