X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fimage.py;h=54aaf50220ec91ddb6969be6d9f27c9a2790ba75;hb=0d9b4d3f412bbf7406b748a8f75a3a00ddb2818a;hp=2449e42dea276958e649d9a82f79ad716bbd6811;hpb=2ac2da4b770f57bede8e9a9ee65142242fdf05a3;p=sfa.git

diff --git a/sfa/openstack/image.py b/sfa/openstack/image.py
index 2449e42d..54aaf502 100644
--- a/sfa/openstack/image.py
+++ b/sfa/openstack/image.py
@@ -50,7 +50,7 @@ class ImageManager:
     def get_available_disk_images(self):
         # get image records
         disk_images = []
-        for img in self.driver.shell.image_manager.detail():
+        for img in self.driver.shell.image_manager.get_images_detailed():
             image = Image(img)
             if image.container_format in ['ami', 'ovf']:
                 disk_images.append(image)
@@ -63,13 +63,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)