From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 28 Jun 2012 15:19:56 +0000 (-0400)
Subject: cleanup
X-Git-Tag: sfa-2.1-12~36^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bc381392611859b1dcaef62e32a237719bc79f24;p=sfa.git

cleanup
---

diff --git a/sfa/openstack/image.py b/sfa/openstack/image.py
index 4af0da43..54aaf502 100644
--- a/sfa/openstack/image.py
+++ b/sfa/openstack/image.py
@@ -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)