git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include firewall rules in openstack manifest rspec
[sfa.git]
/
sfa
/
openstack
/
image.py
diff --git
a/sfa/openstack/image.py
b/sfa/openstack/image.py
index
2449e42
..
54aaf50
100644
(file)
--- 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 = []
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)
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:
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:
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
except ImageNotFound:
pass
- return
disk_image
+ return
Image(image)