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 (parent:
ef3e070
)
fix bug in get_aggregate_nodes()
merged-in-sfa-2.1-2
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Tue, 7 Feb 2012 18:43:26 +0000
(13:43 -0500)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Tue, 7 Feb 2012 18:43:26 +0000
(13:43 -0500)
sfa/openstack/osaggregate.py
patch
|
blob
|
history
diff --git
a/sfa/openstack/osaggregate.py
b/sfa/openstack/osaggregate.py
index
6ca9209
..
60e3d56
100644
(file)
--- a/
sfa/openstack/osaggregate.py
+++ b/
sfa/openstack/osaggregate.py
@@
-5,6
+5,7
@@
from sfa.rspecs.elements.hardware_type import HardwareType
from sfa.rspecs.elements.node import Node
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.login import Login
from sfa.rspecs.elements.node import Node
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.login import Login
+from sfa.rspecs.elements.disk_image import DiskImage
from sfa.rspecs.elements.services import Services
from sfa.util.xrn import Xrn
from sfa.util.osxrn import OSXrn
from sfa.rspecs.elements.services import Services
from sfa.util.xrn import Xrn
from sfa.util.osxrn import OSXrn
@@
-87,12
+88,12
@@
class OSAggregate:
images = self.driver.shell.image_manager.detail()
disk_images = []
for image in images:
images = self.driver.shell.image_manager.detail()
disk_images = []
for image in images:
- if image
.container_format
== 'ami':
- img = Image()
- img['name'] = im
g.name
- img['description'] = im
g.name
- img['os'] = im
g.name
- img['version'] = im
g.name
+ if image
['container_format']
== 'ami':
+ img =
Disk
Image()
+ img['name'] = im
age['name']
+ img['description'] = im
age['name']
+ img['os'] = im
age['name']
+ img['version'] = im
age['name']
disk_images.append(img)
rspec_nodes = []
disk_images.append(img)
rspec_nodes = []
@@
-107,11
+108,10
@@
class OSAggregate:
HardwareType({'name': 'pc'})]
slivers = []
for instance in instances:
HardwareType({'name': 'pc'})]
slivers = []
for instance in instances:
- for image in images:
- sliver = self.instance_to_sliver(instance)
- sliver['disk_images'] = disk_images
-
- slivers = [self.instance_to_sliver(inst) for inst in instances]
+ sliver = self.instance_to_sliver(instance)
+ sliver['disk_images'] = disk_images
+ slivers.append(sliver)
+
rspec_node['slivers'] = slivers
rspec_nodes.append(rspec_node)
rspec_node['slivers'] = slivers
rspec_nodes.append(rspec_node)