git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
54cfedb
)
fix bugs in disk_image_to_rspec_object(), get_machine_image_details()
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 27 Feb 2012 22:01:44 +0000
(17:01 -0500)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 27 Feb 2012 22:01:44 +0000
(17:01 -0500)
sfa/openstack/osaggregate.py
patch
|
blob
|
history
diff --git
a/sfa/openstack/osaggregate.py
b/sfa/openstack/osaggregate.py
index
e7486e8
..
cf5a3b4
100644
(file)
--- a/
sfa/openstack/osaggregate.py
+++ b/
sfa/openstack/osaggregate.py
@@
-15,10
+15,10
@@
from sfa.rspecs.version_manager import VersionManager
def disk_image_to_rspec_object(image):
img = DiskImage()
def disk_image_to_rspec_object(image):
img = DiskImage()
- img['name'] = image['name']
- img['description'] = image['name']
- img['os'] = image['name']
- img['version'] = image['name']
+ img['name'] = image['
ami']['
name']
+ img['description'] = image['
ami']['
name']
+ img['os'] = image['
ami']['
name']
+ img['version'] = image['
ami']['
name']
return img
return img
@@
-65,9
+65,11
@@
class OSAggregate:
"""
disk_image = {}
if image['container_format'] == 'ami':
"""
disk_image = {}
if image['container_format'] == 'ami':
+ kernel_id = image['properties']['kernel_id']
+ ramdisk_id = image['properties']['ramdisk_id']
disk_image['ami'] = image
disk_image['ami'] = image
- disk_image['aki'] = self.driver.shell.image_manager.show(
image['kernel_id']
)
- disk_image['ari'] = self.driver.shell.image_manager.show(
image['ramdisk_id']
)
+ disk_image['aki'] = self.driver.shell.image_manager.show(
kernel_id
)
+ disk_image['ari'] = self.driver.shell.image_manager.show(
ramdisk_id
)
return disk_image
def get_disk_image(self, id=None, name=None):
return disk_image
def get_disk_image(self, id=None, name=None):
@@
-137,7
+139,7
@@
class OSAggregate:
# available images
disk_images = self.get_available_disk_images()
disk_image_objects = [disk_image_to_rspec_object(image) \
# available images
disk_images = self.get_available_disk_images()
disk_image_objects = [disk_image_to_rspec_object(image) \
- for image in disk_image]
+ for image in disk_image
s
]
rspec_nodes = []
for zone in zones:
rspec_node = Node()
rspec_nodes = []
for zone in zones:
rspec_node = Node()