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:
0dcc08c
)
fix bug in getComponents, return nodes in the format the user requested
author
Tony Mack
<tmack@cs.princeton.edu>
Fri, 6 Feb 2009 04:12:04 +0000
(
04:12
+0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Fri, 6 Feb 2009 04:12:04 +0000
(
04:12
+0000)
geni/aggregate.py
patch
|
blob
|
history
diff --git
a/geni/aggregate.py
b/geni/aggregate.py
index
acaf16e
..
533b365
100644
(file)
--- a/
geni/aggregate.py
+++ b/
geni/aggregate.py
@@
-244,7
+244,7
@@
class Aggregate(GeniServer):
self.refresh_components()
elif now < self.threshold and not self.nodes.keys():
self.load_components()
self.refresh_components()
elif now < self.threshold and not self.nodes.keys():
self.load_components()
- return self.nodes
.keys()
+ return self.nodes
[type]
def getSlices(self, hrn):
"""
def getSlices(self, hrn):
"""
@@
-263,7
+263,6
@@
class Aggregate(GeniServer):
if type in ['aggregate']:
nodes = self.shell.GetNodes(self.auth)
elif type in ['slice']:
if type in ['aggregate']:
nodes = self.shell.GetNodes(self.auth)
elif type in ['slice']:
- print hrn
slicename = hrn_to_pl_slicename(hrn)
slices = self.shell.GetSlices(self.auth, [slicename])
node_ids = slices[0]['node_ids']
slicename = hrn_to_pl_slicename(hrn)
slices = self.shell.GetSlices(self.auth, [slicename])
node_ids = slices[0]['node_ids']