X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fimage.py;h=555b1b9bb1d04f2d20a0cf1f3d141cd388fc1d94;hb=06768bd605e5d47fadfc90a35c74e30f267226a5;hp=4af0da430ab380d7ed3cb98cfaa66ec84bec4480;hpb=2e3b53c4bcd4926efe82d50fef5922548b88eff7;p=sfa.git

diff --git a/sfa/openstack/image.py b/sfa/openstack/image.py
index 4af0da43..555b1b9b 100644
--- a/sfa/openstack/image.py
+++ b/sfa/openstack/image.py
@@ -4,7 +4,8 @@ from sfa.rspecs.elements.disk_image import DiskImage
 
 class Image:
     
-    def __init__(self, image={}):
+    def __init__(self, image=None):
+        if image is None: image={}
         self.id = None
         self.container_format = None
         self.kernel_id = None
@@ -63,13 +64,11 @@ class ImageManager:
         disk_image = None
         try:
             if id:
-                image = self.driver.shell.image_manager.show(id)
+                image = self.driver.shell.nova_manager.images.find(id=id)
             elif name:
-                image = self.driver.shell.image_manager.show_by_name(name)
-            if image['container_format'] in ['ami', 'ovf']:
-                disk_image = Image(image)
+                image = self.driver.shell.nova_manager.images.find(name=name)
         except ImageNotFound:
                 pass
-        return disk_image
+        return Image(image)