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
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)
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)