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:
b2d364d
)
fix AttributeError
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 1 Feb 2012 02:22:47 +0000
(21:22 -0500)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 1 Feb 2012 02:22:47 +0000
(21:22 -0500)
sfa/openstack/osaggregate.py
patch
|
blob
|
history
diff --git
a/sfa/openstack/osaggregate.py
b/sfa/openstack/osaggregate.py
index
521cbb8
..
c165cfb
100644
(file)
--- a/
sfa/openstack/osaggregate.py
+++ b/
sfa/openstack/osaggregate.py
@@
-49,7
+49,7
@@
class OSAggregate:
def get_slice_nodes(self, slice_xrn):
name = OSXrn(xrn = slice_xrn).name
def get_slice_nodes(self, slice_xrn):
name = OSXrn(xrn = slice_xrn).name
- instances = self.driver.instance_get_all_by_project(name)
+ instances = self.driver.
shell.
instance_get_all_by_project(name)
rspec_nodes = []
for instance in instances:
rspec_node = Node()
rspec_nodes = []
for instance in instances:
rspec_node = Node()
@@
-64,7
+64,7
@@
class OSAggregate:
def get_aggregate_nodes(self):
def get_aggregate_nodes(self):
- zones = self.driver.zone_get_all()
+ zones = self.driver.
shell.
zone_get_all()
if not zones:
zones = ['cloud']
else:
if not zones:
zones = ['cloud']
else:
@@
-80,7
+80,7
@@
class OSAggregate:
rspec_node['exclusive'] = 'false'
rspec_node['hardware_types'] = [HardwareType({'name': 'plos-pc'}),
HardwareType({'name': 'pc'})]
rspec_node['exclusive'] = 'false'
rspec_node['hardware_types'] = [HardwareType({'name': 'plos-pc'}),
HardwareType({'name': 'pc'})]
- instances = self.driver.instance_type_get_all().values()
+ instances = self.driver.
shell.
instance_type_get_all().values()
slivers = [self.instance_to_sliver(inst) for inst in instances]
rspec_node['slivers'] = slivers
rspec_nodes.append(rspec_node)
slivers = [self.instance_to_sliver(inst) for inst in instances]
rspec_node['slivers'] = slivers
rspec_nodes.append(rspec_node)