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:
8b3614f
)
updated
author
Tony Mack
<tmack@cs.princeton.edu>
Mon, 16 Mar 2009 23:52:29 +0000
(23:52 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Mon, 16 Mar 2009 23:52:29 +0000
(23:52 +0000)
geni/aggregate.py
patch
|
blob
|
history
diff --git
a/geni/aggregate.py
b/geni/aggregate.py
index
604d759
..
7d5daec
100644
(file)
--- a/
geni/aggregate.py
+++ b/
geni/aggregate.py
@@
-250,6
+250,8
@@
class Aggregate(GeniServer):
# Get the required nodes
if type in ['aggregate']:
nodes = self.shell.GetNodes(self.auth)
# Get the required nodes
if type in ['aggregate']:
nodes = self.shell.GetNodes(self.auth)
+ try: linkspecs = self.shell.GetLinkSpecs() # if call is supported
+ except: linkspecs = []
elif type in ['slice']:
slicename = hrn_to_pl_slicename(hrn)
slices = self.shell.GetSlices(self.auth, [slicename])
elif type in ['slice']:
slicename = hrn_to_pl_slicename(hrn)
slices = self.shell.GetSlices(self.auth, [slicename])
@@
-290,7
+292,11
@@
class Aggregate(GeniServer):
duration = end_time - start_time
# create the plc dict
duration = end_time - start_time
# create the plc dict
- networks = [{'nodes': nodes, 'name': self.hrn, 'start_time': start_time, 'duration': duration}]
+ networks = [{'nodes': nodes,
+ 'links': linkspecs,
+ 'name': self.hrn,
+ 'start_time': start_time,
+ 'duration': duration}]
resources = {'networks': networks, 'start_time': start_time, 'duration': duration}
# convert the plc dict to an rspec dict
resources = {'networks': networks, 'start_time': start_time, 'duration': duration}
# convert the plc dict to an rspec dict