From bc381392611859b1dcaef62e32a237719bc79f24 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 28 Jun 2012 11:19:56 -0400 Subject: [PATCH] cleanup --- sfa/openstack/image.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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) -- 2.47.0